edu-rdm-integration 2.1.0__py3-none-any.whl → 2.2.1__py3-none-any.whl

edu_rdm_integration/collect_and_export_data/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'edu_rdm_integration.collect_and_export_data.apps.AppConfig'

edu_rdm_integration/collect_and_export_data/apps.py

@@ -0,0 +1,9 @@
+from django.apps import (
+    AppConfig as AppConfigBase,
+)
+
+
+class AppConfig(AppConfigBase):
+
+    name = __package__
+    label = 'rdm_collect_and_export_data'

edu_rdm_integration/collect_and_export_data/migrations/0001_initial.py

@@ -0,0 +1,67 @@
+# Generated by Django 3.0.14 on 2024-03-11 16:10
+# flake8: noqa
+import uuid
+
+import django.contrib.postgres.fields.jsonb
+import django.db.models.deletion
+import django.utils.timezone
+from django.db import (
+    migrations,
+    models,
+)
+
+import educommon.django.db.mixins
+
+import edu_rdm_integration.utils
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('edu_rdm_integration', '0008_transferredentity'),
+        ('async_task', '0002_task_type_and_status_data'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EduRdmExportDataCommandProgress',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Дата создания')),
+                ('period_started_at', models.DateTimeField(verbose_name='Левая граница периода выборки данных для выгрузки')),
+                ('period_ended_at', models.DateTimeField(verbose_name='Правая граница периода выборки данных для выгрузки')),
+                ('generation_id', models.UUIDField(default=uuid.uuid4, verbose_name='Идентификатор генерации')),
+                ('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='Тип команды')),
+                ('entity', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='edu_rdm_integration.RegionalDataMartEntityEnum', verbose_name='Сущность РВД')),
+                ('stage', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='edu_rdm_integration.ExportingDataStage', verbose_name='Этап выгрузки данных')),
+                ('task', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='async_task.RunningTask', verbose_name='Асинхронная задача')),
+            ],
+            options={
+                'db_table': 'edu_rdm_exporting_data_command_progress',
+            },
+            bases=(educommon.django.db.mixins.ReprStrPreModelMixin, models.Model),
+        ),
+        migrations.CreateModel(
+            name='EduRdmCollectDataCommandProgress',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Дата создания')),
+                ('logs_period_started_at', models.DateTimeField(verbose_name='Левая граница периода обрабатываемых логов')),
+                ('logs_period_ended_at', models.DateTimeField(verbose_name='Правая граница периода обрабатываемых логов')),
+                ('generation_id', models.UUIDField(default=uuid.uuid4, verbose_name='Идентификатор генерации')),
+                ('institute_ids', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=list, null=True, 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='Тип команды')),
+                ('model', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='edu_rdm_integration.RegionalDataMartModelEnum', verbose_name='Модель РВД')),
+                ('stage', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='edu_rdm_integration.CollectingExportedDataStage', verbose_name='Этап формирования данных для выгрузки')),
+                ('task', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='async_task.RunningTask', verbose_name='Асинхронная задача')),
+            ],
+            options={
+                'db_table': 'edu_rdm_collecting_data_command_progress',
+            },
+            bases=(educommon.django.db.mixins.ReprStrPreModelMixin, models.Model),
+        ),
+    ]

edu_rdm_integration/collect_and_export_data/models.py

