From 22c41fd7471f978ef07d172e1e9ccbfa85eb1f03 Mon Sep 17 00:00:00 2001 From: Aleksandr Meshchriakov Date: Fri, 20 Mar 2026 14:45:36 +0100 Subject: [PATCH] fix pre-commit --- src/apps/parsers/admin.py | 8 +++++- src/apps/parsers/fns_upload.py | 12 ++++++--- tests/apps/core/test_celery_module.py | 36 +++++++++++++++++---------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/apps/parsers/admin.py b/src/apps/parsers/admin.py index 5f9d6f9..5e3523b 100644 --- a/src/apps/parsers/admin.py +++ b/src/apps/parsers/admin.py @@ -646,7 +646,13 @@ class FinancialReportAdmin(admin.ModelAdmin): "load_batch", "created_at", ] - list_filter = ["status", "source", "load_batch", "registry_organization", "created_at"] + list_filter = [ + "status", + "source", + "load_batch", + "registry_organization", + "created_at", + ] search_fields = [ "external_id", "ogrn", diff --git a/src/apps/parsers/fns_upload.py b/src/apps/parsers/fns_upload.py index 57475f6..d2ba6fc 100644 --- a/src/apps/parsers/fns_upload.py +++ b/src/apps/parsers/fns_upload.py @@ -34,7 +34,9 @@ class FNSUploadService: """Queue uploaded FNS Excel files and ZIP archives for processing.""" @classmethod - def queue_uploaded_files(cls, *, files, requested_by_id: int | None) -> FNSUploadResult: + def queue_uploaded_files( + cls, *, files, requested_by_id: int | None + ) -> FNSUploadResult: result = FNSUploadResult() seen_hashes: set[str] = set() @@ -79,7 +81,9 @@ class FNSUploadService: ) cls._accumulate(result=result, status=status, task_id=task_id) except zipfile.BadZipFile as exc: - raise ValueError("Загруженный файл не является корректным ZIP архивом") from exc + raise ValueError( + "Загруженный файл не является корректным ZIP архивом" + ) from exc return result @@ -168,7 +172,9 @@ class FNSUploadService: return True @staticmethod - def _accumulate(*, result: FNSUploadResult, status: str, task_id: str | None) -> None: + def _accumulate( + *, result: FNSUploadResult, status: str, task_id: str | None + ) -> None: if status == "queued": result.queued += 1 if task_id: diff --git a/tests/apps/core/test_celery_module.py b/tests/apps/core/test_celery_module.py index cae69e0..8671906 100644 --- a/tests/apps/core/test_celery_module.py +++ b/tests/apps/core/test_celery_module.py @@ -46,7 +46,9 @@ class CeleryModuleTest(SimpleTestCase): ) app_mock.autodiscover_tasks.assert_called_once_with() self.assertEqual(module.app, app_mock) - self.assertIn("parse-industrial-production-daily", module.app.conf.beat_schedule) + self.assertIn( + "parse-industrial-production-daily", module.app.conf.beat_schedule + ) self.assertIn("parse-manufactures-daily", module.app.conf.beat_schedule) self.assertIn("parse-industrial-products-daily", module.app.conf.beat_schedule) self.assertIn("parse-inspections-weekly", module.app.conf.beat_schedule) @@ -63,12 +65,16 @@ class CeleryModuleTest(SimpleTestCase): apply_async=apply_async_mock ) - with patch.object(module, "settings", SimpleNamespace( - CELERY_STARTUP_REFRESH_ENABLED=True, - CELERY_STARTUP_REFRESH_LOCK_KEY="startup-lock", - CELERY_STARTUP_REFRESH_LOCK_TTL_SECONDS=120, - CELERY_STARTUP_REFRESH_DELAY_SECONDS=45, - )), patch.object(module.cache, "add", return_value=True) as add_mock, patch.dict( + with patch.object( + module, + "settings", + SimpleNamespace( + CELERY_STARTUP_REFRESH_ENABLED=True, + CELERY_STARTUP_REFRESH_LOCK_KEY="startup-lock", + CELERY_STARTUP_REFRESH_LOCK_TTL_SECONDS=120, + CELERY_STARTUP_REFRESH_DELAY_SECONDS=45, + ), + ), patch.object(module.cache, "add", return_value=True) as add_mock, patch.dict( sys.modules, {"apps.parsers.tasks": fake_tasks_module} ): module._queue_startup_sources_refresh() @@ -88,12 +94,16 @@ class CeleryModuleTest(SimpleTestCase): apply_async=apply_async_mock ) - with patch.object(module, "settings", SimpleNamespace( - CELERY_STARTUP_REFRESH_ENABLED=True, - CELERY_STARTUP_REFRESH_LOCK_KEY="startup-lock", - CELERY_STARTUP_REFRESH_LOCK_TTL_SECONDS=120, - CELERY_STARTUP_REFRESH_DELAY_SECONDS=45, - )), patch.object(module.cache, "add", return_value=False), patch.dict( + with patch.object( + module, + "settings", + SimpleNamespace( + CELERY_STARTUP_REFRESH_ENABLED=True, + CELERY_STARTUP_REFRESH_LOCK_KEY="startup-lock", + CELERY_STARTUP_REFRESH_LOCK_TTL_SECONDS=120, + CELERY_STARTUP_REFRESH_DELAY_SECONDS=45, + ), + ), patch.object(module.cache, "add", return_value=False), patch.dict( sys.modules, {"apps.parsers.tasks": fake_tasks_module} ): module._queue_startup_sources_refresh()