educommon 3.9.9__py3-none-any.whl → 3.10.0__py3-none-any.whl

educommon/async_task/tasks.py

@@ -12,6 +12,9 @@ from celery import (
     states,
     Task,
 )
+from celery.exceptions import (
+    Ignore,
+)
 from celery.schedules import (
     maybe_schedule,
 )
@@ -184,6 +187,8 @@ class AsyncTask(Task):
             'description': '',
             # прогресс выполнения задачи
             'progress': 'Неизвестно',
+            'exc_type': '',
+            'exc_message': '',
         }
         self.update_state(
             state=AsyncTaskStatus.to_state(AsyncTaskStatus.STARTED),
@@ -280,6 +285,9 @@ class AsyncTask(Task):
 
         Запускается, если во время выполнения задачи возникла ошибка.
         """
+        self.state['exc_type'] = type(exc).__name__
+        self.state['exc_message'] = exc.__str__()
+
         self._update_running_task(
             task_id,
             status=AsyncTaskStatus.FAILURE,
@@ -323,3 +331,36 @@ class PeriodicAsyncTask(AsyncTask):
             'options': cls.options or {},
             'relative': cls.relative,
         }
+
+
+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,
+        }

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.9.9^0
-VERSION = 3.9.9
-REVISION = 2d3b71332d666fd04710cba539889684db787d3b
-VERSION_DATE = 02.07.2024
-REVISION_DATE = 02.07.2024
+BRANCH = tags/3.10.0^0
+VERSION = 3.10.0
+REVISION = b22dda296d7f58eb45bb87633d1a1d4b45afe36b
+VERSION_DATE = 27.08.2024
+REVISION_DATE = 27.08.2024

{educommon-3.9.9.dist-info → educommon-3.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educommon
-Version: 3.9.9
+Version: 3.10.0
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group

{educommon-3.9.9.dist-info → educommon-3.10.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 educommon/__init__.py,sha256=fvsBDL7g8HgOTd-JHOh7TSvMcnUauvGVgPuyA2Z9hUI,419
 educommon/thread_data.py,sha256=n0XtdesP9H92O3rJ8K6fVnJLiHqyJEfh2xpuT36wzxs,61
-educommon/version.conf,sha256=q0D3hPkCDlx0wZTT80WA8kCxLNImlP4GI6vr_-h8jfs,450
+educommon/version.conf,sha256=GEc3p9Cz8yLJMP33CoXa2gpl4l7N-Dv8Rdbzq8JeLPA,452
 educommon/about/README.rst,sha256=U48UW5jv-8qHyaV56atzzkNMvzHKXVcWSb_NR06PnMo,2685
 educommon/about/__init__.py,sha256=H1W0IgW-qX9LCZ49GOJzHdmQGHhh-MA6U1xmNx7WnfM,132
 educommon/about/apps.py,sha256=GrpJAOE2sF0ukWsqugP_WJS88DO4aL-T3kTLprrJrcA,259
@@ -21,7 +21,7 @@ educommon/async_task/exceptions.py,sha256=PaaG2nqP0G2eZ-p0yssca2hhxIccil6MYKH6Zt
 educommon/async_task/helpers.py,sha256=HihuIHrszhVQAb-Cs6-l4npnlNAgctItGBJ-oIPQX74,2706
 educommon/async_task/locker.py,sha256=TwVFhuEGsK0JHPXsWuqx7t2Op2mUKETY5EvHSeuKjc8,3844
 educommon/async_task/models.py,sha256=pICrDFr4Vq6KWpa28NIALP45aLs0lqP7YC2p1IQDFSc,7430
-educommon/async_task/tasks.py,sha256=A6tIuDyqMo9pPEezluyO8_Gs_XerMvWdFmluZ6VjFwI,11537
+educommon/async_task/tasks.py,sha256=T0INbjknXspeMleUkxPSGwJoKJy1_ZSDed4kbQ-RK44,12929
 educommon/async_task/ui.py,sha256=LD7RwM4-6M_6ZO3Ulwy6_lK7rDPcddg-gB6EOV65494,5829
 educommon/async_task/migrations/0001_initial.py,sha256=W0HfBmhatmQ7Dy4giGeqaZNtLHiEVAvJqx0AvHaxGZ0,3677
 educommon/async_task/migrations/0002_task_type_and_status_data.py,sha256=rDGxKnbwu4OqfcodFwA_TR-kfDGRKJhivEBFKuurM30,3359
@@ -344,8 +344,8 @@ educommon/ws_log/smev/exceptions.py,sha256=lmy7o2T3dJkqgIhG07qyh5yPqO3qZAYABuT4J
 educommon/ws_log/templates/report/smev_logs.xlsx,sha256=nnYgB0Z_ix8HoxsRICjsZfFRQBdra-5Gd8nWhCxTjYg,10439
 educommon/ws_log/templates/ui-js/smev-logs-list-window.js,sha256=AGup3D8GTJSY9WdDPj0zBJeYQBFOmGgcbxPOJbKK-nY,513
 educommon/ws_log/templates/ui-js/smev-logs-report-setting-window.js,sha256=nQ7QYK9frJcE7g7kIt6INg9TlEEJAPPayBJgRaoTePA,1103
-educommon-3.9.9.dist-info/METADATA,sha256=3pTRDtYLzRZF949mWKXop0DcwX8K0Qf3kFlj8X_0xeQ,1562
-educommon-3.9.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-educommon-3.9.9.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.9.9.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.9.9.dist-info/RECORD,,
+educommon-3.10.0.dist-info/METADATA,sha256=-bS0yfIclXtDEmBJDKnsIjTI7LKXKQnThnbmAZjjA4g,1563
+educommon-3.10.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+educommon-3.10.0.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.10.0.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.10.0.dist-info/RECORD,,

{educommon-3.9.9.dist-info → educommon-3.10.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any