@@ -0,0 +1,67 @@
+from django.db.models import (
+    SET_NULL,
+    FileField,
+    ForeignKey,
+    PositiveSmallIntegerField,
+)
+
+from edu_rdm_integration.enums import (
+    CommandType,
+)
+from edu_rdm_integration.models import (
+    AbstractCollectDataCommandProgress,
+    AbstractExportDataCommandProgress,
+)
+from edu_rdm_integration.utils import (
+    get_data_command_progress_attachment_path,
+)
+
+
+class EduRdmCollectDataCommandProgress(AbstractCollectDataCommandProgress):
+    """
+    Модель, хранящая данные для формирования и отслеживания асинхронных задач по сбору данных.
+    """
+
+    task = ForeignKey(
+        to='async_task.RunningTask',
+        verbose_name='Асинхронная задача',
+        blank=True,
+        null=True,
+        on_delete=SET_NULL,
+    )
+    logs_link = FileField(
+        upload_to=get_data_command_progress_attachment_path,
+        max_length=255,
+        verbose_name='Ссылка на файл логов',
+    )
+    type = PositiveSmallIntegerField(  # noqa: A003
+        verbose_name='Тип команды',
+        choices=CommandType.get_choices(),
+    )
+
+    class Meta(AbstractCollectDataCommandProgress.Meta):
+        db_table = 'edu_rdm_collecting_data_command_progress'
+
+
+class EduRdmExportDataCommandProgress(AbstractExportDataCommandProgress):
+    """Команда экспорта данных."""
+
+    task = ForeignKey(
+        to='async_task.RunningTask',
+        verbose_name='Асинхронная задача',
+        null=True,
+        blank=True,
+        on_delete=SET_NULL,
+    )
+    logs_link = FileField(
+        upload_to=get_data_command_progress_attachment_path,
+        max_length=255,
+        verbose_name='Файл лога',
+    )
+    type = PositiveSmallIntegerField(  # noqa: A003
+        verbose_name='Тип команды',
+        choices=CommandType.get_choices(),
+    )
+
+    class Meta(AbstractExportDataCommandProgress.Meta):
+        db_table = 'edu_rdm_exporting_data_command_progress'

edu_rdm_integration/collect_and_export_data/utils.py

@@ -0,0 +1,77 @@
+from edu_rdm_integration.collect_and_export_data.models import (
+    EduRdmCollectDataCommandProgress,
+    EduRdmExportDataCommandProgress,
+)
+from edu_rdm_integration.collect_data.collect import (
+    BaseCollectModelsDataByGeneratingLogs,
+)
+from edu_rdm_integration.export_data.export import (
+    ExportEntitiesData,
+)
+from edu_rdm_integration.helpers import (
+    save_command_log_link,
+)
+
+
+class CollectCommandMixin:
+    """Класс-примесь для запуска команды сборки моделей."""
+
+    def get_collect_command(self, command_id: int) -> EduRdmCollectDataCommandProgress:
+        """Возвращает экземпляр модели команды запуска."""
+        command = EduRdmCollectDataCommandProgress.objects.get(id=command_id)
+
+        return command
+
+    def get_collect_models_class(self):
+        """Возвращает класс для сбора данных."""
+        return BaseCollectModelsDataByGeneratingLogs
+
+    def run_collect_command(self, command) -> None:
+        """Запуск команды сбора."""
+        collect_models_data_class = self.get_collect_models_class()
+        collect_models_data_class(
+            models=(command.model_id,),
+            logs_period_started_at=command.logs_period_started_at,
+            logs_period_ended_at=command.logs_period_ended_at,
+            command_id=command.id,
+            institute_ids=command.institute_ids or (),
+        ).collect()
+
+    def save_collect_command_logs(self, command_id: int, log_dir: str):
+        """Сохранение ссылки на файл логов в команде."""
+        try:
+            command = self.get_collect_command(command_id)
+        except EduRdmCollectDataCommandProgress.DoesNotExist:
+            command = None
+
+        if command:
+            save_command_log_link(command, log_dir)
+
+
+class ExportCommandMixin:
+    """Класс-примесь для запуска команды выгрузки сущностей."""
+
+    def get_export_command(self, command_id: int) -> EduRdmExportDataCommandProgress:
+        """Возвращает экземпляр модели команды запуска."""
+        command = EduRdmExportDataCommandProgress.objects.get(id=command_id)
+
+        return command
+
+    def run_export_command(self, command: EduRdmExportDataCommandProgress) -> None:
+        """Запуск команды выгрузки."""
+        ExportEntitiesData(
+            entities=(command.entity_id,),
+            period_started_at=command.period_started_at,
+            period_ended_at=command.period_ended_at,
+            command_id=command.id,
+        ).export()
+
+    def save_export_command_logs(self, command_id: int, log_dir: str):
+        """Сохранение ссылки на файл логов в команде."""
+        try:
+            command = self.get_export_command(command_id)
+        except EduRdmExportDataCommandProgress.DoesNotExist:
+            command = None
+
+        if command:
+            save_command_log_link(command, log_dir)

