Merge tasks

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")
 

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

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):

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 paperless.tasks import index_optimize
-from documents.tasks import index_reindex
+from paperless.tasks import index_reindex
 
 
 class Command(ProgressBarMixin, BaseCommand):

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

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
 

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):

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

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):

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")
 

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

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

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):

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

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

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