Merge data models

diff --git a/src/documents/barcodes.py b/src/documents/barcodes.py
index 11a7dc6b33be7a4ef8e3024e95fbf90bc4937dcb..acfc779f9989efe4b6a83ff679c8bcf2482c275e 100644 (file)
--- a/src/documents/barcodes.py
+++ b/src/documents/barcodes.py
@@ -14,13 +14,13 @@ from pikepdf import PasswordError
 from pikepdf import Pdf
 
 from documents.converters import convert_from_tiff_to_pdf
-from documents.data_models import ConsumableDocument
 from documents.plugins.base import ConsumeTaskPlugin
 from documents.plugins.base import StopConsumeTaskError
 from documents.plugins.helpers import ProgressStatusOptions
 from documents.utils import copy_basic_file_stats
 from documents.utils import copy_file_with_basic_stats
 from documents.utils import maybe_override_pixel_limit
+from paperless.data_models import ConsumableDocument
 from paperless.models import Tag
 
 if TYPE_CHECKING:

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index d95e32420ebdef688aac9cc497c22bb93ad7af0e..d358bb80bf1149ff92a373cc29efc55b8a0a606c 100644 (file)
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -16,14 +16,14 @@ from django.conf import settings
 from django.db.models import Q
 from django.utils import timezone
 
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
-from documents.data_models import DocumentSource
 from documents.permissions import set_permissions_for_object
 from documents.plugins.helpers import DocumentsStatusManager
 from documents.tasks import bulk_update_documents
 from documents.tasks import consume_file
 from documents.tasks import update_document_content_maybe_archive_file
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
+from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 1b0ed4459b7bb848a219cfe13c095ccec87ba1a1..4d9509e565a7b7431bbbc7ddee015369193cef09 100644 (file)
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -16,8 +16,6 @@ from filelock import FileLock
 from rest_framework.reverse import reverse
 
 from documents.classifier import load_classifier
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
 from documents.file_handling import create_source_path_directory
 from documents.file_handling import generate_unique_filename
 from documents.loggers import LoggingMixin
@@ -39,6 +37,8 @@ from documents.templating.workflows import parse_w_workflow_placeholders
 from documents.utils import copy_basic_file_stats
 from documents.utils import copy_file_with_basic_stats
 from documents.utils import run_subprocess
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index 3f15e6a04aabc4d2f3bb7f1e91d6eb517c7e9377..ebf4e07a013a48b9c1a203ea9bcfdd363945b989 100644 (file)
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -16,11 +16,11 @@ from django.core.management.base import CommandError
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers.polling import PollingObserver
 
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
-from documents.data_models import DocumentSource
 from documents.parsers import is_file_ext_supported
 from documents.tasks import consume_file
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
+from paperless.data_models import DocumentSource
 from paperless.models import Tag
 
 try:

diff --git a/src/documents/plugins/base.py b/src/documents/plugins/base.py
index 81f0c86c322abd96e150678eb7ef5e175f553c1b..89682cdaf55b3e5fccc901c9d7a553b95f98b532 100644 (file)
--- a/src/documents/plugins/base.py
+++ b/src/documents/plugins/base.py
@@ -2,9 +2,9 @@ import abc
 from pathlib import Path
 from typing import Final
 
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
 from documents.plugins.helpers import ProgressManager
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
 
 
 class StopConsumeTaskError(Exception):

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 006da390b1c2dc6554c93817588b60d2531a6ac8..2cb6737a73a64fd41287c1193aa9661d67b9866b 100644 (file)
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -36,7 +36,6 @@ if settings.AUDIT_LOG_ENABLED:
 
 
 from documents import bulk_edit
-from documents.data_models import DocumentSource
 from documents.parsers import is_mime_type_supported
 from documents.permissions import get_groups_with_only_permission
 from documents.permissions import set_permissions_for_object
@@ -44,6 +43,7 @@ from documents.templating.filepath import validate_filepath_template_and_render
 from documents.templating.utils import convert_format_str_to_template_format
 from documents.validators import uri_validator
 from documents.validators import url_validator
