diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index f94362ed9..fd0d12804 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -23,7 +23,6 @@ from django.utils import timezone from filelock import FileLock from guardian.shortcuts import remove_perm -from documents import matching from documents.caching import clear_document_caches from documents.file_handling import create_source_path_directory from documents.file_handling import delete_empty_directories @@ -32,6 +31,7 @@ from documents.mail import send_email from documents.permissions import get_objects_for_user_owner_aware from documents.permissions import set_permissions_for_object from documents.templating.workflows import parse_w_workflow_placeholders +from paperless import matching from paperless.models import Correspondent from paperless.models import CustomField from paperless.models import CustomFieldInstance diff --git a/src/documents/tests/test_matchables.py b/src/documents/tests/test_matchables.py index a3b5ec52d..a6c4e27f7 100644 --- a/src/documents/tests/test_matchables.py +++ b/src/documents/tests/test_matchables.py @@ -8,8 +8,8 @@ from django.contrib.auth.models import User from django.test import TestCase from django.test import override_settings -from documents import matching from documents.signals import document_consumption_finished +from paperless import matching from paperless.models import Correspondent from paperless.models import Document from paperless.models import DocumentType diff --git a/src/documents/tests/test_workflows.py b/src/documents/tests/test_workflows.py index 8deebe482..51cf2a706 100644 --- a/src/documents/tests/test_workflows.py +++ b/src/documents/tests/test_workflows.py @@ -24,12 +24,12 @@ if TYPE_CHECKING: from documents import tasks from documents.data_models import ConsumableDocument from documents.data_models import DocumentSource -from documents.matching import document_matches_workflow from documents.signals import document_consumption_finished from documents.tests.utils import DirectoriesMixin from documents.tests.utils import DummyProgressManager from documents.tests.utils import FileSystemAssertsMixin from documents.tests.utils import SampleDirMixin +from paperless.matching import document_matches_workflow from paperless.models import Correspondent from paperless.models import CustomField from paperless.models import CustomFieldInstance diff --git a/src/documents/matching.py b/src/paperless/matching.py similarity index 100% rename from src/documents/matching.py rename to src/paperless/matching.py diff --git a/src/paperless/views.py b/src/paperless/views.py index acecc5826..fcfa3e7c8 100644 --- a/src/paperless/views.py +++ b/src/paperless/views.py @@ -124,10 +124,6 @@ from documents.filters import StoragePathFilterSet from documents.filters import TagFilterSet from documents.index import DelayedQuery from documents.mail import send_email -from documents.matching import match_correspondents -from documents.matching import match_document_types -from documents.matching import match_storage_paths -from documents.matching import match_tags from documents.parsers import get_parser_class_for_mime_type from documents.parsers import parse_date_generator from documents.permissions import PaperlessAdminPermissions @@ -174,6 +170,10 @@ from paperless.config import GeneralConfig from paperless.db import GnuPG from paperless.filters import GroupFilterSet from paperless.filters import UserFilterSet +from paperless.matching import match_correspondents +from paperless.matching import match_document_types +from paperless.matching import match_storage_paths +from paperless.matching import match_tags from paperless.models import ApplicationConfiguration from paperless.models import Correspondent from paperless.models import CustomField