Merge tasks

diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index 298a3a92f9fb969bea8aa341e7228046ea0d83a7..6120b10df37dfacdd536e68dc2f49f6deda03926 100644 (file)
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -8,8 +8,8 @@ from django.core.management.base import BaseCommand
 
 from documents.management.commands.mixins import MultiProcessMixin
 from documents.management.commands.mixins import ProgressBarMixin
-from documents.tasks import update_document_content_maybe_archive_file
 from paperless.models import Document
+from paperless.tasks import update_document_content_maybe_archive_file
 
 logger = logging.getLogger("paperless.management.archiver")
 

diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py
index b77e4281b404d3663dd1c7b51259121928aaee53..9934a5dbd2df7ad789273f8afa677812d392103d 100644 (file)
--- a/src/documents/management/commands/document_consumer.py
+++ b/src/documents/management/commands/document_consumer.py
@@ -16,12 +16,12 @@ from django.core.management.base import CommandError
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers.polling import PollingObserver
 
-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
 from paperless.parsers import is_file_ext_supported
+from paperless.tasks import consume_file
 
 try:
     from inotifyrecursive import INotify

diff --git a/src/documents/management/commands/document_create_classifier.py b/src/documents/management/commands/document_create_classifier.py
index f7903aac77f916e57f529de4513cc1f2b95d689e..855861d33accf219cda76b2b7a118e3651d8b059 100644 (file)
--- a/src/documents/management/commands/document_create_classifier.py
+++ b/src/documents/management/commands/document_create_classifier.py
@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from documents.tasks import train_classifier
+from paperless.tasks import train_classifier
 
 
 class Command(BaseCommand):

diff --git a/src/documents/management/commands/document_index.py b/src/documents/management/commands/document_index.py
index 1fa4f5a70e695cb42c336653569203e2a71f9404..08d5f4657f398380ae43453e3d5e80d97c659d2b 100644 (file)
--- a/src/documents/management/commands/document_index.py
+++ b/src/documents/management/commands/document_index.py
@@ -2,8 +2,8 @@ from django.core.management import BaseCommand
 from django.db import transaction
 
 from documents.management.commands.mixins import ProgressBarMixin
-from documents.tasks import index_optimize
-from documents.tasks import index_reindex
+from paperless.tasks import index_optimize
+from paperless.tasks import index_reindex
 
 
 class Command(ProgressBarMixin, BaseCommand):

diff --git a/src/documents/tests/test_barcodes.py b/src/documents/tests/test_barcodes.py
index 7188d72eee96e78609169d023f45bea224ef8539..08a1aeeb406f7a526bc4469956d7dae51b2a179b 100644 (file)
--- a/src/documents/tests/test_barcodes.py
+++ b/src/documents/tests/test_barcodes.py
@@ -9,13 +9,13 @@ from django.conf import settings
 from django.test import TestCase
 from django.test import override_settings
 
-from documents import tasks
 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 import tasks
 from paperless.barcodes import BarcodePlugin
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentMetadataOverrides

diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index bdd3e6f398de91bcac34309d02f8a8e501644520..29e95689c7638c39886717cc23f798b077eb1116 100644 (file)
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -18,7 +18,6 @@ from django.utils import timezone
 from guardian.core import ObjectPermissionChecker
 
 from documents.plugins.helpers import ProgressStatusOptions
-from documents.tasks import sanity_check
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import FileSystemAssertsMixin
 from documents.tests.utils import GetConsumerMixin
@@ -33,6 +32,7 @@ from paperless.models import StoragePath
 from paperless.models import Tag
 from paperless.parsers import DocumentParser
 from paperless.parsers import ParseError
+from paperless.tasks import sanity_check
 from paperless_mail.models import MailRule
 from paperless_mail.parsers import MailDocumentParser
 

diff --git a/src/documents/tests/test_document_model.py b/src/documents/tests/test_document_model.py
index 9a83602a35411fe1bba355efe5e52f5c60de4667..633aaa708641b3ba29140ad429efa7418b65a197 100644 (file)
--- a/src/documents/tests/test_document_model.py
+++ b/src/documents/tests/test_document_model.py
@@ -8,9 +8,9 @@ from django.test import TestCase
 from django.test import override_settings
 from django.utils import timezone
 
-from documents.tasks import empty_trash
 from paperless.models import Correspondent
 from paperless.models import Document
+from paperless.tasks import empty_trash
 
 
 class TestDocument(TestCase):

diff --git a/src/documents/tests/test_double_sided.py b/src/documents/tests/test_double_sided.py
index 03d044b242e03b61ea695dce89a57d358c22f54a..cb769c96d132464589ecfefad6bf34ac4aa42a01 100644 (file)
--- a/src/documents/tests/test_double_sided.py
+++ b/src/documents/tests/test_double_sided.py
@@ -9,10 +9,10 @@ from django.test import override_settings
 from pdfminer.high_level import extract_text
 from pikepdf import Pdf
 
-from documents import tasks
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import DummyProgressManager
 from documents.tests.utils import FileSystemAssertsMixin
+from paperless import tasks
 from paperless.consumer import ConsumerError
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentSource

diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 207e9cf3fb7c338b28abc47ddd9d46f054970def..08d501f31e2e63f1e995bb88d47d9a7f1ec9fc66 100644 (file)
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -13,7 +13,6 @@ from django.test import TestCase
 from django.test import override_settings
 from django.utils import timezone
 
