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

educommon/ws_log/models.py

@@ -1,4 +1,5 @@
 """Модели приложения логирования СМЭВ."""
+
 import datetime
 
 from django.db import (
@@ -53,12 +54,9 @@ class ExtendedSmevLogManager(models.Manager):
             # Пустые и null значения приведем к значению по умолчанию "Успешно"
             # для использования в фильтрации
             result_with_default=Case(
-                When(
-                    Q(result__isnull=True) | Q(result=''),
-                    then=Value(SmevLog.RESULT_DEFAULT_VALUE)
-                ),
+                When(Q(result__isnull=True) | Q(result=''), then=Value(SmevLog.RESULT_DEFAULT_VALUE)),
                 default='result',
-                output_field=models.CharField()
+                output_field=models.CharField(),
             ),
         )
 
@@ -99,44 +97,35 @@ class SmevLog(BaseObjectModel):
 
     RESULT_DEFAULT_VALUE = 'Успешно'
 
-    service_address = models.CharField(
-        'Адрес сервиса', max_length=250, null=True, blank=True)
+    service_address = models.CharField('Адрес сервиса', max_length=250, null=True, blank=True)
 
-    method_name = models.CharField(
-        'Код метода', max_length=250, null=True, blank=True, db_index=True)
+    method_name = models.CharField('Код метода', max_length=250, null=True, blank=True, db_index=True)
 
-    method_verbose_name = models.CharField(
-        'Наименование метода', max_length=250, null=True, blank=True)
+    method_verbose_name = models.CharField('Наименование метода', max_length=250, null=True, blank=True)
 
     request = models.TextField('SOAP запрос', null=True, blank=True)
     response = models.TextField('SOAP ответ', null=True, blank=True)
     result = models.TextField('Результат', null=True, blank=True)
 
-    time = models.DateTimeField(
-        'Время СМЭВ запроса', default=datetime.datetime.now, db_index=True)
+    time = models.DateTimeField('Время СМЭВ запроса', default=datetime.datetime.now, db_index=True)
 
     interaction_type = models.PositiveSmallIntegerField(
-        'Вид взаимодействия', choices=INTERACTION_TYPES, default=IS_SMEV)
-
-    direction = models.SmallIntegerField(
-        choices=DIRECTION,
-        verbose_name='Направление запроса'
+        'Вид взаимодействия', choices=INTERACTION_TYPES, default=IS_SMEV
     )
 
+    direction = models.SmallIntegerField(choices=DIRECTION, verbose_name='Направление запроса')
+
     consumer_type = models.PositiveSmallIntegerField(
-        'Потребитель сервиса', choices=CONSUMER_TYPES, default=INDIVIDUAL,
-        null=True, blank=True)
+        'Потребитель сервиса', choices=CONSUMER_TYPES, default=INDIVIDUAL, null=True, blank=True
+    )
 
-    consumer_name = models.CharField(
-        'Наименование потребителя', max_length=100, null=True, blank=True)
+    consumer_name = models.CharField('Наименование потребителя', max_length=100, null=True, blank=True)
 
     source = models.PositiveSmallIntegerField(
-        'Источник взаимодействия', choices=SOURCE_TYPES,
-        default=None, null=True, blank=True)
+        'Источник взаимодействия', choices=SOURCE_TYPES, default=None, null=True, blank=True
+    )
 
-    target_name = models.CharField(
-        'Наименование электронного сервиса', max_length=100, null=True,
-        blank=True)
+    target_name = models.CharField('Наименование электронного сервиса', max_length=100, null=True, blank=True)
 
     objects = models.Manager()
     extended_manager = ExtendedSmevLogManager()
@@ -158,15 +147,12 @@ class SmevProvider(BaseObjectModel):
 
     mnemonics = models.CharField('Мнемоника', max_length=100)
     address = models.CharField('Адрес СМЭВ', max_length=100)
-    source = models.PositiveSmallIntegerField(
-        'Источник взаимодействия', choices=SOURCE_TYPES)
-    service_name = models.CharField(
-        'Наименование эл. сервиса', max_length=100)
+    source = models.PositiveSmallIntegerField('Источник взаимодействия', choices=SOURCE_TYPES)
+    service_name = models.CharField('Наименование эл. сервиса', max_length=100)
     service_address_status_changes = models.CharField(
-        'Адрес сервиса изменения статуса', max_length=100,
-        null=True, blank=True)
-    entity = models.CharField(
-        'Наименование юр.лица', max_length=255, null=True, blank=True)
+        'Адрес сервиса изменения статуса', max_length=100, null=True, blank=True
+    )
+    entity = models.CharField('Наименование юр.лица', max_length=255, null=True, blank=True)
 
     class Meta:
         verbose_name = 'Поставщик СМЭВ'

