educommon 3.9.5__py3-none-any.whl → 3.9.7__py3-none-any.whl

educommon/async_task/tasks.py

@@ -5,6 +5,7 @@ from datetime import (
 )
 from typing import (
     Optional,
+    Union,
 )
 
 from celery import (
@@ -210,7 +211,7 @@ class AsyncTask(Task):
         if self.logging_in_db:
             update_running_task(task_id, **params)
 
-    def after_return(self, status, retval, task_id, args, kwargs, einfo):
+    def after_return(self, status: str, retval: Union[dict, Exception], task_id: str, args, kwargs, einfo):
         """Завершение задачи."""
         self.debug(f'Task {self.__name__} (id = {task_id}) finished')
 
@@ -219,12 +220,11 @@ class AsyncTask(Task):
             self.release_lock(lock_id)
 
         if isinstance(retval, dict):
-            self.update_state(
-                state=retval.get('task_state', status),
-                meta=retval,
-            )
+            state = retval.get('task_state', status)
         else:
-            self.update_state(state=status)
+            state = status
+
+        self.update_state(state=state, meta=retval)
 
     def update_state(self, task_id=None, state=None, meta=None, **kwargs):
         """Обновление состояния задачи.

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.9.5
-VERSION = 3.9.5
-REVISION = 23cd0822a5be7df5155bc0f1a9373a0aa4c932bb
-VERSION_DATE = 09.04.2024
-REVISION_DATE = 09.04.2024
+BRANCH = tags/3.9.7^0
+VERSION = 3.9.7
+REVISION = 2150c3554f1cdb0dbe1969c67642543d95993b43
+VERSION_DATE = 14.05.2024
+REVISION_DATE = 14.05.2024

educommon/ws_log/models.py

@@ -12,6 +12,7 @@ from django.db.models.expressions import (
     Value,
     When,
 )
+
 from m3.db import (
     BaseEnumerate,
     BaseObjectModel,
@@ -47,7 +48,7 @@ class ExtendedSmevLogManager(models.Manager):
     """
 
     def get_queryset(self):
-        query = super(ExtendedSmevLogManager, self).get_queryset()
+        query = super().get_queryset()
         return query.annotate(
             # Пустые и null значения приведем к значению по умолчанию "Успешно"
             # для использования в фильтрации
@@ -56,7 +57,8 @@ class ExtendedSmevLogManager(models.Manager):
                     Q(result__isnull=True) | Q(result=''),
                     then=Value(SmevLog.RESULT_DEFAULT_VALUE)
                 ),
-                default='result'
+                default='result',
+                output_field=models.CharField()
             ),
         )
 

{educommon-3.9.5.dist-info → educommon-3.9.7.dist-info}/METADATA

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

{educommon-3.9.5.dist-info → educommon-3.9.7.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=iat5WOXWSXcZVK76TOwuvzAGxtfUe6fSvziwjGUbGaU,448
+educommon/version.conf,sha256=m_HlJ1eU43zFeo-7ziC0ih-q3zcO04s_WELvd1sWObM,450
 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=QYMhmpIB8zXu_JrXdbFy6Y39zubn2Ao6VYuHKggGIj0,11533
+educommon/async_task/tasks.py,sha256=A6tIuDyqMo9pPEezluyO8_Gs_XerMvWdFmluZ6VjFwI,11537
 educommon/async_task/ui.py,sha256=x7SeQZ_JXCy7gbUtVTcDXqmS-mCWKH_BgJc2gK1i_hw,5446
 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
@@ -323,7 +323,7 @@ educommon/ws_log/__init__.py,sha256=9VzXIVt7xpcgQBW6QWWc8np2PJpJfrkPqi5OmVG_Jo4,
 educommon/ws_log/actions.py,sha256=pnG1m5fkpcQq0fg06KC8cLp-TryxILEOELx8985SpFY,9153
 educommon/ws_log/app_meta.py,sha256=JG1hyk9JQwxL-CY7Z3gDhoZA1M9DtD6Z0jcXCQ9vNt8,94
 educommon/ws_log/base.py,sha256=PhihS8qDJ_y9GITlmJ2lXoHbTBzQmiaLO6ojXrt-nCk,7138
-educommon/ws_log/models.py,sha256=F2y0AWFHjkr6eH4Nkr10IbZ-teHL0Wn2YnhDt7kpJA8,5634
+educommon/ws_log/models.py,sha256=bBknFBRyjJsDMQiLy5h7twJwOVAHbWTf92gSOZxLYyw,5656
 educommon/ws_log/provider.py,sha256=qRFo6zfdtNY-PtH9OpECZ_ioSncQpV6IwzCP_XPaOaw,885
 educommon/ws_log/report.py,sha256=uHotDZbRrDc_nLwn06kcvn9i5QLM_gpVMcWu1qTZdOA,3487
 educommon/ws_log/ui.py,sha256=DlqrBj-hV4bbTaiLWmRvTXA7TQO_vOiYHhE-fEq7Yxk,4038
@@ -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.5.dist-info/METADATA,sha256=yGBjpWatn8OlAitY2xmkTR43diVrbd56gd530HTFOoo,1562
-educommon-3.9.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-educommon-3.9.5.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.9.5.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.9.5.dist-info/RECORD,,
+educommon-3.9.7.dist-info/METADATA,sha256=Na6dokHStlFYA89oTQFQsWs1pBNs7YYjsoQTYGOyuUA,1562
+educommon-3.9.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+educommon-3.9.7.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.9.7.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.9.7.dist-info/RECORD,,