edu-rdm-integration 3.10.3__py3-none-any.whl → 3.11.0__py3-none-any.whl

edu_rdm_integration/migrations/0018_auto_20250704_0725.py

@@ -0,0 +1,154 @@
+# Generated by Django 3.2.24 on 2025-07-04 07:25
+
+from django.db import (
+    migrations,
+)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('rdm_collect_and_export_data', '0003_auto_20250704_0725'),
+        ('edu_rdm_integration', '0017_delete_uploaddatacommand'),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.RemoveField(
+                    model_name='collectingexporteddatastage',
+                    name='manager',
+                ),
+                migrations.RemoveField(
+                    model_name='collectingexporteddatastage',
+                    name='status',
+                ),
+                migrations.RemoveField(
+                    model_name='collectingexporteddatasubstage',
+                    name='function',
+                ),
+                migrations.RemoveField(
+                    model_name='collectingexporteddatasubstage',
+                    name='previous',
+                ),
+                migrations.RemoveField(
+                    model_name='collectingexporteddatasubstage',
+                    name='stage',
+                ),
+                migrations.RemoveField(
+                    model_name='collectingexporteddatasubstage',
+                    name='status',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatastage',
+                    name='manager',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatastage',
+                    name='status',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstage',
+                    name='function',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstage',
+                    name='stage',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstage',
+                    name='status',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstageattachment',
+                    name='exporting_data_sub_stage',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstageentity',
+                    name='entity',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstageentity',
+                    name='exporting_data_sub_stage',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstageuploaderclientlog',
+                    name='attachment',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstageuploaderclientlog',
+                    name='entry',
+                ),
+                migrations.RemoveField(
+                    model_name='exportingdatasubstageuploaderclientlog',
+                    name='sub_stage',
+                ),
+                migrations.DeleteModel(
+                    name='RegionalDataMartModelEnum',
+                ),
+                migrations.RemoveField(
+                    model_name='transferredentity',
+                    name='entity',
+                ),
+                migrations.RemoveField(
+                    model_name='uploadstatusrequestlog',
+                    name='entry',
+                ),
+                migrations.RemoveField(
+                    model_name='uploadstatusrequestlog',
+                    name='request_status',
+                ),
+                migrations.RemoveField(
+                    model_name='uploadstatusrequestlog',
+                    name='upload',
+                ),
+                migrations.DeleteModel(
+                    name='UploaderClientLog',
+                ),
+                migrations.DeleteModel(
+                    name='CollectingDataStageStatus',
+                ),
+                migrations.DeleteModel(
+                    name='CollectingDataSubStageStatus',
+                ),
+                migrations.DeleteModel(
+                    name='CollectingExportedDataStage',
+                ),
+                migrations.DeleteModel(
+                    name='CollectingExportedDataSubStage',
+                ),
+                migrations.DeleteModel(
+                    name='DataMartRequestStatus',
+                ),
+                migrations.DeleteModel(
+                    name='ExportingDataStage',
+                ),
+                migrations.DeleteModel(
+                    name='ExportingDataStageStatus',
+                ),
+                migrations.DeleteModel(
+                    name='ExportingDataSubStage',
+                ),
+                migrations.DeleteModel(
+                    name='ExportingDataSubStageAttachment',
+                ),
+                migrations.DeleteModel(
+                    name='ExportingDataSubStageEntity',
+                ),
+                migrations.DeleteModel(
+                    name='ExportingDataSubStageStatus',
+                ),
+                migrations.DeleteModel(
+                    name='ExportingDataSubStageUploaderClientLog',
+                ),
+                migrations.DeleteModel(
+                    name='RegionalDataMartEntityEnum',
+                ),
+                migrations.DeleteModel(
+                    name='TransferredEntity',
+                ),
+                migrations.DeleteModel(
+                    name='UploadStatusRequestLog',
+                ),
+            ],
+        ),
+    ]

edu_rdm_integration/pipelines/transfer/actions.py