+from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index fd0d12804a1dc6e245d2f36fb0074f596e0fb39d..cba7568a5b63d115d9c1e0c5f3357bbeb479e8b6 100644 (file)
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -50,8 +50,8 @@ if TYPE_CHECKING:
     from pathlib import Path
 
     from documents.classifier import DocumentClassifier
-    from documents.data_models import ConsumableDocument
-    from documents.data_models import DocumentMetadataOverrides
+    from paperless.data_models import ConsumableDocument
+    from paperless.data_models import DocumentMetadataOverrides
 
 logger = logging.getLogger("paperless.handlers")
 

diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index a01782c9df8fb4ce067b0ba375b037dc186cb935..d961d18814e9667b396d01283d1dedf34bb3a2ff 100644 (file)
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -27,8 +27,6 @@ from documents.classifier import DocumentClassifier
 from documents.classifier import load_classifier
 from documents.consumer import ConsumerPlugin
 from documents.consumer import WorkflowTriggerPlugin
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
 from documents.double_sided import CollatePlugin
 from documents.file_handling import create_source_path_directory
 from documents.file_handling import generate_unique_filename
@@ -42,6 +40,8 @@ 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.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
 from paperless.models import Correspondent
 from paperless.models import CustomFieldInstance
 from paperless.models import Document

diff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.py
index c27c1f05070d5387a929346a22ce57247e87616c..fe388866a3fdc75b2bb5704c13406bb51f52ae39 100644 (file)
--- a/src/documents/tests/test_api_documents.py
+++ b/src/documents/tests/test_api_documents.py
@@ -28,10 +28,10 @@ from documents.caching import CACHE_50_MINUTES
 from documents.caching import CLASSIFIER_HASH_KEY
 from documents.caching import CLASSIFIER_MODIFIED_KEY
 from documents.caching import CLASSIFIER_VERSION_KEY
-from documents.data_models import DocumentSource
 from documents.signals.handlers import run_workflows
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import DocumentConsumeDelayMixin
+from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

diff --git a/src/documents/tests/test_api_workflows.py b/src/documents/tests/test_api_workflows.py
index d414eae770246a7377cb2a531b3095462d945529..9c76bacd7211a0f7b683aff23683e6c75924b770 100644 (file)
--- a/src/documents/tests/test_api_workflows.py
+++ b/src/documents/tests/test_api_workflows.py
@@ -5,8 +5,8 @@ from django.contrib.auth.models import User
 from rest_framework import status
 from rest_framework.test import APITestCase
 
-from documents.data_models import DocumentSource
 from documents.tests.utils import DirectoriesMixin
+from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import DocumentType

diff --git a/src/documents/tests/test_barcodes.py b/src/documents/tests/test_barcodes.py
index 218588dbc52621229f32a56002daa47523193b37..70adaf7b668599285a4de20c569dd1c6305e6e90 100644 (file)
--- a/src/documents/tests/test_barcodes.py
+++ b/src/documents/tests/test_barcodes.py
@@ -11,15 +11,15 @@ from django.test import override_settings
 
 from documents import tasks
 from documents.barcodes import BarcodePlugin
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
-from documents.data_models import DocumentSource
 from documents.plugins.base import StopConsumeTaskError
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import DocumentConsumeDelayMixin
 from documents.tests.utils import DummyProgressManager
 from documents.tests.utils import FileSystemAssertsMixin
 from documents.tests.utils import SampleDirMixin
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
+from paperless.data_models import DocumentSource
 from paperless.models import Document
 from paperless.models import Tag
 

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 6155f4841fc17244621e30e7a83f535fac77a17c..bb483d4da329c4fdfc04ec68d249e2cf61c769e6 100644 (file)
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -18,8 +18,6 @@ from django.utils import timezone
 from guardian.core import ObjectPermissionChecker
 
 from documents.consumer import ConsumerError
