Merge consumer

diff --git a/src/documents/double_sided.py b/src/documents/double_sided.py
index 3c3ec4723f336692803a4367140987c7847be9c2..c0b84ec48473bbe77c00166fdca3c64bee061cb7 100644 (file)
--- a/src/documents/double_sided.py
+++ b/src/documents/double_sided.py
@@ -8,12 +8,12 @@ from typing import Final
 from django.conf import settings
 from pikepdf import Pdf
 
-from documents.consumer import ConsumerError
 from documents.converters import convert_from_tiff_to_pdf
 from documents.plugins.base import ConsumeTaskPlugin
 from documents.plugins.base import NoCleanupPluginMixin
 from documents.plugins.base import NoSetupPluginMixin
 from documents.plugins.base import StopConsumeTaskError
+from paperless.consumer import ConsumerError
 
 logger = logging.getLogger("paperless.double_sided")
 

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

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index bb483d4da329c4fdfc04ec68d249e2cf61c769e6..9490c16f623b1cb4ccc531770304d47e30cfd0a6 100644 (file)
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -17,7 +17,6 @@ from django.test import override_settings
 from django.utils import timezone
 from guardian.core import ObjectPermissionChecker
 
-from documents.consumer import ConsumerError
 from documents.parsers import DocumentParser
 from documents.parsers import ParseError
 from documents.plugins.helpers import ProgressStatusOptions
@@ -25,6 +24,7 @@ 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.consumer import ConsumerError
 from paperless.data_models import DocumentMetadataOverrides
 from paperless.data_models import DocumentSource
 from paperless.models import Correspondent

diff --git a/src/documents/tests/test_double_sided.py b/src/documents/tests/test_double_sided.py
index 6b3b59df0a6cc704074379069d2ce7591389d1f6..dad2385e33e1817184c3a880e80533fe10364f52 100644 (file)
--- a/src/documents/tests/test_double_sided.py
+++ b/src/documents/tests/test_double_sided.py
@@ -10,12 +10,12 @@ from pdfminer.high_level import extract_text
 from pikepdf import Pdf
 
 from documents import tasks
-from documents.consumer import ConsumerError
 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.consumer import ConsumerError
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentSource
 

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

diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py
index 87388ced8090cb935b0e6ae3cb2247d30702fb6d..5be5621aa6386eece1ad9201bdcc3da154c80fca 100644 (file)
--- a/src/documents/tests/utils.py
+++ b/src/documents/tests/utils.py
@@ -20,9 +20,9 @@ from django.db.migrations.executor import MigrationExecutor
 from django.test import TransactionTestCase
 from django.test import override_settings
 
-from documents.consumer import ConsumerPlugin
 from documents.parsers import ParseError
 from documents.plugins.helpers import ProgressStatusOptions
+from paperless.consumer import ConsumerPlugin
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentMetadataOverrides
 from paperless.data_models import DocumentSource

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