educommon 3.11.0__py3-none-any.whl → 3.11.2__py3-none-any.whl

educommon/async_task/migrations/0003_alter_runningtask_options.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.23 on 2025-02-04 13:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('async_task', '0002_task_type_and_status_data'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='runningtask',
+            name='options',
+            field=models.JSONField(blank=True, null=True, verbose_name='Дополнительные опции задачи'),
+        ),
+    ]

educommon/async_task/models.py

@@ -9,9 +9,6 @@ from celery import (
 from django.contrib.contenttypes.models import (
     ContentType,
 )
-from django.contrib.postgres.fields import (
-    JSONField,
-)
 from django.db.models import (
     PROTECT,
     SET_NULL,
@@ -22,6 +19,7 @@ from django.db.models import (
     Index,
     PositiveIntegerField,
     UUIDField,
+    JSONField,
 )
 from m3.db import (
     BaseObjectModel,

educommon/utils/misc.py

@@ -127,12 +127,23 @@ def message_to_sentry(message=None, extra=None, tag=None, level=logging.INFO):
     В параметре tag можно отправить тег для последующего поиска в Sentry
     """
     if getattr(settings, 'SENTRY_DSN', None):
-        from raven.contrib.django.raven_compat.models import (
-            client as sentry_client,
-        )
-        sentry_client.captureMessage(
-            message=message,
-            data={'level': level},
-            extra=extra,
-            tags={'tags': tag} if tag else None
-        )
+        if getattr(settings, 'USE_SENTRY_SDK', None):
+            from sentry_sdk import (
+                capture_message,
+            )
+            capture_message(
+                message=message,
+                level=level,
+                extras=extra,
+                tags={'tags': tag} if tag else None
+            )
+        else:
+            from raven.contrib.django.raven_compat.models import (
+                client as sentry_client,
+            )
+            sentry_client.captureMessage(
+                message=message,
+                data={'level': level},
+                extra=extra,
+                tags={'tags': tag} if tag else None
+            )

educommon/utils/ui.py

@@ -4,6 +4,7 @@ import os
 from datetime import (
     datetime,
     time,
+    date,
 )
 
 from django.conf import (
@@ -243,6 +244,8 @@ class DatetimeFilterCreator:
     Поддерживает значения по умолчанию.
     """
 
+    MIN_VALUE_DATE = date(1917, 1, 1)
+
     def __init__(self, model, field_name,
                  get_from=lambda: None, get_to=lambda: None):
         """Фильтр по интервалу для datetime поля.
@@ -281,7 +284,8 @@ class DatetimeFilterCreator:
                 self.model,
                 model_register=observer,
                 control_creator=lambda: ext.ExtDateField(
-                    value=self.defaults['from']()
+                    value=self.defaults['from'](),
+                    min_value=self.__class__.MIN_VALUE_DATE,
                 ),
                 field_name=self.field_name,
                 lookup=lambda dt: Q(**{
@@ -292,7 +296,8 @@ class DatetimeFilterCreator:
                 self.model,
                 model_register=observer,
                 control_creator=lambda: ext.ExtDateField(
-                    value=self.defaults['to']()
+                    value=self.defaults['to'](),
+                    min_value=self.__class__.MIN_VALUE_DATE,
                 ),
                 field_name=self.field_name,
                 lookup=lambda dt: Q(**{

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.11.0
-VERSION = 3.11.0
-REVISION = f55e33a2f910df4cd73e441a843b681a481919bc
-VERSION_DATE = 25.09.2024
-REVISION_DATE = 25.09.2024
+BRANCH = tags/3.11.2
+VERSION = 3.11.2
+REVISION = 7472df222cb4d77b8e2220554691e392ca729eca
+VERSION_DATE = 21.02.2025
+REVISION_DATE = 21.02.2025

{educommon-3.11.0.dist-info → educommon-3.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: educommon
-Version: 3.11.0
+Version: 3.11.2
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group
@@ -19,8 +19,8 @@ Classifier: Framework :: Django :: 2.2
 Classifier: Framework :: Django :: 3.0
 Classifier: Framework :: Django :: 3.1
 Classifier: Framework :: Django :: 3.2
-Requires-Dist: packaging <24,>=21.3
-Requires-Dist: Django <4,>=2.2
+Requires-Dist: packaging<24,>=21.3
+Requires-Dist: Django<4,>=3.1
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
 Requires-Dist: termcolor
@@ -28,15 +28,20 @@ Requires-Dist: django-sendfile
 Requires-Dist: requests
 Requires-Dist: celery
 Requires-Dist: spyne
-Requires-Dist: xlsxwriter <1,>=0.9.3
-Requires-Dist: m3-builder <2,>=1.2
-Requires-Dist: m3-db-utils >=0.3.13
-Requires-Dist: m3-django-compat <2,>=1.10.2
-Requires-Dist: m3-core <3,>=2.2.16
-Requires-Dist: m3-ui <3,>=2.2.40
-Requires-Dist: m3-objectpack <3,>=2.2.49
-Requires-Dist: m3-simple-report <2,>=1.4.1
-Requires-Dist: m3-spyne-smev <2,>=0.2.4
-Requires-Dist: python-magic ==0.4.15
-Requires-Dist: distro <2,>=1.3.0
-
+Requires-Dist: xlsxwriter<1,>=0.9.3
+Requires-Dist: m3-builder<2,>=1.2
+Requires-Dist: m3-db-utils>=0.3.13
+Requires-Dist: m3-django-compat<2,>=1.10.2
+Requires-Dist: m3-core<3,>=2.2.16
+Requires-Dist: m3-ui<3,>=2.2.40
+Requires-Dist: m3-objectpack<3,>=2.2.49
+Requires-Dist: m3-simple-report<2,>=1.4.1
+Requires-Dist: m3-spyne-smev<2,>=0.2.4
+Requires-Dist: python-magic==0.4.15
+Requires-Dist: distro<2,>=1.3.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary

{educommon-3.11.0.dist-info → educommon-3.11.2.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=wgh9j5tHQoztDcRaVnISzOv7b8mQS40XZNuU8O4qFR8,450
+educommon/version.conf,sha256=XnUcmdS_K284mZ44Xjlb920GvBGdaK8B5ZE4r3GQFqs,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
@@ -20,11 +20,12 @@ educommon/async_task/consts.py,sha256=LulbNKSlS_T8sNjFqMS7DtaotVI0HibD1a0Iz9iDo8
 educommon/async_task/exceptions.py,sha256=PaaG2nqP0G2eZ-p0yssca2hhxIccil6MYKH6ZteezP8,117
 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/models.py,sha256=GdIzccMAJ6vZwGAI1HPukp3ceOgbaQ4dzkHi3HO-Ty4,7383
 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
+educommon/async_task/migrations/0003_alter_runningtask_options.py,sha256=bZz5o5q66rf9Hh4kmHs-WcV05Q2KhQEbLrs4s9bWzjg,480
 educommon/async_task/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 educommon/async_task/templates/ui-js/async-task-list-win.js,sha256=hjVV7S7HcJcpFkeToGAPQh_Icg63QC4jqGAyGOlilK8,749
 educommon/async_task/templates/ui-js/async-task-revoke.js,sha256=xKDi60ZH6X9CDkauYL27Ry6msmmJ1v14Cm1kv0lMkxg,1257
@@ -287,7 +288,7 @@ educommon/utils/caching.py,sha256=ux6ShlJJK3gh0C6XvpanbapXOI5uXUhDNgWQI7AsBBE,40
 educommon/utils/conversion.py,sha256=kEe15TwIH19RmC2mRl1JrrqD8mXgbCAPOYWnkIQXxqQ,1966
 educommon/utils/crypto.py,sha256=3uMk2CP53ZOsJ5Tcb0DLWxmk9ezINZQUsQcqF6j8XR0,2158
 educommon/utils/date.py,sha256=B0-rgaeM1LqjCBsINetjauZaOe0ATAcQUCZJTnLnNzo,16800
-educommon/utils/misc.py,sha256=pDM47_Bu-YNNx6l1kDppI4D0RtsCbKnczlku-OzlB60,4254
+educommon/utils/misc.py,sha256=BUMP9of-H5COcBWai5MJIV4iygKfMFwdI-Ry5IXSxWg,4629
 educommon/utils/object_grid.py,sha256=mUJd0HJmj4PVljmkwxlR3mQO__YnlLBmAZcFWGxTHLc,9048
 educommon/utils/patches.py,sha256=Pio9V3bmDH79tTJnM5hi8rwhMEBtbpAg30zPTk5fuN0,1157
 educommon/utils/plugins.py,sha256=YAD3FM78ihPtyaB_olNM1CoSc5Q5icF_J3A0ivFBFmY,9469
@@ -296,7 +297,7 @@ educommon/utils/seqtools.py,sha256=v621d2X1BO8PQeKIioX4V1BlLTnwIt__GJh9zPF1uI8,5
 educommon/utils/serializer.py,sha256=qdjC6Q6l-bwl9wAzhU6Ujs2_9sc57Z5RA9iNUmzBM74,8787
 educommon/utils/storage.py,sha256=UwKZX1qnZQgbFn34wLpPnSv_xU6KdpW3M1yz_VxCmww,2883
 educommon/utils/system.py,sha256=CBdm4t3ng6luvcQANpJiKrJplFmFeM-lX0rKhuII5Ik,2834
-educommon/utils/ui.py,sha256=zZU6XIi-lV_xkXv_O9fNcvzAs26PpHtcO-3H-mo-KhU,16082
+educommon/utils/ui.py,sha256=TCsP1kk9CNtLFNFG_Ggvt0iS-EpooqWfgAv5ducqA9k,16255
 educommon/utils/db/__init__.py,sha256=np9pL-_tv4C6i0iQzTjc-ZGKhaotJK8YSryoPaJ0QQA,7734
 educommon/utils/db/postgresql.py,sha256=3LOvLqG8QV3hsvo_fupkV26cQmSf0WNBhgpVcfs-lWc,2820
 educommon/utils/fonts/Arial.ttf,sha256=NcDzVZ2NtWnjbDEJW4pg1EFkPZX1kTneQOI_ragZuDM,275572
@@ -349,8 +350,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.11.0.dist-info/METADATA,sha256=B8t2OQ9Hzeu07wf-yJbwyDJKcwUpLAVW-ktXa9tXOz8,1563
-educommon-3.11.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-educommon-3.11.0.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.11.0.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.11.0.dist-info/RECORD,,
+educommon-3.11.2.dist-info/METADATA,sha256=4w-3qIGoPuE7MVbfF_k2dt2PF-fETgnVCBDxg1Hcfvw,1666
+educommon-3.11.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+educommon-3.11.2.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.11.2.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.11.2.dist-info/RECORD,,

{educommon-3.11.0.dist-info → educommon-3.11.2.dist-info}/WHEEL

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