diff --git a/src/documents/tests/test_barcodes.py b/src/documents/tests/test_barcodes.py index 08a1aeeb4..bf255d6ba 100644 --- a/src/documents/tests/test_barcodes.py +++ b/src/documents/tests/test_barcodes.py @@ -9,7 +9,6 @@ from django.conf import settings from django.test import TestCase from django.test import override_settings -from documents.plugins.base import StopConsumeTaskError from documents.tests.utils import DirectoriesMixin from documents.tests.utils import DocumentConsumeDelayMixin from documents.tests.utils import DummyProgressManager @@ -22,6 +21,7 @@ from paperless.data_models import DocumentMetadataOverrides from paperless.data_models import DocumentSource from paperless.models import Document from paperless.models import Tag +from paperless.plugins.base import StopConsumeTaskError try: import zxingcpp # noqa: F401 diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index 29e95689c..1ac295c38 100644 --- 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.plugins.helpers import ProgressStatusOptions from documents.tests.utils import DirectoriesMixin from documents.tests.utils import FileSystemAssertsMixin from documents.tests.utils import GetConsumerMixin @@ -32,6 +31,7 @@ from paperless.models import StoragePath from paperless.models import Tag from paperless.parsers import DocumentParser from paperless.parsers import ParseError +from paperless.plugins.helpers import ProgressStatusOptions from paperless.tasks import sanity_check from paperless_mail.models import MailRule from paperless_mail.parsers import MailDocumentParser diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py index cfcea7c30..581a553b3 100644 --- a/src/documents/tests/utils.py +++ b/src/documents/tests/utils.py @@ -20,12 +20,12 @@ from django.db.migrations.executor import MigrationExecutor from django.test import TransactionTestCase from django.test import override_settings -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 from paperless.parsers import ParseError +from paperless.plugins.helpers import ProgressStatusOptions def setup_directories(): diff --git a/src/paperless/barcodes.py b/src/paperless/barcodes.py index 9e2bb3df8..152d2ec79 100644 --- a/src/paperless/barcodes.py +++ b/src/paperless/barcodes.py @@ -13,12 +13,12 @@ from pikepdf import Page from pikepdf import PasswordError from pikepdf import Pdf -from documents.plugins.base import ConsumeTaskPlugin -from documents.plugins.base import StopConsumeTaskError -from documents.plugins.helpers import ProgressStatusOptions from paperless.converters import convert_from_tiff_to_pdf from paperless.data_models import ConsumableDocument from paperless.models import Tag +from paperless.plugins.base import ConsumeTaskPlugin +from paperless.plugins.base import StopConsumeTaskError +from paperless.plugins.helpers import ProgressStatusOptions from paperless.utils import copy_basic_file_stats from paperless.utils import copy_file_with_basic_stats from paperless.utils import maybe_override_pixel_limit diff --git a/src/paperless/bulk_edit.py b/src/paperless/bulk_edit.py index ab8f70f36..61f02f44c 100644 --- a/src/paperless/bulk_edit.py +++ b/src/paperless/bulk_edit.py @@ -16,7 +16,6 @@ from django.conf import settings from django.db.models import Q from django.utils import timezone -from documents.plugins.helpers import DocumentsStatusManager from paperless.data_models import ConsumableDocument from paperless.data_models import DocumentMetadataOverrides from paperless.data_models import DocumentSource @@ -27,6 +26,7 @@ from paperless.models import Document from paperless.models import DocumentType from paperless.models import StoragePath from paperless.permissions import set_permissions_for_object +from paperless.plugins.helpers import DocumentsStatusManager from paperless.tasks import bulk_update_documents from paperless.tasks import consume_file from paperless.tasks import update_document_content_maybe_archive_file diff --git a/src/paperless/consumer.py b/src/paperless/consumer.py index 765e9cccc..8bb639262 100644 --- a/src/paperless/consumer.py +++ b/src/paperless/consumer.py @@ -15,12 +15,6 @@ from django.utils import timezone from filelock import FileLock from rest_framework.reverse import reverse -from documents.plugins.base import AlwaysRunPluginMixin -from documents.plugins.base import ConsumeTaskPlugin -from documents.plugins.base import NoCleanupPluginMixin -from documents.plugins.base import NoSetupPluginMixin -from documents.plugins.helpers import ProgressManager -from documents.plugins.helpers import ProgressStatusOptions from documents.signals import document_consumption_finished from documents.signals import document_consumption_started from documents.signals.handlers import run_workflows @@ -43,6 +37,12 @@ from paperless.parsers import ParseError from paperless.parsers import get_parser_class_for_mime_type from paperless.parsers import parse_date from paperless.permissions import set_permissions_for_object +from paperless.plugins.base import AlwaysRunPluginMixin +from paperless.plugins.base import ConsumeTaskPlugin +from paperless.plugins.base import NoCleanupPluginMixin +from paperless.plugins.base import NoSetupPluginMixin +from paperless.plugins.helpers import ProgressManager +from paperless.plugins.helpers import ProgressStatusOptions from paperless.templating.workflows import parse_w_workflow_placeholders from paperless.utils import copy_basic_file_stats from paperless.utils import copy_file_with_basic_stats diff --git a/src/paperless/double_sided.py b/src/paperless/double_sided.py index bcd82f377..47503bee8 100644 --- a/src/paperless/double_sided.py +++ b/src/paperless/double_sided.py @@ -8,12 +8,12 @@ from typing import Final from django.conf import settings from pikepdf import 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 from paperless.converters import convert_from_tiff_to_pdf +from paperless.plugins.base import ConsumeTaskPlugin +from paperless.plugins.base import NoCleanupPluginMixin +from paperless.plugins.base import NoSetupPluginMixin +from paperless.plugins.base import StopConsumeTaskError logger = logging.getLogger("paperless.double_sided") diff --git a/src/documents/plugins/__init__.py b/src/paperless/plugins/__init__.py similarity index 100% rename from src/documents/plugins/__init__.py rename to src/paperless/plugins/__init__.py diff --git a/src/documents/plugins/base.py b/src/paperless/plugins/base.py similarity index 98% rename from src/documents/plugins/base.py rename to src/paperless/plugins/base.py index 89682cdaf..a45c69bd5 100644 --- a/src/documents/plugins/base.py +++ b/src/paperless/plugins/base.py @@ -2,9 +2,9 @@ import abc from pathlib import Path from typing import Final -from documents.plugins.helpers import ProgressManager from paperless.data_models import ConsumableDocument from paperless.data_models import DocumentMetadataOverrides +from paperless.plugins.helpers import ProgressManager class StopConsumeTaskError(Exception): diff --git a/src/documents/plugins/helpers.py b/src/paperless/plugins/helpers.py similarity index 100% rename from src/documents/plugins/helpers.py rename to src/paperless/plugins/helpers.py diff --git a/src/paperless/tasks.py b/src/paperless/tasks.py index 2a529ef5c..3e1d00f0e 100644 --- a/src/paperless/tasks.py +++ b/src/paperless/tasks.py @@ -19,10 +19,6 @@ from django.utils import timezone from filelock import FileLock from whoosh.writing import AsyncWriter -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.signals import document_updated from documents.signals.handlers import cleanup_document_deletion from documents.signals.handlers import run_workflows @@ -51,6 +47,10 @@ 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.plugins.base import ConsumeTaskPlugin +from paperless.plugins.base import ProgressManager +from paperless.plugins.base import StopConsumeTaskError +from paperless.plugins.helpers import ProgressStatusOptions from paperless.sanity_checker import SanityCheckFailedException if settings.AUDIT_LOG_ENABLED: diff --git a/src/paperless/tests/test_websockets.py b/src/paperless/tests/test_websockets.py index 5ba909d1c..c9aa50b71 100644 --- a/src/paperless/tests/test_websockets.py +++ b/src/paperless/tests/test_websockets.py @@ -5,10 +5,10 @@ from channels.testing import WebsocketCommunicator from django.test import TestCase from django.test import override_settings -from documents.plugins.helpers import DocumentsStatusManager -from documents.plugins.helpers import ProgressManager -from documents.plugins.helpers import ProgressStatusOptions from paperless.asgi import application +from paperless.plugins.helpers import DocumentsStatusManager +from paperless.plugins.helpers import ProgressManager +from paperless.plugins.helpers import ProgressStatusOptions TEST_CHANNEL_LAYERS = { "default": {