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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. educommon/async_task/tasks.py +6 -6
  2. educommon/version.conf +5 -5
  3. {educommon-3.9.5.dist-info → educommon-3.9.6.dist-info}/METADATA +1 -1
  4. {educommon-3.9.5.dist-info → educommon-3.9.6.dist-info}/RECORD +7 -7
  5. {educommon-3.9.5.dist-info → educommon-3.9.6.dist-info}/WHEEL +0 -0
  6. {educommon-3.9.5.dist-info → educommon-3.9.6.dist-info}/dependency_links.txt +0 -0
  7. {educommon-3.9.5.dist-info → educommon-3.9.6.dist-info}/top_level.txt +0 -0
educommon/async_task/tasks.py CHANGED
@@ -5,6 +5,7 @@ from datetime import (
5
5
  )
6
6
  from typing import (
7
7
  Optional,
8
+ Union,
8
9
  )
9
10
 
10
11
  from celery import (
@@ -210,7 +211,7 @@ class AsyncTask(Task):
210
211
  if self.logging_in_db:
211
212
  update_running_task(task_id, **params)
212
213
 
213
- def after_return(self, status, retval, task_id, args, kwargs, einfo):
214
+ def after_return(self, status: str, retval: Union[dict, Exception], task_id: str, args, kwargs, einfo):
214
215
  """Завершение задачи."""
215
216
  self.debug(f'Task {self.__name__} (id = {task_id}) finished')
216
217
 
@@ -219,12 +220,11 @@ class AsyncTask(Task):
219
220
  self.release_lock(lock_id)
220
221
 
221
222
  if isinstance(retval, dict):
222
- self.update_state(
223
- state=retval.get('task_state', status),
224
- meta=retval,
225
- )
223
+ state = retval.get('task_state', status)
226
224
  else:
227
- self.update_state(state=status)
225
+ state = status
226
+
227
+ self.update_state(state=state, meta=retval)
228
228
 
229
229
  def update_state(self, task_id=None, state=None, meta=None, **kwargs):
230
230
  """Обновление состояния задачи.
educommon/version.conf CHANGED
@@ -4,8 +4,8 @@
4
4
  # нормальной установки обновлений.
5
5
 
6
6
  [version]
7
- BRANCH = tags/3.9.5
8
- VERSION = 3.9.5
9
- REVISION = 23cd0822a5be7df5155bc0f1a9373a0aa4c932bb
10
- VERSION_DATE = 09.04.2024
11
- REVISION_DATE = 09.04.2024
7
+ BRANCH = tags/3.9.6
8
+ VERSION = 3.9.6
9
+ REVISION = 1db60d8567b7d574828c7217b421726deb3ab035
10
+ VERSION_DATE = 12.04.2024
11
+ REVISION_DATE = 12.04.2024
{educommon-3.9.5.dist-info → educommon-3.9.6.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: educommon
3
- Version: 3.9.5
3
+ Version: 3.9.6
4
4
  Summary: Общая кодовая база для проектов БЦ Образование
5
5
  Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
6
6
  Author: BARS Group
{educommon-3.9.5.dist-info → educommon-3.9.6.dist-info}/RECORD RENAMED
@@ -1,6 +1,6 @@
1
1
  educommon/__init__.py,sha256=fvsBDL7g8HgOTd-JHOh7TSvMcnUauvGVgPuyA2Z9hUI,419
2
2
  educommon/thread_data.py,sha256=n0XtdesP9H92O3rJ8K6fVnJLiHqyJEfh2xpuT36wzxs,61
3
- educommon/version.conf,sha256=iat5WOXWSXcZVK76TOwuvzAGxtfUe6fSvziwjGUbGaU,448
3
+ educommon/version.conf,sha256=l7UfRQw8wmcaWx-1EAAFDaIke-pX2sbG3vJcPUn4CEA,448
4
4
  educommon/about/README.rst,sha256=U48UW5jv-8qHyaV56atzzkNMvzHKXVcWSb_NR06PnMo,2685
5
5
  educommon/about/__init__.py,sha256=H1W0IgW-qX9LCZ49GOJzHdmQGHhh-MA6U1xmNx7WnfM,132
6
6
  educommon/about/apps.py,sha256=GrpJAOE2sF0ukWsqugP_WJS88DO4aL-T3kTLprrJrcA,259
@@ -21,7 +21,7 @@ educommon/async_task/exceptions.py,sha256=PaaG2nqP0G2eZ-p0yssca2hhxIccil6MYKH6Zt
21
21
  educommon/async_task/helpers.py,sha256=HihuIHrszhVQAb-Cs6-l4npnlNAgctItGBJ-oIPQX74,2706
22
22
  educommon/async_task/locker.py,sha256=TwVFhuEGsK0JHPXsWuqx7t2Op2mUKETY5EvHSeuKjc8,3844
23
23
  educommon/async_task/models.py,sha256=pICrDFr4Vq6KWpa28NIALP45aLs0lqP7YC2p1IQDFSc,7430
24
- educommon/async_task/tasks.py,sha256=QYMhmpIB8zXu_JrXdbFy6Y39zubn2Ao6VYuHKggGIj0,11533
24
+ educommon/async_task/tasks.py,sha256=A6tIuDyqMo9pPEezluyO8_Gs_XerMvWdFmluZ6VjFwI,11537
25
25
  educommon/async_task/ui.py,sha256=x7SeQZ_JXCy7gbUtVTcDXqmS-mCWKH_BgJc2gK1i_hw,5446
26
26
  educommon/async_task/migrations/0001_initial.py,sha256=W0HfBmhatmQ7Dy4giGeqaZNtLHiEVAvJqx0AvHaxGZ0,3677
27
27
  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
344
344
  educommon/ws_log/templates/report/smev_logs.xlsx,sha256=nnYgB0Z_ix8HoxsRICjsZfFRQBdra-5Gd8nWhCxTjYg,10439
345
345
  educommon/ws_log/templates/ui-js/smev-logs-list-window.js,sha256=AGup3D8GTJSY9WdDPj0zBJeYQBFOmGgcbxPOJbKK-nY,513
346
346
  educommon/ws_log/templates/ui-js/smev-logs-report-setting-window.js,sha256=nQ7QYK9frJcE7g7kIt6INg9TlEEJAPPayBJgRaoTePA,1103
347
- educommon-3.9.5.dist-info/METADATA,sha256=yGBjpWatn8OlAitY2xmkTR43diVrbd56gd530HTFOoo,1562
348
- educommon-3.9.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
349
- educommon-3.9.5.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
350
- educommon-3.9.5.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
351
- educommon-3.9.5.dist-info/RECORD,,
347
+ educommon-3.9.6.dist-info/METADATA,sha256=S0A8Y2rjK_IgCSYD5Gs3bpq3RSLUYzUioswDSuDlANs,1562
348
+ educommon-3.9.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
349
+ educommon-3.9.6.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
350
+ educommon-3.9.6.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
351
+ educommon-3.9.6.dist-info/RECORD,,