edu-rdm-integration 3.18.2__py3-none-any.whl → 3.18.4__py3-none-any.whl

edu_rdm_integration/core/utils.py

@@ -11,9 +11,6 @@ from typing import (
     Union,
 )
 
-from _operator import (
-    attrgetter,
-)
 from django.conf import (
     settings,
 )
@@ -58,7 +55,6 @@ def register_classes(classes: Iterable[type[BaseEnumRegisterMixin]]) -> None:
     Args:
         classes: Классы, поддерживающие интерфейс регистрации.
     """
-
     for enum_class in classes:
         enum_class.register()
 

edu_rdm_integration/pipelines/cleanup_outdated_data/management/commands/rdm_cleanup_outdated_data.py

@@ -2,6 +2,9 @@ from django.core.management import (
     BaseCommand,
 )
 
+from edu_rdm_integration.rdm_models.models import (
+    RDMModelEnum,
+)
 from edu_rdm_integration.stages.service.model_outdated_data.managers import (
     ModelOutdatedDataCleanerManager,
 )
@@ -14,7 +17,42 @@ class Command(BaseCommand):
 
     help = 'Ночная команда для очистки устаревших данных РВД.'
 
+    def add_arguments(self, parser):
+        """Добавляет аргументы командной строки."""
+        models = ', '.join(f'{key} - {value.title}' for key, value in RDMModelEnum.get_enum_data().items())
+        models_help_text = (
+            f'Значением параметра является перечисление моделей РВД, для которых должна быть произведена зачистка '
+            f'устаревших данных. '
+            f'Перечисление моделей:\n{models}. Если модели не указываются, то зачистка устаревших данных будет '
+            f'производиться для всех моделей. Модели перечисляются через запятую без пробелов.'
+        )
+        parser.add_argument(
+            '--models',
+            action='store',
+            dest='models',
+            type=lambda ml: [m.strip().upper() for m in ml.strip().split(',')] if ml else None,
+            help=models_help_text,
+        )
+
+        parser.add_argument(
+            '--safe',
+            action='store_true',
+            dest='safe',
+            default=False,
+            help='Запускать команду в безопасном режиме (без удаления данных, только логирование).',
+        )
+
+        parser.add_argument(
+            '--log-sql',
+            action='store_true',
+            dest='log_sql',
+            default=False,
+            help='Включить логирование SQL-запросов, выполняемых во время работы команды.',
+        )
+
     def handle(self, *args, **options):
         """Запуск очистки устаревших данных РВД."""
-        model_data_cleaner_manager = ModelOutdatedDataCleanerManager()
+        model_data_cleaner_manager = ModelOutdatedDataCleanerManager(
+            models=options['models'], safe=options['safe'], log_sql=options['log_sql']
+        )
         model_data_cleaner_manager.run()

edu_rdm_integration/stages/service/model_outdated_data/cleaners.py

@@ -16,8 +16,17 @@ if TYPE_CHECKING:
 class BaseModelOutdatedDataCleaner(metaclass=ABCMeta):
     """Базовый класс уборщика устаревших данных моделей РВД."""
 
-    def __init__(self, model_enum_value: 'ModelEnumValue', *args, **kwargs):
+    def __init__(
+        self,
+        model_enum_value: 'ModelEnumValue',
+        *args,
+        safe: bool = False,
+        log_sql: bool = False,
+        **kwargs,
+    ):
         self._model_enum_value = model_enum_value
+        self._safe = safe
+        self._log_sql = log_sql
 
         super().__init__(*args, **kwargs)
 

edu_rdm_integration/stages/service/model_outdated_data/managers.py

@@ -1,6 +1,7 @@
 import importlib
 from typing import (
     TYPE_CHECKING,
+    Optional,
 )
 
 from edu_rdm_integration.rdm_models.models import (
@@ -22,6 +23,20 @@ class ModelOutdatedDataCleanerManager:
     метод run.
     """
 
+    def __init__(
+        self,
+        *args,
+        models: Optional[list[str]] = None,
+        safe: bool = False,
+        log_sql: bool = False,
+        **kwargs,
+    ):
+        self._models = models
+        self._safe = safe
+        self._log_sql = log_sql
+
+        super().__init__(*args, **kwargs)
+
     def _process_model(self, model_enum_value: 'ModelEnumValue'):
         """Обрабатывает модель РВД."""
         if not hasattr(model_enum_value, 'outdated_data_cleaners'):
@@ -33,11 +48,14 @@ class ModelOutdatedDataCleanerManager:
                 outdated_data_cleaner_module = importlib.import_module(outdated_data_cleaner_module_path)
                 outdated_data_cleaner = getattr(outdated_data_cleaner_module, cleaner_name)
 
-            outdated_data_cleaner(model_enum_value=model_enum_value).run()
+            outdated_data_cleaner(model_enum_value=model_enum_value, safe=self._safe, log_sql=self._log_sql).run()
 
     def _process_models(self):
         """Обрабатывает все модели РВД."""
         for model_enum_value in RDMModelEnum.get_model_enum_values():
+            if self._models is not None and model_enum_value.key not in self._models:
+                continue
+
             self._process_model(model_enum_value=model_enum_value)
 
     def run(self):

