edu-rdm-integration 3.10.4__py3-none-any.whl → 3.11.1__py3-none-any.whl

edu_rdm_integration/stages/export_data/operations.py

@@ -70,14 +70,14 @@ from edu_rdm_integration.core.storages import (
     RegionalDataMartEntityStorage,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 from edu_rdm_integration.stages.export_data.helpers import (
     get_exporting_managers_max_period_ended_dates,
 )
 from edu_rdm_integration.stages.export_data.models import (
-    ExportingDataStage,
-    ExportingDataSubStageStatus,
+    RDMExportingDataStage,
+    RDMExportingDataSubStageStatus,
 )
 
 
@@ -100,10 +100,8 @@ class BaseExportEntitiesData(BaseOperationData):
         super().__init__(**kwargs)
 
         # Если сущности не указаны, берется значение по умолчанию - все сущности:
-        entities = entities if entities else RegionalDataMartEntityEnum.get_enum_data().keys()
-        self.entities: list[ModelEnumValue] = [
-            RegionalDataMartEntityEnum.get_model_enum_value(entity) for entity in entities
-        ]
+        entities = entities if entities else RDMEntityEnum.get_enum_data().keys()
+        self.entities: list[ModelEnumValue] = [RDMEntityEnum.get_model_enum_value(entity) for entity in entities]
 
         self.period_started_at = period_started_at
         self.period_ended_at = period_ended_at
@@ -124,9 +122,9 @@ class BaseExportEntitiesData(BaseOperationData):
 
     def _has_stage_created_or_in_progress(self, manager_id: str, entity: str) -> bool:
         """Проверяет есть ли готовый к работе stage или в работе для данной сущности."""
-        stage_created_or_in_progress = ExportingDataStage.objects.filter(
+        stage_created_or_in_progress = RDMExportingDataStage.objects.filter(
             manager_id=manager_id,
-            status_id__in=(ExportingDataSubStageStatus.CREATED.key, ExportingDataSubStageStatus.IN_PROGRESS.key),
+            status_id__in=(RDMExportingDataSubStageStatus.CREATED.key, RDMExportingDataSubStageStatus.IN_PROGRESS.key),
         ).exists()
 
         if stage_created_or_in_progress:
@@ -265,7 +263,7 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
             # и modified записи модели < левой границы периода команды latest (даты последней удачной выгрузки):
             model.objects.filter(
                 exporting_sub_stage__ended_at__gt=now - timedelta(days=365),
-                exporting_sub_stage__status_id=ExportingDataSubStageStatus.FAILED.key,
+                exporting_sub_stage__status_id=RDMExportingDataSubStageStatus.FAILED.key,
                 modified__gt=F('exporting_sub_stage__ended_at'),
                 modified__lt=last_finished_export_data,
             ),

edu_rdm_integration/stages/export_data/registry/actions.py

@@ -42,16 +42,16 @@ from edu_rdm_integration.core.registry.actions import (
     BaseStartTaskAction,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 from edu_rdm_integration.stages.export_data.generators import (
     BaseFirstExportEntitiesDataCommandsGenerator,
 )
 from edu_rdm_integration.stages.export_data.models import (
-    EduRdmExportDataCommandProgress,
-    ExportingDataStageStatus,
-    ExportingDataSubStage,
-    ExportingDataSubStageStatus,
+    RDMExportingDataCommandProgress,
+    RDMExportingDataStageStatus,
+    RDMExportingDataSubStage,
+    RDMExportingDataSubStageStatus,
 )
 from edu_rdm_integration.stages.export_data.registry.ui import (
     CreateExportCommandWindow,
@@ -63,7 +63,7 @@ from edu_rdm_integration.stages.export_data.registry.ui import (
 class BaseExportingDataProgressPack(BaseCommandProgressPack):
     """Базовый пак команд экспорта данных сущностей РВД."""
 
-    model = EduRdmExportDataCommandProgress
+    model = RDMExportingDataCommandProgress
     title = 'Экспорт данных сущностей РВД'
 
     add_window = CreateExportCommandWindow
@@ -83,7 +83,7 @@ class BaseExportingDataProgressPack(BaseCommandProgressPack):
             'header': 'Сущность',
             'sortable': True,
             'filter': ChoicesFilter(
-                choices=[(key, key) for key in RegionalDataMartEntityEnum.get_model_enum_keys()],
+                choices=[(key, key) for key in RDMEntityEnum.get_model_enum_keys()],
                 parser=str,
                 lookup=lambda key: Q(entity=key) if key else Q(),
             ),
@@ -128,7 +128,7 @@ class BaseExportingDataProgressPack(BaseCommandProgressPack):
             'header': 'Статус экспорта',
             'sortable': True,
             'filter': ChoicesFilter(
-                choices=[(key, key) for key in ExportingDataStageStatus.get_model_enum_keys()],
+                choices=[(key, key) for key in RDMExportingDataStageStatus.get_model_enum_keys()],
                 parser=str,
                 lookup=lambda key: Q(stage__status=key) if key else Q(),
             ),
@@ -213,9 +213,9 @@ class BaseExportingDataProgressPack(BaseCommandProgressPack):
 
         return query.annotate(
             finished_sub_stages=Subquery(
-                ExportingDataSubStage.objects.filter(
+                RDMExportingDataSubStage.objects.filter(
                     stage_id=OuterRef('stage_id'),
-                    status=ExportingDataSubStageStatus.FINISHED.key,
+                    status=RDMExportingDataSubStageStatus.FINISHED.key,
                 )
                 .annotate(
                     finished_count=Func(F('id'), function='Count'),
@@ -223,9 +223,9 @@ class BaseExportingDataProgressPack(BaseCommandProgressPack):
                 .values('finished_count'),
             ),
             ready_sub_stages=Subquery(
-                ExportingDataSubStage.objects.filter(
+                RDMExportingDataSubStage.objects.filter(
                     stage_id=OuterRef('stage_id'),
-                    status=ExportingDataSubStageStatus.READY_FOR_EXPORT.key,
+                    status=RDMExportingDataSubStageStatus.READY_FOR_EXPORT.key,
                 )
                 .annotate(
                     ready_count=Func(F('id'), function='Count', output_field=IntegerField()),
@@ -233,9 +233,9 @@ class BaseExportingDataProgressPack(BaseCommandProgressPack):
                 .values('ready_count'),
             ),
             process_errors_sub_stages=Subquery(
-                ExportingDataSubStage.objects.filter(
+                RDMExportingDataSubStage.objects.filter(
                     stage_id=OuterRef('stage_id'),
-                    status=ExportingDataSubStageStatus.PROCESS_ERROR.key,
+                    status=RDMExportingDataSubStageStatus.PROCESS_ERROR.key,
                 )
                 .annotate(process_errors_count=Func(F('id'), function='Count', output_field=IntegerField()))
                 .values('process_errors_count'),
@@ -275,14 +275,14 @@ class PrepareSubStageForExportAction(BaseAction):
     def run(self, request, context):
         """Обновление статусов подэтапов не принятых витриной."""
         command_ids = context.commands
-        stage_ids = EduRdmExportDataCommandProgress.objects.filter(id__in=command_ids).values_list(
+        stage_ids = RDMExportingDataCommandProgress.objects.filter(id__in=command_ids).values_list(
             'stage_id', flat=True
         )
 
-        updated_count = ExportingDataSubStage.objects.filter(
+        updated_count = RDMExportingDataSubStage.objects.filter(
             stage_id__in=stage_ids,
-            status=ExportingDataSubStageStatus.PROCESS_ERROR.key,
-        ).update(status=ExportingDataSubStageStatus.READY_FOR_EXPORT.key)
+            status=RDMExportingDataSubStageStatus.PROCESS_ERROR.key,
+        ).update(status=RDMExportingDataSubStageStatus.READY_FOR_EXPORT.key)
         if updated_count:
             message = f'Будет переотправлено {updated_count} подэтапов.'
         else:

edu_rdm_integration/stages/export_data/registry/apps.py

@@ -8,4 +8,4 @@ class RDMExportDataRegistryAppConfig(AppConfig):
 
     name = 'edu_rdm_integration.stages.export_data.registry'
     label = 'edu_rdm_integration_export_data_registry'
-    verbose_name = 'Экспорт данных моделей РВД из интерфейса'
+    verbose_name = 'Экспорт данных моделей РВД из интерфейса'

edu_rdm_integration/stages/export_data/registry/ui.py

@@ -37,7 +37,7 @@ from edu_rdm_integration.core.registry.ui import (
     CommandProgressListWindow,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 
 
@@ -57,9 +57,7 @@ class CreateExportCommandWindow(BaseCreateCommandWindow):
             trigger_action_all=True,
             allow_blank=False,
         )
-        entity.set_store(
-            ExtDataStore((idx, key) for idx, key in enumerate(RegionalDataMartEntityEnum.get_model_enum_keys()))
-        )
+        entity.set_store(ExtDataStore((idx, key) for idx, key in enumerate(RDMEntityEnum.get_model_enum_keys())))
         period_started_at = ExtDateTimeField(
             name='period_started_at',
             label='Начало периода',

edu_rdm_integration/stages/upload_data/consts.py

@@ -1,10 +1,10 @@
 from edu_rdm_integration.stages.upload_data.models import (
-    DataMartRequestStatus,
+    RDMRequestStatus,
 )
 
 
 FAILED_STATUSES = {
-    DataMartRequestStatus.FAILED_PROCESSING,
-    DataMartRequestStatus.REQUEST_ID_NOT_FOUND,
-    DataMartRequestStatus.FLC_ERROR,
+    RDMRequestStatus.FAILED_PROCESSING,
+    RDMRequestStatus.REQUEST_ID_NOT_FOUND,
+    RDMRequestStatus.FLC_ERROR,
 }

edu_rdm_integration/stages/upload_data/export_managers.py

@@ -43,9 +43,9 @@ from edu_rdm_integration.stages.export_data.functions.base.requests import (
     RegionalDataMartEntityRequest,
 )
 from edu_rdm_integration.stages.export_data.models import (
-    ExportingDataSubStage,
-    ExportingDataSubStageAttachment,
-    ExportingDataSubStageStatus,
+    RDMExportingDataSubStage,
+    RDMExportingDataSubStageAttachment,
+    RDMExportingDataSubStageStatus,
 )
 from edu_rdm_integration.stages.upload_data.consts import (
     FAILED_STATUSES,
@@ -60,9 +60,9 @@ from edu_rdm_integration.stages.upload_data.helpers import (
     UploadStatusHelper,
 )
 from edu_rdm_integration.stages.upload_data.models import (
-    DataMartRequestStatus,
-    ExportingDataSubStageUploaderClientLog,
-    UploadStatusRequestLog,
+    RDMExportingDataSubStageUploaderClientLog,
+    RDMRequestStatus,
+    RDMUploadStatusRequestLog,
 )
 from edu_rdm_integration.stages.upload_data.queues import (
     Queue,
@@ -91,10 +91,10 @@ class ExportQueueSender:
 
         При расчете используются только файлы, отмеченные как отправленные, но не обработанные витриной.
         """
-        sended_attachment_ids = ExportingDataSubStageUploaderClientLog.objects.filter(
+        sended_attachment_ids = RDMExportingDataSubStageUploaderClientLog.objects.filter(
             file_upload_status=FileUploadStatusEnum.IN_PROGRESS
         ).values_list('attachment_id', flat=True)
-        file_size = ExportingDataSubStageAttachment.objects.filter(id__in=sended_attachment_ids).aggregate(
+        file_size = RDMExportingDataSubStageAttachment.objects.filter(id__in=sended_attachment_ids).aggregate(
             Sum('attachment_size')
         )['attachment_size__sum']
 
@@ -102,18 +102,18 @@ class ExportQueueSender:
 
     def _make_stage_filter(self) -> Q:
         """Формирование фильтра для выборки подэтапов."""
-        return Q(status_id=ExportingDataSubStageStatus.READY_FOR_EXPORT.key)
+        return Q(status_id=RDMExportingDataSubStageStatus.READY_FOR_EXPORT.key)
 
     def get_sub_stages_attachments_to_export(self):
         """Выборка готовых к экспорту подэтапов."""
         sub_stage_ids = (
-            ExportingDataSubStage.objects.filter(self._make_stage_filter())
+            RDMExportingDataSubStage.objects.filter(self._make_stage_filter())
             .order_by('started_at')
             .values_list('id', flat=True)[: self.limit]
         )
 
         return (
-            ExportingDataSubStage.objects.filter(id__in=sub_stage_ids)
+            RDMExportingDataSubStage.objects.filter(id__in=sub_stage_ids)
             .annotate(
                 attachment_id=F('exportingdatasubstageattachment__id'),
                 attachment_name=F('exportingdatasubstageattachment__attachment'),
@@ -201,7 +201,7 @@ class WorkerSender:
         self.entities = set()
         self.received_file_size = 0
 
-    def get_file_upload_status(self, request_id: str) -> tuple[Optional[int], Optional[DataMartRequestStatus], 'Entry']:
+    def get_file_upload_status(self, request_id: str) -> tuple[Optional[int], Optional[RDMRequestStatus], 'Entry']:
         """Возвращает статус файла в витрине по запросу."""
         file_upload_status = None
 
@@ -209,7 +209,7 @@ class WorkerSender:
         request_status = None
 
         if response:
-            request_status = DataMartRequestStatus.get_values_to_enum_data().get(response.get('code'))
+            request_status = RDMRequestStatus.get_values_to_enum_data().get(response.get('code'))
 
             if not request_status:
                 logger.error(
@@ -220,7 +220,7 @@ class WorkerSender:
         if request_status in FAILED_STATUSES:
             file_upload_status = FileUploadStatusEnum.ERROR
 
-        elif request_status == DataMartRequestStatus.SUCCESSFULLY_PROCESSED:
+        elif request_status == RDMRequestStatus.SUCCESSFULLY_PROCESSED:
             file_upload_status = FileUploadStatusEnum.FINISHED
 
         return file_upload_status, request_status, log_entry
@@ -229,14 +229,14 @@ class WorkerSender:
         """Отправка файлов."""
         sub_stages = self.queue.dequeue()
         for (sub_stage_id, entity_key), upload_files in sub_stages.items():
-            sub_stage = ExportingDataSubStage.objects.filter(id=sub_stage_id).first()
+            sub_stage = RDMExportingDataSubStage.objects.filter(id=sub_stage_id).first()
             if not sub_stage:
                 return
 
             result_to_save = []
             upload_status_requests_to_save = []
             errors = []
-            status = ExportingDataSubStageStatus.FINISHED.key
+            status = RDMExportingDataSubStageStatus.FINISHED.key
             for file in upload_files:
                 if settings.RDM_UPLOADER_CLIENT_ENABLE_REQUEST_EMULATION:
                     logger.warning(
@@ -250,7 +250,7 @@ class WorkerSender:
                     file_data = file_path.open('rb').read()
                 except (OSError, IOError, FileNotFoundError) as error:
                     logger.exception(f'Ошибка чтения файла {file_path} - {str(error)} ')
-                    status = ExportingDataSubStageStatus.FAILED.key
+                    status = RDMExportingDataSubStageStatus.FAILED.key
                     continue
 
                 request = RegionalDataMartEntityRequest(
@@ -274,7 +274,7 @@ class WorkerSender:
 
                 file_upload_status = FileUploadStatusEnum.IN_PROGRESS if request_id else FileUploadStatusEnum.ERROR
 
-                sub_stage_uploader_client_log = ExportingDataSubStageUploaderClientLog(
+                sub_stage_uploader_client_log = RDMExportingDataSubStageUploaderClientLog(
                     entry=result.log,
                     sub_stage_id=sub_stage_id,
                     attachment_id=file.attachment_id,
@@ -286,7 +286,7 @@ class WorkerSender:
                 if request_id:
                     updated_file_upload_status, request_status, log_entry = self.get_file_upload_status(request_id)
                     upload_status_requests_to_save.append(
-                        UploadStatusRequestLog(
+                        RDMUploadStatusRequestLog(
                             upload=sub_stage_uploader_client_log,
                             entry=log_entry,
                             request_status_id=getattr(request_status, 'key', None),
@@ -299,7 +299,7 @@ class WorkerSender:
                         self.received_file_size += file.attachment_size
 
                     if updated_file_upload_status == FileUploadStatusEnum.ERROR:
-                        status = ExportingDataSubStageStatus.PROCESS_ERROR.key
+                        status = RDMExportingDataSubStageStatus.PROCESS_ERROR.key
 
                 result_to_save.append(sub_stage_uploader_client_log)
                 if result.error:
@@ -308,15 +308,15 @@ class WorkerSender:
                     )
 
                     errors.append(result.error)
-                    status = ExportingDataSubStageStatus.FAILED.key
+                    status = RDMExportingDataSubStageStatus.FAILED.key
                 else:
                     logger.info(f'Response with {result.response.status_code} code and content {result.response.text}')
                     self.entities.add(entity_key)
 
             # Сохраняем информацию об отправке файлов и убираем подэтап с файлами из очереди
             with atomic():
-                ExportingDataSubStageUploaderClientLog.objects.bulk_create(result_to_save)
-                UploadStatusRequestLog.objects.bulk_create(upload_status_requests_to_save)
+                RDMExportingDataSubStageUploaderClientLog.objects.bulk_create(result_to_save)
+                RDMUploadStatusRequestLog.objects.bulk_create(upload_status_requests_to_save)
                 sub_stage.status_id = status
                 sub_stage.save()
 

edu_rdm_integration/stages/upload_data/helpers.py

@@ -37,7 +37,7 @@ from edu_rdm_integration.stages.export_data.functions.base.requests import (
     RegionalDataMartStatusRequest,
 )
 from edu_rdm_integration.stages.export_data.models import (
-    ExportingDataSubStageStatus,
+    RDMExportingDataSubStageStatus,
 )
 from edu_rdm_integration.stages.upload_data.consts import (
     FAILED_STATUSES,
@@ -46,9 +46,9 @@ from edu_rdm_integration.stages.upload_data.enums import (
     FileUploadStatusEnum,
 )
 from edu_rdm_integration.stages.upload_data.models import (
-    DataMartRequestStatus,
-    ExportingDataSubStageUploaderClientLog,
-    UploadStatusRequestLog,
+    RDMExportingDataSubStageUploaderClientLog,
+    RDMRequestStatus,
+    RDMUploadStatusRequestLog,
 )
 
 
@@ -113,7 +113,7 @@ class UploadStatusHelper:
     @classmethod
     def update_upload_status(
         cls,
-        upload: ExportingDataSubStageUploaderClientLog,
+        upload: RDMExportingDataSubStageUploaderClientLog,
         response: Optional[dict[str, Any]],
         log_entry: 'Entry',
     ) -> None:
@@ -121,7 +121,7 @@ class UploadStatusHelper:
         request_status = None
 
         if isinstance(response, dict):
-            request_status = DataMartRequestStatus.get_values_to_enum_data().get(response.get('code'))
+            request_status = RDMRequestStatus.get_values_to_enum_data().get(response.get('code'))
 
             if not request_status:
                 logger.error(
@@ -130,7 +130,7 @@ class UploadStatusHelper:
                 )
 
         with transaction.atomic():
-            UploadStatusRequestLog.objects.create(
+            RDMUploadStatusRequestLog.objects.create(
                 upload=upload,
                 entry=log_entry,
                 request_status_id=getattr(request_status, 'key', None),
@@ -138,16 +138,16 @@ class UploadStatusHelper:
 
             if request_status in FAILED_STATUSES:
                 upload.file_upload_status = FileUploadStatusEnum.ERROR
-                upload.sub_stage.status_id = ExportingDataSubStageStatus.PROCESS_ERROR.key
+                upload.sub_stage.status_id = RDMExportingDataSubStageStatus.PROCESS_ERROR.key
                 upload.sub_stage.save()
 
-            elif request_status == DataMartRequestStatus.SUCCESSFULLY_PROCESSED:
+            elif request_status == RDMRequestStatus.SUCCESSFULLY_PROCESSED:
                 upload.file_upload_status = FileUploadStatusEnum.FINISHED
 
             if upload.file_upload_status != FileUploadStatusEnum.IN_PROGRESS:
                 upload.save()
 
-    def _process_upload(self, upload: ExportingDataSubStageUploaderClientLog) -> None:
+    def _process_upload(self, upload: RDMExportingDataSubStageUploaderClientLog) -> None:
         """Обрабатывает запись загрузки данных в витрину."""
         response, log_entry = self.send_upload_status_request(upload.request_id)
         self.update_upload_status(upload, response, log_entry)

edu_rdm_integration/stages/upload_data/management/commands/async_fix_attachment_size.py

@@ -38,7 +38,7 @@ from educommon.utils.seqtools import (
 )
 
 from edu_rdm_integration.stages.export_data.models import (
-    ExportingDataSubStageAttachment,
+    RDMExportingDataSubStageAttachment,
 )
 from edu_rdm_integration.stages.upload_data.enums import (
     FileUploadStatusEnum,
@@ -106,7 +106,7 @@ class Command(BaseCommand):
     ) -> list[tuple[int, int]]:
         """Формирование id файлов, которым надо обновить размер."""
         logger.info('Определение файлов, которым надо обновить размер.')
-        attachment_query = ExportingDataSubStageAttachment.objects.filter(
+        attachment_query = RDMExportingDataSubStageAttachment.objects.filter(
             exportingdatasubstageuploaderclientlog__file_upload_status=FileUploadStatusEnum.IN_PROGRESS,
             exportingdatasubstageuploaderclientlog__is_emulation=False,
             attachment_size__isnull=True,

edu_rdm_integration/stages/upload_data/management/commands/check_upload_status.py

@@ -36,7 +36,7 @@ from edu_rdm_integration.stages.upload_data.helpers import (
     UploadStatusHelper,
 )
 from edu_rdm_integration.stages.upload_data.models import (
-    ExportingDataSubStageUploaderClientLog,
+    RDMExportingDataSubStageUploaderClientLog,
 )
 
 
@@ -90,7 +90,7 @@ class Command(BaseCommand):
         if thread_count < 1:
             raise ValueError(f'Количество потоков {thread_count} должно быть больше 0.')
 
-        in_progress_attachment_uploads = ExportingDataSubStageUploaderClientLog.objects.filter(
+        in_progress_attachment_uploads = RDMExportingDataSubStageUploaderClientLog.objects.filter(
             created__gte=kwargs['period_started_at'],
             created__lte=kwargs['period_ended_at'],
             is_emulation=False,

edu_rdm_integration/stages/upload_data/migrations/0002_auto_20250704_0810.py

@@ -0,0 +1,28 @@
+# 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', '0002_auto_20250704_0810'),
+        ('uploader_client', '0001_initial'),
+        ('edu_rdm_integration_upload_data_stage', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='ExportingDataSubStageUploaderClientLog',
+            new_name='RDMExportingDataSubStageUploaderClientLog',
+        ),
+        migrations.RenameModel(
+            old_name='DataMartRequestStatus',
+            new_name='RDMRequestStatus',
+        ),
+        migrations.RenameModel(
+            old_name='UploadStatusRequestLog',
+            new_name='RDMUploadStatusRequestLog',
+        ),
+    ]

edu_rdm_integration/stages/upload_data/models.py

@@ -23,15 +23,15 @@ from m3_db_utils.models import (
 )
 
 from edu_rdm_integration.stages.export_data.models import (
-    ExportingDataSubStage,
-    ExportingDataSubStageAttachment,
+    RDMExportingDataSubStage,
+    RDMExportingDataSubStageAttachment,
 )
 from edu_rdm_integration.stages.upload_data.enums import (
     FileUploadStatusEnum,
 )
 
 
-class DataMartRequestStatus(TitledIntegerModelEnum):
+class RDMRequestStatus(TitledIntegerModelEnum):
     """Модель-перечисление статусов загрузки данных в Витрину."""
 
     UPLOAD_TO_BUFFER = ModelEnumValue(
@@ -85,7 +85,7 @@ class DataMartRequestStatus(TitledIntegerModelEnum):
         verbose_name_plural = 'Статусы загрузки данных в Витрину'
 
 
-class ExportingDataSubStageUploaderClientLog(ReprStrPreModelMixin, BaseObjectModel):
+class RDMExportingDataSubStageUploaderClientLog(ReprStrPreModelMixin, BaseObjectModel):
     """Связь лога Загрузчика данных с подэтапом выгрузки данных."""
 
     entry = ForeignKey(
@@ -96,13 +96,13 @@ class ExportingDataSubStageUploaderClientLog(ReprStrPreModelMixin, BaseObjectMod
     )
 
     sub_stage = ForeignKey(
-        to=ExportingDataSubStage,
+        to=RDMExportingDataSubStage,
         verbose_name='Подэтап выгрузки данных',
         on_delete=CASCADE,
     )
 
     attachment = ForeignKey(
-        to=ExportingDataSubStageAttachment,
+        to=RDMExportingDataSubStageAttachment,
         verbose_name='Прикрепленный файл',
         on_delete=CASCADE,
     )
@@ -147,12 +147,12 @@ class ExportingDataSubStageUploaderClientLog(ReprStrPreModelMixin, BaseObjectMod
         verbose_name_plural = 'Лог запроса подэтапа выгрузки данных'
 
 
-class UploadStatusRequestLog(ReprStrPreModelMixin, BaseObjectModel):
+class RDMUploadStatusRequestLog(ReprStrPreModelMixin, BaseObjectModel):
     """Модель связывающая статусы, загрузку файла в витрину и http-запрос к витрине."""
 
     upload = ForeignKey(
         verbose_name='Cвязь запроса статуса с загрузкой файла в витрину',
-        to=ExportingDataSubStageUploaderClientLog,
+        to=RDMExportingDataSubStageUploaderClientLog,
         on_delete=CASCADE,
     )
     entry = ForeignKey(
@@ -163,7 +163,7 @@ class UploadStatusRequestLog(ReprStrPreModelMixin, BaseObjectModel):
     )
     request_status = ForeignKey(
         verbose_name='Статус запроса в витрине',
-        to=DataMartRequestStatus,
+        to=RDMRequestStatus,
         on_delete=PROTECT,
         null=True,
         blank=True,

edu_rdm_integration/stages/upload_data/tasks.py

@@ -26,7 +26,7 @@ from edu_rdm_integration.stages.upload_data.helpers import (
     UploadStatusHelper,
 )
 from edu_rdm_integration.stages.upload_data.models import (
-    ExportingDataSubStageUploaderClientLog,
+    RDMExportingDataSubStageUploaderClientLog,
 )
 from edu_rdm_integration.stages.upload_data.operations import (
     UploadData,
@@ -55,7 +55,7 @@ class RDMCheckUploadStatus(UniquePeriodicAsyncTask):
         super().process(*args, **kwargs)
 
         # Получаем незавершенные загрузки данных в витрину
-        in_progress_uploads = ExportingDataSubStageUploaderClientLog.objects.filter(
+        in_progress_uploads = RDMExportingDataSubStageUploaderClientLog.objects.filter(
             file_upload_status=FileUploadStatusEnum.IN_PROGRESS,
             is_emulation=False,
         ).select_related('attachment')

{edu_rdm_integration-3.10.4.dist-info → edu_rdm_integration-3.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.10.4
+Version: 3.11.1
 Summary: Интеграция с Региональной витриной данных
 Author-email: BARS Group <education_dev@bars.group>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu-rdm-integration/browse
@@ -15,13 +15,14 @@ Classifier: Framework :: Django :: 2.2
 Classifier: Framework :: Django :: 3.0
 Classifier: Framework :: Django :: 3.1
 Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.0
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: Web Environment
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: transliterate<2
-Requires-Dist: Django<3.3,>=3.1
+Requires-Dist: Django<5.0,>=3.1
 Requires-Dist: celery<5.3,>=4.4.7
 Requires-Dist: asyncpg==0.23.0
 Requires-Dist: educommon<4,>=3.11.0