edu-rdm-integration 3.3.4__py3-none-any.whl → 3.3.6__py3-none-any.whl

edu_rdm_integration/export_data/export.py

@@ -342,13 +342,15 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
             # Связь лога подэтапа выгрузки с логом загрузки данных (ExportingDataSubStageUploaderClientLog)
             # имеет статус FileUploadStatusEnum.ERROR:
             model.objects.filter(
+                exporting_sub_stage__ended_at__gt=now - timedelta(days=365),
+                exporting_sub_stage__exportingdatasubstageuploaderclientlog__created__lt=last_finished_export_data,
                 exporting_sub_stage__exportingdatasubstageuploaderclientlog__file_upload_status=(
                     FileUploadStatusEnum.ERROR),
             ),
         )
 
         for queryset in querysets_to_update:
-            not_exported_model_ids = queryset.values_list('id', flat=True)
+            not_exported_model_ids = queryset.values_list('id', flat=True).iterator()
 
             with atomic():
 

edu_rdm_integration/tasks.py

@@ -34,6 +34,7 @@ from educommon.async_task.models import (
 )
 from educommon.async_task.tasks import (
     PeriodicAsyncTask,
+    UniquePeriodicAsyncTask,
 )
 from educommon.utils.date import (
     get_today_min_datetime,
@@ -100,39 +101,6 @@ if TYPE_CHECKING:
     )
 
 
-class PeriodicTaskLocker(TaskLocker):
-    """Класс отвечающий за блокировку задач.
-
-    Переопределён для возможности игнорирования повторного запуска для уже
-    запущенных периодических задач.
-    """
-
-    def raise_if_locked(self, message: Optional[str] = None):
-        """Если блокировано, то вызывает исключение."""
-        if self.is_locked():
-            self.debug(f'Add failed. Task {self.task_name} currently locked ({self.params})')
-
-            raise Ignore()
-
-
-class UniquePeriodicAsyncTask(PeriodicAsyncTask):
-    """Уникальные периодические задачи."""
-
-    abstract = True
-    lock_expire_seconds = 60 * 60
-
-    locker_class = PeriodicTaskLocker
-
-    @property
-    def locker_config(self) -> dict:
-        """Настройки для механизма блокировок. """
-        return {
-            'lock_params': {'task_name': self.name},
-            'lock_message': f'Task [{self.__name__}] is running',
-            'lock_expire': self.lock_expire_seconds,
-        }
-
-
 class RDMCheckUploadStatus(UniquePeriodicAsyncTask):
     """Периодическая задача для сбора статусов по загрузке файла в витрину."""
 

{edu_rdm_integration-3.3.4.dist-info → edu_rdm_integration-3.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 3.3.4
+Version: 3.3.6
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -28,7 +28,7 @@ Requires-Dist: wheel <0.42,>=0.37.1
 Requires-Dist: transliterate <2
 Requires-Dist: Django <3.3,>=2.2
 Requires-Dist: celery <5.3,>=4.4.7
-Requires-Dist: educommon <4,>=3.9.3
+Requires-Dist: educommon <4,>=3.10.0
 Requires-Dist: function-tools <1,>=0.9.0
 Requires-Dist: m3-db-utils <1,>=0.3.10
 Requires-Dist: m3-django-compat <2,>=1.10.2
@@ -301,6 +301,23 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+## 3.3.6 - 2024-09-02
+Добавлена фильтрация по дате выгрузки при обновлении данных на экспорт в BaseExportLatestEntitiesData
+
+### Изменено
+- [EDUSCHL-22335](https://jira.bars.group/browse/EDUSCHL-22335)
+   PATCH Добавлена фильтрация по дате выгрузки при обновлении данных на экспорт в BaseExportLatestEntitiesData
+
+
+
+## 3.3.5 - 2024-08-26
+Классы UniquePeriodicAsyncTask, PeriodicTaskLocker перенесены в educommon.
+
+### Удалено
+- [EDUSCHL-22267](https://jira.bars.group/browse/EDUSCHL-22267)
+  MINOR Классы UniquePeriodicAsyncTask, PeriodicTaskLocker перенесены в educommon.
+
+
 ## 3.3.4 - 2024-08-16
 Поднята максимальная версия Django (<3.3)
 

{edu_rdm_integration-3.3.4.dist-info → edu_rdm_integration-3.3.6.dist-info}/RECORD

@@ -12,7 +12,7 @@ edu_rdm_integration/models.py,sha256=Fwt2O2j_aPI9owRZprreGQ2t7op-YmIYpZoq5HHjL3M
 edu_rdm_integration/redis_cache.py,sha256=GZhtM1d0cVr5TEqxh15K7dS371Msit6wRemIiYb2rzk,1548
 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=1CbqE7kU23GWbaaym9TMal95zrYDInn8Dw9EEudm1gU,16437
+edu_rdm_integration/tasks.py,sha256=WolNe2t3_NCOisZeg24HyPI3Y0ciOJbwaFprhWgt41Q,15282
 edu_rdm_integration/utils.py,sha256=NIOxlH4JiTOOxYgqcwtfqT5UAtNG24GLq_tsnBUtp8E,10370
 edu_rdm_integration/adapters/__init__.py,sha256=cU0swn4Ny5ZQz5buWRcWsT1mpWuUFJaUlHf2l7TtEBo,83
 edu_rdm_integration/adapters/apps.py,sha256=TyJTkSPs2qAHJ11fqbwLGk3Ea7ujtqWwbxqmvYNQxG8,363
@@ -87,7 +87,7 @@ edu_rdm_integration/enum_register/register.py,sha256=5OWOjK-M0Erd_5CENpBaXhVtfL0
 edu_rdm_integration/export_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/export_data/consts.py,sha256=rmJ_18wHCE54j0VABxfo7Zu01EPFYSjYrj5L79hVW2Y,333
 edu_rdm_integration/export_data/dataclasses.py,sha256=IhftRopP4lS-m3ygdBU5Bz0HF71VSBP4JQ6-8VIVgtY,260
-edu_rdm_integration/export_data/export.py,sha256=3d1POl4xzyh4GVXJYdkXkcyfiUIqsrlPKPO-apw30Uk,16405
+edu_rdm_integration/export_data/export.py,sha256=JZAgT8K49buRb57Pvt7iRkKW_fm7P4luZ4_umbsoY_E,16609
 edu_rdm_integration/export_data/export_manger.py,sha256=_8gkFH380zZVJ9LVxqeZOXphS-RjeIoSbq0eUbXnIMA,9657
 edu_rdm_integration/export_data/generators.py,sha256=yLDOcHB1PoilJwXtKGxZQhDjpeKBzEWoosahbJJ4Ba4,4020
 edu_rdm_integration/export_data/helpers.py,sha256=hU346RmQ17Ra2etFvxXI7JQlLyp_0KxH1jm-eeCqejc,2933
@@ -174,9 +174,9 @@ edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJL
 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/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
-edu_rdm_integration-3.3.4.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.3.4.dist-info/METADATA,sha256=8c0Zf5qu2_xjkr0VAur96AlwA1oCYWCYJ_HHd2w3A54,71494
-edu_rdm_integration-3.3.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-3.3.4.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-3.3.4.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.3.4.dist-info/RECORD,,
+edu_rdm_integration-3.3.6.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.3.6.dist-info/METADATA,sha256=GF0r7I7EfNUKBqQ4USLovvZRvmn4gAJzDxG8KPeN81I,72243
+edu_rdm_integration-3.3.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-3.3.6.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-3.3.6.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.3.6.dist-info/RECORD,,