educommon/ws_log/provider.py

@@ -12,7 +12,8 @@ class SmevLogDataProvider(AbstractDataProvider):
     """Провайдер данных отчета "Логи СМЭВ"."""
 
     def init(self, **params):
-        super(SmevLogDataProvider, self).init(**params)
+        super().init(**params)
+
         self.date_begin = params['date_begin']
         self.date_end = params['date_end']
 

educommon/ws_log/report.py

@@ -26,7 +26,8 @@ class SmevLogReportBuilder(AbstractReportBuilder):
     """Билдер отчёта "Логи СМЭВ"."""
 
     def __init__(self, provider, adapter, report, *args, **kwargs):
-        super(SmevLogReportBuilder, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
+
         self.provider = provider
         self.adapter = adapter
         self.report = report
@@ -37,23 +38,19 @@ class SmevLogReportBuilder(AbstractReportBuilder):
         self.header_section = self.report.get_section('header')
         self.row_section = self.report.get_section('row')
 
-        self.header_section.flush(
-            {'institute_name': self.params['institute_name']})
+        self.header_section.flush({'institute_name': self.params['institute_name']})
 
-        smev_logs = self.provider.smev_logs_data.extra(
-            select={'date': 'DATE(time)'}
-        ).values(
+        smev_logs = self.provider.smev_logs_data.extra(select={'date': 'DATE(time)'}).values(
             'date', 'consumer_type', 'consumer_name', 'source', 'result'
         )
 
         sources = dict(SmevLog.SOURCE_TYPES)
         consumers = dict(SmevLog.CONSUMER_TYPES)
 
-        for index,  smev_log in enumerate(smev_logs, 1):
+        for index, smev_log in enumerate(smev_logs, 1):
             smev_log['index'] = index
             smev_log['source'] = sources.get(smev_log['source'], '')
-            smev_log['consumer_type'] = consumers.get(
-                smev_log['consumer_type'], '')
+            smev_log['consumer_type'] = consumers.get(smev_log['consumer_type'], '')
 
             if not smev_log['result']:
                 smev_log['result'] = 'Успешно'
@@ -82,7 +79,7 @@ class SmevLogPrintReportPack(CommonReportPack):
     extend_menu = extend_desktop = None
 
     def declare_context(self, action):
-        context = super(SmevLogPrintReportPack, self).declare_context(action)
+        context = super().declare_context(action)
 
         if action is self.report_action:
             context.update(
@@ -108,6 +105,4 @@ class SmevLogPrintReportPack(CommonReportPack):
         :raise: ApplicationLogicException
         """
         if context.date_begin > context.date_end:
-            raise ApplicationLogicException(
-                'Дата по не может быть меньше чем Дата с!'
-            )
+            raise ApplicationLogicException('Дата по не может быть меньше чем Дата с!')

educommon/ws_log/smev/applications.py

@@ -1,4 +1,5 @@
 """Приложение для логирования запросов СМЭВ."""
+
 import sys
 import traceback
 
@@ -38,18 +39,12 @@ from educommon.ws_log.utils import (
 class LoggingDjangoApplication(DjangoApplication):
     """Переопределенный класс для логирования запросов СМЭВ."""
 
-    def __init__(self, app, chunked=True, max_content_length=10 * 1024 * 1024,
-                 block_length=8 * 1024):
+    def __init__(self, app, chunked=True, max_content_length=10 * 1024 * 1024, block_length=8 * 1024):
         """Метод инициализации приложения для логирования запросов СМЭВ."""
-        super(LoggingDjangoApplication, self).__init__(
-            app, chunked, max_content_length, block_length)
-        self.application_logger = logger_manager.get_application_logger(
-            self.app.name
-        )
-        self.app.event_manager.add_listener(
-            'method_call',
-            self.application_logger.collect_log_data
-        )
+        super().__init__(app, chunked, max_content_length, block_length)
+
+        self.application_logger = logger_manager.get_application_logger(self.app.name)
+        self.app.event_manager.add_listener('method_call', self.application_logger.collect_log_data)
         self.event_manager.add_listener('wsgi_exception', wsgi_exception)
 
     def generate_contexts(self, ctx, in_string_charset=None):
@@ -63,8 +58,7 @@ class LoggingDjangoApplication(DjangoApplication):
 
             # sets ctx.in_body_doc, ctx.in_header_doc and
             # ctx.method_request_string
-            self.app.in_protocol.decompose_incoming_envelope(
-                ctx, ProtocolBase.REQUEST)
+            self.app.in_protocol.decompose_incoming_envelope(ctx, ProtocolBase.REQUEST)
 
             # returns a list of contexts. multiple contexts can be returned
             # when the requested method also has bound auxiliary methods.
@@ -96,11 +90,7 @@ class LoggingDjangoApplication(DjangoApplication):
         environ = self.application_logger.get_prepared_environ(request)
 
         try:
-            response = WsgiApplication.__call__(
-                self,
-                environ,
-                start_response
-            )
+            response = WsgiApplication.__call__(self, environ, start_response)
             self.set_response(retval, response)
         except Exception:
             traceback_data = sys.exc_info()
@@ -112,7 +102,7 @@ class LoggingDjangoApplication(DjangoApplication):
             uri=request.build_absolute_uri(),
             retval=retval,
             traceback_data=traceback_data,
-            environ=environ
+            environ=environ,
         )
 
         return retval
@@ -139,17 +129,12 @@ class LoggingService(ServiceBase):
                 return result
 
         except SpyneException as exc:
-            raise ApiError(
-                exc.faultcode, exc.faultstring,
-                ctx.function.__name__.replace('Request', 'Response'))
+            raise ApiError(exc.faultcode, exc.faultstring, ctx.function.__name__.replace('Request', 'Response'))
 
         except Exception as exc:
             log = ctx.transport.req['log_record']
-            log.result = str(traceback.format_exc(), errors="ignore")
-            raise ApiError(
-                'Server', exc.message,
-                ctx.function.__name__.replace('Request', 'Response')
-            )
+            log.result = str(traceback.format_exc(), errors='ignore')
+            raise ApiError('Server', str(exc), ctx.function.__name__.replace('Request', 'Response'))
 
     @rpc(Unicode, _returns=Unicode)
     def upper(self, s):

educommon/ws_log/smev/exceptions.py

@@ -10,10 +10,9 @@ class SpyneException(Fault):
     It's a dot-delimited string whose first fragment is
             either 'Client' or 'Server'.
     """
+
     def __init__(self, code=0, message=''):
         if isinstance(code, str):
             Fault.__init__(self, faultstring=code)
         else:
-            Fault.__init__(self,
-                           faultcode='Server;%d' % code,
-                           faultstring=message)
+            Fault.__init__(self, faultcode='Server;%d' % code, faultstring=message)

educommon/ws_log/ui.py

@@ -1,4 +1,5 @@
 """Описания пользовательского интерфейса приложения логирования СМЭВ."""
+
 from m3_ext.ui import (
     all_components as ext,
 )
@@ -18,15 +19,13 @@ from educommon.ws_log.models import (
 )
 
 
-class SmevLogEditWindow(
-    ModelEditWindow.fabricate(
-        SmevLog, field_list=['request', 'response', 'result'])
-):
+class SmevLogEditWindow(ModelEditWindow.fabricate(SmevLog, field_list=['request', 'response', 'result'])):
     """Окно редактирования логов СМЭВ."""
 
     def set_params(self, params):
         """Настройка окна."""
-        super(SmevLogEditWindow, self).set_params(params)
+        super().set_params(params)
+
         self.height, self.width = 800, 800
 
         self.make_read_only()
@@ -41,19 +40,21 @@ class SmevLogListWindow(BaseListWindow):
 
     def _init_components(self):
         """Создание компонентов окна."""
-        super(SmevLogListWindow, self)._init_components()
-        self.print_button = ext.ExtButton(
-            text='Печать', handler='printSmevLogsReport', icon_cls='printer')
+        super()._init_components()
+
+        self.print_button = ext.ExtButton(text='Печать', handler='printSmevLogsReport', icon_cls='printer')
 
     def _do_layout(self):
         """Расположение компонентов окна."""
-        super(SmevLogListWindow, self)._do_layout()
+        super()._do_layout()
+
         self.grid.top_bar.items.append(self.print_button)
         self.grid.top_bar.button_edit.icon_cls = Icons.APPLICATION_VIEW_DETAIL
 
     def set_params(self, params):
         """Настройка окна."""
-        super(SmevLogListWindow, self).set_params(params)
+        super().set_params(params)
+
         self.maximized = True
         self.settings_report_window_url = params['settings_report_window_url']
         self.template_globals = 'ui-js/smev-logs-list-window.js'
@@ -63,7 +64,8 @@ class SmevProviderListWindow(BaseListWindow):
     """Окно списка поставщиков СМЭВ."""
 
     def set_params(self, params):
-        super(SmevProviderListWindow, self).set_params(params)
+        super().set_params(params)
+
         self.width = 1000
 
 
@@ -73,27 +75,20 @@ class SmevProviderEditWindow(ModelEditWindow):
     model = SmevProvider
 
     def set_params(self, params):
-        super(SmevProviderEditWindow, self).set_params(params)
+        super().set_params(params)
+
         self.form.label_width = 200
         self.width = 500
 
 
 class SmevLogReportWindow(BaseEditWindow):
-
     def _init_components(self):
         """Создание компонентов окна."""
-        super(SmevLogReportWindow, self)._init_components()
-        self.field_date_begin = ext.ExtDateField(
-            name='date_begin',
-            label='Дата с',
-            allow_blank=False,
-            anchor='100%')
+        super()._init_components()
 
-        self.field_date_end = ext.ExtDateField(
-            name='date_end',
-            label='Дата по',
-            allow_blank=False,
-            anchor='100%')
+        self.field_date_begin = ext.ExtDateField(name='date_begin', label='Дата с', allow_blank=False, anchor='100%')
+
+        self.field_date_end = ext.ExtDateField(name='date_end', label='Дата по', allow_blank=False, anchor='100%')
 
         self.field_institute = ext.ExtDictSelectField(
             label='Организация',
@@ -102,20 +97,25 @@ class SmevLogReportWindow(BaseEditWindow):
             anchor='100%',
             hide_trigger=False,
             hide_edit_trigger=True,
-            allow_blank=False)
+            allow_blank=False,
+        )
 
     def _do_layout(self):
         """Расположение компонентов окна."""
-        super(SmevLogReportWindow, self)._do_layout()
-        self.form.items.extend([
-            self.field_institute,
-            self.field_date_begin,
-            self.field_date_end,
-        ])
+        super()._do_layout()
+
+        self.form.items.extend(
+            [
+                self.field_institute,
+                self.field_date_begin,
+                self.field_date_end,
+            ]
+        )
 
     def set_params(self, params):
         """Настройка окна."""
-        super(SmevLogReportWindow, self).set_params(params)
+        super().set_params(params)
+
         self.height, self.width = 200, 400
 
         self.field_institute.pack = params['institute_pack']

educommon/ws_log/utils.py

@@ -14,9 +14,7 @@ class LoggerManager:
     """Класс для работы с логгерами приложений веб-сервисов."""
 
     def __init__(self):
-        self._ws_loggers = dict(
-            default=DefaultWsApplicationLogger()
-        )
+        self._ws_loggers = dict(default=DefaultWsApplicationLogger())
 
     @staticmethod
     def __import_logger_class(logger_path):

{educommon-3.13.0.dist-info → educommon-3.13.2.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: educommon
-Version: 3.13.0
+Version: 3.13.2
 Summary: Общая кодовая база для проектов БЦ Образование
-Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
-Author: BARS Group
-Author-email: education_dev@bars-open.ru
+Author-email: BARS Group <education_dev@bars-open.ru>
+Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/educommon/browse
+Project-URL: Repository, https://stash.bars-open.ru/scm/edubase/educommon.git
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: Web Environment
 Classifier: Natural Language :: Russian
@@ -17,7 +17,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-Python: >=3.9
+Description-Content-Type: text/markdown
+Requires-Dist: packaging<25,>=21
 Requires-Dist: Django<4,>=3.1
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
@@ -27,7 +29,7 @@ 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: python-magic==0.4.15
 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
@@ -35,11 +37,21 @@ 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
+Requires-Dist: distro<2,>=1.3.0; sys_platform == "linux"
+Provides-Extra: dev
+Requires-Dist: isort==5.12.0; extra == "dev"
+Requires-Dist: ruff==0.11.2; extra == "dev"
+Requires-Dist: flake8<7,>=4.0.1; extra == "dev"
+Requires-Dist: pytest<8,>=3.2.5; extra == "dev"
+Requires-Dist: pytest-cov<5; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx<7.5,>=7; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints<2.5,>=2; extra == "docs"
+Requires-Dist: myst-parser<3.2,>=3; extra == "docs"
+Requires-Dist: sphinx_design<0.7,>=0.6; extra == "docs"
+
+# Общая кодовая база для проектов БЦ Образование
+
+## Запуск тестов
+- Активировать окружение с установленными пакетами из ``requrements.txt``
+- Выполнить скрипт ``tests/runtests.sh``.