educommon 3.13.0__py3-none-any.whl → 3.13.2__py3-none-any.whl

educommon/auth/rbac/utils.py

@@ -1,4 +1,5 @@
 """Вспомогательные средства для работы с подсистемой RBAC."""
+
 import operator
 from inspect import (
     getfullargspec,
@@ -16,6 +17,7 @@ from educommon.m3 import (
 
 def _resolve_packs_or_actions(packs_or_actions):
     """Возвращает список из паков и экшенов, заданных классами и строками."""
+
     def resolve(pack_or_action):
         if isinstance(pack_or_action, tuple):
             pack, action = pack_or_action
@@ -25,24 +27,18 @@ def _resolve_packs_or_actions(packs_or_actions):
             result = get_pack(pack_or_action)
         return result
 
-    result = [
-        resolve(pack_or_action)
-        for pack_or_action in packs_or_actions
-    ]
+    result = [resolve(pack_or_action) for pack_or_action in packs_or_actions]
 
     return result
 
 
 def _rule_filter(rule_handler, packs_or_actions, operator_):
     """Возвращает обработчик правила, "обернутый" в фильтрующую функцию."""
+
     def action_in_list(action):
         for pack_or_action in _resolve_packs_or_actions(packs_or_actions):
-            if (
-                isinstance(pack_or_action, Action) and
-                action.__class__ is pack_or_action.__class__
-            ) or (
-                isinstance(pack_or_action, ActionPack) and
-                action.parent is pack_or_action
+            if (isinstance(pack_or_action, Action) and action.__class__ is pack_or_action.__class__) or (
+                isinstance(pack_or_action, ActionPack) and action.parent is pack_or_action
             ):
                 return True
 
@@ -97,6 +93,7 @@ def invert_rule(rule_handler):
 
     :rtype: callable
     """
+
     def wrapper(action, request, user, *args, **kwargs):
         return not rule_handler(action, request, user, *args, **kwargs)
 
@@ -118,6 +115,7 @@ def any_rules(*rule_handlers):
 
     :rtype: callable
     """
+
     def wrapper(action, request, user, *args, **kwargs):
         for rule_handler in rule_handlers:
             if rule_handler(action, request, user, *args, **kwargs):
@@ -145,6 +143,7 @@ def all_rules(*rule_handlers):
 
     :rtype: callable
     """
+
     def wrapper(action, request, user, *args, **kwargs):
         for rule_handler in rule_handlers:
             if not rule_handler(action, request, user, *args, **kwargs):
@@ -176,7 +175,7 @@ def get_rbac_rule_data(request, action):
     :type action: m3.actions.Action
     """
     if not hasattr(request, '_rbac_rule_data'):
-        if (hasattr(action, 'get_rbac_rule_data')):
+        if hasattr(action, 'get_rbac_rule_data'):
             method = action.get_rbac_rule_data
         else:
             method = action.parent.get_rbac_rule_data

educommon/auth/rbac/validators.py

@@ -12,10 +12,9 @@ from educommon.django.db.validators.simple import (
 )
 
 
-package_name_validator = RegexValidator(re.compile(
-    r'(^[_a-z][_a-z0-9]*$)|(^[_a-z][._a-z0-9]*[_a-z0-9]{1}$)', re.IGNORECASE
-))
+package_name_validator = RegexValidator(
+    re.compile(r'(^[_a-z][_a-z0-9]*$)|(^[_a-z][._a-z0-9]*[_a-z0-9]{1}$)', re.IGNORECASE)
+)
 """Валидатор имени пакета."""
 
-is_package_name_valid = partial(validate_value,
-                                validator=package_name_validator)
+is_package_name_valid = partial(validate_value, validator=package_name_validator)

educommon/auth/simple_auth/__init__.py

@@ -5,8 +5,4 @@ from educommon.auth.simple_auth import (
 
 # Например, settings.LOGIN_URL = simple_auth.get_login_url()
 def get_login_url():
-    return ''.join((
-        const.AUTH_CONTROLLER_URL,
-        const.AUTH_PACK_URL,
-        const.LOGIN_PAGE_URL
-    ))
+    return ''.join((const.AUTH_CONTROLLER_URL, const.AUTH_PACK_URL, const.LOGIN_PAGE_URL))

educommon/auth/simple_auth/actions.py

@@ -73,7 +73,8 @@ class AuthPack(BasePack):
     login_checker = checkers.DefaultLoginChecker()
 
     def __init__(self):
-        super(AuthPack, self).__init__()
+        super().__init__()
+
         self.login_page_action = LoginPageAction()
         self.login_action = LoginAction()
 
@@ -86,43 +87,55 @@ class AuthPack(BasePack):
         self.change_password_page_action = ChangeResetPasswordPageAction()
         self.change_password_action = ChangeResetPasswordAction()
 
-        self.actions.extend((
-            self.login_page_action,
-            self.logout_confirm_action,
-            self.login_action,
-            self.logout_action,
-            self.reset_password_page_action,
-            self.reset_password_action,
-            self.change_password_page_action,
-            self.change_password_action
-        ))
+        self.actions.extend(
+            (
+                self.login_page_action,
+                self.logout_confirm_action,
+                self.login_action,
+                self.logout_action,
+                self.reset_password_page_action,
+                self.reset_password_action,
+                self.change_password_page_action,
+                self.change_password_action,
+            )
+        )
 
     def declare_context(self, action):
-        ctx = super(AuthPack, self).declare_context(action)
+        """Определяет контекст для экшена входа."""
+        ctx = super().declare_context(action)
+
         if action is self.login_action:
             ctx['login'] = dict(type='str', default='')
             ctx['password'] = dict(type='str', default='')
+
         return ctx
 
     def get_login_url(self):
+        """Возвращает URL экшена входа."""
         return self.login_action.get_absolute_url()
 
     def get_logout_url(self):
+        """Возвращает URL экшена выхода."""
         return self.logout_action.get_absolute_url()
 
     def get_login_page_url(self):
+        """Возвращает URL страницы входа."""
         return self.login_page_action.get_absolute_url()
 
     def get_reset_password_page_url(self):
+        """Возвращает URL страницы восстановления пароля."""
         return self.reset_password_page_action.get_absolute_url()
 
     def get_reset_password_url(self):
+        """Возвращает URL экшена восстановления пароля."""
         return self.reset_password_action.get_absolute_url()
 
     def get_change_password_page_url(self):
+        """Возвращает URL страницы изменения пароля."""
         return self.change_password_page_action.get_absolute_url()
 
     def get_change_password_url(self):
+        """Возвращает URL экшена изменения пароля."""
         return self.change_password_action.get_absolute_url()
 
 
@@ -133,26 +146,21 @@ class LoginPageAction(BaseAction):
     template_file_name = 'simple_auth/login_page.html'
 
     def _get_login_panel(self, request, context):
+        """Возвращает компонент панели логина."""
         get_login_panel = ioc.get('simple_auth__get_login_panel')
 
-        return self.handle(
-            'get_login_panel',
-            get_login_panel(request, context)
-        )
+        return self.handle('get_login_panel', get_login_panel(request, context))
 
     def get_template_context(self, request, context):
+        """Формирует контекст шаблона страницы входа."""
         return dict(
             login_url=self.parent.get_login_url(),
             login_panel=self._get_login_panel(request, context),
-            reset_password_page_url=self.parent.get_reset_password_page_url()
+            reset_password_page_url=self.parent.get_reset_password_page_url(),
         )
 
     def run(self, request, context):
-        return render(
-            request,
-            self.template_file_name,
-            self.get_template_context(request, context)
-        )
+        return render(request, self.template_file_name, self.get_template_context(request, context))
 
 
 class LoginAction(BaseAction):
@@ -169,19 +177,23 @@ class LoginAction(BaseAction):
         if not request.is_ajax():
             result = HttpResponseRedirect('/')
         elif err_msg:
-            result = PreJsonResult(dict(
-                success=False,
-                redirect='',
-                message=err_msg or '',
-            ))
+            result = PreJsonResult(
+                dict(
+                    success=False,
+                    redirect='',
+                    message=err_msg or '',
+                )
+            )
         else:
             user = auth.authenticate(username=username, password=password)
             auth.login(request, user)
 
-            result = PreJsonResult(dict(
-                success=True,
-                redirect='/',
-            ))
+            result = PreJsonResult(
+                dict(
+                    success=True,
+                    redirect='/',
+                )
+            )
 
         return result
 
@@ -193,16 +205,13 @@ class ResetPasswordPageAction(BaseAction):
     template_file_name = 'simple_auth/reset_password_page.html'
 
     def get_template_context(self, request, context):
+        """Формирует контекст для шаблона восстановления пароля."""
         return dict(
-            login_page_url=self.parent.get_login_page_url(),
-            reset_password_url=self.parent.get_reset_password_url()
+            login_page_url=self.parent.get_login_page_url(), reset_password_url=self.parent.get_reset_password_url()
         )
 
     def run(self, request, context):
-        return render(
-            request, self.template_file_name,
-            self.get_template_context(request, context)
-        )
+        return render(request, self.template_file_name, self.get_template_context(request, context))
 
 
 class ResetPasswordAction(BaseAction):
@@ -212,22 +221,22 @@ class ResetPasswordAction(BaseAction):
     email_template_file_name = 'simple_auth/email/reset_password.html'
 
     def context_declaration(self):
+        """Определяет входной контекст с email для восстановления."""
         return {'email': {'type': 'str'}}
 
     def get_email_template_context(self, request, context):
+        """Формирует контекст для email шаблона восстановления пароля."""
         site_url = settings.SITE_URL.rstrip('/')
-        return dict(
-            site_url=site_url,
-            recover_url=urljoin(
-                site_url, self.parent.get_change_password_page_url()
-            )
-        )
+
+        return dict(site_url=site_url, recover_url=urljoin(site_url, self.parent.get_change_password_page_url()))
 
     @staticmethod
     def _get_user_by_email(email):
+        """Ищет пользователя по email."""
         if ioc.has_value('get_user_by_email'):
             get_user_by_email = ioc.get('get_user_by_email')
         else:
+
             def get_user_by_email(email):
                 query = get_user_model().objects.filter(email=email)
                 if query.count() == 1:
@@ -238,10 +247,13 @@ class ResetPasswordAction(BaseAction):
     def run(self, request, context):
         user = ResetPasswordAction._get_user_by_email(context.email)
         if user is None:
-            return OperationResult(False, message=(
-                'Этот адрес электронной почты не связан ни с одной учетной '
-                'записью. Вы уверены, что зарегистрированы?'
-            ))
+            return OperationResult(
+                False,
+                message=(
+                    'Этот адрес электронной почты не связан ни с одной учетной '
+                    'записью. Вы уверены, что зарегистрированы?'
+                ),
+            )
 
         now = datetime.datetime.now()
         life = getattr(settings, 'RESET_CODES_LIFE', None)
@@ -253,29 +265,17 @@ class ResetPasswordAction(BaseAction):
         code = uuid4().hex
         ResetPasswords.objects.create(user=user, code=code)
         template_context = self.get_email_template_context(request, context)
-        template_context.update({
-            'username': user.username,
-            'code': code
-        })
+        template_context.update({'username': user.username, 'code': code})
 
         # Шаблон отправки email
-        template = render_to_string(
-            self.email_template_file_name,
-            template_context
-        )
+        template = render_to_string(self.email_template_file_name, template_context)
 
         # Отправка письма
-        msg = EmailMessage(
-            'Восстановление пароля', template,
-            settings.DEFAULT_FROM_EMAIL, [context.email]
-        )
+        msg = EmailMessage('Восстановление пароля', template, settings.DEFAULT_FROM_EMAIL, [context.email])
         msg.content_subtype = 'html'
         msg.send()
 
-        return OperationResult(
-            message='На указанный адрес отправлено письмо с дальнейшими'
-                    ' инструкциями.'
-        )
+        return OperationResult(message='На указанный адрес отправлено письмо с дальнейшими инструкциями.')
 
 
 class ChangeResetPasswordPageAction(BaseAction):
@@ -285,13 +285,15 @@ class ChangeResetPasswordPageAction(BaseAction):
     template_file_name = 'simple_auth/change_reset_password_page.html'
 
     def context_declaration(self):
+        """Определяет контекст с кодом восстановления пароля."""
         return {'code': {'type': 'str'}}
 
     def get_template_context(self, request, context):
+        """Формирует контекст для шаблона смены пароля."""
         return dict(
             code=context.code,
             login_page_url=self.parent.get_login_page_url(),
-            change_password_url=self.parent.get_change_password_url()
+            change_password_url=self.parent.get_change_password_url(),
         )
 
     def run(self, request, context):
@@ -299,17 +301,10 @@ class ChangeResetPasswordPageAction(BaseAction):
         life = getattr(settings, 'RESET_CODES_LIFE', None)
         life = datetime.timedelta(minutes=life or const.RESET_CODES_LIFE)
         # Если не найден пользователь
-        if not ResetPasswords.objects.filter(
-            date__gte=now - life, code=context.code
-        ).exists():
-            return HttpResponseRedirect(
-                self.parent.get_reset_password_page_url()
-            )
+        if not ResetPasswords.objects.filter(date__gte=now - life, code=context.code).exists():
+            return HttpResponseRedirect(self.parent.get_reset_password_page_url())
 
-        return render(
-            request, self.template_file_name,
-            self.get_template_context(request, context)
-        )
+        return render(request, self.template_file_name, self.get_template_context(request, context))
 
 
 class ChangeResetPasswordAction(BaseAction):
@@ -319,15 +314,10 @@ class ChangeResetPasswordAction(BaseAction):
     validator = validators.DefaultPasswordValidator()
 
     def context_declaration(self):
-        return {
-            'code': {'type': 'str'},
-            'password': {'type': 'str'},
-            'password_confirm': {'type': 'str'}
-        }
-
-    @convert_validation_error_to(
-        ApplicationLogicException, model=ResetPasswords
-    )
+        """Определяет контекст с кодом и паролями."""
+        return {'code': {'type': 'str'}, 'password': {'type': 'str'}, 'password_confirm': {'type': 'str'}}
+
+    @convert_validation_error_to(ApplicationLogicException, model=ResetPasswords)
     def run(self, request, context):
         password = context.password
         confirm = context.password_confirm
@@ -337,13 +327,9 @@ class ChangeResetPasswordAction(BaseAction):
         life = datetime.timedelta(minutes=life or const.RESET_CODES_LIFE)
 
         try:
-            user = ResetPasswords.objects.filter(
-                date__gte=now - life
-            ).get(code=context.code).user
+            user = ResetPasswords.objects.filter(date__gte=now - life).get(code=context.code).user
         except ResetPasswords.DoesNotExist:
-            return HttpResponseRedirect(
-                self.parent.get_reset_password_page_url()
-            )
+            return HttpResponseRedirect(self.parent.get_reset_password_page_url())
 
         if password != confirm:
             raise ValidationError('Пароль и подтверждение не совпадают!')
@@ -356,6 +342,7 @@ class ChangeResetPasswordAction(BaseAction):
         user.save()
 
         ResetPasswords.objects.filter(user=user).delete()
+
         return OperationResult(message='Новый пароль установлен!')
 
 
@@ -366,8 +353,8 @@ class LogoutConfirmAction(BaseAction):
 
     def run(self, request, context):
         msg_box = MessageBox(
-            '', 'Вы действительно хотите выйти из системы?',
-            MessageBox.ICON_QUESTION, MessageBox.BTN_YESNO)
+            '', 'Вы действительно хотите выйти из системы?', MessageBox.ICON_QUESTION, MessageBox.BTN_YESNO
+        )
 
         msg_box.handler_yes = """
         Ext.Ajax.request({
@@ -379,6 +366,7 @@ class LogoutConfirmAction(BaseAction):
             }
         });
         """ % {'url': self.parent.logout_action.get_absolute_url()}
+
         return http.HttpResponse(msg_box.get_script())
 
 
@@ -388,7 +376,6 @@ class LogoutAction(BaseAction):
     url = '/logout'
 
     def run(self, request, context):
-
         auth.logout(request)
 
         if request.is_ajax():

educommon/auth/simple_auth/app_meta.py

@@ -26,9 +26,7 @@ auth_controller = ioc.get('auth_controller')
 
 
 def register_actions():
-    auth_controller.extend_packs((
-        AuthPack(),
-    ))
+    auth_controller.extend_packs((AuthPack(),))
 
 
 def register_desktop_menu():
@@ -37,12 +35,7 @@ def register_desktop_menu():
     DesktopLoader.add(
         GENERIC_USER,
         DesktopLoader.TOOLBOX,
-        DesktopShortcut(
-            pack=auth_pack.logout_confirm_action,
-            name='Выход',
-            index=256,
-            icon='logout'
-        )
+        DesktopShortcut(pack=auth_pack.logout_confirm_action, name='Выход', index=256, icon='logout'),
     )
 
     uificate_the_controller(auth_controller)

educommon/auth/simple_auth/checkers.py

@@ -1,4 +1,5 @@
 """Классы, осуществляющие проверку пользовательских данных."""
+
 from m3_django_compat import (
     get_user_model,
 )
@@ -17,7 +18,7 @@ class DefaultLoginChecker:
 
     def _check_lic(self, *args, **kwargs):
         # TODO: проверка лицензии
-        request = kwargs['request']
+        kwargs['request']
         return None
 
     def _check_user_exists(self, *args, **kwargs):
@@ -63,8 +64,7 @@ class DefaultLoginChecker:
         средствами django.
         """
         for checker in self._checkers:
-            error = checker(
-                self, request=request, username=username, password=password)
+            error = checker(self, request=request, username=username, password=password)
 
             if error:
                 return error

educommon/auth/simple_auth/migrations/0001_initial.py

@@ -8,7 +8,6 @@ from django.db import (
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
@@ -18,9 +17,29 @@ class Migration(migrations.Migration):
             name='ResetPasswords',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('code', models.CharField(unique=True, max_length=32, verbose_name='\u041a\u043e\u0434 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f')),
-                ('date', models.DateTimeField(auto_now_add=True, verbose_name='\u0414\u0430\u0442\u0430 \u0441\u0431\u0440\u043e\u0441\u0430 \u043f\u0430\u0440\u043e\u043b\u044f')),
-                ('user', models.ForeignKey(verbose_name='\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE,)),
+                (
+                    'code',
+                    models.CharField(
+                        unique=True,
+                        max_length=32,
+                        verbose_name='\u041a\u043e\u0434 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f',
+                    ),
+                ),
+                (
+                    'date',
+                    models.DateTimeField(
+                        auto_now_add=True,
+                        verbose_name='\u0414\u0430\u0442\u0430 \u0441\u0431\u0440\u043e\u0441\u0430 \u043f\u0430\u0440\u043e\u043b\u044f',
+                    ),
+                ),
+                (
+                    'user',
+                    models.ForeignKey(
+                        verbose_name='\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c',
+                        to=settings.AUTH_USER_MODEL,
+                        on_delete=models.CASCADE,
+                    ),
+                ),
             ],
             options={
                 'verbose_name': '\u0421\u0431\u0440\u043e\u0448\u0435\u043d\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c',

educommon/auth/simple_auth/validators.py

@@ -1,5 +1,4 @@
 class DefaultPasswordValidator:
-
     """Валидация пароля."""
 
     _validators = []

educommon/contingent/actions.py

@@ -1,4 +1,5 @@
 """Паки справочников контингента."""
+
 from django.db.models import (
     Q,
 )
@@ -48,7 +49,7 @@ class OkoguPack(ObjectPack):
 
         Добавляется css класс для переноса строк в ячейках грида
         """
-        super(OkoguPack, self).configure_grid(grid)
+        super().configure_grid(grid)
 
         grid.cls = 'word-wrap-grid'  # перенос строк в ячейках грида
 
@@ -90,7 +91,7 @@ class OKSMPack(ObjectPack):
             'sortable': True,
             'searchable': True,
             'width': 3,
-        }
+        },
     ]
 
     def get_rows_query(self, request, context):
