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

educommon/async_task/models.py

@@ -26,14 +26,14 @@ from django.db.models import (
 from m3.db import (
     BaseObjectModel,
 )
-from m3_django_compat.models import (
-    GenericForeignKey,
-)
 
 from m3_db_utils.models import (
     ModelEnumValue,
     TitledModelEnum,
 )
+from m3_django_compat.models import (
+    GenericForeignKey,
+)
 
 from educommon.async_task.consts import (
     TASK_DEFAULT_USER_NAME,

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/auth/rbac/models.py

@@ -25,10 +25,14 @@ from m3 import (
 from m3.db import (
     safe_delete,
 )
+
 from m3_django_compat import (
     ModelOptions,
     atomic,
 )
+from m3_django_compat.exceptions import (
+    FieldDoesNotExist,
+)
 from m3_django_compat.models import (
     GenericForeignKey,
 )

educommon/contingent/contingent_plugin/apps.py

@@ -2,15 +2,24 @@ from importlib import (
     import_module,
 )
 
+from django import (
+    VERSION,
+)
 from django.apps.config import (
     AppConfig,
 )
 
 
+_VERSION = VERSION[:2]
+
+
 class ContingentPluginAppConfig(AppConfig):
 
     name = __package__
 
+    if _VERSION >= (3, 2):
+        default = False
+
     def _register_related_objects_views(self):
         """Добавляет представления для моделей приложения."""
         from educommon.django.db.model_view import (

educommon/django/db/mixins/__init__.py

@@ -1,13 +1,14 @@
 """Классы-примеси для моделей Django."""
-from django.core.exceptions import (
-    FieldDoesNotExist,
-)
 from django.db import (
     models,
 )
+
 from m3_django_compat import (
     atomic,
 )
+from m3_django_compat.exceptions import (
+    FieldDoesNotExist,
+)
 
 
 class DeferredActionsMixin(models.Model):

educommon/django/db/partitioning/README.md

@@ -55,11 +55,22 @@ management-команды
 секционирования для конкретной таблицы можно с помощью команды ``apply_partitioning``:
 
 ```bash
-$ ./manage.py apply_partitioning app_label model_name field_name
+$ ./manage.py apply_partitioning --app_label --model_name --field_name  --is_foreign_table --schema_name
 ```
 
-где ``app_label`` -- лейбл приложения, ``model_name`` -- имя модели, а ``field_label`` -- название поля.
-``field_name`` выступает в качестве ключа секционирования.
+где обязательные параметры
+``app_label`` -- лейбл приложения, ``model_name`` -- имя модели, а ``field_label`` -- название поля.
+``field_name`` выступает в качестве ключа секционирования,
+
+необязательные параметры
+``is_foreign_table`` -- признак того, что в базе есть таблицы, на которые ссылаются из сторонних баз (внешние таблицы)
+``schemas_names`` -- строка со списком схем таблиц, на которые ссылаются из сторонних баз (внешние таблицы) - важно 
+перечислять все необходимые схемы - например, --schemas_names=public,pg_temp
+
+
+Пример
+1) apply_partitioning --app_label=mark --model_name=MarkLog --field_name=timestamp
+2) apply_partitioning --app_label=mark --model_name=MarkLog --field_name=timestamp --is_foreign_table=True --schemas_names=public,pg_temp
 
 Перенос записей из родительской таблицы в ее разделы
 ----------------------------------------------------
@@ -68,8 +79,38 @@ $ ./manage.py apply_partitioning app_label model_name field_name
 секции можно с помощью management-команды ``split_table``:
 
 ```bash
-$ ./manage.py split_table app_label model_name field_name --timeout 5
+$ ./manage.py split_table --app_label --model_name --field_name --timeout=5 --cursor_itersize=1000
+```
+
+Необязательный параметр
+``--timeout`` задает время ожидания между переносом записей из родительской таблицы
+в соответствующую секцию.
+``--cursor_itersize``- задает количесвто удаляемых записей за одну итерацию, по умолчанию 100
+
+Пример
+```bash
+$ ./manage.py split_table  --app_label=mark --model_name=MarkLog --field_name=timestamp
+```
+
+Удаление записей из родительской таблицы по условию до ее партицирования
+----------------------------------------------------
+
+Удаление записей из родительской таблицы по условию
+```bash
+$ ./manage.py clear_table --app_label --model_name --field_name --before_value --timeout --cursor_itersize
 ```
 
+где  обязательные аргументы -``app_label`` -- лейбл приложения, ``model_name`` -- имя модели,
+ ``field_name`` -- название поля, ``before_value`` - значение до которого удаляем все данные
+
+Необязательный параметр
 ``--timeout`` задает время ожидания между переносом каждой записи из родительской таблицы
 в соответствующую секцию.
+``--cursor_itersize``- задает количество удаляемых записей за одну итерацию, по умолчанию 10 000
+
+
+Пример
+
+```bash
+$ ./manage.py clear_table --app_label=mark --model_name=MarkLog --field_name=timestamp --before_value='2022-09-01' --timeout=2 --cursor_itersize=1000
+```

educommon/django/db/partitioning/__init__.py

@@ -41,6 +41,9 @@ from time import (
 from types import (
     MethodType,
 )
+from typing import (
+    Optional,
+)
 
 from django.conf import (
     settings,
@@ -61,6 +64,7 @@ from django.db.utils import (
 from django.utils.functional import (
     cached_property,
 )
+
 from m3_django_compat import (
     ModelOptions,
     commit_unless_managed,
@@ -69,6 +73,11 @@ from m3_django_compat import (
 from educommon.django.db.observer import (
     ModelObserverBase,
 )
+from educommon.django.db.partitioning.const import (
+    CURSOR_ITERSIZE,
+    INSERT_CURSOR_ITERSIZE,
+    PARTITION_TRIGGERS_FUNCTIONS,
+)
 
 
 _MESSAGE_PREFIX = '[Partitioning] '
@@ -114,17 +123,7 @@ def is_initialized(database_alias):
             return False
 
     # Проверка наличия всех функций схемы.
-    function_names = set((
-        'getattr',
-        'get_partition_name',
-        'set_partition_constraint',
-        'table_exists',
-        'is_table_partitioned',
-        'create_partition',
-        'before_insert',
-        'instead_of_insert',
-        'before_update',
-    ))
+    function_names = PARTITION_TRIGGERS_FUNCTIONS
     for function_name in function_names:
         with closing(connections[database_alias].cursor()) as cursor:
             cursor.execute(
@@ -227,7 +226,7 @@ def set_partitioning_for_model(model, column_name, force=False):
         значение будет определять раздел таблицы, в который будет помещена
         запись.
 
-    :raises django.core.exceptions.FieldDoesNotExist: если модель *model* не
+    :raises m3_django_compat.exceptions.FieldDoesNotExist: если модель *model* не
         содержит поля *column_name*
     """
     database_alias, table_name, pk_column_name = _get_model_params(model)
@@ -244,7 +243,7 @@ def set_partitioning_for_model(model, column_name, force=False):
     _execute_sql_file(database_alias, 'triggers.sql', locals())
 
 
-def split_table(model, column_name, timeout=0):
+def split_table(model, column_name: str, timeout: float = 0,  cursor_itersize: Optional[int] = None):
     """Переносит записи из разбиваемой таблицы в ее разделы.
 
     Недостающие разделы будут созданы автоматически.
@@ -257,12 +256,17 @@ def split_table(model, column_name, timeout=0):
         запись.
     :param float timeout: Время ожидания в секундах  между переносом записей
         (можно использовать для снижения нагрузки на СУБД).
+    :param int cursor_itersize: Количество записей, попадающих в итератор курсора бд
+        при запросе разбиения таблиц.
 
-    :raises django.core.exceptions.FieldDoesNotExist: если модель *model* не
+    :raises m3_django_compat.exceptions.FieldDoesNotExist: если модель *model* не
         содержит поля *column_name*
     """
     database_alias, table_name, pk_column_name = _get_model_params(model)
 
+    if not cursor_itersize:
+        cursor_itersize = INSERT_CURSOR_ITERSIZE
+
     # для проверки наличия поля в модели
     ModelOptions(model).get_field(column_name)
 
@@ -294,10 +298,14 @@ def split_table(model, column_name, timeout=0):
     move_cursor = connection.cursor()
 
     results = cursor_iter(
-        ids_cursor, connection.features.empty_fetchmany_value, 1
+        ids_cursor, connection.features.empty_fetchmany_value, 1, cursor_itersize
     )
     for rows in results:
-        pk_column_values = tuple(pkv for (pkv,) in rows)
+        # Если всего одна запись, то используем строку, чтобы не получать ошибку sql-запроса на обновление
+        if len(rows) == 1:
+            pk_column_values = f'{rows[0]}'.replace(',', '')
+        else:
+            pk_column_values = tuple(pkv for (pkv,) in rows)
         # Этот update выполняется для того, чтобы сработала триггерная
         # функция partitioning.before_update.
         move_cursor.execute((
@@ -306,13 +314,11 @@ def split_table(model, column_name, timeout=0):
             'where {pk_column_name} in {pk_column_values}'
         ).format(**locals()))
 
-        commit_unless_managed(database_alias)
-
         if timeout:
             sleep(timeout)
 
 
-def clear_table(model, column_name, column_value, timeout=0):
+def clear_table(model, column_name: str, column_value: str, timeout=0, cursor_itersize: Optional[int] = None):
     """Удаление записей по условию.
 
     С помощью данной команды удаляются записи из основной (не секционированной)
@@ -327,9 +333,14 @@ def clear_table(model, column_name, column_value, timeout=0):
         будут удаляться записи.
     :param float timeout: Время ожидания в секундах  между удалением 100
         записей (можно использовать для снижения нагрузки на СУБД).
+    :param int cursor_itersize: Количество записей, попадающих в итератор курсора бд
+        при запросе удаления таблиц.
     """
     database_alias, table_name, pk_column_name = _get_model_params(model)
 
+    if not cursor_itersize:
+        cursor_itersize = CURSOR_ITERSIZE
+
     connection = connections[database_alias]
 
     if settings.DATABASES[database_alias]['DISABLE_SERVER_SIDE_CURSORS']:
@@ -349,17 +360,19 @@ def clear_table(model, column_name, column_value, timeout=0):
     delete_cursor = connection.cursor()
 
     results = cursor_iter(
-        ids_cursor, connection.features.empty_fetchmany_value, 1
+        ids_cursor, connection.features.empty_fetchmany_value, 1, cursor_itersize,
     )
     for rows in results:
-        pk_column_values = tuple(pkv for (pkv,) in rows)
+        # Если всего одна запись, то используем строку, чтобы не получать ошибку sql-запроса на удаление
+        if len(rows) == 1:
+            pk_column_values = f'{rows[0]}'.replace(',', '')
+        else:
+            pk_column_values = tuple(pkv for (pkv,) in rows)
         delete_cursor.execute((
             'delete from {table_name} '
             'where {pk_column_name} in {pk_column_values}'
         ).format(**locals()))
 
-        commit_unless_managed(database_alias)
-
         if timeout:
             sleep(timeout)
 
@@ -441,6 +454,17 @@ def drop_partitions_before_date(model, date):
                 )
 
 
+def set_partitioned_function_search_path(database_alias: str, schema_names: Optional[str] = None):
+    """"Проставляет параметры поиска для существующих функций партицирования.
+
+    Это необходимо для корректной работы с таблицами к которым обращаются как к внешним через postgres_fdw.
+    """
+    schema_names = schema_names or 'public'
+    _execute_sql_file(database_alias, 'partitioning_set_search_path.sql', dict(
+        schema_names=schema_names,
+    ))
+
+
 class PartitioningObserver(ModelObserverBase):
     """Оптимизирует операции вставки в партиционированные таблицы.
 

educommon/django/db/partitioning/const.py

@@ -0,0 +1,24 @@
+# Количество записей, попадающих в итератор курсора бд при запросе удаления таблиц
+CURSOR_ITERSIZE = 10_000
+# Количество записей, попадающих в итератор курсора бд при запросе разбиения таблиц.
+INSERT_CURSOR_ITERSIZE = 100
+
+
+# Стандартный список функций при инициализации партицирования
+BASE_PARTITION_FUNCTIONS = (
+    'getattr',
+    'get_partition_name',
+    'set_partition_constraint',
+    'table_exists',
+    'is_table_partitioned',
+    'create_partition',
+    'trigger_exists',
+)
+
+# Функции для работы триггеров партицированных таблиц
+PARTITION_TRIGGERS_FUNCTIONS = BASE_PARTITION_FUNCTIONS + (
+    'before_insert',
+    'instead_of_insert',
+    'before_update',
+    'after_insert',
+)

educommon/django/db/partitioning/management/commands/apply_partitioning.py

@@ -1,6 +1,13 @@
+from django.core.exceptions import (
+    FieldDoesNotExist,
+)
+from django.core.management.base import (
+    CommandError,
+)
 from django.db import (
     router,
 )
+
 from m3_django_compat import (
     BaseCommand,
     get_model,
@@ -9,6 +16,9 @@ from m3_django_compat import (
 from educommon.django.db import (
     partitioning,
 )
+from educommon.logger import (
+    info as logger_info,
+)
 
 
 class Command(BaseCommand):
@@ -20,30 +30,66 @@ class Command(BaseCommand):
     `educommon.django.db.partitioning.set_partitioning_for_model`.
 
     """
-    help = 'Applies partitioning to the table.'
+    help = 'Applies partitioning to the table.'  # noqa: A003
 
     def add_arguments(self, parser):
+        """Обработка аргументов команды."""
         parser.add_argument(
-            'app_label',
+            '--app_label',
+            type=str,
             help='App label of an application.',
         )
         parser.add_argument(
-            'model_name',
+            '--model_name',
+            type=str,
             help='Model name.',
         )
         parser.add_argument(
-            'field_name',
+            '--field_name',
+            type=str,
             help='Field name. It will be the partition key.',
         )
+        parser.add_argument(
+            '--is_foreign_table',
+            type=bool,
+            default=False,
+            help='Партицирование для внешних таблиц'
+        )
+        parser.add_argument(
+            '--schemas_names',
+            type=str,
+            default=None,
+            help='Cхемы внешних таблиц при партицировании.'
+        )
 
     def handle(self, *args, **options):
+        """Выполнение команды."""
         app_label = options['app_label']
         model_name = options['model_name']
         field_name = options['field_name']
-        Model = get_model(app_label, model_name)
-        db_alias = router.db_for_write(Model)
+        is_foreign_table = options['is_foreign_table']
+        schemas_names = options['schemas_names']
+
+        logger_info('Apply partitioning started\n')
+        try:
+            django_db_model = get_model(app_label, model_name)
+        except LookupError as e:
+            raise CommandError(e.message)
+
+        try:
+            django_db_model._meta.get_field(field_name)
+        except FieldDoesNotExist:
+            raise CommandError('Invalid field name ({0})'.format(field_name))
+
+        db_alias = router.db_for_write(django_db_model)
 
         if not partitioning.is_initialized(db_alias):
             partitioning.init(db_alias)
 
-        partitioning.set_partitioning_for_model(Model, field_name, force=True)
+        # Дополнительно пробросим схемы для работ с внешними таблицами
+        if is_foreign_table:
+            partitioning.set_partitioned_function_search_path(db_alias, schemas_names)
+
+        partitioning.set_partitioning_for_model(django_db_model, field_name, force=True)
+
+        logger_info('Apply partitioning ended\n')

educommon/django/db/partitioning/management/commands/clear_table.py

@@ -9,6 +9,9 @@ from m3_django_compat import (
     BaseCommand,
     get_model,
 )
+from m3_django_compat.exceptions import (
+    FieldDoesNotExist,
+)
 
 from educommon.django.db import (
     partitioning,
@@ -30,19 +33,23 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         parser.add_argument(
-            'app_label',
+            '--app_label',
+            type=str,
             help='App label of an application.',
         )
         parser.add_argument(
-            'model_name',
+            '--model_name',
+            type=str,
             help='Model name.',
         )
         parser.add_argument(
-            'field_name',
+            '--field_name',
+            type=str,
             help='Field name. It will be a check column.',
         )
         parser.add_argument(
-            'before_value',
+            '--before_value',
+            type=str,
             help='Deleting rows before this value.',
         )
         parser.add_argument(
@@ -51,6 +58,12 @@ class Command(BaseCommand):
             help=('Timeout (in seconds) between the data removes iterations. '
                   'It used to reduce the database load.')
         )
+        parser.add_argument(
+            '--cursor_itersize', action='store', dest='cursor_itersize',
+            type=int,
+            default=None,
+            help='Количество строк загруженных за раз при загрузке строк при работе команды.'
+        )
 
     def handle(self, *args, **options):
         app_label = options['app_label']
@@ -58,6 +71,7 @@ class Command(BaseCommand):
         field_name = options['field_name']
         before_value = options['before_value']
         timeout = options['timeout']
+        cursor_itersize = options['cursor_itersize']
 
         try:
             model = get_model(app_label, model_name)
@@ -69,4 +83,4 @@ class Command(BaseCommand):
         except FieldDoesNotExist:
             raise CommandError('Invalid field name ({0})'.format(field_name))
 
-        partitioning.clear_table(model, field_name, before_value, timeout)
+        partitioning.clear_table(model, field_name, before_value, timeout, cursor_itersize)

educommon/django/db/partitioning/management/commands/split_table.py

@@ -9,10 +9,16 @@ from m3_django_compat import (
     BaseCommand,
     get_model,
 )
+from m3_django_compat.exceptions import (
+    FieldDoesNotExist,
+)
 
 from educommon.django.db import (
     partitioning,
 )
+from educommon.logger import (
+    info as logger_info,
+)
 
 
 class Command(BaseCommand):
@@ -30,15 +36,18 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         parser.add_argument(
-            'app_label',
+            '--app_label',
+            type=str,
             help='App label of an application.',
         )
         parser.add_argument(
-            'model_name',
+            '--model_name',
+            type=str,
             help='Model name.',
         )
         parser.add_argument(
-            'field_name',
+            '--field_name',
+            type=str,
             help='Field name. It will be the partition key.',
         )
         parser.add_argument(
@@ -47,12 +56,19 @@ class Command(BaseCommand):
             help=('Timeout (in seconds) between the data transfer iterations. '
                   'It used to reduce the database load.')
         )
+        parser.add_argument(
+            '--cursor_itersize', action='store', dest='cursor_itersize',
+            type=int,
+            default=None,
+            help='Количество строк загруженных за раз при загрузке строк при работе команды.'
+        )
 
     def handle(self, *args, **options):
         app_label = options['app_label']
         model_name = options['model_name']
         field_name = options['field_name']
         timeout = options['timeout']
+        cursor_itersize = options['cursor_itersize']
 
         try:
             model = get_model(app_label, model_name)
@@ -64,4 +80,8 @@ class Command(BaseCommand):
         except FieldDoesNotExist:
             raise CommandError('Invalid field name ({0})'.format(field_name))
 
-        partitioning.split_table(model, field_name, timeout)
+        logger_info('Split table started\n')
+
+        partitioning.split_table(model, field_name, timeout, cursor_itersize)
+
+        logger_info('Split table ended\n')

educommon/django/db/partitioning/partitioning.sql

@@ -134,6 +134,23 @@ create or replace function partitioning.table_exists(
 $BODY$ language plpgsql immutable;
 
 
+create or replace function partitioning.trigger_exists(
+    table_name text, trigger_name text
+) returns boolean as $BODY$
+    ---------------------------------------------------------------------------
+    -- Проверяет, существует ли в таблице table_name триггер с именем trigger_name.
+    ---------------------------------------------------------------------------
+    begin
+        return exists(
+            select 1
+            from pg_catalog.pg_trigger
+            where tgrelid = table_name::regclass::oid and
+            tgname = trigger_name
+        );
+    end;
+$BODY$ language plpgsql immutable;
+
+
 create or replace function partitioning.is_table_partitioned(
     table_name text
 ) returns boolean as $BODY$
@@ -197,6 +214,7 @@ create or replace function partitioning.create_partition(
         partition_name text;
         tablespace_name name;
         tablespace_sql text;
+        trigger_name text;
     begin
         -- имя создаваемой таблицы
         partition_name := partitioning.get_partition_name(
@@ -235,14 +253,18 @@ create or replace function partitioning.create_partition(
 
         -- создание триггера для раздела обрабатывающего изменения, которые
         -- требуют переноса записи из одного раздела таблицы в другой
-        execute
-            'create trigger partitioning__' || partition_name || '__update '
+        -- перед созданием проверяем, что такого триггера нет для партиции
+        trigger_name = 'partitioning__' || partition_name || '__update';
+        if not partitioning.trigger_exists(partition_name, trigger_name) then
+            execute
+                'create trigger ' || trigger_name || ' '
                 'before update on ' ||
                     schema_name || '.' || partition_name || ' ' ||
                 'for each row ' ||
                 'execute procedure partitioning.before_update(' ||
                     '''' || pk_column_name || ''', ''' || column_name || ''''
                 ')';
+        end if;
     end;
 $BODY$ language plpgsql;
 

educommon/django/db/partitioning/partitioning_set_search_path.sql

@@ -0,0 +1,11 @@
+begin;
+
+alter function partitioning.before_insert() set search_path = '{schema_names}';
+
+alter function partitioning.after_insert() set search_path = '{schema_names}';
+
+alter function partitioning.instead_of_insert() set search_path = '{schema_names}';
+
+alter function partitioning.before_update() set search_path = '{schema_names}';
+
+commit;

educommon/m3/extensions/listeners/delete_check/mixins.py

@@ -152,7 +152,10 @@ class CascadeDeleteMixin:
 
     @staticmethod
     def skip_field(field):
-        return field in getattr(field.model, 'cascade_delete_for', ())
+        cascade_delete_for = getattr(field.model, 'cascade_delete_for', ())
+        if isinstance(cascade_delete_for, dict):
+            cascade_delete_for = tuple(cascade_delete_for.keys())
+        return field in cascade_delete_for
 
     @atomic
     def safe_delete(self):

educommon/m3/extensions/listeners/delete_check/utils.py

@@ -2,6 +2,7 @@ from django.db.models import (
     SET_DEFAULT,
     SET_NULL,
 )
+
 from m3.db import (
     safe_delete,
 )
@@ -53,7 +54,11 @@ def get_custom_on_delete_function(field):
         not isinstance(field.model.cascade_delete_for, dict)
     ):
         return None
-    on_delete_params = field.model.cascade_delete_for[field]
+
+    on_delete_params = {}
+    for _field, _field_params in field.model.cascade_delete_for.items():
+        if _field == field:
+            on_delete_params = _field_params
     return on_delete_params.get('on_delete')
 
 

educommon/report/constructor/base.py

@@ -1,6 +1,5 @@
 # pylint: disable=protected-access
 from django.core.exceptions import (
-    FieldDoesNotExist,
     ValidationError,
 )
 from django.db import (
@@ -24,6 +23,9 @@ from m3_django_compat import (
     ModelOptions,
     get_related,
 )
+from m3_django_compat.exceptions import (
+    FieldDoesNotExist,
+)
 
 from educommon.django.db.utils import (
     LazyModel,

educommon/report/constructor/editor/actions.py

@@ -10,9 +10,6 @@ from itertools import (
 from django.contrib.contenttypes.models import (
     ContentType,
 )
-from django.core.exceptions import (
-    FieldDoesNotExist,
-)
 from django.db.transaction import (
     atomic,
 )
@@ -27,6 +24,9 @@ from m3_ext.ui.results import (
     ExtUIScriptResult,
 )
 
+from m3_django_compat.exceptions import (
+    FieldDoesNotExist,
+)
 from objectpack.actions import (
     BaseAction,
     ObjectPack,

educommon/report/constructor/utils.py

@@ -5,9 +5,6 @@ from inspect import (
     isclass,
 )
 
-from django.core.exceptions import (
-    FieldDoesNotExist,
-)
 from django.db.models.fields import (
     BooleanField,
     CharField,
@@ -26,9 +23,13 @@ from django.db.models.fields.related import (
 from django.db.models.fields.reverse_related import (
     ForeignObjectRel,
 )
+
 from m3_django_compat import (
     get_related,
 )
+from m3_django_compat.exceptions import (
+    FieldDoesNotExist,
+)
 
 from educommon.report.constructor.constants import (
     CT_BOOLEAN,

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.9.4^0
-VERSION = 3.9.4
-REVISION = b525751553abee2f4deac7b1783499fb00ef29f5
-VERSION_DATE = 03.04.2024
-REVISION_DATE = 03.04.2024
+BRANCH = tags/3.9.6
+VERSION = 3.9.6
+REVISION = 1db60d8567b7d574828c7217b421726deb3ab035
+VERSION_DATE = 12.04.2024
+REVISION_DATE = 12.04.2024

{educommon-3.9.4.dist-info → educommon-3.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educommon
-Version: 3.9.4
+Version: 3.9.6
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group
@@ -17,8 +17,10 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 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 <3.2,>=2.2
+Requires-Dist: Django <4,>=2.2
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
 Requires-Dist: termcolor
@@ -28,7 +30,7 @@ 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.11
+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

{educommon-3.9.4.dist-info → educommon-3.9.6.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=45BReSu8CR7Bw853URhL6tptlqRIL7Bo_BbW3NJj4VY,450
+educommon/version.conf,sha256=l7UfRQw8wmcaWx-1EAAFDaIke-pX2sbG3vJcPUn4CEA,448
 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,8 +20,8 @@ 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=5c7eYSvr8dLI0DEbDblSjVb9W5UlWA32rwvL2MNig-A,7430
-educommon/async_task/tasks.py,sha256=QYMhmpIB8zXu_JrXdbFy6Y39zubn2Ao6VYuHKggGIj0,11533
+educommon/async_task/models.py,sha256=pICrDFr4Vq6KWpa28NIALP45aLs0lqP7YC2p1IQDFSc,7430
+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
@@ -79,7 +79,7 @@ educommon/auth/rbac/checker.py,sha256=8A583rwsXDeb4dCegN5mufMFhyDwvd72zfug90usvF
 educommon/auth/rbac/config.py,sha256=mRpOzD29ZHc0zX-CxhUyyICj3h0xj9gUM6N1OoLEWm0,1074
 educommon/auth/rbac/constants.py,sha256=Hm4kuG7HZ9krTwF6HIj3eMe8v98ui3EMueToBTeOh4A,502
 educommon/auth/rbac/manager.py,sha256=3WecXF0SU-uBGMxAWnsVLGmVI9QmHS7zDQ9wVgu6mZE,16250
-educommon/auth/rbac/models.py,sha256=NwRoHkK8z_yK3TIlt2ws0sE_kzIM9Yo0p0q8u5o95mo,15146
+educommon/auth/rbac/models.py,sha256=fnLEYsr22ylGdefhT8bZz3mO8MZv8yAM5k6K8GXZYLQ,15214
 educommon/auth/rbac/permissions.py,sha256=rvAYUhWiB4xln39BgxRaXs7T5IzHAg0ZAtKgU__uPk8,865
 educommon/auth/rbac/ui.py,sha256=RK3YpoKyxKoJyK_qaBzV6HpwffA_S99ZzQbNKS134Ng,15735
 educommon/auth/rbac/utils.py,sha256=L9F5yXfDhkrgVHjgqsO7r5gYrfbM32OVAMiH_bMU4hQ,7819
@@ -122,7 +122,7 @@ educommon/contingent/base.py,sha256=jo-8ViLDsb7-AgIVDbkfw6DMvYG-AfMFtO4WGsROCr8,
 educommon/contingent/catalogs.py,sha256=OafO1jDi7q7wm_7cnu8k-xiUc6mwKhXE36HklJX2Sb4,61449
 educommon/contingent/contingent_plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 educommon/contingent/contingent_plugin/actions.py,sha256=SXjFCDGyFHrOZNcroEouRLZB7NqFSs7M_1Gw89bfe48,717
-educommon/contingent/contingent_plugin/apps.py,sha256=ctT2ZbSh_7t0MT9apHAynxw22JHQ2YSrSnAJzXx4giM,697
+educommon/contingent/contingent_plugin/apps.py,sha256=2RustoCdwosXEIXpXlgK1UVfFvx729K_lP6F6l8xCr8,810
 educommon/contingent/contingent_plugin/model_views.py,sha256=Xk-Xck9GsiB2AGdW750fsGtT2p1hybZmGI5hE2JhIwM,769
 educommon/contingent/contingent_plugin/models.py,sha256=Du9Ks2irXNLDmH0yE5fmID--eMyWufHYJihOdvEbceA,2506
 educommon/contingent/contingent_plugin/observer.py,sha256=JywNusbhDhTHe1sbWS_joSvK2sB_-b3yYFdEY4ZYX08,5181
@@ -145,20 +145,22 @@ educommon/django/db/signals.py,sha256=pbBr31q3hK6aBW6FZXYmATxKp8KrCuqmrNdDZNnpw3
 educommon/django/db/utils.py,sha256=S9rZhfLn4GYWXiVOPSsEGl382NzUFeOxh-G7OtB43vE,9206
 educommon/django/db/migration/__init__.py,sha256=FwICNxrFGFwzy5klIKzYIhVpsunLipS4W8ysS8C0z5k,1882
 educommon/django/db/migration/operations.py,sha256=R_SCK8R1IF6x5qjJPoTnGjiAedqnBT-OpaEjyyJaxVM,9527
-educommon/django/db/mixins/__init__.py,sha256=Ogjjua1VNYQNlKQJjevrby7qgwlvC9noQ5v3TJ6eViA,14740
+educommon/django/db/mixins/__init__.py,sha256=SnFhMU701HuRcmS8QuIx4SS3B4vRdVsfwK7SgrqDD0U,14746
 educommon/django/db/mixins/date_interval.py,sha256=9Ro7KxqSf-dskU9MjAra3aS2a09_11cv1Tol7JWQw3g,24715
 educommon/django/db/mixins/validation.py,sha256=u3SDRSDvEkOjEMgfgCIFtnTUk4LRPdru0swzTGDSqIY,12173
 educommon/django/db/model_view/__init__.py,sha256=x0rHvR0q6RSDtuMWDGASrtCIYsytfNh-jHcsra0BTZY,12363
 educommon/django/db/model_view/table-view.html,sha256=EEz_tSJagl-mT-_bJaELshAEnFnuhPerpWegb3XeGO8,631
-educommon/django/db/partitioning/README.md,sha256=w4_eFovGlBYAMt-zN7ENv7zHpJyK7L1Jlmbdqt0OiXY,4455
-educommon/django/db/partitioning/__init__.py,sha256=PqHa7IymPftrIXtDo4iWKBVw1PAIizl0iI2-dONFwQM,22376
-educommon/django/db/partitioning/partitioning.sql,sha256=PKKYKgn9MXQtt1vg498XdWD0vGYkzxc_sPKIWmpaSrk,20345
+educommon/django/db/partitioning/README.md,sha256=OgmFZwK_wD1EFKRprnFkeF0Rt7igcEuBncsOF9CsBjI,6927
+educommon/django/db/partitioning/__init__.py,sha256=SGUfTkw3iWcWXjOk7tcXc7RiYpeACssc5O8AMie0CbI,24083
+educommon/django/db/partitioning/const.py,sha256=52Ue7NylmDUMfV0kbk5fqCaE045IhMIh5ZX9juedYbY,927
+educommon/django/db/partitioning/partitioning.sql,sha256=UfPrtxy82tIr3XjXg_qTg-rUS0KqUyBexp3TBPdU0gk,21304
+educommon/django/db/partitioning/partitioning_set_search_path.sql,sha256=oGlljp2A6xd3FctJAqPAO7RCBSar7C_nsXEu8Ssi0WM,342
 educommon/django/db/partitioning/triggers.sql,sha256=OEwQqMwzRB79LcFM0-cWH8x_UdLKw-iZTSPILTGJ1Uk,3401
 educommon/django/db/partitioning/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 educommon/django/db/partitioning/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-educommon/django/db/partitioning/management/commands/apply_partitioning.py,sha256=oAsPDLD1YAQ0zU2zGPNlwDaNGCrnVBNC86U1I5xcuoM,1612
-educommon/django/db/partitioning/management/commands/clear_table.py,sha256=c3sWVCsxOcrIhPqck1om5_Od7IKe8SjMVwRNa0cPMaE,2235
-educommon/django/db/partitioning/management/commands/split_table.py,sha256=UOFbOWNTvjJLIRzByCv_VpGCsTct-oGONsyYXJgCSpo,2082
+educommon/django/db/partitioning/management/commands/apply_partitioning.py,sha256=iDpw7Fl_PvuQK0R6yfcwKM8s6ctRi7eLMaW-qEaJLNM,3174
+educommon/django/db/partitioning/management/commands/clear_table.py,sha256=dohXtylU31ZxOJ1XPOrDcYi9DCA1fU13HWGJ_LgHqW4,2785
+educommon/django/db/partitioning/management/commands/split_table.py,sha256=gZwTsewKmToaeHh1MpDjttKUrCGYAxAKEy63e7EyPfA,2756
 educommon/django/db/validators/__init__.py,sha256=Hyx-L4suVzUuCEb-HQB9g8LnaxKQp2ymv-DtaOW6qbw,1986
 educommon/django/db/validators/simple.py,sha256=cwG-OLVPdD146A9dzLOaGyzZOoUWgQoFu9KDQ7_k8xI,38886
 educommon/django/storages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -214,11 +216,11 @@ educommon/m3/extensions/listeners/__init__.py,sha256=ax097TgSn7rWH8L3DSiVCc1MOKn
 educommon/m3/extensions/listeners/delete_check/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 educommon/m3/extensions/listeners/delete_check/cancel-confirm-window.js,sha256=Xh0Rzk9ua9NtR9TR0x7oPn0Q96IKqBQF0XkkFzTOUVI,916
 educommon/m3/extensions/listeners/delete_check/listeners.py,sha256=r_PhNLlt16Tcikl4lOmhG-E7Hl7KL596ZQL3cEr3f8w,6131
-educommon/m3/extensions/listeners/delete_check/mixins.py,sha256=DmmTepSHbPBZ49_hdueqHtD2oHjkR_JldlmozdfpDhQ,7660
+educommon/m3/extensions/listeners/delete_check/mixins.py,sha256=kelvluswqu8u2h5QyVs_VEfwatkVWrSVbRlv4skScmw,7823
 educommon/m3/extensions/listeners/delete_check/related-objects-window.html,sha256=Do_SnmWfexnhDzgvr7o7JJubH4N8pvPNa268cd-JIcA,94
 educommon/m3/extensions/listeners/delete_check/signals.py,sha256=QnfevsAKpKtOE_EBc7h1qg4hTV4LxXYL5ivvpHyc704,467
 educommon/m3/extensions/listeners/delete_check/ui.py,sha256=W3sBsZGbF3q0rxuMUEmycBvFngUh--UQ-77xdjgvDP0,3507
-educommon/m3/extensions/listeners/delete_check/utils.py,sha256=m4vlKh7zhLbIRV2A8KDS54n1u_t1cL70p6o5E3VwQyQ,2979
+educommon/m3/extensions/listeners/delete_check/utils.py,sha256=87OmVAzx2lX_7M12Tsgr6cZocrnvuwnDMpIrx23Xmzw,3092
 educommon/objectpack/__init__.py,sha256=TwmrbrumJoH9KjYhbLnKExWmo4A0UQeyNYTK__93Vr8,69
 educommon/objectpack/actions.py,sha256=KanZUKMl4aUSRPZV-SJB3JwjDTYzuGweI9L5cE1KziI,14735
 educommon/objectpack/apps.py,sha256=LZl_kQ9s7G9pQ4a5_mWNPN52mFWJ7RGvGIHCHwhKYPo,220
@@ -238,7 +240,7 @@ educommon/report/constructor/README.rst,sha256=M6bnt3eAdRMUSIbRXdbuleron11RajRmT
 educommon/report/constructor/__init__.py,sha256=sMDEr17Etf69p4NKRelFv9ySrNT6JulFO1IByVfZA1w,1252
 educommon/report/constructor/app_meta.py,sha256=4hFKVlGCO4Mlu46fCw5k7iD9kSse8b9MQt3tRV5WyfE,200
 educommon/report/constructor/apps.py,sha256=NUp1dCkzHduZFXT6XPDQPasAei3Bs3TYdEQzXhqn1J8,371
-educommon/report/constructor/base.py,sha256=QUwT-hksW-ho0t-fEXslJ6cpTVRrjLFAU6guCDcqc7Y,27289
+educommon/report/constructor/base.py,sha256=ABSNm1QrUyN4E6RybN7NM72D5W_4U6bz4vvxyTkIsNA,27333
 educommon/report/constructor/config.py,sha256=6PjPv4A3zww_DnZqE-aj72zduW7cZqbzVwuCP8JDsYg,1058
 educommon/report/constructor/constants.py,sha256=VF3tu6vEWrN37oPyipD3LGCElbaY2JHGaKy7AxUbQIU,3381
 educommon/report/constructor/exceptions.py,sha256=NL2mQggBHbkHaQFKpr9mTj7R5IVtxtCRKzJ00dgfTqM,1287
@@ -246,7 +248,7 @@ educommon/report/constructor/mixins.py,sha256=4Oh3JB3VRr8Es6yLS3W1sXVPrV61SVPm-v
 educommon/report/constructor/models.py,sha256=g-fbs_kM16GBh_5MY0NenXc8cVwihDLVXz3uS_JN1Mg,18764
 educommon/report/constructor/plugin_meta.py,sha256=52IdIKr7ArMiHOnyZlKV5Fn6PxMhSbttipXz_Vbfkmg,114
 educommon/report/constructor/registries.py,sha256=aTFeW0htAeDYWd9HlLqn3GTK3mttjS8I8LddPc6Ea7M,1883
-educommon/report/constructor/utils.py,sha256=KR2wDuvxOZXqHeq1IklpNXyLRrLSJEv5jsd3w2fKIqA,6557
+educommon/report/constructor/utils.py,sha256=lXfKGlqPhmlnSLg4O0FTxRd3kLQtx3WlLQ7z84lbres,6563
 educommon/report/constructor/validators.py,sha256=E_VKNz0Z3YqJOJTjd7OdZXFMDnW8UUiVUIH9Jk6Irtw,524
 educommon/report/constructor/builders/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 educommon/report/constructor/builders/excel/__init__.py,sha256=ZjiilnR4FRJm0DM06G3yKHBEDAPXs5JvuPO3JOg2FB8,104
@@ -256,7 +258,7 @@ educommon/report/constructor/builders/excel/constants.py,sha256=SM5OEkd7CMrGhuCp
 educommon/report/constructor/builders/excel/product.py,sha256=NsfjhUViZyi_XpDjiUJDwfgHVRlE98v40RMAa6mpAzk,6229
 educommon/report/constructor/builders/excel/with_merged_cells.py,sha256=mOlzkfqkbjTc3u9VsUyoNUAgH3AKc351E4Jz-5J6OTs,5150
 educommon/report/constructor/editor/__init__.py,sha256=WS6vGDp9CjGE-e_-AgywqN-W67tv5F_WcPgebLHwKbg,41
-educommon/report/constructor/editor/actions.py,sha256=_9ZKrUPxQTN1lfJaPRIuYpYLC39t3Yuq273TrUAAST4,38810
+educommon/report/constructor/editor/actions.py,sha256=EHJKR3AxwAPcK02YmL2U8ti-brstJK0ZzqulhoJ6oyk,38815
 educommon/report/constructor/editor/edit-window.js,sha256=AcbwuumR3k6Nzh8PNz8Rz35hREjl0cyenPI_3BcLq6o,39225
 educommon/report/constructor/editor/list-window.js,sha256=S2KQGqg5GnFMMYmPNEm_Yf9nXTbfwvIfs4E3LgWO9-0,3247
 educommon/report/constructor/editor/ui.py,sha256=sZjfiiQa2LIcfoyczPlMz3ImzO7TSNNAaV2We5hywIc,24628
@@ -342,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.4.dist-info/METADATA,sha256=2hmH1DlhM909yL-K__dPJVJVZr_yCDrhO9HBNGZsXu8,1486
-educommon-3.9.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-educommon-3.9.4.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.9.4.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.9.4.dist-info/RECORD,,
+educommon-3.9.6.dist-info/METADATA,sha256=S0A8Y2rjK_IgCSYD5Gs3bpq3RSLUYzUioswDSuDlANs,1562
+educommon-3.9.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+educommon-3.9.6.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.9.6.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.9.6.dist-info/RECORD,,