Merge index

diff --git a/src/documents/admin.py b/src/documents/admin.py
index 2ef908d065b39ecbb3fb5bfde55f2ff382cbf05e..696b3a0fdc9e0748e1edc637e5e4b5a181e6a7ea 100644 (file)
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -85,7 +85,7 @@ class DocumentAdmin(GuardedModelAdmin):
         return Document.global_objects.all()
 
     def delete_queryset(self, request, queryset):
-        from documents import index
+        from paperless import index
 
         with index.open_index_writer() as writer:
             for o in queryset:
@@ -94,13 +94,13 @@ class DocumentAdmin(GuardedModelAdmin):
         super().delete_queryset(request, queryset)
 
     def delete_model(self, request, obj):
-        from documents import index
+        from paperless import index
 
         index.remove_document_from_index(obj)
         super().delete_model(request, obj)
 
     def save_model(self, request, obj, form, change):
-        from documents import index
+        from paperless import index
 
         index.add_or_update_document(obj)
         super().save_model(request, obj, form, change)

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index cba7568a5b63d115d9c1e0c5f3357bbeb479e8b6..0148165374c4ecc0fc91a0c09bf2dffba3a47321 100644 (file)
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -578,7 +578,7 @@ def cleanup_custom_field_deletion(sender, instance: CustomField, **kwargs):
 
 
 def add_to_index(sender, document, **kwargs):
-    from documents import index
+    from paperless import index
 
     index.add_or_update_document(document)
 

diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index e7dadc2b74a21533d931c5a2b9635d68dfb9705f..0380eb59d68e310e904d1f1035173d108df8bb66 100644 (file)
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -19,7 +19,6 @@ from django.utils import timezone
 from filelock import FileLock
 from whoosh.writing import AsyncWriter
 
-from documents import index
 from documents import sanity_checker
 from documents.barcodes import BarcodePlugin
 from documents.caching import clear_document_caches
@@ -38,6 +37,7 @@ 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 import index
 from paperless.consumer import ConsumerPlugin
 from paperless.consumer import WorkflowTriggerPlugin
 from paperless.data_models import ConsumableDocument

diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.py
index 05e14d588c7dd8bcc62d16c89c6285774db4af0b..d846f9ba84180a7e0d0c1ccab555dc143fbb2cff 100644 (file)
--- a/src/documents/tests/test_admin.py
+++ b/src/documents/tests/test_admin.py
@@ -5,9 +5,9 @@ from django.contrib.auth.models import User
 from django.test import TestCase
 from django.utils import timezone
 
-from documents import index
 from documents.admin import DocumentAdmin
 from documents.tests.utils import DirectoriesMixin
+from paperless import index
 from paperless.admin import PaperlessUserAdmin
 from paperless.models import Document
 

diff --git a/src/documents/tests/test_api_search.py b/src/documents/tests/test_api_search.py
index e49e358b4d78798baa6f7d095dedcbeae594f8c4..391261c1e5cefc031fa93484b4667ca0f255a45c 100644 (file)
--- a/src/documents/tests/test_api_search.py
+++ b/src/documents/tests/test_api_search.py
@@ -14,8 +14,8 @@ from rest_framework import status
 from rest_framework.test import APITestCase
 from whoosh.writing import AsyncWriter
 
-from documents import index
 from documents.tests.utils import DirectoriesMixin
+from paperless import index
 from paperless.bulk_edit import set_permissions
 from paperless.models import Correspondent
 from paperless.models import CustomField

diff --git a/src/documents/tests/test_delayedquery.py b/src/documents/tests/test_delayedquery.py
index a8cc12c1e686235c56c4a38b9b254c30fdeee8b8..a3b926d78bb3037c24739a7a4bcca56cb0118910 100644 (file)
--- a/src/documents/tests/test_delayedquery.py
+++ b/src/documents/tests/test_delayedquery.py
@@ -1,7 +1,7 @@
 from django.test import TestCase
 from whoosh import query
 
-from documents.index import get_permissions_criterias
+from paperless.index import get_permissions_criterias
 from paperless.models import User
 
 

diff --git a/src/documents/tests/test_index.py b/src/documents/tests/test_index.py
index 459ac596e6efcee6a5ae1adc61da04e1cb97f92f..ecd16070c112c1c221f50e3646c4b7a50adb1e27 100644 (file)
--- a/src/documents/tests/test_index.py
+++ b/src/documents/tests/test_index.py
@@ -2,8 +2,8 @@ from unittest import mock
 
 from django.test import TestCase
 
-from documents import index
 from documents.tests.utils import DirectoriesMixin