edu_rdm_integration/enums.py

@@ -154,3 +154,15 @@ class EntityRetiredStatusEnum(ValueCodeEnumerate):
         RETIRED: 'Прекращена',
         ENTERED_IN_ERROR: 'Создана по ошибке',
     }
+
+
+class CommandType(BaseEnumerate):
+    """Тип команды."""
+
+    AUTO = 1
+    MANUAL = 2
+
+    values = {
+        AUTO: 'Автоматический',
+        MANUAL: 'Ручной',
+    }

edu_rdm_integration/helpers.py

@@ -1,4 +1,5 @@
 import heapq
+import os
 from concurrent.futures import (
     ThreadPoolExecutor,
 )
@@ -12,8 +13,12 @@ from typing import (
     List,
     Optional,
     Tuple,
+    Union,
 )
 
+from django.conf import (
+    settings,
+)
 from django.db import (
     transaction,
 )
@@ -28,6 +33,10 @@ from educommon import (
     logger,
 )
 
+from edu_rdm_integration.collect_and_export_data.models import (
+    EduRdmCollectDataCommandProgress,
+    EduRdmExportDataCommandProgress,
+)
 from edu_rdm_integration.enums import (
     FileUploadStatusEnum,
 )
@@ -151,7 +160,7 @@ class Graph:
     """
 
     def __init__(self):
-        self.vertices: Dict[str, Dict[str,  Optional[str]]] = {}
+        self.vertices: Dict[str, Dict[str, Optional[str]]] = {}
         """Словарь для хранения данных графа."""
 
     def add_vertex(self, vertex: str):
@@ -261,3 +270,14 @@ class Graph:
         path.reverse()
 
         return path
+
+
+def save_command_log_link(
+    command: Union[EduRdmCollectDataCommandProgress, EduRdmExportDataCommandProgress],
+    log_dir: str
+) -> None:
+    """Сохраняет ссылку на лог команды."""
+    log_file = os.path.join(settings.MEDIA_ROOT, log_dir, f'{command.id}.log')
+    if os.path.exists(log_file):
+        command.logs_link = os.path.join(log_dir, f'{command.id}.log')
+        command.save()

edu_rdm_integration/tasks.py

@@ -1,3 +1,13 @@
+from itertools import (
+    chain,
+)
+from typing import (
+    TYPE_CHECKING,
+    Dict,
+    Optional,
+    Type,
+)
+
 import celery
 from celery.schedules import (
     crontab,
@@ -5,34 +15,84 @@ from celery.schedules import (
 from django.conf import (
     settings,
 )
+from django.db.models import (
+    CharField,
+    Max,
+)
+from django.db.models.functions import (
+    Cast,
+)
+from django.utils import (
+    timezone,
+)
 
 from educommon.async_task.models import (
     AsyncTaskType,
+    RunningTask,
 )
 from educommon.async_task.tasks import (
     PeriodicAsyncTask,
 )
+from educommon.utils.date import (
+    get_today_min_datetime,
+)
+from m3_db_utils.consts import (
+    DEFAULT_ORDER_NUMBER,
+)
 
+from edu_rdm_integration.collect_and_export_data.models import (
+    EduRdmCollectDataCommandProgress,
+    EduRdmExportDataCommandProgress,
+)
+from edu_rdm_integration.collect_data.collect import (
+    BaseCollectLatestModelsData,
+)
 from edu_rdm_integration.collect_data.helpers import (
     set_failed_status_suspended_collecting_data_stages,
 )
 from edu_rdm_integration.consts import (
+    REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
+    REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
     TASK_QUEUE_NAME,
 )
 from edu_rdm_integration.enums import (
+    CommandType,
     FileUploadStatusEnum,
 )
+from edu_rdm_integration.export_data.export import (
+    ExportLatestEntitiesData,
+)
 from edu_rdm_integration.export_data.helpers import (
     set_failed_status_suspended_exporting_data_stages,
 )
 from edu_rdm_integration.helpers import (
     UploadStatusHelper,
+    save_command_log_link,
 )
 from edu_rdm_integration.models import (
+    CollectingDataSubStageStatus,
+    CollectingExportedDataSubStage,
+    ExportingDataSubStage,
+    ExportingDataSubStageStatus,
     ExportingDataSubStageUploaderClientLog,
+    RegionalDataMartEntityEnum,
+    TransferredEntity,
+)
+from edu_rdm_integration.storages import (
+    RegionalDataMartEntityStorage,
 )
 
 
+if TYPE_CHECKING:
+    from datetime import (
+        datetime,
+    )
+
+    from function_tools.managers import (
+        RunnerManager,
+    )
+
+
 class RDMCheckUploadStatus(PeriodicAsyncTask):
     """Периодическая задача для сбора статусов по загрузке файла в витрину."""
 
@@ -95,6 +155,185 @@ class CheckSuspendedExportedStagePeriodicTask(PeriodicAsyncTask):
         )
 
 
+class TransferLatestEntitiesDataPeriodicTask(PeriodicAsyncTask):
+    """Периодическая задача сбора и выгрузки данных."""
+
+    queue = TASK_QUEUE_NAME
+    routing_key = TASK_QUEUE_NAME
+    description = 'Периодическая задача сбора и экспорта данных РВД'
+    task_type = AsyncTaskType.UNKNOWN
+    run_every = crontab(
+        minute=settings.RDM_TRANSFER_TASK_MINUTE,
+        hour=settings.RDM_TRANSFER_TASK_HOUR,
+        day_of_week=settings.RDM_TRANSFER_TASK_DAY_OF_WEEK,
+    )
+
+    def __init__(self) -> None:
+        super().__init__()
+
+        self._collecting_data_managers: Dict[str, Type['RunnerManager']] = {}
+        self._collecting_data_manager_to_logs_period_end: Dict[str, datetime] = {}
+
+        self._exporting_data_managers: Dict[str, Type['RunnerManager']] = {}
+        self._exporting_data_manager_to_period_end: Dict[str, datetime] = {}
+
+        self._transferred_entities = []
+
+    def process(self, *args, **kwargs):
+        """Выполняет задачу."""
+        super().process(*args, **kwargs)
+
+        self._collect_transferred_entities()
+        self._collect_managers()
+        self._calculate_collecting_managers_logs_period_ended_at()
+        self._calculate_exporting_managers_ended_at()
+
+        task_id = RunningTask.objects.filter(
+            pk=self.request.id,
+        ).values_list('pk', flat=True).first()
+
+        model_enum_values = RegionalDataMartEntityEnum.get_entities_model_enums(
+            entity_enums=self._transferred_entities,
+            is_sorted=True,
+        )
+
+        filtered_model_enum_values = filter(lambda model: model.order_number != DEFAULT_ORDER_NUMBER, model_enum_values)
+        for model_enum_value in filtered_model_enum_values:
+            self._run_collect_model_data(model_enum_value.key, task_id)
+
+        for entity_enum_value in sorted(self._transferred_entities, key=lambda entity: entity.order_number):
+            self._run_export_entity_data(entity_enum_value.key, task_id)
+
+    def _run_collect_model_data(self, model: str, task_id: str) -> None:
+        """Запускает сбор данных модели РВД."""
+        command = self._create_collect_command(model, task_id)
+        collect_model_data = self._prepare_collect_model_data_class(command)
+        collect_model_data.collect()
+
+        command.refresh_from_db(fields=['stage_id'])
+        save_command_log_link(command, settings.RDM_COLLECT_LOG_DIR)
+
+    def _run_export_entity_data(self, entity: str, task_id: str) -> None:
+        """Запускает экспорт данных сущности РВД."""
+        command = self._create_export_command(entity, task_id)
+        if command:
+            export_entity_data = self._prepare_export_entity_data_class(command)
+            export_entity_data.export()
+
+            command.refresh_from_db(fields=['stage_id'])
+            save_command_log_link(command, settings.RDM_EXPORT_LOG_DIR)
+
+    def _collect_transferred_entities(self) -> None:
+        """Собирает сущности РВД, по которым будет произведен сбор и экспорт данных."""
+        self._transferred_entities = [
+            RegionalDataMartEntityEnum.get_model_enum_value(key=entity)
+            for entity in TransferredEntity.objects.values_list('entity', flat=True)
+        ]
+
+    def _collect_managers(self) -> None:
+        """Собирает менеджеры Функций для сбора и выгрузки данных."""
+        entity_storage = RegionalDataMartEntityStorage()
+        entity_storage.prepare()
+
+        collecting_models_data_managers_map = entity_storage.prepare_entities_manager_map(
+            tags={REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA},
+        )
+        exporting_entities_data_managers_map = entity_storage.prepare_entities_manager_map(
+            tags={REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA},
+        )
+
+        for transferred_entity in self._transferred_entities:
+            for model in chain((transferred_entity.main_model_enum, ), transferred_entity.additional_model_enums):
+                collect_manager_class = collecting_models_data_managers_map.get(model.key)
+                if collect_manager_class:
+                    self._collecting_data_managers[model.key] = collect_manager_class
+
+            export_manager_class = exporting_entities_data_managers_map.get(transferred_entity.key)
+            if export_manager_class:
+                self._exporting_data_managers[transferred_entity.key] = export_manager_class
+
+    def _calculate_collecting_managers_logs_period_ended_at(self) -> None:
+        """Определяет дату последнего успешного этапа сбора у менеджеров Функций сбора."""
+        self._collecting_data_manager_to_logs_period_end = dict(
+            CollectingExportedDataSubStage.objects.annotate(
+                manager_id=Cast('stage__manager_id', output_field=CharField()),
+                max_logs_period_ended_at=Max('stage__logs_period_ended_at'),
+            ).filter(
+                status_id=CollectingDataSubStageStatus.READY_TO_EXPORT.key,
+                manager_id__in=[manager.uuid for manager in self._collecting_data_managers.values()],
+            ).values_list('manager_id', 'max_logs_period_ended_at'),
+        )
+
+    def _calculate_exporting_managers_ended_at(self) -> None:
+        """Определяет дату последнего успешного подэтапа экспорта у менеджеров Функций экспорта."""
+        self._exporting_data_manager_to_period_end = dict(
+            ExportingDataSubStage.objects.annotate(
+                manager_id=Cast('stage__manager_id', output_field=CharField()),
+                max_ended_at=Max('ended_at'),
+            ).filter(
+                status_id=ExportingDataSubStageStatus.FINISHED.key,
+                manager_id__in=[manager.uuid for manager in self._exporting_data_managers.values()],
+            ).values_list('manager_id', 'max_ended_at'),
+        )
+
+    def _create_collect_command(self, model: str, task_id: str) -> EduRdmCollectDataCommandProgress:
+        """Создает команду сбора данных моделей РВД."""
+        manager = self._collecting_data_managers[model]
+        logs_period_started_at = (
+            self._collecting_data_manager_to_logs_period_end.get(manager.uuid)
+            or get_today_min_datetime()
+        )
+
+        return EduRdmCollectDataCommandProgress.objects.create(
+            model_id=model,
+            logs_period_started_at=logs_period_started_at,
+            logs_period_ended_at=timezone.now(),
+            task_id=task_id,
+            type=CommandType.AUTO,
+        )
+
+    def _create_export_command(self, entity: str, task_id: str) -> Optional[EduRdmExportDataCommandProgress]:
+        """Создает команду экспорта данных сущностей РВД."""
+        manager = self._exporting_data_managers[entity]
+        period_started_at = self._exporting_data_manager_to_period_end.get(manager.uuid)
+
+        if period_started_at:
+            return EduRdmExportDataCommandProgress.objects.create(
+                entity_id=entity,
+                period_started_at=period_started_at,
+                period_ended_at=timezone.now(),
+                task_id=task_id,
+                type=CommandType.AUTO,
+            )
+
+    def _prepare_collect_model_data_class(
+        self,
+        command: EduRdmCollectDataCommandProgress
+    ) -> BaseCollectLatestModelsData:
+        """Подготавливает объект класса сбора данных моделей РВД."""
+        return BaseCollectLatestModelsData(
+            models=[command.model_id],
+            logs_period_started_at=command.logs_period_started_at,
+            logs_period_ended_at=command.logs_period_ended_at,
+            command_id=command.id,
+        )
+
+    def _prepare_export_entity_data_class(self, command: EduRdmExportDataCommandProgress) -> ExportLatestEntitiesData:
+        """Подготавливает объект класса экспорта данных сущностей РВД.
+
+        При экспорте данных передаем параметр task_id для обновления поля "Описание"
+        наименованиями выгруженных сущностей.
+        """
+        return ExportLatestEntitiesData(
+            entities=[command.entity_id],
+            period_started_at=command.period_started_at,
+            period_ended_at=command.period_ended_at,
+            command_id=command.id,
+            task_id=self.request.id,
+        )
+
+
 celery_app = celery.app.app_or_default()
 celery_app.register_task(RDMCheckUploadStatus)
 celery_app.register_task(CheckSuspendedExportedStagePeriodicTask)
+celery_app.register_task(TransferLatestEntitiesDataPeriodicTask)

edu_rdm_integration/utils.py

@@ -17,7 +17,6 @@ from typing import (
 from django.conf import (
     settings,
 )
-
 from edu_rdm_integration.apps import (
     EduRDMIntegrationConfig,
 )
@@ -25,6 +24,7 @@ from edu_rdm_integration.consts import (
     ACADEMIC_YEAR,
 )
 
+
 if TYPE_CHECKING:
     from typing import (
         NamedTuple,
@@ -34,6 +34,10 @@ if TYPE_CHECKING:
         Model,
     )
 
+    from edu_rdm_integration.collect_and_export_data.models import (
+        EduRdmCollectDataCommandProgress,
+        EduRdmExportDataCommandProgress,
+    )
     from edu_rdm_integration.helpers import (
         Graph,
     )
@@ -256,3 +260,27 @@ def build_related_model_graph(
             graph.add_edge(current_model._meta.model_name, related_model._meta.model_name, field.name)
 
     return graph
+
+
+def get_data_command_progress_attachment_path(
+    instance: Union['EduRdmCollectDataCommandProgress', 'EduRdmExportDataCommandProgress'],
+    filename: str
+) -> str:
+    """Возвращает путь до файла-вложения при формировании команды сборки или выгрузки данных.
+
+    Args:
+        instance: объект ExportDataCommandProgress или объект CollectDataCommandProgres
+        filename: имя загружаемого файла
+
+    Returns:
+        Строковое представление пути
+    """
+    date_now = datetime.now()
+
+    return os.path.join(
+        settings.UPLOADS,
+        date_now.strftime('%Y/%m/%d'),
+        instance.__class__.__name__.lower(),
+        str(instance.type),
+        filename
+    )

{edu_rdm_integration-2.1.0.dist-info → edu_rdm_integration-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 2.1.0
+Version: 2.2.1
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -293,6 +293,27 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+## [2.2.1] - 2024-03-28
+ Исправление наследования Meta в моделях EduRdmCollectDataCommandProgress и EduRdmExportDataCommandProgress
+
+### Исправлено
+
+- [EDUSCHL-21569](https://jira.bars.group/browse/EDUSCHL-21569)
+  MINOR Перенести оставшиеся общие асинхронные задачи из ЭШ в пакет edu_rdm_integration
+
+## [2.2.0] - 2024-03-20
+
+Из ЭШ перенесена периодическая задача по сбору и выгрузке данных в РВД.
+
+Также из ЭШ перенесены и переименованы модели:
+ - CollectDataCommandProgress перименована в  EduRdmCollectDataCommandProgress
+ - ExportDataCommandProgress перименована в EduRdmExportDataCommandProgress
+ - Добавлены миксины CollectCommandMixin и ExportCommandMixin
+
+### Добавлено
+
+- [EDUSCHL-21569](https://jira.bars.group/browse/EDUSCHL-21569)
+  MINOR Перенести оставшиеся общие асинхронные задачи из ЭШ в пакет edu_rdm_integration
 
 ## [2.1.0] - 2024-03-18
 

{edu_rdm_integration-2.1.0.dist-info → edu_rdm_integration-2.2.1.dist-info}/RECORD

@@ -5,14 +5,14 @@ edu_rdm_integration/apps.py,sha256=5OgNdmuqe26fbu4wYb69haQJe-XFO_rDbnU1vPqJU-U,3
 edu_rdm_integration/base.py,sha256=_G0qPTAXe6bXfgDHNiZMSsYt3sMuUhLKnHuQCWSFttU,1341
 edu_rdm_integration/consts.py,sha256=FFwcMHNsfjP_s9LfkccLAHjJMEMp7ppPmrRlJcgV88k,1104
 edu_rdm_integration/entities.py,sha256=mAjsYlcIbemo4xT5CSCr4payZubiBHB7Rb3Ow1CVsy0,14552
-edu_rdm_integration/enums.py,sha256=6Gv_hpYrC6v75ZtBA_xBrHqvza9NbJKhMa1TdTHkzys,4048
-edu_rdm_integration/helpers.py,sha256=akFN1D_hcu8HRgx-LoJKe9u729gHp7-B0eS7CeBIsH0,10373
+edu_rdm_integration/enums.py,sha256=T3Mu5D-CbKO3BSg16MPPnIPlcc_YGLYR-ThS8dzl9gg,4246
+edu_rdm_integration/helpers.py,sha256=wsVd3GiO7qgb_jtZBqEuedBTW8Q9-j2xcfMBi45O0cw,10997
 edu_rdm_integration/mapping.py,sha256=bwa2fJCbV4YjQcAgRrgT3hgM6dJhr_uBtQgx3L3F2Ck,473
 edu_rdm_integration/models.py,sha256=Wg8NYj4C6Xqw-15AsQGU0TWNzUjdwBW_YZDzmPqx3GY,29327
 edu_rdm_integration/signals.py,sha256=3eRlpkDcFCF6TN80-QM8yBYLcyozzcmoPjz6r4_ApWg,73
 edu_rdm_integration/storages.py,sha256=o5WqUG7SnkeuMt-z8spUi-IraivST-7KHzfY-M3v7FA,6807
-edu_rdm_integration/tasks.py,sha256=EJD4jkIJoWwhX5YZRTZjOP5hLmGv7HEOB8w6NIHDPBw,3591
-edu_rdm_integration/utils.py,sha256=EUf1gt7YzlVH3mIX1M70b7buoox7F_ELwLTomoSENwo,9397
+edu_rdm_integration/tasks.py,sha256=8bQZbhVDuK3RYc8lSbWyW1xDyVgIZQCrcsTo8pUeIeE,13716
+edu_rdm_integration/utils.py,sha256=-my8q9fude6Nc9r_qUDww-8QaU2tcv-xOexewYqOPJw,10369
 edu_rdm_integration/adapters/__init__.py,sha256=cU0swn4Ny5ZQz5buWRcWsT1mpWuUFJaUlHf2l7TtEBo,83
 edu_rdm_integration/adapters/apps.py,sha256=TyJTkSPs2qAHJ11fqbwLGk3Ea7ujtqWwbxqmvYNQxG8,363
 edu_rdm_integration/adapters/caches.py,sha256=OxSqeXySUN42LxEeHBLtC1ZBt-7aicbRbmP1EJYTvV4,1505
@@ -30,6 +30,12 @@ edu_rdm_integration/adapters/strategies.py,sha256=ztEHvdMYjJzjjkV7J9XtuNhn_uUVoJ
 edu_rdm_integration/adapters/strings.py,sha256=-k9dex8A7hCpkzUkudVkKRAbNRuuqog2hYl2xmibl8I,181
 edu_rdm_integration/adapters/tests.py,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEkEV2oy05I,59
 edu_rdm_integration/adapters/validators.py,sha256=LJWnCY8PtXDOj-fm3fBWjQYsHsSLfyKf_D97pqPv73s,496
+edu_rdm_integration/collect_and_export_data/__init__.py,sha256=4glPgPCzAyLreBGUnUrcRPCge45XucJz5bK8VjlQBaE,82
+edu_rdm_integration/collect_and_export_data/apps.py,sha256=fAcctcjxWP4Gd0Qr3YrQkMESrzga4IORWetBTy8wvHo,160
+edu_rdm_integration/collect_and_export_data/models.py,sha256=TGm-hM-1aDhVcFPy0PTC3yNczoZGF4ZmIdr0Y9s8CfU,2038
+edu_rdm_integration/collect_and_export_data/utils.py,sha256=uw85W_uPr7zGa9rA4Bp1nDUrOMnlz0nZ92AZAgNsRlE,3073
+edu_rdm_integration/collect_and_export_data/migrations/0001_initial.py,sha256=UkoaXzh3tokZ8QdCdB09v3rRZfcHhvEwNMuj3mQIB74,4714
+edu_rdm_integration/collect_and_export_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/collect.py,sha256=TfjDD25opR6UlV6oWbMXs3T7nQguSg5IT0k2oFasWJI,14543
 edu_rdm_integration/collect_data/generators.py,sha256=f34AAwdEcQNIokX0ypqYgjRD1XolwBVLER_HYv9ibNw,9075
@@ -156,9 +162,9 @@ edu_rdm_integration/uploader_log/apps.py,sha256=tYJj4-sDlq8fLOSvw18L_yys7SILpTKW
 edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJLdsGmr3SXwH_U,266
 edu_rdm_integration/uploader_log/managers.py,sha256=y5wTSMzF9hpOpIU_A7nIafL_LBU3QEie6LAYWoB-pBQ,3203
 edu_rdm_integration/uploader_log/ui.py,sha256=YM9Buqp2wxE95Wf5gvAATBzuYzDOossK1sEmvFk07cI,2110
-edu_rdm_integration-2.1.0.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-2.1.0.dist-info/METADATA,sha256=ji5SEODXhqO13VaW0Pz8k2dwn6RsQEU-z1Czk48DaCQ,57138
-edu_rdm_integration-2.1.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-2.1.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-2.1.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-2.1.0.dist-info/RECORD,,
+edu_rdm_integration-2.2.1.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-2.2.1.dist-info/METADATA,sha256=0K4JnLA9jXs0MxuvyJlFL0IaolV9Oil6ppFcTemQhxY,58264
+edu_rdm_integration-2.2.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-2.2.1.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-2.2.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-2.2.1.dist-info/RECORD,,