@@ -99,16 +100,15 @@ class OKSMPack(ObjectPack):
 
         Исключается отображение РФ.
         """
-        records = super(OKSMPack, self).get_rows_query(request, context)
+        records = super().get_rows_query(request, context)
 
         return records.exclude(code=OksmVirtialModel.rf_code)
 
     def apply_search(self, query, request, context):
         """Поиск по краткому наименованию или коду."""
-        query = super(
-            OKSMPack, self).apply_search(query, request, context)
+        query = super(OKSMPack, self).apply_search(query, request, context)
 
         if hasattr(context, 'filter'):
-            query = query.filter(Q(shortname__icontains=context.filter) |
-                                 Q(code=context.filter))
+            query = query.filter(Q(shortname__icontains=context.filter) | Q(code=context.filter))
+
         return query

educommon/contingent/app_meta.py

@@ -9,7 +9,4 @@ from educommon.contingent.actions import (
 
 def register_actions():
     """Регистрация паков."""
-    ioc.get('main_controller').extend_packs((
-        OkoguPack(),
-        OKSMPack()
-    ))
+    ioc.get('main_controller').extend_packs((OkoguPack(), OKSMPack()))

educommon/contingent/base.py

@@ -4,6 +4,7 @@ BaseCatalogVirtualModel - виртуальная модель на основе
 BaseEnumerateProductSpecific - перечисление с продуктовыми зависимостями.
 BaseModelView - перечисление на основе виртуальной модели.
 """
