edu-rdm-integration 3.5.1__py3-none-any.whl → 3.5.2.1__py3-none-any.whl

edu_rdm_integration/collect_and_export_data/migrations/0002_auto_20250204_1413.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.2.23 on 2025-02-04 14:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rdm_collect_and_export_data', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='edurdmcollectdatacommandprogress',
+            options={'verbose_name': 'Задача по сбору данных', 'verbose_name_plural': 'Задачи по сбору данных'},
+        ),
+        migrations.AlterModelOptions(
+            name='edurdmexportdatacommandprogress',
+            options={'verbose_name': 'Команда экспорта данных', 'verbose_name_plural': 'Команды экспорта данных'},
+        ),
+        migrations.AlterField(
+            model_name='edurdmcollectdatacommandprogress',
+            name='institute_ids',
+            field=models.JSONField(blank=True, default=list, null=True, verbose_name='id учебного заведения'),
+        ),
+    ]

edu_rdm_integration/collect_data/base/mixins.py

@@ -173,7 +173,8 @@ class BaseIgnoreLogMixin:
     def _exclude_logs(self, model_label: str, object_model_ids: Iterable[int]):
         """Исключаем логи из обработки."""
         for object_id in object_model_ids:
-            self.logs[model_label].pop(object_id)
+            if object_id in self.logs[model_label]:
+                del self.logs[model_label][object_id]
 
     def _ignore_logs(self):
         """

edu_rdm_integration/management/commands/check_upload_status.py

@@ -18,7 +18,9 @@ from typing import (
     TYPE_CHECKING,
     Any,
 )
-
+from django.core.cache import (
+    cache,
+)
 from django.core.management.base import (
     BaseCommand,
 )
@@ -94,4 +96,4 @@ class Command(BaseCommand):
             file_upload_status=FileUploadStatusEnum.IN_PROGRESS,
         )
 
-        UploadStatusHelper(in_progress_attachment_uploads).run(thread_count=thread_count)
+        UploadStatusHelper(in_progress_attachment_uploads, cache).run(thread_count=thread_count)

edu_rdm_integration/models.py

@@ -9,9 +9,6 @@ from typing import (
     Optional,
 )
 
-from django.contrib.postgres.fields import (
-    JSONField,
-)
 from django.db.models import (
     CASCADE,
     PROTECT,
@@ -27,6 +24,7 @@ from django.db.models import (
     PositiveSmallIntegerField,
     SmallIntegerField,
     UUIDField,
+    JSONField,
 )
 from django.utils import (
     timezone,

edu_rdm_integration/uploader_log/managers.py

@@ -45,7 +45,8 @@ class UploaderClientLogManager(Manager):
                     request__icontains='GET',
                     then=F('upload_status_request_log__upload__attachment__attachment'),
                 ),
-                default=Value('')
+                default=Value(''),
+                output_field = CharField(),
             ),
             status_code=Case(
                 When(

{edu_rdm_integration-3.5.1.dist-info → edu_rdm_integration-3.5.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 3.5.1
+Version: 3.5.2.1
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -24,7 +24,7 @@ Requires-Dist: pip <24,>=23.2.1
 Requires-Dist: setuptools <70,>=47.3.1
 Requires-Dist: wheel <0.42,>=0.37.1
 Requires-Dist: transliterate <2
-Requires-Dist: Django <3.3,>=2.2
+Requires-Dist: Django <3.3,>=3.1
 Requires-Dist: celery <5.3,>=4.4.7
 Requires-Dist: asyncpg ==0.23.0
 Requires-Dist: educommon <4,>=3.11.0
@@ -301,6 +301,36 @@ Requires-Dist: uploader-client <1,>=0.2.1
 ### Удалено
 
 
+## [3.5.2.1] - 2025-02-11
+
+Внесено исправление в BaseIgnoreLogMixin, в части работы метода _exclude_logs.
+Исправление ошибки в реестре Журнал Логов РВД.
+
+### Изменено
+
+- [EDUSCHL-23160](https://jira.bars.group/browse/EDUSCHL-23160)
+  PATCH Внесено исправление в BaseIgnoreLogMixin, в части работы метода _exclude_logs.
+
+### Исправлено
+
+- [EDUSCHL-23174](https://jira.bars.group/browse/EDUSCHL-23174)
+  PATCH Для менеджера UploaderClientLogManager с аннотацией поля attachment_file добавлен output_field=CharField().
+
+- [EDUSCHL-23178](https://jira.bars.group/browse/EDUSCHL-23178)
+  PATCH Исправлена команда check_upload_status, в части использования UploadStatusHelper.
+
+
+## [3.5.2] - 2025-02-04
+
+Изменён тип поля institute_ids с django.contrib.postgres.fields.JSONField (поддержка до Django 4.0.)
+на django.db.models.JSONField (поддержка с Django 3.1.0).
+
+### Изменено
+
+- [EDUKNDG-15190](https://jira.bars.group/browse/EDUKNDG-15190)
+  Для модели AbstractCollectDataCommandProgress изменён тип поля institute_ids на django.db.models.JSONField.
+
+
 ## [3.5.1] - 2025-02-04
 
 Изменена очередность обновления моделей при сборе. Обработка связанных моделей производится ранее основной.

{edu_rdm_integration-3.5.1.dist-info → edu_rdm_integration-3.5.2.1.dist-info}/RECORD

@@ -8,7 +8,7 @@ edu_rdm_integration/entities.py,sha256=mhVeB88A-VD5IAzZCNeI1qnkvNoZ8LPiLBdqk1yA3
 edu_rdm_integration/enums.py,sha256=T3Mu5D-CbKO3BSg16MPPnIPlcc_YGLYR-ThS8dzl9gg,4246
 edu_rdm_integration/helpers.py,sha256=pLWkIUZK0M5FZZrTAfe80bV-VZIpBgwxnXBAmYFfFw0,14561
 edu_rdm_integration/mapping.py,sha256=1B6TsC4Os9wiM8L8BChnCNv_iWqjeWu3bdDsqKVsId0,616
-edu_rdm_integration/models.py,sha256=nQo9wLAaTIvZP641IqOtbqsWH2fyyHml-_bVlcHGuHs,33032
+edu_rdm_integration/models.py,sha256=e1n-1UuG0Okhx6NSxD-m3iSlvStDmBdJs-4HiBa8aTQ,32985
 edu_rdm_integration/redis_cache.py,sha256=SP_rcL5t6PTVLOnEYn_NTX0Z666VdZT4By2pyED24Z4,1537
 edu_rdm_integration/signals.py,sha256=3eRlpkDcFCF6TN80-QM8yBYLcyozzcmoPjz6r4_ApWg,73
 edu_rdm_integration/storages.py,sha256=G4Q4tIyJdEyb9ka551PADCFIm66bpsJe9VBRcvQhLMI,6745
@@ -37,6 +37,7 @@ edu_rdm_integration/collect_and_export_data/apps.py,sha256=fAcctcjxWP4Gd0Qr3YrQk
 edu_rdm_integration/collect_and_export_data/models.py,sha256=TGm-hM-1aDhVcFPy0PTC3yNczoZGF4ZmIdr0Y9s8CfU,2038
 edu_rdm_integration/collect_and_export_data/utils.py,sha256=lBWqqhLgMyz2IQN7r9zugRHpYNBbeVp59G0WBxEsmj8,3546
 edu_rdm_integration/collect_and_export_data/migrations/0001_initial.py,sha256=UkoaXzh3tokZ8QdCdB09v3rRZfcHhvEwNMuj3mQIB74,4714
+edu_rdm_integration/collect_and_export_data/migrations/0002_auto_20250204_1413.py,sha256=8kNc8IHzEiIKpIv1oT6rytV80RJrikrEnlvRFpaFRWc,1017
 edu_rdm_integration/collect_and_export_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/collect.py,sha256=-u2ER3MZOLtNRmdtYwimpQqFsEBbJ-8Wsy-AjQeK168,11868
@@ -48,7 +49,7 @@ edu_rdm_integration/collect_data/base/caches.py,sha256=_Ja0q3hPSE_Mq-MCZN-1jr0Wv
 edu_rdm_integration/collect_data/base/functions.py,sha256=E1vYmC8F8NM5cBB5SGQEpluHrMynpjf3Ek3s0HsbxwY,2998
 edu_rdm_integration/collect_data/base/helpers.py,sha256=MsHEzkUl1KVMIxGfDkhcItXLxQNuNNOhN5tzTcPm0NQ,982
 edu_rdm_integration/collect_data/base/managers.py,sha256=hza8kugR9hbLK3LU8DBfF61ul7mPPl5pPm530QMjj0k,6143
-edu_rdm_integration/collect_data/base/mixins.py,sha256=K3HOWaxAE3Myzh8CgTm-ZKE7_hbW9p6IcCnvtbDzlM4,8482
+edu_rdm_integration/collect_data/base/mixins.py,sha256=kwZ77dc5dCmHVGCN6JMslpyfXfEEoks7vmXH-CzezJc,8538
 edu_rdm_integration/collect_data/base/runners.py,sha256=Mf5Lux6IWWqKd798v149OjqfBWiDtigeFd701HSRBGg,1565
 edu_rdm_integration/collect_data/calculated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/calculated/strategies.py,sha256=nppmheuzhF8H7JcfEhEZCmHI0eeRj8BbrLGNF0nsoa0,7619
@@ -144,7 +145,7 @@ edu_rdm_integration/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 edu_rdm_integration/management/general.py,sha256=hmZGp9EKpSAm-VuhXNpW_ETA5TWi3Y-caSj7XB2vtuM,12957
 edu_rdm_integration/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/management/commands/async_fix_attachment_size.py,sha256=9Aa_B04R9VDMY4G9s1DIteWPX7QhOFdm0zReMJWbwbw,9838
-edu_rdm_integration/management/commands/check_upload_status.py,sha256=KDYXzAic6qfTqT8w6EYxKp-4GHmSVVD8Ix82zJ4EhwY,3831
+edu_rdm_integration/management/commands/check_upload_status.py,sha256=6A04WcIKfoF_Hemdh0xT877WUgqP2qcxX1vAs97_b1E,3882
 edu_rdm_integration/management/commands/collect_latest_models_data.py,sha256=4ObBFqYMkX5v1saV9V7PivYBm0RMcDCGNlMGx77UAjs,750
 edu_rdm_integration/management/commands/collect_models_data.py,sha256=11RshcQiXk6Flz-8oiFuM5KSZ_8_c1111qkqmyiu5sw,1022
 edu_rdm_integration/management/commands/datamart_status.py,sha256=ImpXHwRnbcgE5pcz2_QixfEQPSLU6WH1V8Vm7xnPidU,1211
@@ -174,12 +175,12 @@ edu_rdm_integration/uploader_log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 edu_rdm_integration/uploader_log/actions.py,sha256=2ckgI1PKgVcLYkbhtbK_bfv_6lDxpiIRSk1uPCIL-gg,6755
 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=y5wTSMzF9hpOpIU_A7nIafL_LBU3QEie6LAYWoB-pBQ,3203
+edu_rdm_integration/uploader_log/managers.py,sha256=OFdToWV8qhdfeGNpd-UWAmSEISzixmVQ6LF75EW7gzA,3248
 edu_rdm_integration/uploader_log/ui.py,sha256=YM9Buqp2wxE95Wf5gvAATBzuYzDOossK1sEmvFk07cI,2110
 edu_rdm_integration/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
-edu_rdm_integration-3.5.1.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.5.1.dist-info/METADATA,sha256=QVqmV5hnRohBsnRQ0CtNmtkqi75Y_fnyztR3OMHZGXs,78305
-edu_rdm_integration-3.5.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-3.5.1.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-3.5.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.5.1.dist-info/RECORD,,
+edu_rdm_integration-3.5.2.1.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.5.2.1.dist-info/METADATA,sha256=YrQo2_YtbevMz85WBv_ISYiwxShLU4j3hUHvez7Q-Zc,79628
+edu_rdm_integration-3.5.2.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-3.5.2.1.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-3.5.2.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.5.2.1.dist-info/RECORD,,