edu-rdm-integration 3.22.5__py3-none-any.whl → 3.22.8__py3-none-any.whl

edu_rdm_integration/core/consts.py

@@ -39,3 +39,6 @@ ACADEMIC_YEAR = {
 TASK_QUEUE_NAME = 'RDM'
 FAST_TRANSFER_TASK_QUEUE_NAME = 'RDM_FAST'
 LONG_TRANSFER_TASK_QUEUE_NAME = 'RDM_LONG'
+
+# Лаг по времени между сбором и экспортом при работе с репликам (в секундах)
+PAUSE_TIME = 15

edu_rdm_integration/pipelines/transfer/tasks.py

@@ -1,3 +1,4 @@
+import time
 from datetime import (
     datetime,
 )
@@ -37,6 +38,7 @@ from educommon.utils.date import (
 from edu_rdm_integration.core.consts import (
     FAST_TRANSFER_TASK_QUEUE_NAME,
     LONG_TRANSFER_TASK_QUEUE_NAME,
+    PAUSE_TIME,
     TASK_QUEUE_NAME,
 )
 from edu_rdm_integration.core.enums import (
@@ -206,6 +208,9 @@ class BaseTransferLatestEntitiesDataPeriodicTask(BaseTransferLatestEntitiesDataM
 
                         continue
 
+            # Лаг времени для достаки данных в реплику
+            time.sleep(PAUSE_TIME)
+
             try:
                 if export_enabled:
                     self._run_export_entity_data(entity_enum.key, task_id)

edu_rdm_integration/stages/collect_data/registry/templates/ui-js/collect-command-window.js

@@ -1,7 +1,9 @@
 {% load educommon %}
 {% include "ui-js/validators.js" %}
+{% include "ui-js/collect-and-export-validators.js" %}
 
-var win = Ext.getCmp('{{ component.client_id }}');
+var logsPeriodStartField = Ext.getCmp('logs_period_started_at');
+var logsPeriodEndField = Ext.getCmp('logs_period_ended_at');
 
 Ext.onReady(function() {
     // Инициализация валидаторов
@@ -41,24 +43,11 @@ function initializeValidators() {
         });
     }
 
-    // Устанавливаем текущую дату и время как максимальное значение
-    // и выполняем валидацию каждую секунду
-    var validationInterval = setInterval(function() {
-        var now = new Date();
-
-        logsPeriodStartField.setMaxValue(now);
-        logsPeriodEndField.setMaxValue(now);
-
-        logsPeriodStartField.validate();
-        logsPeriodEndField.validate();
-    }, 1000);
-
-    win.on('destroy', function() {
-        clearInterval(validationInterval);
-    });
-
-    logsPeriodStartField.validator = logsPeriodsValidator;
-    logsPeriodEndField.validator = logsPeriodsValidator;
+    // Устанавливаем время по умолчанию в календаре и доп валидатор
+    setupPeriodFields(
+        logsPeriodStartField,
+        logsPeriodEndField,
+    );
 }
 
 function initializeBatchSizeSplitByLogic() {

edu_rdm_integration/stages/collect_data/registry/templates/ui-js/validators.js

@@ -47,20 +47,5 @@ var instituteCountValidator = function() {
     }
     
     this.clearInvalid();
-    return true;
-};
-
-var logsPeriodStartField = Ext.getCmp('logs_period_started_at');
-var logsPeriodEndField = Ext.getCmp('logs_period_ended_at');
-
-var logsPeriodsValidator = function () {
-    if (
-        logsPeriodStartField.getValue() &&
-        logsPeriodEndField.getValue() &&
-        logsPeriodStartField.getValue() > logsPeriodEndField.getValue()
-    ) {
-        return 'Дата конца периода не может быть меньше даты начала периода'
-    };
-
     return true;
 };

edu_rdm_integration/stages/export_data/models.py

@@ -168,6 +168,10 @@ class RDMExportingDataSubStageStatus(TitledModelEnum):
     )
     PROCESS_ERROR = ModelEnumValue(title='Ошибка обработки витриной')
 
+    IN_EXPORT =  ModelEnumValue(
+        title='Экспортируется',
+    )
+
     class Meta:
         db_table = 'rdm_exporting_data_sub_stage_status'
         verbose_name = 'Модель-перечисление статусов подэтапа выгрузки данных'

edu_rdm_integration/stages/export_data/registry/actions.py

@@ -228,7 +228,8 @@ class BaseExportingDataProgressPack(BaseCommandProgressPack):
             ready_sub_stages=Subquery(
                 RDMExportingDataSubStage.objects.filter(
                     stage_id=OuterRef('stage_id'),
-                    status=RDMExportingDataSubStageStatus.READY_FOR_EXPORT.key,
+                    status__in=(RDMExportingDataSubStageStatus.READY_FOR_EXPORT.key,
+                                RDMExportingDataSubStageStatus.IN_EXPORT.key)
                 )
                 .annotate(
                     ready_count=Func(F('id'), function='Count', output_field=IntegerField()),

edu_rdm_integration/stages/export_data/registry/templates/ui-js/create-export-command-win.js

@@ -1,4 +1,5 @@
-var win = Ext.getCmp('{{ component.client_id }}');
+{% include "ui-js/collect-and-export-validators.js" %}
+
 var periodStartField = Ext.getCmp('period_started_at');
 var periodEndField = Ext.getCmp('period_ended_at');
 
@@ -8,34 +9,17 @@ Ext.onReady(function() {
 });
 
 function initializeValidators() {
-    // Устанавливаем текущую дату и время как максимальное значение
-    // и выполняем валидацию каждую секунду
-    var validationInterval = setInterval(function() {
-        var now = new Date();
-
-        periodStartField.setMaxValue(now);
-        periodEndField.setMaxValue(now);
-
-        periodStartField.validate();
-        periodEndField.validate();
-    }, 1000);
-
-    win.on('destroy', function() {
-        clearInterval(validationInterval);
-    });
-
-    var periodsValidator = function () {
-        if (
-            periodStartField.getValue() &&
-            periodEndField.getValue() &&
-            periodStartField.getValue() > periodEndField.getValue()
-        ) {
-            return 'Дата конца периода не может быть меньше даты начала периода'
-        };
-
-        return true;
-    };
-
-    periodStartField.validator = periodsValidator;
-    periodEndField.validator = periodsValidator;
+    // Установка максимальной даты (завтра 23:59:59)
+    const maxDate = new Date();
+    maxDate.setDate(maxDate.getDate() + 1);
+    maxDate.setHours(23, 59, 59);
+
+    periodStartField.setMaxValue(maxDate);
+    periodEndField.setMaxValue(maxDate);
+
+    // Устанавливаем время по умолчанию в календаре и доп валидатор
+    setupPeriodFields(
+        periodStartField,
+        periodEndField,
+    );
 }

edu_rdm_integration/stages/service/service_outdated_data/cleaners/collect_data.py

@@ -21,15 +21,10 @@ from educommon.utils.seqtools import (
     make_chunks,
 )
 
-from web_edu.plugins.regional_data_mart_integration.models import (
-    LessonClass,
-)
-
 from .base import (
     BaseServiceOutdatedDataCleaner,
 )
 from .consts import (
-    OLD_RDM_MODEL,
     UNION_CHUNK_SIZE,
 )
 
@@ -49,14 +44,12 @@ class CollectingDataSubStageCleaner(BaseServiceOutdatedDataCleaner):
     def _get_valid_substage_ids_subquery(self) -> Optional[Subquery]:
         """Подзапрос, возвращающий все допустимые collecting_sub_stage_id из моделей, описанных в RDMModelEnum."""
         model_enum_values = RDMModelEnum.get_model_enum_values()
-        all_model = [model_enum.model for model_enum in model_enum_values] + OLD_RDM_MODEL
+        all_model = [model_enum.model for model_enum in model_enum_values]
         chunk_queries = []
 
         for enum_values_chunk in make_chunks(all_model, UNION_CHUNK_SIZE, is_list=True):
             qs_list = []
             for model_cls in enum_values_chunk:
-                if model_cls in [LessonClass]:
-                    continue
                 try:
                     model_cls._meta.get_field('collecting_sub_stage_id')
                 except FieldDoesNotExist:

edu_rdm_integration/stages/service/service_outdated_data/cleaners/consts.py

@@ -1,12 +1 @@
-from web_edu.plugins.regional_data_mart_integration.models.homework import Homework
-from web_edu.plugins.regional_data_mart_integration.models.homework_material import HomeworkMaterial
-from web_edu.plugins.regional_data_mart_integration.models.homework_student import HomeworkStudent
-
-
 UNION_CHUNK_SIZE = 5
-
-OLD_RDM_MODEL = [
-    HomeworkStudent,
-    HomeworkMaterial,
-    Homework,
-]

edu_rdm_integration/stages/service/service_outdated_data/cleaners/export_data.py

@@ -28,7 +28,6 @@ from .base import (
     ServiceFileCleaner,
 )
 from .consts import (
-    OLD_RDM_MODEL,
     UNION_CHUNK_SIZE,
 )
 
@@ -47,7 +46,7 @@ class ExportingDataSubStageCleaner(BaseServiceOutdatedDataCleaner):
     def _get_valid_substage_ids_subquery(self) -> Optional[Subquery]:
         """Подзапрос, возвращающий все допустимые exporting_sub_stage_id из моделей, описанных в RDMModelEnum."""
         model_enum_values = RDMModelEnum.get_model_enum_values()
-        all_model = [model_enum.model for model_enum in model_enum_values] + OLD_RDM_MODEL
+        all_model = [model_enum.model for model_enum in model_enum_values]
         chunk_queries = []
 
         for enum_values_chunk in make_chunks(all_model, UNION_CHUNK_SIZE, is_list=True):

edu_rdm_integration/stages/upload_data/enums.py

@@ -9,9 +9,11 @@ class FileUploadStatusEnum(BaseEnumerate):
     IN_PROGRESS = 1
     FINISHED = 2
     ERROR = 3
+    IN_CHECK = 4
 
     values = {
         IN_PROGRESS: 'В процессе загрузки в витрину',
         FINISHED: 'Загрузка в витрину закончена',
         ERROR: 'Ошибка загрузки в витрину',
+        IN_CHECK: 'На проверке'
     }

edu_rdm_integration/stages/upload_data/export_managers.py

@@ -106,11 +106,13 @@ class ExportQueueSender:
 
     def get_sub_stages_attachments_to_export(self):
         """Выборка готовых к экспорту подэтапов."""
-        sub_stage_ids = (
+        sub_stage_ids = set(
             RDMExportingDataSubStage.objects.filter(self._make_stage_filter())
             .order_by('started_at')
             .values_list('id', flat=True)[: self.limit]
         )
+        RDMExportingDataSubStage.objects.filter(id__in=sub_stage_ids).update(
+            status=RDMExportingDataSubStageStatus.IN_EXPORT.key)
 
         return (
             RDMExportingDataSubStage.objects.filter(id__in=sub_stage_ids)

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

@@ -0,0 +1,59 @@
+from time import (
+    sleep,
+)
+from typing import (
+    TYPE_CHECKING,
+    Any,
+)
+
+from django.core.cache import (
+    cache,
+)
+from django.core.management.base import (
+    BaseCommand,
+)
+
+from edu_rdm_integration.core.consts import (
+    BATCH_SIZE,
+)
+from edu_rdm_integration.stages.upload_data.enums import (
+    FileUploadStatusEnum,
+)
+from edu_rdm_integration.stages.upload_data.helpers import (
+    UploadStatusHelper,
+)
+from edu_rdm_integration.stages.upload_data.models import (
+    RDMExportingDataSubStageUploaderClientLog,
+)
+
+
+class Command(BaseCommand):
+    """Команда для отправки данных в витрину параллельно-последовательно. В рамках скрипта последовательно,
+    параллельно количетвом запусков команды."""
+
+    help = 'Команда для отправки данных в витрину параллельно-последовательно'  # noqa: A003
+
+
+    def handle(self, *args: tuple[Any], **kwargs: dict[str, Any]) -> None:
+        """Обработчик команды."""
+        while True:
+            self.stdout.write(f'Начало проверки статуса загрузки данных в витрину..')
+
+            # Получаем незавершенные загрузки данных в витрину
+            in_progress_uploads = RDMExportingDataSubStageUploaderClientLog.objects.filter(
+                file_upload_status=FileUploadStatusEnum.IN_PROGRESS,
+                is_emulation=False,
+            ).select_related('attachment')[:BATCH_SIZE]
+
+            for upload in in_progress_uploads:
+                upload.file_upload_status = FileUploadStatusEnum.IN_CHECK
+
+            RDMExportingDataSubStageUploaderClientLog.objects.bulk_update(in_progress_uploads, fields=['file_upload_status'])
+
+            self.stdout.write(f'Обновление статуса загрузки данных в витрину на {FileUploadStatusEnum.IN_CHECK}..')
+
+            UploadStatusHelper(in_progress_uploads, cache).run()
+
+            sleep(10)
+
+            self.stdout.write(f'Окончание проверки статуса загрузки данных в витрину.\n\n')

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

@@ -0,0 +1,45 @@
+from time import sleep
+from typing import (
+    Any,
+)
+
+from django.core.management.base import (
+    BaseCommand,
+)
+
+from django.core.cache import (
+    cache,
+)
+
+from edu_rdm_integration.stages.upload_data.operations import (
+    UploadData,
+)
+from edu_rdm_integration.stages.upload_data.queues import (
+    RdmDictBasedSubStageAttachmentQueue
+)
+
+
+class Command(BaseCommand):
+    """Команда для отправки данных в витрину параллельно-последовательно. В рамках скрипта последовательно,
+    параллельно количетвом запусков команды."""
+
+    help = 'Команда для отправки данных в витрину параллельно-последовательно'  # noqa: A003
+
+
+    def handle(self, *args: tuple[Any], **kwargs: dict[str, Any]) -> None:
+        """Обработчик команды."""
+        while True:
+            self.stdout.write(f'Начало отправки данных в витрину')
+
+            queue = RdmDictBasedSubStageAttachmentQueue()
+            upload_data = UploadData(
+                data_cache=cache,
+                queue=queue,
+            )
+
+            upload_result = upload_data.upload_data()
+
+            sleep(40)
+
+            self.stdout.write(f'Общий объем отправленных файлов {upload_result["total_file_size"]}')
+            self.stdout.write(f'Сущности, отправленные в витрину {upload_result["uploaded_entities"]}')

edu_rdm_integration/stages/upload_data/queues.py

@@ -1,8 +1,12 @@
 import json
+import uuid
 from abc import (
     ABC,
     abstractmethod,
 )
+from collections import (
+    defaultdict,
+)
 from typing import (
     Any,
     Union,
@@ -66,8 +70,6 @@ class RdmRedisSubStageAttachmentQueue(Queue):
     (Sorted Set in Redis)
     - Информация по файлам стандартно по ключу - ключом выступает sub_stage_id
     """
-
-    queue_key = 'rdm:export_sub_stage_ids_queue'
     prefix = 'rdm:'
 
     def __init__(self, *args, **kwargs):
@@ -81,6 +83,9 @@ class RdmRedisSubStageAttachmentQueue(Queue):
             password=settings.RDM_REDIS_PASSWORD,
         )
 
+        self.queue_key = f'rdm:export_sub_stage_ids_queue:{str(uuid.uuid4())[:4]}'
+
+
     def _make_key(self, key: Union[int, str]) -> str:
         """Формирование ключа."""
         return f'{self.prefix}{key}'
@@ -169,3 +174,46 @@ class RdmRedisSubStageAttachmentQueue(Queue):
         db = kwargs['db']
 
         return f'Redis {version} on {host}:{port}/{db}'
+
+
+class RdmDictBasedSubStageAttachmentQueue(Queue):
+    """Очередь файлов и подэтапов на основе словаря.
+
+    Данные хранятся следующим образом:
+    - Словарь вида (id подэтапа, сущность): список с данными по файлам.
+    Данные по файлу в именнованном кортеже UpladFile
+    {
+       (sub_stage_id,entity): [UploadFile1, UploadFile2],
+    }
+    """
+
+    def __init__(self, *args, **kwargs):
+        """Инициализация объекта очереди Queue."""
+        super().__init__(*args, **kwargs)
+
+        self.data = defaultdict(list)
+
+    @property
+    def count(self) -> int:
+        """Возвращает количество подэтапов в очереди."""
+        return len(self.data)
+
+    def enqueue(self, stage_id, entity_name: str, attachmets: list[UploadFile]) -> None:
+        """Помещение в очередь.
+
+        Подэтап попадает в упорядоченную очередь."""
+
+        self.data[(stage_id, entity_name)].extend(attachmets)
+
+    def dequeue(self) -> dict[tuple[Any, Any], list[UploadFile]]:
+        """Возвращает все данные из очереди."""
+        return self.data
+
+    def delete_from_queue(self, sub_stage_id: int, entity_name: str) -> None:
+        """Удаление элемента из очереди."""
+        self.data.get((sub_stage_id, entity_name))
+
+    def clear(self) -> None:
+        """Очистить очередь."""
+        self.data.clear()
+

edu_rdm_integration/stages/upload_data/tasks.py

@@ -32,7 +32,7 @@ from edu_rdm_integration.stages.upload_data.operations import (
     UploadData,
 )
 from edu_rdm_integration.stages.upload_data.queues import (
-    RdmRedisSubStageAttachmentQueue,
+    RdmDictBasedSubStageAttachmentQueue
 )
 
 
@@ -81,7 +81,7 @@ class UploadDataAsyncTask(UniquePeriodicAsyncTask):
         """Выполнение."""
         super().process(*args, **kwargs)
 
-        queue = RdmRedisSubStageAttachmentQueue()
+        queue = RdmDictBasedSubStageAttachmentQueue()
         upload_data = UploadData(
             data_cache=cache,
             queue=queue,

edu_rdm_integration/stages/utils.py

@@ -24,6 +24,18 @@ def update_foreign_key_constraint(
         on_delete (str): Поведение при удалении связанной записи.
     """
     with connection.cursor() as cursor:
+        # Проверяем существование таблиц
+        cursor.execute("""
+            SELECT EXISTS (
+                SELECT FROM information_schema.tables WHERE table_name = %s AND table_schema = 'public'
+            ) AND EXISTS (
+                SELECT FROM information_schema.tables WHERE table_name = %s AND table_schema = 'public'
+            );
+        """, [table_name, target_table])
+
+        if not cursor.fetchone()[0]:
+            return
+
         # Найти имя constraint'а
         cursor.execute(f"""
             SELECT conname

edu_rdm_integration/templates/ui-js/collect-and-export-validators.js

@@ -0,0 +1,54 @@
+function logsPeriodsValidator(startField, endField) {
+    if (
+        startField.getValue() &&
+        endField.getValue() &&
+        startField.getValue() > endField.getValue()
+    ) {
+        return 'Дата конца периода не может быть меньше даты начала периода';
+    }
+    return true;
+}
+
+function setupPeriodFields(startField, endField) {
+    // Функция валидации обоих полей
+    function validatePeriodFields() {
+        startField.validate();
+        endField.validate();
+    }
+
+    // Установка времени начала по умолчанию 00:00:00
+    function setDefaultStartTime() {
+        if (!startField.getValue()) {
+            const defaultDateTime = new Date();
+            defaultDateTime.setHours(0, 0, 0);
+            startField.setValue(defaultDateTime);
+        }
+    }
+
+    // Установка времени конца по умолчанию 23:59:59
+    function setDefaultEndTime() {
+        if (!endField.getValue()) {
+            const defaultDateTime = new Date();
+            defaultDateTime.setHours(23, 59, 59);
+            endField.setValue(defaultDateTime);
+        }
+    }
+
+    // Настройка обработчиков для поля начала периода
+    startField.menu.on('beforeshow', setDefaultStartTime);
+    startField.on('change', validatePeriodFields);
+    startField.on('select', validatePeriodFields);
+
+    // Настройка обработчиков для поля конца периода
+    endField.menu.on('beforeshow', setDefaultEndTime);
+    endField.on('change', validatePeriodFields);
+    endField.on('select', validatePeriodFields);
+
+    // Установка валидаторов
+    startField.validator = function() {
+        return logsPeriodsValidator(startField, endField);
+    };
+    endField.validator = function() {
+        return logsPeriodsValidator(startField, endField);
+    };
+}

{edu_rdm_integration-3.22.5.dist-info → edu_rdm_integration-3.22.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.22.5
+Version: 3.22.8
 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.22.5.dist-info → edu_rdm_integration-3.22.8.dist-info}/RECORD

@@ -9,7 +9,7 @@ edu_rdm_integration/collect_and_export_data/migrations/0002_auto_20250204_1413.p
 edu_rdm_integration/collect_and_export_data/migrations/0003_auto_20250704_0725.py,sha256=IcBTuQWp7D_mP1chCgTXUIJcm5nf2Scdt3ZJgjCgvgI,1108
 edu_rdm_integration/collect_and_export_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/core/consts.py,sha256=4dklnQS7rtuYJu0Hh7oX1Z9dc72pbIWZl9gXMUvc4rI,1526
+edu_rdm_integration/core/consts.py,sha256=DhYEd6DiU9_4eDGH2mTL3sowkubHeEkVi11QSfGj74o,1679
 edu_rdm_integration/core/enums.py,sha256=HHZxX2vIe-c4SY6BIWgOg-Tu-_LVJjltFZ1lI9YITLw,3824
 edu_rdm_integration/core/helpers.py,sha256=Fe2AyI8kHAfcnXAn2I_SyNraI5uAjNzHObUNtZtum-g,12183
 edu_rdm_integration/core/mapping.py,sha256=1B6TsC4Os9wiM8L8BChnCNv_iWqjeWu3bdDsqKVsId0,616
@@ -56,7 +56,7 @@ edu_rdm_integration/pipelines/transfer/apps.py,sha256=mf8voFbMU3FWOwbyisgUUrnUBp
 edu_rdm_integration/pipelines/transfer/enums.py,sha256=7eaCcR_SQD_xz3DXywwZivxfcn0s2BsAddS9LsXlujE,787
 edu_rdm_integration/pipelines/transfer/mixins.py,sha256=tG-04PHYFWZBcVKDx3IejRJq4DsG3WSYeeGg_AnJTR0,4972
 edu_rdm_integration/pipelines/transfer/models.py,sha256=_ZxNVhTntJe07K5P56mzp_sfhNykn-_Zbe7xtktmhNY,1584
-edu_rdm_integration/pipelines/transfer/tasks.py,sha256=6jSJl4aNugKG45Sxb2cWAtS1R_y8LmLT7PHtRZ0GZrk,10936
+edu_rdm_integration/pipelines/transfer/tasks.py,sha256=r2Y12DyIy3xNBqSKswFMSFA_3qwvU64E03y2WvEpVtQ,11089
 edu_rdm_integration/pipelines/transfer/ui.py,sha256=GLRy_oWO50ZbWcb9vnhP5nVuS8pImtw9APyV4tgm7sg,2543
 edu_rdm_integration/pipelines/transfer/migrations/0001_initial.py,sha256=js-Ap6xnw0yBN7E9k7gh9dz-jZkNyDUwmMGftwC55EQ,2322
 edu_rdm_integration/pipelines/transfer/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -79,7 +79,7 @@ edu_rdm_integration/rdm_models/migrations/0001_initial.py,sha256=qXgObuG2nfOLEnG
 edu_rdm_integration/rdm_models/migrations/0002_rename_regionaldatamartmodelenum_rdmmodelenum.py,sha256=hNTLriOc9r9WEVKahJURA3yXhZ3ivbwJJ_HaMC46PpI,451
 edu_rdm_integration/rdm_models/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/stages/utils.py,sha256=XTOXXP1KeLCURjkjObP-lcIEARIBkgguk4MfN2dXivQ,1780
+edu_rdm_integration/stages/utils.py,sha256=Gm07aspzt8jTN8v2pJRxyTCUs-kGeV-JzrxWunUgaf4,2253
 edu_rdm_integration/stages/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/collect_data/apps.py,sha256=PhrxzAMXvzXajSlgwLudAgasVjh9IFS5M7a7pGbEKC0,339
 edu_rdm_integration/stages/collect_data/consts.py,sha256=tzaK9oxzdMRq3oTEocPz4umoXSJWUtFc7YhyXucCNbs,127
@@ -162,15 +162,15 @@ edu_rdm_integration/stages/collect_data/registry/__init__.py,sha256=47DEQpj8HBSa
 edu_rdm_integration/stages/collect_data/registry/actions.py,sha256=-3l944Csa5HCbrPqSOVwkVquoTBaju6BRtGOxF-Mnxc,10171
 edu_rdm_integration/stages/collect_data/registry/apps.py,sha256=K5f97YXKMmdM7m33qgQYvJjrA8_eGAJ4VWyuRjJ0gwQ,439
 edu_rdm_integration/stages/collect_data/registry/ui.py,sha256=pw13DAASxqnX_E5D4RG9CywtnQKQeljXHief7mojVgk,8398
-edu_rdm_integration/stages/collect_data/registry/templates/ui-js/collect-command-window.js,sha256=QfxVSAA0282-41K0XGtyPa9WPzpoX_uClke8pHdAzBo,3112
-edu_rdm_integration/stages/collect_data/registry/templates/ui-js/validators.js,sha256=8A07RgqRs71UuyHNc0HA_isGZL5-W9iLm0O-eC2JFT8,2021
+edu_rdm_integration/stages/collect_data/registry/templates/ui-js/collect-command-window.js,sha256=AZsvitxQyK1FzCH_naHzZ9S-18mKU2otoqeYNa6wqH8,2777
+edu_rdm_integration/stages/collect_data/registry/templates/ui-js/validators.js,sha256=udLEG1MwycYYgSrYiQr7Bqg7meNoetH8rF4JSRyrUdk,1524
 edu_rdm_integration/stages/export_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/apps.py,sha256=TU6AaMZGQE2oHVwKgtUDzFplaVasb2tMIurhkhwkxZo,406
 edu_rdm_integration/stages/export_data/consts.py,sha256=ZEi1kXMs-54KFKxkyGIQVwZ4d8OrOF_vLFQIjjWdSPQ,441
 edu_rdm_integration/stages/export_data/generators.py,sha256=XsTGcKm0oDgE3fUVDxRMkNFriOeuPDBAWi32nx5ASuc,3974
 edu_rdm_integration/stages/export_data/helpers.py,sha256=uBl85AWS-V0usHeLf7VeAsy0ywvqXL_zT1Kgho-MRTM,6537
 edu_rdm_integration/stages/export_data/mixins.py,sha256=YCr5aNcZmDx07JIr-vMietQQ3sZ82caWc7SWOMfdSjY,1772
-edu_rdm_integration/stages/export_data/models.py,sha256=u0gUHGw0qB9QvuhVMAvJ7Xyg5uGvZdKm7oS1UVaxr_g,12340
+edu_rdm_integration/stages/export_data/models.py,sha256=8ewAWI9daAP_pxpq92Y-9m9zuxTp-pIveD_4Rsj1uaw,12426
 edu_rdm_integration/stages/export_data/operations.py,sha256=g8rj4TaFnkRkaBD4omckBTGwsTlYpuBydOwwxY9hEiI,13188
 edu_rdm_integration/stages/export_data/strategies.py,sha256=93pRhUOLL_q4VbWTY3CtC5J8rgPPO2EYn0fJk_oLuLk,6520
 edu_rdm_integration/stages/export_data/function_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -216,10 +216,10 @@ edu_rdm_integration/stages/export_data/migrations/0003_alter_rdmexportingdatasub
 edu_rdm_integration/stages/export_data/migrations/0004_fix_fk_constraints.py,sha256=F77WlV_UmT2FOWYPWsukfZ_ZqHcwbinIRbQmZJrjS34,3025
 edu_rdm_integration/stages/export_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/stages/export_data/registry/actions.py,sha256=zJ1GEzyhoGGRCEGxErmepPtec0qNJtcDJJEaPtcATdA,10847
+edu_rdm_integration/stages/export_data/registry/actions.py,sha256=iKolkD3h6lxx4a2agDeyMVSL_KImN6PI_kjQ_5knWu4,10930
 edu_rdm_integration/stages/export_data/registry/apps.py,sha256=71DtJQ2ULt8_3CnTu2VAfT5ABBrDNY1nKTmZ6UtvIpw,448
 edu_rdm_integration/stages/export_data/registry/ui.py,sha256=0kWWfOmtTyN4SUO9dGUcEz0wgOPA111jHoWw3_LNPqI,6238
-edu_rdm_integration/stages/export_data/registry/templates/ui-js/create-export-command-win.js,sha256=g0dpYsvd_6VfRU4nRv3tNK-0wtMND_VurQRT04ShJjk,1341
+edu_rdm_integration/stages/export_data/registry/templates/ui-js/create-export-command-win.js,sha256=H_bjx5UVjlj1IAm9wZ8AyoukxMXV8W3RFJHwCojng3E,795
 edu_rdm_integration/stages/export_data/registry/templates/ui-js/stage_for_export.js,sha256=329OZIpiKHlQ-i8JStjBLXtouIMKuJHbycArUGSskfk,737
 edu_rdm_integration/stages/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/service/apps.py,sha256=lgCG4_kpwgfDWh6y-GNuUwz5SOjkP7oS8kkUyVUcNRg,648
@@ -231,26 +231,28 @@ edu_rdm_integration/stages/service/service_outdated_data/__init__.py,sha256=47DE
 edu_rdm_integration/stages/service/service_outdated_data/managers.py,sha256=zKGQWIvv1go5OlBIkgBDLNyEKkkHvm0qKFfCatddd68,2715
 edu_rdm_integration/stages/service/service_outdated_data/cleaners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/service/service_outdated_data/cleaners/base.py,sha256=7h6eSex_BakFz3jQiJ7R552SLOb9CPn6Z8xG__Vm_xg,10479
-edu_rdm_integration/stages/service/service_outdated_data/cleaners/collect_data.py,sha256=zol47C4RQFnHd_MNldOHTtEjzeWsIZji1nDzKVVkJRg,4894
-edu_rdm_integration/stages/service/service_outdated_data/cleaners/consts.py,sha256=ONLW_NJFbnYU1CbDF4mzBXXqDt7fyKVfep3Qlf5sJOM,384
-edu_rdm_integration/stages/service/service_outdated_data/cleaners/export_data.py,sha256=A27cOnTgYzQA2_JUedB2SSm6y-g82ADoubKqLT71txw,7153
+edu_rdm_integration/stages/service/service_outdated_data/cleaners/collect_data.py,sha256=hVNBRIaYoMw9Ucg-3P4DFgPkN5HS9ltJoT8WBzzA-ss,4695
+edu_rdm_integration/stages/service/service_outdated_data/cleaners/consts.py,sha256=wVBq4PFm1N-NPHysCiR6KRgkbaeejkc9jruWY0ynGds,21
+edu_rdm_integration/stages/service/service_outdated_data/cleaners/export_data.py,sha256=lC-v1kIGw_wbBM5ytU8lKKCcNgnnXKZoiFBSSfEiLI0,7118
 edu_rdm_integration/stages/service/service_outdated_data/cleaners/upload_data.py,sha256=a8oJ8Sg1eLZf1NemehREkJsvdtmyLwtOIuN5iXpzSb4,2846
 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
 edu_rdm_integration/stages/upload_data/dataclasses.py,sha256=zwxlED6yEeMStfc-Y6pvdY7xF-530qbO0HBWfwneeI8,261
-edu_rdm_integration/stages/upload_data/enums.py,sha256=uGRqcflf6moPWfFa8KKbeSY2y88-AegAcRJKlQ1PA_Y,453
-edu_rdm_integration/stages/upload_data/export_managers.py,sha256=DYHX0LwB6RkRqOEaB5EIWqbSJqjaUfR09AjRTjI2CR4,13646
+edu_rdm_integration/stages/upload_data/enums.py,sha256=MisSJm2kDbW245IaJl5f5if45RCvotPg_8RdL6PQwPg,512
+edu_rdm_integration/stages/upload_data/export_managers.py,sha256=OnycW8DaDUcLAyG-JbUGUymWb9eBzctqpl2kgwT5NuY,13792
 edu_rdm_integration/stages/upload_data/helpers.py,sha256=lCvM8QsERXRXP9rcpgaSQOKUkvi3bxkeHEC_zZruQy4,6183
 edu_rdm_integration/stages/upload_data/models.py,sha256=4XiodbnbK2MRBi8wTfU0beZQW3dLPT4_5NAh9DM-9gw,5220
 edu_rdm_integration/stages/upload_data/operations.py,sha256=CVQYaucerJbOAE3JDO05FaX4Bz9hBMKBXYqJohXKZpI,6462
-edu_rdm_integration/stages/upload_data/queues.py,sha256=MbDnltQLjTCXLnNQVO0KA4SaAzyU8xO51CRid6Cle4g,6130
-edu_rdm_integration/stages/upload_data/tasks.py,sha256=SYoQjL4sl0W0yOBFczlnQW-N4YcFiFgdMlEQUDO7IsQ,3573
+edu_rdm_integration/stages/upload_data/queues.py,sha256=9PcIZHHh--OslhA0gPLh6yyS7jaxpa5cSFRaJ85rUC4,7851
+edu_rdm_integration/stages/upload_data/tasks.py,sha256=-2CqrlNY17l6cE0VoBrWJKJnYD-2EZid0GvL9IGfVE4,3580
 edu_rdm_integration/stages/upload_data/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/upload_data/management/base.py,sha256=cXGIXvb1K5Q6xPM7S4W0gqGZO9dUao_ix_hyVJ6bkfQ,4402
 edu_rdm_integration/stages/upload_data/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/upload_data/management/commands/async_fix_attachment_size.py,sha256=50Bcy4TXg-xrBDBCMmKoxXl6chy2XibJlaD4ij2GCvY,9741
 edu_rdm_integration/stages/upload_data/management/commands/check_upload_status.py,sha256=FQgt41BDSWrXBdHas6vwCB0dx0sSS7MhGYxPd95sEL4,3951
+edu_rdm_integration/stages/upload_data/management/commands/custom_check_upload_status.py,sha256=Ka1Wf_wb_gh1Y7Ruf8McL21mXUMt1IdLsi9UfRbg70M,2271
+edu_rdm_integration/stages/upload_data/management/commands/custom_upload_files.py,sha256=gih12QHVu4KkBa1qy2P9ZtH4c6Tpd7oTGTIqOjyZlIc,1565
 edu_rdm_integration/stages/upload_data/management/commands/datamart_status.py,sha256=aKsxjSG2EiSuetyh9mDVfhKU3ZZAAS8GCAXbOv8lQaE,1262
 edu_rdm_integration/stages/upload_data/management/commands/datamart_upload.py,sha256=VF94eqO3nIbvhPFwtUlYLAMwPXEU0uGt9m5xnIjLu68,1525
 edu_rdm_integration/stages/upload_data/migrations/0001_initial.py,sha256=4dRroCI8ZxBuyRJC81si-LVAfzLMn3mYDccy48gUzCo,8080
@@ -268,8 +270,9 @@ 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.22.5.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.22.5.dist-info/METADATA,sha256=AV1obC85cWLt_cOlLzzwn6ZlCI_pl9rQH_VEs6rHXKI,43714
-edu_rdm_integration-3.22.5.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-edu_rdm_integration-3.22.5.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.22.5.dist-info/RECORD,,
+edu_rdm_integration/templates/ui-js/collect-and-export-validators.js,sha256=NMjuFzc7sCK8EKbsrT7p-7Tvxa3AcNSRdKHQnlTK2v8,1967
+edu_rdm_integration-3.22.8.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.22.8.dist-info/METADATA,sha256=tAFUxWFDQ-3VhyyJBQkSlV1VYHQsN_VHSSfcMOnBS2w,43714
+edu_rdm_integration-3.22.8.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+edu_rdm_integration-3.22.8.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.22.8.dist-info/RECORD,,