-from documents.tasks import empty_trash
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import FileSystemAssertsMixin
 from paperless.file_handling import create_source_path_directory
@@ -25,6 +24,7 @@ from paperless.models import CustomFieldInstance
 from paperless.models import Document
 from paperless.models import DocumentType
 from paperless.models import StoragePath
+from paperless.tasks import empty_trash
 
 
 class TestFileHandling(DirectoriesMixin, FileSystemAssertsMixin, TestCase):

diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index 902ec75a1bde7bc71c85f1dc94c0e62d3bcf4efc..f01db93ceb635927fd2e66a6b2ac6145b0f1150a 100644 (file)
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -13,11 +13,11 @@ from django.core.management import call_command
 from django.test import TestCase
 from django.test import override_settings
 
-from documents.tasks import update_document_content_maybe_archive_file
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import FileSystemAssertsMixin
 from paperless.file_handling import generate_filename
 from paperless.models import Document
+from paperless.tasks import update_document_content_maybe_archive_file
 
 sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
 

diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py
index 8b9a389e21efa0faebaa8174ff75ddde90c22416..fae31876a38327fc60c64accb47f311359d129b7 100644 (file)
--- a/src/documents/tests/test_tasks.py
+++ b/src/documents/tests/test_tasks.py
@@ -7,12 +7,12 @@ from django.conf import settings
 from django.test import TestCase
 from django.utils import timezone
 
-from documents import tasks
 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
+from paperless import tasks
 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 295bb3878d30b9286aaf5daef0a1ec5b7b3952e3..e57542a3cb52d083200c9e6fb23dc352026a5df6 100644 (file)
--- a/src/documents/tests/test_workflows.py
+++ b/src/documents/tests/test_workflows.py
@@ -21,12 +21,12 @@ if TYPE_CHECKING:
     from django.db.models import QuerySet
 
 
-from documents import tasks
 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 import tasks
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentSource
 from paperless.matching import document_matches_workflow

diff --git a/src/paperless/barcodes.py b/src/paperless/barcodes.py
index ef9274c51fadf83da34cbe7a8aaf2e9e2b1dab36..e357b4b331eb261187c294e23dd8b207507a029c 100644 (file)
--- a/src/paperless/barcodes.py
+++ b/src/paperless/barcodes.py
@@ -123,7 +123,7 @@ class BarcodePlugin(ConsumeTaskPlugin):
                 ),
             ).resolve()
 
-            from documents import tasks
+            from paperless import tasks
 
             # Create the split document tasks
             for new_document in self.separate_pages(separator_pages):

diff --git a/src/paperless/bulk_edit.py b/src/paperless/bulk_edit.py
index cebe091d18ad9913254c5fbacd6954220cb3c273..ab8f70f3665c5ea684b831b25f49f16726dbe7d6 100644 (file)
--- a/src/paperless/bulk_edit.py
+++ b/src/paperless/bulk_edit.py
@@ -17,9 +17,6 @@ from django.db.models import Q
 from django.utils import timezone
 
 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
@@ -30,6 +27,9 @@ 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.tasks import bulk_update_documents
+from paperless.tasks import consume_file
+from paperless.tasks import update_document_content_maybe_archive_file
 
 if TYPE_CHECKING:
     from django.contrib.auth.models import User

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

diff --git a/src/paperless/views.py b/src/paperless/views.py
index 535831e517f3883ebb10a5ebb51092a8e37fd824..93c26aceda7d4b9c7ed1629dfda55ccee1388c1a 100644 (file)
--- a/src/paperless/views.py
+++ b/src/paperless/views.py
@@ -102,11 +102,6 @@ from documents.filters import StoragePathFilterSet
 from documents.filters import TagFilterSet
 from documents.schema import generate_object_with_permissions_schema
 from documents.signals import document_updated
-from documents.tasks import consume_file
-from documents.tasks import empty_trash
-from documents.tasks import index_optimize
-from documents.tasks import sanity_check
-from documents.tasks import train_classifier
 from documents.templating.filepath import validate_filepath_template_and_render
 from paperless import bulk_edit
 from paperless import index
@@ -194,6 +189,11 @@ from paperless.serialisers import UserSerializer
 from paperless.serialisers import WorkflowActionSerializer
 from paperless.serialisers import WorkflowSerializer
 from paperless.serialisers import WorkflowTriggerSerializer
+from paperless.tasks import consume_file
+from paperless.tasks import empty_trash
+from paperless.tasks import index_optimize
+from paperless.tasks import sanity_check
+from paperless.tasks import train_classifier
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 from paperless_mail.oauth import PaperlessMailOAuth2Manager

diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index 0748fea530149ba33c04e683b1c93b92be925c32..f1561e2ab39fd4365091b164a72e0f97b4c8703f 100644 (file)
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -33,13 +33,13 @@ from imap_tools import errors
 from imap_tools.mailbox import MailBoxTls
 from imap_tools.query import LogicOperator
 
-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.loggers import LoggingMixin
 from paperless.models import Correspondent
 from paperless.parsers import is_mime_type_supported
+from paperless.tasks import consume_file
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 from paperless_mail.models import ProcessedMail