+from paperless import index
 from paperless.models import Document
 
 

diff --git a/src/paperless/bulk_edit.py b/src/paperless/bulk_edit.py
index d358bb80bf1149ff92a373cc29efc55b8a0a606c..55cd357a784f2d8e2a36d4296a68c11c1e6077a6 100644 (file)
--- a/src/paperless/bulk_edit.py
+++ b/src/paperless/bulk_edit.py
@@ -220,7 +220,7 @@ def delete(doc_ids: list[int]) -> Literal["OK"]:
     try:
         Document.objects.filter(id__in=doc_ids).delete()
 
-        from documents import index
+        from paperless import index
 
         with index.open_index_writer() as writer:
             for id in doc_ids:

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

diff --git a/src/paperless/views.py b/src/paperless/views.py
index 2fd35d149f6605eca7cfb84b7ed97b0b0a399968..fdb997226c7e9b93515e9b0f54a6e9ac28d2fd21 100644 (file)
--- a/src/paperless/views.py
+++ b/src/paperless/views.py
@@ -89,7 +89,6 @@ from rest_framework.viewsets import ModelViewSet
 from rest_framework.viewsets import ReadOnlyModelViewSet
 from rest_framework.viewsets import ViewSet
 
-from documents import index
 from documents.bulk_download import ArchiveOnlyStrategy
 from documents.bulk_download import OriginalAndArchiveStrategy
 from documents.bulk_download import OriginalsOnlyStrategy
@@ -118,7 +117,6 @@ from documents.filters import PaperlessTaskFilterSet
 from documents.filters import ShareLinkFilterSet
 from documents.filters import StoragePathFilterSet
 from documents.filters import TagFilterSet
-from documents.index import DelayedQuery
 from documents.mail import send_email
 from documents.parsers import get_parser_class_for_mime_type
 from documents.parsers import parse_date_generator
@@ -137,6 +135,7 @@ 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
 from paperless import version
 from paperless.celery import app as celery_app
 from paperless.config import GeneralConfig
@@ -146,6 +145,7 @@ from paperless.data_models import DocumentSource
 from paperless.db import GnuPG
 from paperless.filters import GroupFilterSet
 from paperless.filters import UserFilterSet
+from paperless.index import DelayedQuery
 from paperless.matching import match_correspondents
 from paperless.matching import match_document_types
 from paperless.matching import match_storage_paths
@@ -978,7 +978,7 @@ class DocumentViewSet(
 
     def update(self, request, *args, **kwargs):
         response = super().update(request, *args, **kwargs)
-        from documents import index
+        from paperless import index
 
         index.add_or_update_document(self.get_object())
 
@@ -990,7 +990,7 @@ class DocumentViewSet(
         return response
 
     def destroy(self, request, *args, **kwargs):
-        from documents import index
+        from paperless import index
 
         index.remove_document_from_index(self.get_object())
         try:
@@ -1266,7 +1266,7 @@ class DocumentViewSet(
                 doc.modified = timezone.now()
                 doc.save()
 
-                from documents import index
+                from paperless import index
 
                 index.add_or_update_document(doc)
 
@@ -1303,7 +1303,7 @@ class DocumentViewSet(
             doc.modified = timezone.now()
             doc.save()
 
-            from documents import index
+            from paperless import index
 
             index.add_or_update_document(doc)
 
@@ -1498,7 +1498,7 @@ class UnifiedSearchViewSet(DocumentViewSet):
         filtered_queryset = super().filter_queryset(queryset)
 
         if self._is_search_request():
-            from documents import index
+            from paperless import index
 
             if "query" in self.request.query_params:
                 query_class = index.DelayedFullTextQuery
@@ -1518,7 +1518,7 @@ class UnifiedSearchViewSet(DocumentViewSet):
 
     def list(self, request, *args, **kwargs):
         if self._is_search_request():
-            from documents import index
+            from paperless import index
 
             try:
                 with index.open_index_searcher() as s:
@@ -2032,7 +2032,7 @@ class SearchAutoCompleteView(GenericAPIView):
         else:
             limit = 10
 
-        from documents import index
+        from paperless import index
 
         ix = index.open_index()
 
@@ -2110,7 +2110,7 @@ class GlobalSearchView(PassUserMixin):
             docs = all_docs.filter(title__icontains=query)
             if not db_only and len(docs) < OBJECT_LIMIT:
                 # If we don't have enough results, search by content
-                from documents import index
+                from paperless import index
 
                 with index.open_index_searcher() as s:
                     fts_query = index.DelayedFullTextQuery(