Merge templating

src/documents/migrations/1055_alter_storagepath_path.py

@@ -6,7 +6,7 @@ from django.db import models
 from django.db import transaction
 from filelock import FileLock
 
-from documents.templating.utils import convert_format_str_to_template_format
+from paperless.templating.utils import convert_format_str_to_template_format
 
 
 def convert_from_format_to_template(apps, schema_editor):

src/documents/signals/handlers.py

@@ -23,7 +23,6 @@ from django.utils import timezone
 from filelock import FileLock
 from guardian.shortcuts import remove_perm
 
-from documents.templating.workflows import parse_w_workflow_placeholders
 from paperless import matching
 from paperless.caching import clear_document_caches
 from paperless.file_handling import create_source_path_directory
@@ -45,6 +44,7 @@ from paperless.models import WorkflowRun
 from paperless.models import WorkflowTrigger
 from paperless.permissions import get_objects_for_user_owner_aware
 from paperless.permissions import set_permissions_for_object
+from paperless.templating.workflows import parse_w_workflow_placeholders
 
 if TYPE_CHECKING:
     from pathlib import Path

src/paperless/checks.py

@@ -15,7 +15,7 @@ from django.db.utils import OperationalError
 from django.db.utils import ProgrammingError
 
 from documents.signals import document_consumer_declaration
-from documents.templating.utils import convert_format_str_to_template_format
+from paperless.templating.utils import convert_format_str_to_template_format
 
 exists_message = "{} is set but doesn't exist."
 exists_hint = "Create a directory at {}"

src/paperless/consumer.py

@@ -24,7 +24,6 @@ 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
-from documents.templating.workflows import parse_w_workflow_placeholders
 from paperless.classifier import load_classifier
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentMetadataOverrides
@@ -44,6 +43,7 @@ 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.templating.workflows import parse_w_workflow_placeholders
 from paperless.utils import copy_basic_file_stats
 from paperless.utils import copy_file_with_basic_stats
 from paperless.utils import run_subprocess

src/paperless/file_handling.py

@@ -2,9 +2,9 @@ import os
 
 from django.conf import settings
 
-from documents.templating.filepath import validate_filepath_template_and_render
-from documents.templating.utils import convert_format_str_to_template_format
 from paperless.models import Document
+from paperless.templating.filepath import validate_filepath_template_and_render
+from paperless.templating.utils import convert_format_str_to_template_format
 
 
 def create_source_path_directory(source_path):

src/paperless/serialisers.py

@@ -35,8 +35,6 @@ if settings.AUDIT_LOG_ENABLED:
     from auditlog.context import set_actor
 
 
-from documents.templating.filepath import validate_filepath_template_and_render
-from documents.templating.utils import convert_format_str_to_template_format
 from paperless import bulk_edit
 from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
@@ -61,6 +59,8 @@ from paperless.models import WorkflowTrigger
 from paperless.parsers import is_mime_type_supported
 from paperless.permissions import get_groups_with_only_permission
 from paperless.permissions import set_permissions_for_object
+from paperless.templating.filepath import validate_filepath_template_and_render
+from paperless.templating.utils import convert_format_str_to_template_format
 from paperless.validators import uri_validator
 from paperless.validators import url_validator
 

src/paperless/views.py

@@ -90,7 +90,6 @@ from rest_framework.viewsets import ReadOnlyModelViewSet
 from rest_framework.viewsets import ViewSet
 
 from documents.signals import document_updated
-from documents.templating.filepath import validate_filepath_template_and_render
 from paperless import bulk_edit
 from paperless import index
 from paperless import version
@@ -194,6 +193,7 @@ 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.templating.filepath import validate_filepath_template_and_render
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 from paperless_mail.oauth import PaperlessMailOAuth2Manager