+
 import json
 import os
 
@@ -66,11 +67,8 @@ class BaseCatalogVirtualModel(VirtualModel):
 
     @classmethod
     def get_serialized_values(cls, ids):
-        """Список сериализованных объектов
-        для маппинга в ExtMultiSelectField.
-        """
-        return json.dumps(list(cls.objects.filter(id__in=ids).values(
-            *cls.fields_to_serialize)))
+        """Список сериализованных объектов для маппинга в ExtMultiSelectField."""
+        return json.dumps(list(cls.objects.filter(id__in=ids).values(*cls.fields_to_serialize)))
 
     @classmethod
     def _get_ids(cls):
@@ -84,7 +82,8 @@ class BaseCatalogVirtualModel(VirtualModel):
 
         :param dict params: Данные объекта модели.
         """
-        super(BaseCatalogVirtualModel, self).__init__()
+        super().__init__()
+
         for param in params:
             setattr(self, param, params[param])
 
@@ -130,18 +129,15 @@ class BaseEnumerateProductSpecific(BaseEnumerate, ProductSpecific):
         assert all(code in cls.values for code in list_codes), (
             'Все значения list_codes должны содержаться в values класса'
         )
-        super(BaseEnumerateProductSpecific, cls).set_category(list_codes)
+
+        super().set_category(list_codes)
 
     @classmethod
     def get_choices(cls):
         """Возвращает заданные для конкретных продуктов значения."""
         codes = cls.current_kind or cls.values
 
-        return [
-            (k, v)
-            for k, v in cls.values.items()
-            if k in codes
-        ]
+        return [(k, v) for k, v in cls.values.items() if k in codes]
 
 
 class BaseModelView(ProductSpecific):
@@ -170,9 +166,7 @@ class BaseModelView(ProductSpecific):
 
         :return: [(value_field, display_field), ...]
         """
-        codes = cls.current_kind or [
-            rec[cls.value_field]
-            for rec in cls.model.data]
+        codes = cls.current_kind or [rec[cls.value_field] for rec in cls.model.data]
 
         result = (
             (record[cls.value_field], record[cls.display_field])
@@ -181,4 +175,5 @@ class BaseModelView(ProductSpecific):
         )
 
         result = tuple(sorted(result, key=lambda code_name: code_name[1]))
+
         return result