From 730636f38ee21e618990fcbb31ba999e8be2ba2a Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:36:31 -0700 Subject: [PATCH] Merge caching --- src/documents/signals/handlers.py | 2 +- src/documents/tasks.py | 2 +- src/documents/tests/test_api_documents.py | 8 ++++---- src/{documents => paperless}/caching.py | 0 src/paperless/classifier.py | 8 ++++---- src/paperless/conditionals.py | 12 ++++++------ src/paperless/views.py | 12 ++++++------ 7 files changed, 22 insertions(+), 22 deletions(-) rename src/{documents => paperless}/caching.py (100%) diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 98ef65978..85058ad05 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -23,10 +23,10 @@ from django.utils import timezone from filelock import FileLock from guardian.shortcuts import remove_perm -from documents.caching import clear_document_caches from documents.mail import send_email 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 from paperless.file_handling import delete_empty_directories from paperless.file_handling import generate_unique_filename diff --git a/src/documents/tasks.py b/src/documents/tasks.py index f4af14aa6..482c1d443 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -20,7 +20,6 @@ from filelock import FileLock from whoosh.writing import AsyncWriter from documents import sanity_checker -from documents.caching import clear_document_caches from documents.plugins.base import ConsumeTaskPlugin from documents.plugins.base import ProgressManager from documents.plugins.base import StopConsumeTaskError @@ -31,6 +30,7 @@ from documents.signals.handlers import cleanup_document_deletion from documents.signals.handlers import run_workflows from paperless import index from paperless.barcodes import BarcodePlugin +from paperless.caching import clear_document_caches from paperless.classifier import DocumentClassifier from paperless.classifier import load_classifier from paperless.consumer import ConsumerPlugin diff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.py index 34f5abc9c..2033e61f8 100644 --- a/src/documents/tests/test_api_documents.py +++ b/src/documents/tests/test_api_documents.py @@ -24,13 +24,13 @@ from guardian.shortcuts import assign_perm from rest_framework import status from rest_framework.test import APITestCase -from documents.caching import CACHE_50_MINUTES -from documents.caching import CLASSIFIER_HASH_KEY -from documents.caching import CLASSIFIER_MODIFIED_KEY -from documents.caching import CLASSIFIER_VERSION_KEY from documents.signals.handlers import run_workflows from documents.tests.utils import DirectoriesMixin from documents.tests.utils import DocumentConsumeDelayMixin +from paperless.caching import CACHE_50_MINUTES +from paperless.caching import CLASSIFIER_HASH_KEY +from paperless.caching import CLASSIFIER_MODIFIED_KEY +from paperless.caching import CLASSIFIER_VERSION_KEY from paperless.data_models import DocumentSource from paperless.models import Correspondent from paperless.models import CustomField diff --git a/src/documents/caching.py b/src/paperless/caching.py similarity index 100% rename from src/documents/caching.py rename to src/paperless/caching.py diff --git a/src/paperless/classifier.py b/src/paperless/classifier.py index 042cba1a5..f794db7a1 100644 --- a/src/paperless/classifier.py +++ b/src/paperless/classifier.py @@ -17,10 +17,10 @@ if TYPE_CHECKING: from django.conf import settings from django.core.cache import cache -from documents.caching import CACHE_50_MINUTES -from documents.caching import CLASSIFIER_HASH_KEY -from documents.caching import CLASSIFIER_MODIFIED_KEY -from documents.caching import CLASSIFIER_VERSION_KEY +from paperless.caching import CACHE_50_MINUTES +from paperless.caching import CLASSIFIER_HASH_KEY +from paperless.caching import CLASSIFIER_MODIFIED_KEY +from paperless.caching import CLASSIFIER_VERSION_KEY from paperless.models import Document from paperless.models import MatchingModel diff --git a/src/paperless/conditionals.py b/src/paperless/conditionals.py index 8686888d1..ed33a2864 100644 --- a/src/paperless/conditionals.py +++ b/src/paperless/conditionals.py @@ -4,12 +4,12 @@ from datetime import timezone from django.conf import settings from django.core.cache import cache -from documents.caching import CACHE_5_MINUTES -from documents.caching import CACHE_50_MINUTES -from documents.caching import CLASSIFIER_HASH_KEY -from documents.caching import CLASSIFIER_MODIFIED_KEY -from documents.caching import CLASSIFIER_VERSION_KEY -from documents.caching import get_thumbnail_modified_key +from paperless.caching import CACHE_5_MINUTES +from paperless.caching import CACHE_50_MINUTES +from paperless.caching import CLASSIFIER_HASH_KEY +from paperless.caching import CLASSIFIER_MODIFIED_KEY +from paperless.caching import CLASSIFIER_VERSION_KEY +from paperless.caching import get_thumbnail_modified_key from paperless.classifier import DocumentClassifier from paperless.models import Document diff --git a/src/paperless/views.py b/src/paperless/views.py index 8dd514105..9fcd2dd59 100644 --- a/src/paperless/views.py +++ b/src/paperless/views.py @@ -89,12 +89,6 @@ from rest_framework.viewsets import ModelViewSet from rest_framework.viewsets import ReadOnlyModelViewSet from rest_framework.viewsets import ViewSet -from documents.caching import get_metadata_cache -from documents.caching import get_suggestion_cache -from documents.caching import refresh_metadata_cache -from documents.caching import refresh_suggestions_cache -from documents.caching import set_metadata_cache -from documents.caching import set_suggestions_cache from documents.filters import CorrespondentFilterSet from documents.filters import CustomFieldFilterSet from documents.filters import DocumentFilterSet @@ -121,6 +115,12 @@ from paperless import version from paperless.bulk_download import ArchiveOnlyStrategy from paperless.bulk_download import OriginalAndArchiveStrategy from paperless.bulk_download import OriginalsOnlyStrategy +from paperless.caching import get_metadata_cache +from paperless.caching import get_suggestion_cache +from paperless.caching import refresh_metadata_cache +from paperless.caching import refresh_suggestions_cache +from paperless.caching import set_metadata_cache +from paperless.caching import set_suggestions_cache from paperless.celery import app as celery_app from paperless.classifier import load_classifier from paperless.conditionals import metadata_etag