-from documents.data_models import DocumentMetadataOverrides
-from documents.data_models import DocumentSource
 from documents.parsers import DocumentParser
 from documents.parsers import ParseError
 from documents.plugins.helpers import ProgressStatusOptions
@@ -27,6 +25,8 @@ from documents.tasks import sanity_check
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import FileSystemAssertsMixin
 from documents.tests.utils import GetConsumerMixin
+from paperless.data_models import DocumentMetadataOverrides
+from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import Document

diff --git a/src/documents/tests/test_double_sided.py b/src/documents/tests/test_double_sided.py
index 5d068b735964dc5e1b0c3662aedb54f79578de72..6b3b59df0a6cc704074379069d2ce7591389d1f6 100644 (file)
--- a/src/documents/tests/test_double_sided.py
+++ b/src/documents/tests/test_double_sided.py
@@ -11,13 +11,13 @@ from pikepdf import Pdf
 
 from documents import tasks
 from documents.consumer import ConsumerError
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentSource
 from documents.double_sided import STAGING_FILE_NAME
 from documents.double_sided import TIMEOUT_MINUTES
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import DummyProgressManager
 from documents.tests.utils import FileSystemAssertsMixin
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentSource
 
 
 @override_settings(

diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py
index a741fe5aa7a7408fe87bb96f4c69f411d4bac471..d2de96b59a9138d46375e21c09ba481d3ee2a13e 100644 (file)
--- a/src/documents/tests/test_management_consumer.py
+++ b/src/documents/tests/test_management_consumer.py
@@ -13,10 +13,10 @@ from django.test import TransactionTestCase
 from django.test import override_settings
 
 from documents.consumer import ConsumerError
-from documents.data_models import ConsumableDocument
 from documents.management.commands import document_consumer
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import DocumentConsumeDelayMixin
+from paperless.data_models import ConsumableDocument
 from paperless.models import Tag
 
 

diff --git a/src/documents/tests/test_migration_workflows.py b/src/documents/tests/test_migration_workflows.py
index 9895188188a4e42c4169fe7640824ec546b76e68..1c16da9ddb5ab4ab87f4084bc1bdc08215d834a7 100644 (file)
--- a/src/documents/tests/test_migration_workflows.py
+++ b/src/documents/tests/test_migration_workflows.py
@@ -1,5 +1,5 @@
-from documents.data_models import DocumentSource
 from documents.tests.utils import TestMigrations
+from paperless.data_models import DocumentSource
 
 
 class TestMigrateWorkflow(TestMigrations):

diff --git a/src/documents/tests/test_task_signals.py b/src/documents/tests/test_task_signals.py
index a5ab8bd07de99d7a6bf0835cfc7e1ad9af20cb5a..c2594f596841d4f02a72dd0da45505f240f20b65 100644 (file)
--- a/src/documents/tests/test_task_signals.py
+++ b/src/documents/tests/test_task_signals.py
@@ -4,15 +4,15 @@ from unittest import mock
 import celery
 from django.test import TestCase
 
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
-from documents.data_models import DocumentSource
 from documents.signals.handlers import before_task_publish_handler
 from documents.signals.handlers import task_failure_handler
 from documents.signals.handlers import task_postrun_handler
 from documents.signals.handlers import task_prerun_handler
 from documents.tests.test_consumer import fake_magic_from_file
 from documents.tests.utils import DirectoriesMixin
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
+from paperless.data_models import DocumentSource
 from paperless.models import PaperlessTask
 
 

diff --git a/src/documents/tests/test_workflows.py b/src/documents/tests/test_workflows.py
index 51cf2a706c20572ba4f1301c41fbfe29b0595aac..295bb3878d30b9286aaf5daef0a1ec5b7b3952e3 100644 (file)
--- a/src/documents/tests/test_workflows.py
+++ b/src/documents/tests/test_workflows.py
@@ -22,13 +22,13 @@ if TYPE_CHECKING:
 
 
 from documents import tasks
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentSource
 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.data_models import ConsumableDocument
+from paperless.data_models import DocumentSource
 from paperless.matching import document_matches_workflow
 from paperless.models import Correspondent
 from paperless.models import CustomField

diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py
index fc50b3948a0702f3f53967ed53ed07127547fc64..87388ced8090cb935b0e6ae3cb2247d30702fb6d 100644 (file)
--- a/src/documents/tests/utils.py
+++ b/src/documents/tests/utils.py
@@ -21,11 +21,11 @@ from django.test import TransactionTestCase
 from django.test import override_settings
 
 from documents.consumer import ConsumerPlugin
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
-from documents.data_models import DocumentSource
 from documents.parsers import ParseError
 from documents.plugins.helpers import ProgressStatusOptions
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
+from paperless.data_models import DocumentSource
 
 
 def setup_directories():

diff --git a/src/documents/data_models.py b/src/paperless/data_models.py
similarity index 100%
rename from src/documents/data_models.py
rename to src/paperless/data_models.py

diff --git a/src/paperless/matching.py b/src/paperless/matching.py
index e01ca7eca92320dfb97c1adff163531b2fc8ef10..c3cc3ea0f7205e05a0709d013778e08e31af6f87 100644 (file)
--- a/src/paperless/matching.py
+++ b/src/paperless/matching.py
@@ -5,9 +5,9 @@ import re
 from fnmatch import fnmatch
 from typing import TYPE_CHECKING
 
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentSource
 from documents.permissions import get_objects_for_user_owner_aware
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
 from paperless.models import Document
 from paperless.models import DocumentType

diff --git a/src/paperless/models.py b/src/paperless/models.py
index 78d46b036b219c8146c6d9cb7378ee91d9e58394..92cf66e637770d1fd5d63090010991182070afb3 100644 (file)
--- a/src/paperless/models.py
+++ b/src/paperless/models.py
@@ -23,8 +23,8 @@ from django.db.models.functions import Cast
 from django.db.models.functions import Substr
 from django_softdelete.models import SoftDeleteModel
 
-from documents.data_models import DocumentSource
 from documents.parsers import get_default_file_extension
+from paperless.data_models import DocumentSource
 
 DEFAULT_SINGLETON_INSTANCE_ID = 1
 

diff --git a/src/paperless/views.py b/src/paperless/views.py
index fcfa3e7c8ee60325f8fffb90a694eb96b9504efa..2cb3b1debfba5fa06f5a557416e373152bc26abf 100644 (file)
--- a/src/paperless/views.py
+++ b/src/paperless/views.py
@@ -108,9 +108,6 @@ from documents.conditionals import preview_last_modified
 from documents.conditionals import suggestions_etag
 from documents.conditionals import suggestions_last_modified
 from documents.conditionals import thumbnail_last_modified
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
-from documents.data_models import DocumentSource
 from documents.filters import CorrespondentFilterSet
 from documents.filters import CustomFieldFilterSet
 from documents.filters import DocumentFilterSet
@@ -167,6 +164,9 @@ from documents.templating.filepath import validate_filepath_template_and_render
 from paperless import version
 from paperless.celery import app as celery_app
 from paperless.config import GeneralConfig
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
+from paperless.data_models import DocumentSource
 from paperless.db import GnuPG
 from paperless.filters import GroupFilterSet
 from paperless.filters import UserFilterSet

diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index 906804aa3271119ca1753229d1b1ffc21b9da819..cb5bec64fbeb441728ccab5ef574a6ad6c00cf9d 100644 (file)
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -33,12 +33,12 @@ from imap_tools import errors
 from imap_tools.mailbox import MailBoxTls
 from imap_tools.query import LogicOperator
 
-from documents.data_models import ConsumableDocument
-from documents.data_models import DocumentMetadataOverrides
-from documents.data_models import DocumentSource
 from documents.loggers import LoggingMixin
 from documents.parsers import is_mime_type_supported
 from documents.tasks import consume_file
+from paperless.data_models import ConsumableDocument
+from paperless.data_models import DocumentMetadataOverrides
+from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule