diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py index 944e2942e..b5b103646 100644 --- a/src/documents/tests/test_management_exporter.py +++ b/src/documents/tests/test_management_exporter.py @@ -25,7 +25,6 @@ from guardian.models import UserObjectPermission from guardian.shortcuts import assign_perm from documents.management.commands import document_exporter -from documents.sanity_checker import check_sanity from documents.settings import EXPORTER_FILE_NAME from documents.tests.utils import DirectoriesMixin from documents.tests.utils import FileSystemAssertsMixin @@ -43,6 +42,7 @@ from paperless.models import User from paperless.models import Workflow from paperless.models import WorkflowAction from paperless.models import WorkflowTrigger +from paperless.sanity_checker import check_sanity from paperless_mail.models import MailAccount diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py index d8a1b1814..d068a749f 100644 --- a/src/documents/tests/test_sanity_check.py +++ b/src/documents/tests/test_sanity_check.py @@ -7,9 +7,9 @@ import filelock from django.conf import settings from django.test import TestCase -from documents.sanity_checker import check_sanity from documents.tests.utils import DirectoriesMixin from paperless.models import Document +from paperless.sanity_checker import check_sanity class TestSanityCheck(DirectoriesMixin, TestCase): diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py index fae31876a..c3e582e85 100644 --- a/src/documents/tests/test_tasks.py +++ b/src/documents/tests/test_tasks.py @@ -7,8 +7,6 @@ from django.conf import settings from django.test import TestCase from django.utils import timezone -from documents.sanity_checker import SanityCheckFailedException -from documents.sanity_checker import SanityCheckMessages from documents.tests.test_classifier import dummy_preprocess from documents.tests.utils import DirectoriesMixin from documents.tests.utils import FileSystemAssertsMixin @@ -17,6 +15,8 @@ from paperless.models import Correspondent from paperless.models import Document from paperless.models import DocumentType from paperless.models import Tag +from paperless.sanity_checker import SanityCheckFailedException +from paperless.sanity_checker import SanityCheckMessages class TestIndexReindex(DirectoriesMixin, TestCase): diff --git a/src/paperless/management/commands/document_sanity_checker.py b/src/paperless/management/commands/document_sanity_checker.py index 88295445c..d8b4d52a0 100644 --- a/src/paperless/management/commands/document_sanity_checker.py +++ b/src/paperless/management/commands/document_sanity_checker.py @@ -1,7 +1,7 @@ from django.core.management.base import BaseCommand -from documents.sanity_checker import check_sanity from paperless.management.commands.mixins import ProgressBarMixin +from paperless.sanity_checker import check_sanity class Command(ProgressBarMixin, BaseCommand): diff --git a/src/documents/sanity_checker.py b/src/paperless/sanity_checker.py similarity index 100% rename from src/documents/sanity_checker.py rename to src/paperless/sanity_checker.py diff --git a/src/paperless/tasks.py b/src/paperless/tasks.py index 482c1d443..2a529ef5c 100644 --- a/src/paperless/tasks.py +++ b/src/paperless/tasks.py @@ -19,16 +19,15 @@ from django.utils import timezone from filelock import FileLock from whoosh.writing import AsyncWriter -from documents import sanity_checker from documents.plugins.base import ConsumeTaskPlugin from documents.plugins.base import ProgressManager from documents.plugins.base import StopConsumeTaskError from documents.plugins.helpers import ProgressStatusOptions -from documents.sanity_checker import SanityCheckFailedException from documents.signals import document_updated from documents.signals.handlers import cleanup_document_deletion from documents.signals.handlers import run_workflows from paperless import index +from paperless import sanity_checker from paperless.barcodes import BarcodePlugin from paperless.caching import clear_document_caches from paperless.classifier import DocumentClassifier @@ -52,6 +51,7 @@ from paperless.models import WorkflowRun from paperless.models import WorkflowTrigger from paperless.parsers import DocumentParser from paperless.parsers import get_parser_class_for_mime_type +from paperless.sanity_checker import SanityCheckFailedException if settings.AUDIT_LOG_ENABLED: from auditlog.models import LogEntry