edu-rdm-integration 0.7.2__py3-none-any.whl → 0.8.0__py3-none-any.whl

edu_rdm_integration/function_templates/function_export_data_template/managers.py-tpl

@@ -59,7 +59,7 @@ class {{ camel_case_function_name }}RunnerManager({{ strategy.manager_class_name
         """Возвращает класс ранера."""
         return {{ camel_case_function_name }}Runner
 
-    def _prepare_model_ids_map(self) -> Dict[ModelEnumValue, Iterator[int]]:
+    def _prepare_model_ids_map(self) -> Dict['ModelEnumValue', Iterator[int]]:
         """Осуществляется поиск записей моделей добавленных или обновленных за указанный период времени.
 
         В выборках (QuerySet) необходимо использовать iterator().

edu_rdm_integration/migrations/0004_uploaderclientlog.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.2.28 on 2023-12-01 20:58
+from django.db import (
+    migrations,
+)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uploader_client', '0001_initial'),
+        ('edu_rdm_integration', '0003_create_index_file_upload_status'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UploaderClientLog',
+            fields=[],
+            options={
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('edu_rdm_integration.exportingdatasubstageuploaderclientlog', ),
+        ),
+    ]

edu_rdm_integration/models.py

@@ -56,6 +56,28 @@ from edu_rdm_integration.enums import (
 from edu_rdm_integration.utils import (
     get_exporting_data_stage_attachment_path,
 )
+from io import (
+    StringIO,
+)
+from typing import (
+    Optional,
+    Tuple,
+)
+
+from django.db.models import (
+    Manager,
+)
+from django.utils.functional import (
+    cached_property,
+)
+
+from uploader_client.models import (
+    Entry,
+)
+
+from edu_rdm_integration.uploader_log.managers import (
+    UploaderClientLogManager,
+)
 
 
 class CollectingDataStageStatus(TitledModelEnum):
@@ -755,3 +777,50 @@ class AbstractCollectDataCommandProgress(ReprStrPreModelMixin, BaseObjectModel):
         db_table = 'rdm_collecting_data_command_progress'
         verbose_name = 'Задача по сбору данных'
         verbose_name_plural = 'Задачи по сбору данных'
+
+
+class UploaderClientLog(Entry):
+    """Прокси модель Загрузчика данных в витрину."""
+
+    objects = UploaderClientLogManager()
+    base_objects = Manager()
+
+    @cached_property
+    def http_method_and_url(self) -> Tuple[str, str]:
+        """Возвращает http-метод и url из поля запроса Entry.request."""
+        request = StringIO(self.request)
+        request_first_line = request.readline()
+        request.close()
+
+        method, url = request_first_line.split(' ')[:2]
+        if not (method and url.startswith('http')):
+            method = url = ''
+
+        return method.strip('[]'), url
+
+    @cached_property
+    def http_response_status(self) -> str:
+        """Статус-код запроса к витрине."""
+        try:
+            http_status = self.response.split(' ')[0].strip('[]')
+        except IndexError:
+            http_status = None
+        return http_status
+
+    @property
+    def http_method(self) -> str:
+        """Значение http-метода."""
+        return self.http_method_and_url[0]
+
+    @property
+    def request_url(self) -> str:
+        """URL запроса."""
+        return self.http_method_and_url[1]
+
+    @property
+    def request_error(self) -> Optional[str]:
+        """Ошибка запроса."""
+        return self.error
+
+    class Meta:
+        proxy = True

edu_rdm_integration/uploader_log/actions.py

@@ -0,0 +1,229 @@
+from datetime import (
+    date,
+    datetime,
+    time,
+    timedelta,
+)
+from functools import (
+    partial,
+)
+from typing import (
+    Optional,
+)
+
+from django.db.models import (
+    Q,
+)
+from m3_ext.ui.icons import (
+    Icons,
+)
+from objectpack.actions import (
+    ObjectPack,
+)
+
+from educommon.objectpack.actions import (
+    ExtObjectRowsAction,
+)
+from educommon.objectpack.filters import (
+    BoolChoicesFilter,
+    ColumnFilterEngine,
+    DateFilterByAnnotatedField,
+)
+from educommon.utils.object_grid import (
+    add_one_row_button,
+    boolean_column_renderer,
+)
+from educommon.utils.ui import (
+    append_template_globals,
+)
+
+from edu_rdm_integration.models import (
+    UploaderClientLog,
+)
+from edu_rdm_integration.uploader_log.ui import (
+    UploaderLogInfoWindow,
+)
+
+
+class UploaderLogPack(ObjectPack):
+    """
+    Пак журнала Загрузчика данных в витрину.
+    """
+
+    title = 'Журнал логов РВД'
+    model = UploaderClientLog
+
+    edit_window = UploaderLogInfoWindow
+
+    _is_primary_for_model = False
+    can_delete = False
+    list_sort_order = ['-request_datetime']
+    _DEFAULT_PAGING_LIMIT = 35
+
+    filter_engine_clz = ColumnFilterEngine
+    _fd = partial(DateFilterByAnnotatedField, model)
+
+    need_check_permission = True
+
+    columns = [
+        {
+            'header': '№ п/п',
+            'data_index': 'row_number',
+            'sortable': False,
+            'width': 3,
+        },
+        {
+            'header': 'Метод',
+            'data_index': 'http_method',
+            'sortable': False,
+            'width': 3,
+        },
+        {
+            'header': 'URL',
+            'data_index': 'request_url',
+            'searchable': True,
+            'sortable': False,
+            'width': 21,
+        },
+        {
+            'header': 'Дата и время запроса',
+            'data_index': 'request_datetime',
+            'sortable': True,
+            'filter': _fd(
+                'request_datetime',
+                tooltip='C',
+                default_value=date.today() - timedelta(days=1),
+                editable=False,
+                lookup=lambda v: Q(request_datetime__gte=datetime.combine(v, time.min))
+            ) & _fd(
+                'request_datetime',
+                tooltip='По',
+                default_value=date.today,
+                editable=False,
+                lookup=lambda v: Q(request_datetime__lte=datetime.combine(v, time.max))
+            ),
+            'width': 11,
+        },
+        {
+            'header': 'Результат',
+            'data_index': 'http_response_status',
+            'sortable': False,
+            'width': 5,
+        },
+        {
+            'header': 'Путь до файлов',
+            'data_index': 'attachment_file',
+            'sortable': False,
+            'searchable': True,
+            'width': 37,
+        },
+        {
+            'header': 'ID запроса',
+            'data_index': 'request_id',
+            'sortable': False,
+            'searchable': True,
+            'width': 10,
+        },
+        {
+            'header': 'Код статуса загрузки',
+            'data_index': 'status_code',
+            'sortable': False,
+            'searchable': True,
+            'width': 10,
+        },
+        {
+            'header': 'Описание статуса загрузки',
+            'data_index': 'status_description',
+            'sortable': False,
+            'searchable': True,
+            'width': 10,
+        },
+        {
+            'header': 'Режим эмуляции',
+            'data_index': 'is_emulation',
+            'sortable': False,
+            'filter': BoolChoicesFilter('is_emulation'),
+            'column_renderer': boolean_column_renderer(),
+            'width': 5,
+        }
+    ]
+
+    def __init__(self):
+        """Инициализация."""
+        super(UploaderLogPack, self).__init__()
+
+        self.edit_window_action.perm_code = 'view'
+        self.replace_action('rows_action', ExtObjectRowsAction())
+
+    def get_rows_query(self, request, context):
+        """Возвращает кварисет для получения списка данных."""
+        context._row_number = int(getattr(context, 'start', 0))
+
+        return super().get_rows_query(request, context)
+
+    def get_row(self, row_id: Optional[int]) -> 'UploaderClientLog':
+        """Возвращает объект по идентификатору."""
+        if row_id:
+            record = self.model.base_objects.get(id=row_id)
+        else:
+            record = super().get_row(row_id)
+
+        return record
+
+    def prepare_row(self, obj, request, context):
+        """Установка дополнительных атрибутов объекта."""
+        context._row_number += 1
+        obj.row_number = context._row_number
+
+        return obj
+
+    def create_list_window(self, is_select_mode, request, context):
+        """Создание окна списка."""
+        win = super().create_list_window(is_select_mode, request, context)
+
+        append_template_globals(win, 'ui-js/object-grid-buttons.js')
+
+        return win
+
+    def get_list_window_params(self, params, request, context):
+        """Установка параметров окна списка."""
+        params = super().get_list_window_params(params, request, context)
+
+        params.update(
+            maximized=True,
+        )
+
+        return params
+
+    def configure_grid(self, grid, *args, **kwargs):
+        """Конфигурирование грида окна списка."""
+        super().configure_grid(grid, *args, **kwargs)
+
+        grid.url_edit = None
+        add_one_row_button(
+            'Просмотр',
+            grid,
+            self.edit_window_action,
+            Icons.APPLICATION_VIEW_DETAIL,
+            dbl_clicked=True,
+            index=0,
+        )
+
+    def get_edit_window_params(self, params, request, context):
+        """Параметры окна редактирования."""
+        params = super().get_edit_window_params(params, request, context)
+
+        params.update(
+            title=f'{self.title}: Просмотр',
+        )
+
+        return params
+
+    def extend_menu(self, menu):  # noqa D102
+        return menu.SubMenu(
+            'Администрирование', menu.SubMenu(
+                'Региональная витрина данных', menu.Item(
+                    self.title, self.list_window_action
+                )
+            )
+        )

edu_rdm_integration/uploader_log/apps.py

@@ -0,0 +1,10 @@
+from django.apps import (
+    AppConfig,
+)
+
+
+class UploaderLoggerConfig(AppConfig):  # noqa D101
+
+    name = 'regional_data_mart_integration.uploader_log'
+    label = 'regional_data_mart_integration_uploader_log'
+    verbose_name = 'Журнал логов РВД'

edu_rdm_integration/uploader_log/enums.py

@@ -0,0 +1,15 @@
+from m3.db import (
+    BaseEnumerate,
+)
+
+
+class RequestResultStatus(BaseEnumerate):
+    """Результат выполнения запроса."""
+
+    SUCCESS = 1
+    ERROR = 2
+
+    values = {
+        SUCCESS: 'Успех',
+        ERROR: 'Ошибка',
+    }

edu_rdm_integration/uploader_log/managers.py

@@ -0,0 +1,100 @@
+from django.db.models import (
+    Case,
+    CharField,
+    F,
+    Manager,
+    PositiveSmallIntegerField,
+    Q,
+    Value,
+    When,
+)
+from django.db.models.functions import (
+    Cast,
+)
+
+from edu_rdm_integration.uploader_log.enums import (
+    RequestResultStatus,
+)
+
+
+class UploaderClientLogManager(Manager):
+    """Менеджер модели журнала Загрузчика данных в витрину."""
+
+    def get_queryset(self):
+        """Возвращает кварисет."""
+        query = super().get_queryset()
+
+        result_status = Case(
+            When(
+                Q(Q(error__isnull=True) | Q(error__exact=''))
+                & Q(Q(response__isnull=False) & ~Q(response__exact='')),
+                then=Value(RequestResultStatus.SUCCESS)
+            ),
+            default=Value(RequestResultStatus.ERROR),
+            output_field=PositiveSmallIntegerField(),
+        )
+
+        query = query.annotate(
+            request_datetime=F('date_time'),
+            attachment_file=Case(
+                When(
+                    request__icontains='POST',
+                    then=F('uploader_client_log__attachment__attachment')
+                ),
+                When(
+                    request__icontains='GET',
+                    then=F('upload_status_request_log__upload__attachment__attachment'),
+                ),
+                default=Value('')
+            ),
+            status_code=Case(
+                When(
+                    request__icontains='POST',
+                    then=Value('', output_field=CharField())
+                ),
+                When(
+                    request__icontains='GET',
+                    then=Cast(
+                        'upload_status_request_log__status__code',
+                        output_field=CharField()
+                    ),
+                ),
+                default=Value('')
+            ),
+            status_description=Case(
+                When(
+                    request__icontains='POST',
+                    then=Value('', output_field=CharField()),
+                ),
+                When(
+                    request__icontains='GET',
+                    then=F('upload_status_request_log__status__description'),
+                ),
+                default=Value('')
+            ),
+            is_emulation=Case(
+                When(
+                    request__icontains='POST',
+                    then=F('uploader_client_log__is_emulation'),
+                ),
+                When(
+                    request__icontains='GET',
+                    then=F('upload_status_request_log__upload__is_emulation'),
+                ),
+                default=Value(False)
+            ),
+            request_id=Case(
+                When(
+                    request__icontains='POST',
+                    then=F('uploader_client_log__request_id')
+                ),
+                When(
+                    request__icontains='GET',
+                    then=F('upload_status_request_log__upload__request_id')
+                ),
+                default=Value('')
+            ),
+            result_status=result_status
+        )
+
+        return query

edu_rdm_integration/uploader_log/ui.py

@@ -0,0 +1,64 @@
+from m3_ext.ui.fields import (
+    ExtTextArea,
+)
+from objectpack.ui import (
+    BaseEditWindow,
+)
+
+from educommon.utils.ui import (
+    switch_window_in_read_only_mode,
+)
+
+
+class UploaderLogInfoWindow(BaseEditWindow):
+    """Окно просмотра лога Загрузчика данных в витрину."""
+
+    def _init_components(self):
+        """Инициализация компонентов окна."""
+        super(UploaderLogInfoWindow, self)._init_components()
+
+        self.field__request = ExtTextArea(
+            label='Запрос',
+            name='request',
+            anchor='100%',
+            height=160,
+        )
+        self.field__response = ExtTextArea(
+            label='Ответ',
+            name='response',
+            anchor='100%',
+            height=160,
+        )
+        self.field__error = ExtTextArea(
+            label='Ошибка',
+            name='request_error',
+            anchor='100%',
+            height=80,
+        )
+        self.field__attachment = ExtTextArea(
+            label='Вложения',
+            name='attachment_file',
+            anchor='100%',
+            height=40,
+        )
+
+    def _do_layout(self):
+        """Размещение компонентов окна на форме."""
+        super(UploaderLogInfoWindow, self)._do_layout()
+
+        self.form.items.extend((
+            self.field__request,
+            self.field__response,
+            self.field__error,
+            self.field__attachment,
+        ))
+
+    def set_params(self, params):
+        """Настройка окна."""
+        super(UploaderLogInfoWindow, self).set_params(params)
+
+        self.height = 'auto'
+        self.width = 700
+
+        switch_window_in_read_only_mode(self)
+        self.make_read_only()

{edu_rdm_integration-0.7.2.dist-info → edu_rdm_integration-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 0.7.2
+Version: 0.8.0
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -28,7 +28,7 @@ Requires-Dist: setuptools <69,>=47.3.1
 Requires-Dist: wheel <0.42,>=0.37.1
 Requires-Dist: transliterate <2
 Requires-Dist: Django <2.3,>=1.11
-Requires-Dist: educommon <4,>=3.0.0
+Requires-Dist: educommon <4,>=3.6.0
 Requires-Dist: function-tools <1,>=0.8.0
 Requires-Dist: m3-db-utils <1,>=0.3.8
 Requires-Dist: uploader-client <1,>=0.2.1
@@ -289,6 +289,26 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+## [0.8.0] - 2023-12-05
+
+Вынесен функционал просмотра логов РВД из ЭШ.
+
+### Изменено
+
+- [EDUCLLG-7736](https://jira.bars.group/browse/EDUCLLG-7736)
+  MINOR Вынесен функционал просмотра логов РВД из ЭШ.
+
+
+## [0.7.3] - 2023-12-07
+
+Исправлена аннотация в шаблоне managers.py-tpl для функции экспорта.
+
+### Исправлено
+
+- [EDUSCHL-19604](https://jira.bars.group/browse/EDUSCHL-19604)
+  PATCH Исправлена аннотация в шаблоне managers.py-tpl для функции экспорта.
+
+
 ## [0.7.2] - 2023-12-05
 
 В метод _clean_data класса BaseCollectingFunctionTestCase добавлена возможность обрабатывать поля относящиеся к 
@@ -303,6 +323,7 @@ Requires-Dist: uploader-client <1,>=0.2.1
 - [EDUSCHL-19507](https://jira.bars.group/browse/EDUSCHL-19507)
   PATCH Добавление обработки plugins_info при генерации списка данных формирования команд.
 
+
 ## [0.7.1] - 2023-12-02
 
 Доработано получение множества моделей на основе данных plugins_info при работе метода _get_loggable_models.
@@ -312,6 +333,7 @@ Requires-Dist: uploader-client <1,>=0.2.1
 - [EDUSCHL-19576](https://jira.bars.group/browse/EDUSCHL-20954)
   PATCH Доработано получение множества моделей на основе данных plugins_info при работе метода _get_loggable_models.
 
+
 ## [0.7.0] - 2023-12-02
 
 Добавлено формирование логов для последующего скачивания. 

{edu_rdm_integration-0.7.2.dist-info → edu_rdm_integration-0.8.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ edu_rdm_integration/consts.py,sha256=chOsPOOY4_JLzN-8idg-VjbLWSlp6r3maFWqnvUsapg
 edu_rdm_integration/entities.py,sha256=mAjsYlcIbemo4xT5CSCr4payZubiBHB7Rb3Ow1CVsy0,14552
 edu_rdm_integration/enums.py,sha256=fnDPz6pwOYWS6vp65IAExbpDzn2q9U3_9GGyuf4B468,4876
 edu_rdm_integration/mapping.py,sha256=bwa2fJCbV4YjQcAgRrgT3hgM6dJhr_uBtQgx3L3F2Ck,473
-edu_rdm_integration/models.py,sha256=eUlR0DUIXcvr2yy_b0GZA6Jv__X9_iWyUsJhDMKwFDk,24976
+edu_rdm_integration/models.py,sha256=EqLDzsmuSLRcVbAPgySMRhnuRtgKFQaOri4ffl2sEKE,26702
 edu_rdm_integration/signals.py,sha256=3eRlpkDcFCF6TN80-QM8yBYLcyozzcmoPjz6r4_ApWg,73
 edu_rdm_integration/storages.py,sha256=o5WqUG7SnkeuMt-z8spUi-IraivST-7KHzfY-M3v7FA,6807
 edu_rdm_integration/utils.py,sha256=vjme0N6tEXnHt6SaqjavZshjwc-mVv4X3Pz37a5YgTw,7092
@@ -117,7 +117,7 @@ edu_rdm_integration/function_templates/function_export_data_template/enums.py-tp
 edu_rdm_integration/function_templates/function_export_data_template/errors.py-tpl,sha256=dFPgKvChYiv5iyMdoqOG8szqX7BEp8BTmDog2trqueE,247
 edu_rdm_integration/function_templates/function_export_data_template/functions.py-tpl,sha256=QhhZiZ1cBYIuzzH5Pe7zQjd1QQwJglRA_Gf1iNeK4GY,2882
 edu_rdm_integration/function_templates/function_export_data_template/helpers.py-tpl,sha256=tySl3pBeaGjORX5qc2y1zvC8YogpcwbNqvGhh1Ow1Ws,1272
-edu_rdm_integration/function_templates/function_export_data_template/managers.py-tpl,sha256=tK5GLit5n1TTfLdsxClWxpwlRbfUITRJUWsJwrI7Iqs,2669
+edu_rdm_integration/function_templates/function_export_data_template/managers.py-tpl,sha256=SQGcjYmUhA2BOt9XPuWfKdK989zC59SrPYXy4TNYUFo,2671
 edu_rdm_integration/function_templates/function_export_data_template/presenters.py-tpl,sha256=2Jv_xfrz1Qxj-NXEIaa08uWrIhb5QVZEr9uRxVXczAA,316
 edu_rdm_integration/function_templates/function_export_data_template/results.py-tpl,sha256=2iyHuzzS0YPZ688hAhSnPKnkY5BZNRNiZpLRcrn40CE,589
 edu_rdm_integration/function_templates/function_export_data_template/runners.py-tpl,sha256=_5csHUJ79u7NqLAgjbH05tAbOcWH-sHZGYcKliZPmKQ,3653
@@ -134,10 +134,17 @@ edu_rdm_integration/management/commands/export_entities_data.py,sha256=Mas1zwsH-
 edu_rdm_integration/migrations/0001_initial.py,sha256=toNuYoHZePe5wJ6AKEW9oPOdt2OefmxDEDDJGYQIrFk,18719
 edu_rdm_integration/migrations/0002_init_data_uploadstatus.py,sha256=kht966YNuDbC3qTGrcWswJPsVuAtNO59Ck15G2eS2bU,944
 edu_rdm_integration/migrations/0003_create_index_file_upload_status.py,sha256=TiLnqQ8bxkVI7sRa5-D3JQ6jopFYDoH1ytSxmU6USUo,735
+edu_rdm_integration/migrations/0004_uploaderclientlog.py,sha256=Llw_cqPpYJSrbEuEsFraUWKrBSq_tFbGzTlO2DnqOKg,626
 edu_rdm_integration/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration-0.7.2.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-0.7.2.dist-info/METADATA,sha256=Jj94orw2kybIow-ejyt_m-Ugn50xUlelkQXJIFLg5nM,44463
-edu_rdm_integration-0.7.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-0.7.2.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-0.7.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-0.7.2.dist-info/RECORD,,
+edu_rdm_integration/uploader_log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+edu_rdm_integration/uploader_log/actions.py,sha256=CIFfmft5m7Nnl_9Drw7FdCVWr9htKJcbcimb4Dcl3EQ,6568
+edu_rdm_integration/uploader_log/apps.py,sha256=tYJj4-sDlq8fLOSvw18L_yys7SILpTKWNmE2Qug6GnE,265
+edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJLdsGmr3SXwH_U,266
+edu_rdm_integration/uploader_log/managers.py,sha256=Oe2R1G2toEdaEh9ftU1_5s9-t_VFIXgR0TlvbIZyosk,3166
+edu_rdm_integration/uploader_log/ui.py,sha256=i3q4dNYiKPcZMP3QgbKFD0aTysBntXE-Hu_B6nSjrYU,1789
+edu_rdm_integration-0.8.0.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-0.8.0.dist-info/METADATA,sha256=gzs_8o4A12ziXqhjwWP4BBwN5h3yma-2xSk1vQDVuzY,45107
+edu_rdm_integration-0.8.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-0.8.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-0.8.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-0.8.0.dist-info/RECORD,,