{edu_rdm_integration-3.18.2.dist-info → edu_rdm_integration-3.18.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.18.2
+Version: 3.18.4
 Summary: Интеграция с Региональной витриной данных
 Author-email: BARS Group <education_dev@bars.group>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu-rdm-integration/browse

{edu_rdm_integration-3.18.2.dist-info → edu_rdm_integration-3.18.4.dist-info}/RECORD

@@ -18,7 +18,7 @@ edu_rdm_integration/core/redis_cache.py,sha256=R9_C1H8XbCHxZUoPbr7lfepI7Ic7td_NQ
 edu_rdm_integration/core/signals.py,sha256=3eRlpkDcFCF6TN80-QM8yBYLcyozzcmoPjz6r4_ApWg,73
 edu_rdm_integration/core/storages.py,sha256=9nlRfHe4DJMNVgr0N4DGIEnsYLsEGDEO9KFvNac-B_E,6635
 edu_rdm_integration/core/typing.py,sha256=2asD8biX0l_DVqJSU4y19-zzEBJMk967PUj3UhzICzs,785
-edu_rdm_integration/core/utils.py,sha256=MaZ-78hR_dlvm6_r2uoYY4Jvv8adMfGz9dIk3QMlPDA,9856
+edu_rdm_integration/core/utils.py,sha256=KAqzToW3fwnWuPAmJplWZwDkBxqjOkjaNsGZnti5gB8,9813
 edu_rdm_integration/core/registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/core/registry/actions.py,sha256=DF5x1OjuVnfFFuPfK1HVIbDdhVArmlSv0-inqf-Gl6s,3886
 edu_rdm_integration/core/registry/apps.py,sha256=ioBzfLzvKb36KmuVVCHbg9wxM6PHy4ZnxxbLm2Da_yI,378
@@ -48,7 +48,7 @@ edu_rdm_integration/pipelines/cleanup_outdated_data/__init__.py,sha256=47DEQpj8H
 edu_rdm_integration/pipelines/cleanup_outdated_data/apps.py,sha256=tyTlr1Wt574eby2vIV68FMm7SPFSZKYw6zNkD8x6COE,507
 edu_rdm_integration/pipelines/cleanup_outdated_data/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/pipelines/cleanup_outdated_data/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/pipelines/cleanup_outdated_data/management/commands/rdm_cleanup_outdated_data.py,sha256=Mhas_dqs3NPpCKyRxdGFkQCrsic8_48fRDFhVAmq2MU,676
+edu_rdm_integration/pipelines/cleanup_outdated_data/management/commands/rdm_cleanup_outdated_data.py,sha256=7sdBe-if4Nz66saTFN8Q35cEVpHse3vQvokas8MQi44,2586
 edu_rdm_integration/pipelines/transfer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/pipelines/transfer/actions.py,sha256=e94NVtTcFIqBBTZ9vbSfh_0oXUWK9ZOx2pDYnIePJVc,5920
 edu_rdm_integration/pipelines/transfer/app_meta.py,sha256=jshfepDDJrbCACtJBJBPuidAVJ6rcziQiet27wqOIjk,373
@@ -220,9 +220,9 @@ edu_rdm_integration/stages/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 edu_rdm_integration/stages/service/apps.py,sha256=lgCG4_kpwgfDWh6y-GNuUwz5SOjkP7oS8kkUyVUcNRg,648
 edu_rdm_integration/stages/service/tasks.py,sha256=PPCtT6EpLkAKRczY0KIT6GeE9eBkv60fl2W6KFvCRqc,2302
 edu_rdm_integration/stages/service/model_outdated_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/stages/service/model_outdated_data/cleaners.py,sha256=gk5_wUNVJwr3D6k5fJDzbSGEhWUXqk9yT6xPK7OP1hw,637
-edu_rdm_integration/stages/service/model_outdated_data/managers.py,sha256=U2rBg-t-X9YfapP4xRRfKiou7sX0V10WxrPHyeCQ-oI,1880
-edu_rdm_integration/stages/service/outdated_service_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+edu_rdm_integration/stages/service/model_outdated_data/cleaners.py,sha256=D4NX5BryzlOORfFRHUElRAsHVLObppPUq4DPGCKTmtw,793
+edu_rdm_integration/stages/service/model_outdated_data/managers.py,sha256=0LNjvycTtSMGsN37U-otlPL_vlYJKZXtNXxwkseK1wA,2353
+edu_rdm_integration/stages/service/service_outdated_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/upload_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/upload_data/apps.py,sha256=aFhVPK-65b35CGKoAeAgQ0mm3STaWtZg7rqk3eL-b7s,620
 edu_rdm_integration/stages/upload_data/consts.py,sha256=yTygXxS5dBRCvrE7Q3D0jEGSC5apIKvVAAViDM8QcKA,223
@@ -254,8 +254,8 @@ edu_rdm_integration/stages/upload_data/uploader_log/ui.py,sha256=mU3XA9zVKHGqzNk
 edu_rdm_integration/stages/upload_data/uploader_log/migrations/0001_initial.py,sha256=r5oOB7DBK9-mfuqPAgjXUJY5-hEcmMdILCwDTpaLnBc,753
 edu_rdm_integration/stages/upload_data/uploader_log/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/upload_data/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
-edu_rdm_integration-3.18.2.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.18.2.dist-info/METADATA,sha256=zd1jKvBCnNe9yQII04MTYP7vkbcpmHsnH-3TIz1xMdY,39873
-edu_rdm_integration-3.18.2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-edu_rdm_integration-3.18.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.18.2.dist-info/RECORD,,
+edu_rdm_integration-3.18.4.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.18.4.dist-info/METADATA,sha256=UkQWafoZO26RSQc_CZ61h-QOT5oywXhbDyPJ-kB06nM,39873
+edu_rdm_integration-3.18.4.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+edu_rdm_integration-3.18.4.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.18.4.dist-info/RECORD,,