@@ -24,7 +24,7 @@ from edu_rdm_integration.pipelines.transfer.ui import (
     TransferredEntityListWindow,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 
 
@@ -32,7 +32,7 @@ class EntitySelectPack(ObjectPack):
     """Пак выбора сущностей для сбора и экспорта данных."""
 
     title = 'Сущность РВД'
-    model = RegionalDataMartEntityEnum
+    model = RDMEntityEnum
     _is_primary_for_model = False
 
     list_sort_order = ('order_number',)

edu_rdm_integration/pipelines/transfer/mixins.py

@@ -17,7 +17,7 @@ from edu_rdm_integration.core.storages import (
     RegionalDataMartEntityStorage,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 from edu_rdm_integration.stages.collect_data.helpers import (
     get_collecting_managers_max_period_ended_dates,
@@ -67,7 +67,7 @@ class BaseTransferLatestEntitiesDataMixin:
     def _collect_transferred_entities(self) -> None:
         """Собирает сущности РВД, по которым будет произведен сбор и экспорт данных."""
         self._transferred_entities = [
-            (RegionalDataMartEntityEnum.get_model_enum_value(key=entity), export_enabled)
+            (RDMEntityEnum.get_model_enum_value(key=entity), export_enabled)
             for entity, export_enabled in self.get_entity_qs().values_list('entity', 'export_enabled')
         ]
 

edu_rdm_integration/pipelines/transfer/models.py

@@ -15,7 +15,7 @@ from edu_rdm_integration.pipelines.transfer.enums import (
     EntityLevelQueueTypeEnum,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 
 
@@ -23,7 +23,7 @@ class TransferredEntity(BaseObjectModel):
     """Сущность, по которой должен быть произведен сбор и экспорт данных."""
 
     entity = OneToOneField(
-        to=RegionalDataMartEntityEnum,
+        to=RDMEntityEnum,
         verbose_name='Сущность',
         on_delete=CASCADE,
     )

edu_rdm_integration/pipelines/transfer/tasks.py

@@ -55,13 +55,13 @@ from edu_rdm_integration.pipelines.transfer.models import (
     TransferredEntity,
 )
 from edu_rdm_integration.stages.collect_data.models import (
-    EduRdmCollectDataCommandProgress,
+    RDMCollectingDataCommandProgress,
 )
 from edu_rdm_integration.stages.collect_data.operations import (
     BaseCollectLatestModelsData,
 )
 from edu_rdm_integration.stages.export_data.models import (
-    EduRdmExportDataCommandProgress,
+    RDMExportingDataCommandProgress,
 )
 from edu_rdm_integration.stages.export_data.operations import (
     ExportLatestEntitiesData,
@@ -112,7 +112,7 @@ class BaseTransferLatestEntitiesDataPeriodicTask(BaseTransferLatestEntitiesDataM
             command.refresh_from_db(fields=['stage_id'])
             save_command_log_link(command, settings.RDM_EXPORT_LOG_DIR)
 
-    def _create_collect_command(self, model: str, task_id: str) -> EduRdmCollectDataCommandProgress:
+    def _create_collect_command(self, model: str, task_id: str) -> RDMCollectingDataCommandProgress:
         """Создает команду сбора данных моделей РВД."""
         manager = self._collecting_data_managers[model]
         manager_last_collected = (
@@ -122,7 +122,7 @@ class BaseTransferLatestEntitiesDataPeriodicTask(BaseTransferLatestEntitiesDataM
         period_started_at = manager_last_collected
         period_ended_at = self._get_period_ended_at()
 
-        return EduRdmCollectDataCommandProgress.objects.create(
+        return RDMCollectingDataCommandProgress.objects.create(
             model_id=model,
             logs_period_started_at=period_started_at,
             logs_period_ended_at=period_ended_at,
@@ -130,7 +130,7 @@ class BaseTransferLatestEntitiesDataPeriodicTask(BaseTransferLatestEntitiesDataM
             type=CommandType.AUTO,
         )
 
-    def _create_export_command(self, entity: str, task_id: str) -> Optional[EduRdmExportDataCommandProgress]:
+    def _create_export_command(self, entity: str, task_id: str) -> Optional[RDMExportingDataCommandProgress]:
         """Создает команду экспорта данных сущностей РВД."""
         manager = self._exporting_data_managers[entity]
         manager_last_exported = self._exporting_data_manager_to_period_end.get(manager.uuid)
@@ -139,7 +139,7 @@ class BaseTransferLatestEntitiesDataPeriodicTask(BaseTransferLatestEntitiesDataM
             period_started_at = manager_last_exported
             period_ended_at = timezone.now()
 
-            return EduRdmExportDataCommandProgress.objects.create(
+            return RDMExportingDataCommandProgress.objects.create(
                 entity_id=entity,
                 period_started_at=period_started_at,
                 period_ended_at=period_ended_at,
@@ -150,7 +150,7 @@ class BaseTransferLatestEntitiesDataPeriodicTask(BaseTransferLatestEntitiesDataM
         return None
 
     def _prepare_collect_model_data_class(
-        self, command: EduRdmCollectDataCommandProgress
+        self, command: RDMCollectingDataCommandProgress
     ) -> BaseCollectLatestModelsData:
         """Подготавливает объект класса сбора данных моделей РВД."""
         return BaseCollectLatestModelsData(
@@ -161,7 +161,7 @@ class BaseTransferLatestEntitiesDataPeriodicTask(BaseTransferLatestEntitiesDataM
             use_times_limit=True,
         )
 
-    def _prepare_export_entity_data_class(self, command: EduRdmExportDataCommandProgress) -> ExportLatestEntitiesData:
+    def _prepare_export_entity_data_class(self, command: RDMExportingDataCommandProgress) -> ExportLatestEntitiesData:
         """Подготавливает объект класса экспорта данных сущностей РВД.
 
         При экспорте данных передаем параметр task_id для обновления поля "Описание"

edu_rdm_integration/rdm_entities/entities.py

@@ -19,7 +19,7 @@ from edu_rdm_integration.rdm_entities.mixins import (
     EntityEnumRegisterMixin,
 )
 from edu_rdm_integration.rdm_models.models import (
-    RegionalDataMartModelEnum,
+    RDMModelEnum,
 )
 
 
@@ -123,7 +123,7 @@ class AddressEntity(EntityEnumRegisterMixin, BaseEntity):
 
         !!! Временное решение. Будет удалено в рамках EDUSCHL-20938.
         """
-        return RegionalDataMartModelEnum.ADDRESS
+        return RDMModelEnum.ADDRESS
 
 
 @dataclass
@@ -192,7 +192,7 @@ class AddressOrganisationEntity(EntityEnumRegisterMixin, BaseEntity):
 
         !!! Временное решение. Будет удалено в рамках EDUSCHL-20938.
         """
-        return RegionalDataMartModelEnum.ADDRESS_ORGANISATION
+        return RDMModelEnum.ADDRESS_ORGANISATION
 
     # TODO EDUSCHL-20938 Удалить в рамках задачи
     @classmethod
@@ -203,7 +203,7 @@ class AddressOrganisationEntity(EntityEnumRegisterMixin, BaseEntity):
 
         !!! Временное решение. Будет удалено в рамках EDUSCHL-20938.
         """
-        return (RegionalDataMartModelEnum.ORGANISATION,)
+        return (RDMModelEnum.ORGANISATION,)
 
 
 @dataclass
@@ -288,7 +288,7 @@ class TelecomEntity(EntityEnumRegisterMixin, BaseEntity):
 
         !!! Временное решение. Будет удалено в рамках EDUSCHL-20938.
         """
-        return RegionalDataMartModelEnum.TELECOM
+        return RDMModelEnum.TELECOM
 
 
 @dataclass
@@ -415,4 +415,4 @@ class OrganisationsEntity(EntityEnumRegisterMixin, BaseEntity):
 
         !!! Временное решение. Будет удалено в рамках EDUSCHL-20938.
         """
-        return RegionalDataMartModelEnum.ORGANISATION
+        return RDMModelEnum.ORGANISATION

edu_rdm_integration/rdm_entities/migrations/0001_initial.py

@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('edu_rdm_integration', '0017_delete_uploaddatacommand'),
+        ('edu_rdm_integration', '0018_auto_20250704_0725'),
     ]
 
     operations = [

edu_rdm_integration/rdm_entities/migrations/0002_rename_regionaldatamartentityenum_rdmentityenum.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.24 on 2025-07-04 08:10
+
+from django.db import (
+    migrations,
+)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('edu_rdm_integration_export_data_stage', '0001_initial'),
+        ('edu_rdm_integration_transfer_pipeline', '0001_initial'),
+        ('edu_rdm_integration_entities', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='RegionalDataMartEntityEnum',
+            new_name='RDMEntityEnum',
+        ),
+    ]

edu_rdm_integration/rdm_entities/mixins.py

@@ -17,14 +17,14 @@ from edu_rdm_integration.core.utils import (
     camel_to_underscore,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 
 
 class EntityEnumRegisterMixin(BaseEnumRegisterMixin):
     """Миксин, для регистрации сущности в RegionalDataMartEntityEnum."""
 
-    enum = RegionalDataMartEntityEnum
+    enum = RDMEntityEnum
     """Модель-перечисление в которую регистрируется сущность."""
 
     main_model_enum: ModelEnumValue

edu_rdm_integration/rdm_entities/models.py

@@ -4,7 +4,7 @@ from m3_db_utils.models import (
 )
 
 
-class RegionalDataMartEntityEnum(TitledModelEnum):
+class RDMEntityEnum(TitledModelEnum):
     """Модель-перечисление сущностей выгрузки в Региональная витрина данных.
 
     Поля:

edu_rdm_integration/rdm_models/migrations/0001_initial.py

@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('edu_rdm_integration', '0017_delete_uploaddatacommand'),
+        ('edu_rdm_integration', '0018_auto_20250704_0725'),
     ]
 
     operations = [

edu_rdm_integration/rdm_models/migrations/0002_rename_regionaldatamartmodelenum_rdmmodelenum.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.24 on 2025-07-04 08:10
+
+from django.db import (
+    migrations,
+)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('edu_rdm_integration_collect_data_stage', '0003_auto_20250704_0810'),
+        ('edu_rdm_integration_models', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='RegionalDataMartModelEnum',
+            new_name='RDMModelEnum',
+        ),
+    ]

edu_rdm_integration/rdm_models/mixins.py

@@ -21,14 +21,14 @@ from edu_rdm_integration.core.utils import (
     camel_to_underscore,
 )
 from edu_rdm_integration.rdm_models.models import (
-    RegionalDataMartModelEnum,
+    RDMModelEnum,
 )
 
 
 class ModelEnumRegisterMixin(BaseEnumRegisterMixin):
     """Миксин, для регистрации модели в RegionalDataMartModelEnum."""
 
-    enum = RegionalDataMartModelEnum
+    enum = RDMModelEnum
     """Модель-перечисление в которую регистрируется модель."""
 
     creating_trigger_models: tuple[models.Model, ...] = ()

edu_rdm_integration/rdm_models/models.py

@@ -19,17 +19,17 @@ from m3_db_utils.models import (
 )
 
 
-class BaseEntityModel(ReprStrPreModelMixin, BaseObjectModel):
-    """Базовая модель сущности."""
+class BaseRDMModel(ReprStrPreModelMixin, BaseObjectModel):
+    """Базовая модель РВД."""
 
     collecting_sub_stage = ForeignKey(
-        verbose_name='Подэтап сбора данных сущности',
-        to='edu_rdm_integration_collect_data_stage.CollectingExportedDataSubStage',
+        verbose_name='Подэтап сбора данных',
+        to='edu_rdm_integration_collect_data_stage.RDMCollectingDataSubStage',
         on_delete=CASCADE,
     )
     exporting_sub_stage = ForeignKey(
-        verbose_name='Подэтап выгрузки',
-        to='edu_rdm_integration_export_data_stage.ExportingDataSubStage',
+        verbose_name='Подэтап выгрузки данных',
+        to='edu_rdm_integration_export_data_stage.RDMExportingDataSubStage',
         blank=True,
         null=True,
         on_delete=CASCADE,
@@ -63,7 +63,7 @@ class BaseEntityModel(ReprStrPreModelMixin, BaseObjectModel):
         abstract = True
 
 
-class RegionalDataMartModelEnum(TitledModelEnum):
+class RDMModelEnum(TitledModelEnum):
     """Модель-перечисление моделей "Региональная витрина данных"."""
 
     class Meta:

edu_rdm_integration/stages/collect_data/function_templates/function_collect_data_template/functions.py-tpl

@@ -15,7 +15,7 @@ from edu_rdm_integration.core.consts import (
     REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
 )
 from edu_rdm_integration.rdm_models.models import (
-    RegionalDataMartModelEnum,
+    RDMModelEnum,
 )
 
 from {{ strategy.function_class_module }} import (
@@ -88,7 +88,7 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
     def _prepare_entities(cls) -> list['ModelEnumValue']:
         """Формирование списка ключей модели-перечисления моделей РВД."""
         rdm_models = [
-            RegionalDataMartModelEnum.,
+            RDMModelEnum.,
         ]
 
         return rdm_models

edu_rdm_integration/stages/collect_data/functions/base/functions.py

@@ -16,9 +16,9 @@ from edu_rdm_integration.core.consts import (
     LOGS_DELIMITER,
 )
 from edu_rdm_integration.stages.collect_data.models import (
-    CollectingDataSubStageStatus,
-    CollectingExportedDataStage,
-    CollectingExportedDataSubStage,
+    RDMCollectingDataStage,
+    RDMCollectingDataSubStage,
+    RDMCollectingDataSubStageStatus,
 )
 
 
@@ -29,11 +29,11 @@ class BaseCollectingCalculatedDataFunction(
 ):
     """Базовый класс функций сбора данных для интеграции с "Региональная витрина данных"."""
 
-    def __init__(self, *args, stage: CollectingExportedDataStage, **kwargs):
+    def __init__(self, *args, stage: RDMCollectingDataStage, **kwargs):
         super().__init__(*args, stage=stage, **kwargs)
 
         previous_sub_stage = (
-            CollectingExportedDataSubStage.objects.filter(
+            RDMCollectingDataSubStage.objects.filter(
                 function_id=self.uuid,
             )
             .order_by('started_at')
@@ -41,7 +41,7 @@ class BaseCollectingCalculatedDataFunction(
             .first()
         )
 
-        self._sub_stage = CollectingExportedDataSubStage.objects.create(
+        self._sub_stage = RDMCollectingDataSubStage.objects.create(
             stage=stage,
             function_id=self.uuid,
             previous_id=getattr(previous_sub_stage, 'pk', None),
@@ -53,7 +53,7 @@ class BaseCollectingCalculatedDataFunction(
 
     def _before_prepare(self, *args, **kwargs):
         """Выполнение действий функций системы."""
-        self._sub_stage.status_id = CollectingDataSubStageStatus.IN_PROGRESS.key
+        self._sub_stage.status_id = RDMCollectingDataSubStageStatus.IN_PROGRESS.key
         self._sub_stage.save()
 
         logger.info(f'{LOGS_DELIMITER * 3}change status {repr(self._sub_stage)}')
@@ -76,9 +76,9 @@ class BaseCollectingCalculatedDataFunction(
         super().run(*args, **kwargs)
 
         if self.result.errors:
-            self._sub_stage.status_id = CollectingDataSubStageStatus.FAILED.key
+            self._sub_stage.status_id = RDMCollectingDataSubStageStatus.FAILED.key
         else:
-            self._sub_stage.status_id = CollectingDataSubStageStatus.READY_TO_EXPORT.key
+            self._sub_stage.status_id = RDMCollectingDataSubStageStatus.READY_TO_EXPORT.key
 
         self._sub_stage.save()
 

edu_rdm_integration/stages/collect_data/functions/base/managers.py

@@ -33,8 +33,8 @@ from edu_rdm_integration.core.consts import (
     LOGS_DELIMITER,
 )
 from edu_rdm_integration.stages.collect_data.models import (
-    CollectingDataStageStatus,
-    CollectingExportedDataStage,
+    RDMCollectingDataStage,
+    RDMCollectingDataStageStatus,
 )
 
 
@@ -64,7 +64,7 @@ class BaseCollectingDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
 
         self._logs_period_started_at = logs_period_started_at
         self._logs_period_ended_at = logs_period_ended_at
-        self._stage = CollectingExportedDataStage.objects.create(
+        self._stage = RDMCollectingDataStage.objects.create(
             manager_id=self.uuid,
             logs_period_started_at=logs_period_started_at,
             logs_period_ended_at=logs_period_ended_at,
@@ -141,7 +141,7 @@ class BaseCollectingDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
 
         logger.info(f'{LOGS_DELIMITER}{self.__class__.__name__} start preparing logs records..')
 
-        self._stage.status_id = CollectingDataStageStatus.IN_PROGRESS.key
+        self._stage.status_id = RDMCollectingDataStageStatus.IN_PROGRESS.key
         self._stage.save()
 
         super()._create_runner(
@@ -164,9 +164,9 @@ class BaseCollectingDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
     def _after_start_runner(self, *args, **kwargs):
         """Точка расширения поведения менеджера ранера после запуска ранера."""
         if self._runner.result.errors:
-            self._stage.status_id = CollectingDataStageStatus.FAILED.key
+            self._stage.status_id = RDMCollectingDataStageStatus.FAILED.key
         else:
-            self._stage.status_id = CollectingDataStageStatus.FINISHED.key
+            self._stage.status_id = RDMCollectingDataStageStatus.FINISHED.key
 
         self._stage.save()