edu-rdm-integration 3.9.1__py3-none-any.whl → 3.10.0__py3-none-any.whl

edu_rdm_integration/migrations/0006_request_status_data.py

@@ -12,62 +12,65 @@ def init_request_statuses(apps, schema_editor):
     """Заполнение первоначальными данными DataMartRequestStatus."""
     DataMartRequestStatus = apps.get_model('edu_rdm_integration', 'DataMartRequestStatus')  # noqa: N806
 
-    DataMartRequestStatus.objects.bulk_create([
-        DataMartRequestStatus(
-            key='UPLOAD_TO_BUFFER',
-            value=-1,
-            title='Загрузка данных в буффер',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-        DataMartRequestStatus(
-            key='BUFFERED',
-            value=0,
-            title='Запрос буфферизирован',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-        DataMartRequestStatus(
-            key='WAIT_FOR_OPEN_DELTA',
-            value=1,
-            title='Ожидает открытия дельты',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-        DataMartRequestStatus(
-            key='IN_PROCESSING',
-            value=2,
-            title='В обработке',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-        DataMartRequestStatus(
-            key='SUCCESSFULLY_PROCESSED',
-            value=3,
-            title='Успешно обработан',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-        DataMartRequestStatus(
-            key='FAILED_PROCESSING',
-            value=4,
-            title='Ошибка обработки запроса',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-        DataMartRequestStatus(
-            key='REQUEST_ID_NOT_FOUND',
-            value=5,
-            title='Идентификатор запроса не обнаружен',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-        DataMartRequestStatus(
-            key='FORMAT_LOGICAL_CONTROL',
-            value=6,
-            title='Форматно-логический контроль',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-        DataMartRequestStatus(
-            key='FLC_ERROR',
-            value=7,
-            title='Ошибки ФЛК',
-            order_number=DEFAULT_ORDER_NUMBER,
-        ),
-    ], ignore_conflicts=True)
+    DataMartRequestStatus.objects.bulk_create(
+        [
+            DataMartRequestStatus(
+                key='UPLOAD_TO_BUFFER',
+                value=-1,
+                title='Загрузка данных в буффер',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+            DataMartRequestStatus(
+                key='BUFFERED',
+                value=0,
+                title='Запрос буфферизирован',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+            DataMartRequestStatus(
+                key='WAIT_FOR_OPEN_DELTA',
+                value=1,
+                title='Ожидает открытия дельты',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+            DataMartRequestStatus(
+                key='IN_PROCESSING',
+                value=2,
+                title='В обработке',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+            DataMartRequestStatus(
+                key='SUCCESSFULLY_PROCESSED',
+                value=3,
+                title='Успешно обработан',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+            DataMartRequestStatus(
+                key='FAILED_PROCESSING',
+                value=4,
+                title='Ошибка обработки запроса',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+            DataMartRequestStatus(
+                key='REQUEST_ID_NOT_FOUND',
+                value=5,
+                title='Идентификатор запроса не обнаружен',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+            DataMartRequestStatus(
+                key='FORMAT_LOGICAL_CONTROL',
+                value=6,
+                title='Форматно-логический контроль',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+            DataMartRequestStatus(
+                key='FLC_ERROR',
+                value=7,
+                title='Ошибки ФЛК',
+                order_number=DEFAULT_ORDER_NUMBER,
+            ),
+        ],
+        ignore_conflicts=True,
+    )
 
 
 def migrate_upload_status_to_request_status(apps, schema_editor):
@@ -86,12 +89,11 @@ def migrate_upload_status_to_request_status(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0005_auto_20231204_1224'),
     ]
 
     operations = [
         migrations.RunPython(init_request_statuses, reverse_code=migrations.RunPython.noop),
-        migrations.RunPython(migrate_upload_status_to_request_status, reverse_code=migrations.RunPython.noop)
+        migrations.RunPython(migrate_upload_status_to_request_status, reverse_code=migrations.RunPython.noop),
     ]

edu_rdm_integration/migrations/0007_delete_upload_status.py

@@ -6,7 +6,6 @@ from django.db import (
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0006_request_status_data'),
     ]

edu_rdm_integration/migrations/0009_auto_20240522_1619.py

@@ -8,14 +8,10 @@ from django.db import (
 def add_exporting_data_sub_stage_status(apps, schema_editor):
     """Добавление нового статуса этапу выгрузки данных."""
     ExportingDataSubStageStatus = apps.get_model('edu_rdm_integration', 'ExportingDataSubStageStatus')  # noqa: N806
-    ExportingDataSubStageStatus.objects.get_or_create(
-        key='READY_FOR_EXPORT',
-        title='Готов к выгрузке'
-    )
+    ExportingDataSubStageStatus.objects.get_or_create(key='READY_FOR_EXPORT', title='Готов к выгрузке')
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0008_transferredentity'),
     ]

edu_rdm_integration/migrations/0010_transferredentity_export_enabled.py

@@ -7,7 +7,6 @@ from django.db import (
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0009_auto_20240522_1619'),
     ]

edu_rdm_integration/migrations/0011_exportingdatasubstageentity.py

@@ -8,7 +8,6 @@ from django.db import (
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0010_transferredentity_export_enabled'),
     ]
@@ -18,8 +17,22 @@ class Migration(migrations.Migration):
             name='ExportingDataSubStageEntity',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('entity', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='edu_rdm_integration.regionaldatamartentityenum', verbose_name='Сущность РВД')),
-                ('exporting_data_sub_stage', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='edu_rdm_integration.exportingdatasubstage', verbose_name='Подэтап выгрузки данных')),
+                (
+                    'entity',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to='edu_rdm_integration.regionaldatamartentityenum',
+                        verbose_name='Сущность РВД',
+                    ),
+                ),
+                (
+                    'exporting_data_sub_stage',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to='edu_rdm_integration.exportingdatasubstage',
+                        verbose_name='Подэтап выгрузки данных',
+                    ),
+                ),
             ],
             options={
                 'verbose_name': 'Связь сущности и подэтапа выгрузки',

edu_rdm_integration/migrations/0012_exportingdatasubstageattachment_attachment_size.py

@@ -7,7 +7,6 @@ from django.db import (
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0011_exportingdatasubstageentity'),
     ]

edu_rdm_integration/migrations/0013_set_attachment_size.py

@@ -8,7 +8,7 @@ from educommon.utils.seqtools import (
     make_chunks,
 )
 
-from edu_rdm_integration.enums import (
+from edu_rdm_integration.stages.upload_data.enums import (
     FileUploadStatusEnum,
 )
 
@@ -20,16 +20,16 @@ CHUNK_SIZE = 500
 
 def set_attachment_size(apps, schema_editor):
     """Установка размера файла по умолчанию."""
-    ExportingDataSubStageAttachment = apps.get_model(
-        'edu_rdm_integration', 'ExportingDataSubStageAttachment'
-    )  # noqa: N806
+    ExportingDataSubStageAttachment = apps.get_model('edu_rdm_integration', 'ExportingDataSubStageAttachment')  # noqa: N806
     ExportingDataSubStageUploaderClientLog = apps.get_model(
         'edu_rdm_integration', 'ExportingDataSubStageUploaderClientLog'
     )  # noqa: N806
 
-    attachment_ids = ExportingDataSubStageUploaderClientLog.objects.filter(
-        file_upload_status=FileUploadStatusEnum.IN_PROGRESS
-    ).values_list('attachment_id', flat=True).iterator()
+    attachment_ids = (
+        ExportingDataSubStageUploaderClientLog.objects.filter(file_upload_status=FileUploadStatusEnum.IN_PROGRESS)
+        .values_list('attachment_id', flat=True)
+        .iterator()
+    )
 
     sub_stage_with_deleted_attachments = []
     for chunked_attachment_ids in make_chunks(attachment_ids, CHUNK_SIZE):
@@ -47,12 +47,8 @@ def set_attachment_size(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0012_exportingdatasubstageattachment_attachment_size'),
     ]
 
-    operations = [
-        migrations.RunPython(set_attachment_size, reverse_code=migrations.RunPython.noop)
-    ]
-
+    operations = [migrations.RunPython(set_attachment_size, reverse_code=migrations.RunPython.noop)]

edu_rdm_integration/migrations/0014_uploaddatacommand.py

@@ -11,11 +11,10 @@ from django.db import (
 
 import educommon.django.db.mixins
 
-import edu_rdm_integration.utils
+import edu_rdm_integration.core.utils
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('async_task', '0002_task_type_and_status_data'),
         ('edu_rdm_integration', '0013_set_attachment_size'),
@@ -26,12 +25,40 @@ class Migration(migrations.Migration):
             name='UploadDataCommand',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('logs_link', models.FileField(max_length=255, upload_to=edu_rdm_integration.utils.get_data_command_progress_attachment_path, verbose_name='Ссылка на файл логов')),
-                ('type', models.PositiveSmallIntegerField(choices=[(1, 'Автоматический'), (2, 'Ручной')], verbose_name='Тип команды')),
+                (
+                    'logs_link',
+                    models.FileField(
+                        max_length=255,
+                        upload_to=edu_rdm_integration.core.utils.get_data_command_progress_attachment_path,
+                        verbose_name='Ссылка на файл логов',
+                    ),
+                ),
+                (
+                    'type',
+                    models.PositiveSmallIntegerField(
+                        choices=[(1, 'Автоматический'), (2, 'Ручной')], verbose_name='Тип команды'
+                    ),
+                ),
                 ('created', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Дата создания')),
                 ('generation_id', models.UUIDField(default=uuid.uuid4, verbose_name='Идентификатор генерации')),
-                ('entity', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='edu_rdm_integration.regionaldatamartentityenum', verbose_name='Сущность РВД')),
-                ('task', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='async_task.runningtask', verbose_name='Асинхронная задача')),
+                (
+                    'entity',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to='edu_rdm_integration.regionaldatamartentityenum',
+                        verbose_name='Сущность РВД',
+                    ),
+                ),
+                (
+                    'task',
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to='async_task.runningtask',
+                        verbose_name='Асинхронная задача',
+                    ),
+                ),
             ],
             options={
                 'verbose_name': 'Команда отправки данных в витрину',

edu_rdm_integration/migrations/0015_set_exporting_sub_stage_status.py

@@ -8,14 +8,10 @@ from django.db import (
 def add_exporting_data_sub_stage_status(apps, schema_editor):
     """Добавление нового статуса этапу выгрузки данных."""
     ExportingDataSubStageStatus = apps.get_model('edu_rdm_integration', 'ExportingDataSubStageStatus')  # noqa: N806
-    ExportingDataSubStageStatus.objects.get_or_create(
-        key='PROCESS_ERROR',
-        title='Ошибка обработки витриной'
-    )
+    ExportingDataSubStageStatus.objects.get_or_create(key='PROCESS_ERROR', title='Ошибка обработки витриной')
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0014_uploaddatacommand'),
     ]

edu_rdm_integration/migrations/0016_transferredentity_queue_level.py

@@ -7,7 +7,6 @@ from django.db import (
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0015_set_exporting_sub_stage_status'),
     ]
@@ -17,6 +16,7 @@ class Migration(migrations.Migration):
             model_name='transferredentity',
             name='queue_level',
             field=models.PositiveIntegerField(
-                choices=[(1, 'Быстрая'), (2, 'Основная'), (3, 'Долгая')], default=2, verbose_name='Уровень очереди'),
+                choices=[(1, 'Быстрая'), (2, 'Основная'), (3, 'Долгая')], default=2, verbose_name='Уровень очереди'
+            ),
         ),
     ]

edu_rdm_integration/migrations/0017_delete_uploaddatacommand.py

@@ -1,10 +1,11 @@
 # Generated by Django 3.2.24 on 2025-05-07 19:50
 
-from django.db import migrations
+from django.db import (
+    migrations,
+)
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('edu_rdm_integration', '0016_transferredentity_queue_level'),
     ]

edu_rdm_integration/migrations/__init__.py

@@ -0,0 +1 @@
+# TODO EDUDEVOPS-95 будет удалено в будущих версиях

edu_rdm_integration/{registry → pipelines/transfer}/actions.py

@@ -16,14 +16,16 @@ from objectpack.actions import (
     SelectorWindowAction,
 )
 
-from edu_rdm_integration.models import (
-    RegionalDataMartEntityEnum,
+from edu_rdm_integration.pipelines.transfer.models import (
     TransferredEntity,
 )
-from edu_rdm_integration.registry.ui import (
+from edu_rdm_integration.pipelines.transfer.ui import (
     TransferredEntityEditWindow,
     TransferredEntityListWindow,
 )
+from edu_rdm_integration.rdm_entities.models import (
+    RegionalDataMartEntityEnum,
+)
 
 
 class EntitySelectPack(ObjectPack):
@@ -33,7 +35,7 @@ class EntitySelectPack(ObjectPack):
     model = RegionalDataMartEntityEnum
     _is_primary_for_model = False
 
-    list_sort_order = ('order_number', )
+    list_sort_order = ('order_number',)
 
     columns = [
         {
@@ -77,16 +79,11 @@ class TransferredEntityExportChangeAction(BaseAction):
 
     def context_declaration(self):
         """Объявляет контекст экшна."""
-        return {
-            'ids': {'type': 'int_list', 'default': []},
-            'export_enabled': {'type': 'boolean', 'default': True}
-        }
+        return {'ids': {'type': 'int_list', 'default': []}, 'export_enabled': {'type': 'boolean', 'default': True}}
 
     def run(self, request, context):
         """Обеспечивает выполнение запроса."""
-        self.parent.model.objects.filter(
-            id__in=context.ids
-        ).update(export_enabled=context.export_enabled)
+        self.parent.model.objects.filter(id__in=context.ids).update(export_enabled=context.export_enabled)
 
         return OperationResult(success=True)
 
@@ -96,10 +93,7 @@ class TransferredEntitySaveAction(BaseAction):
 
     def context_declaration(self):
         """Объявляет контекст экшна."""
-        return {
-            'id': {'type': 'str_list', 'default': []},
-            self.parent.id_param_name: {'type': 'int'}
-        }
+        return {'id': {'type': 'str_list', 'default': []}, self.parent.id_param_name: {'type': 'int'}}
 
     def run(self, request, context):
         """Обеспечивает выполнение запроса."""
@@ -107,18 +101,11 @@ class TransferredEntitySaveAction(BaseAction):
         if obj_id:
             queue_level = getattr(context, 'queue_level', None)
             if queue_level:
-                self.parent.model.objects.filter(
-                    id=obj_id
-                ).exclude(
-                    queue_level=queue_level
-                ).update(
+                self.parent.model.objects.filter(id=obj_id).exclude(queue_level=queue_level).update(
                     queue_level=queue_level
                 )
         else:
-            self.parent.model.objects.bulk_create([
-                self.parent.model(entity_id=key)
-                for key in context.id
-            ])
+            self.parent.model.objects.bulk_create([self.parent.model(entity_id=key) for key in context.id])
 
         return OperationResult(success=True)
 
@@ -131,7 +118,7 @@ class TransferredEntityPack(ObjectPack):
 
     can_delete = True
 
-    list_sort_order = ('entity__order_number', )
+    list_sort_order = ('entity__order_number',)
 
     need_check_permission = True
     list_window = TransferredEntityListWindow
@@ -153,7 +140,7 @@ class TransferredEntityPack(ObjectPack):
         {
             'data_index': 'queue_level',
             'header': 'Уровень очереди',
-        }
+        },
     ]
 
     def __init__(self):

edu_rdm_integration/pipelines/transfer/app_meta.py

@@ -0,0 +1,18 @@
+from educommon import (
+    ioc,
+)
+
+from edu_rdm_integration.pipelines.transfer.actions import (
+    EntitySelectPack,
+    TransferredEntityPack,
+)
+
+
+def register_actions():
+    """Регистрирует паки и экшны."""
+    ioc.get('main_controller').packs.extend(
+        (
+            TransferredEntityPack(),
+            EntitySelectPack(),
+        )
+    )

edu_rdm_integration/pipelines/transfer/apps.py

@@ -0,0 +1,19 @@
+from django.apps import (
+    AppConfig,
+)
+
+
+class RDMTransferPipelineAppConfig(AppConfig):
+    """Приложение для организации процесса сбора, экспорта в файлы и отправки файлов в витрину."""
+
+    name = 'edu_rdm_integration.pipelines.transfer'
+    label = 'edu_rdm_integration_transfer_pipeline'
+    verbose_name = 'Приложение для организации процесса сбора, экспорта в файлы и отправки файлов в витрину.'
+
+    def ready(self):
+        """Готовность приложения."""
+        if self.name == 'edu_rdm_integration.pipelines.transfer':
+            # ruff: noqa: F401
+            from . import (
+                tasks,
+            )

edu_rdm_integration/pipelines/transfer/enums.py

@@ -0,0 +1,34 @@
+from typing import (
+    Optional,
+)
+
+from m3.db import (
+    BaseEnumerate,
+)
+
+from edu_rdm_integration.core.consts import (
+    FAST_TRANSFER_TASK_QUEUE_NAME,
+    LONG_TRANSFER_TASK_QUEUE_NAME,
+    TASK_QUEUE_NAME,
+)
+
+
+class EntityLevelQueueTypeEnum(BaseEnumerate):
+    """Тип уровня очереди сущности."""
+
+    FAST = 1
+    BASE = 2
+    LONG = 3
+
+    values = {FAST: 'Быстрая', BASE: 'Основная', LONG: 'Долгая'}
+
+    celery_queue_maps = {
+        FAST: FAST_TRANSFER_TASK_QUEUE_NAME,
+        BASE: TASK_QUEUE_NAME,
+        LONG: LONG_TRANSFER_TASK_QUEUE_NAME,
+    }
+
+    @classmethod
+    def get_queue_name(cls, level: int) -> Optional[str]:
+        """Возвращает очередь."""
+        return cls.celery_queue_maps.get(level)

edu_rdm_integration/pipelines/transfer/migrations/0001_initial.py

@@ -0,0 +1,57 @@
+# Generated by Django 3.2.24 on 2025-06-28 16:04
+
+import django.db.models.deletion
+from django.db import (
+    migrations,
+    models,
+)
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        ('edu_rdm_integration_entities', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.CreateModel(
+                    name='TransferredEntity',
+                    fields=[
+                        (
+                            'id',
+                            models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+                        ),
+                        (
+                            'export_enabled',
+                            models.BooleanField(default=True, verbose_name='Включение экспорта для сущности'),
+                        ),
+                        (
+                            'queue_level',
+                            models.PositiveIntegerField(
+                                choices=[(1, 'Быстрая'), (2, 'Основная'), (3, 'Долгая')],
+                                default=2,
+                                verbose_name='Уровень очереди',
+                            ),
+                        ),
+                        (
+                            'entity',
+                            models.OneToOneField(
+                                on_delete=django.db.models.deletion.CASCADE,
+                                to='edu_rdm_integration_entities.regionaldatamartentityenum',
+                                verbose_name='Сущность',
+                            ),
+                        ),
+                    ],
+                    options={
+                        'verbose_name': 'Сущность, по которой должен быть произведен сбор и экспорт данных',
+                        'verbose_name_plural': 'Сущности, по которым должен быть произведен сбор и экспорт данных',
+                        'db_table': 'rdm_transferred_entity',
+                    },
+                ),
+            ],
+            database_operations=[],
+        ),
+    ]