arpakitlib 1.8.99__tar.gz → 1.8.100__tar.gz

{arpakitlib-1.8.99 → arpakitlib-1.8.100}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.99
+Version: 1.8.100
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.99 → arpakitlib-1.8.100}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py

@@ -1,7 +1,7 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
-from project.sqladmin_.util.etc import format_datetime_
+from project.sqladmin_.util.etc import format_datetime_, format_json_, format_json_for_preview_
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
 
 
@@ -27,8 +27,10 @@ class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
         ApiKeyDBM.value,
     ]
     column_formatters = {
-        ApiKeyDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        ApiKeyDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        ApiKeyDBM.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
     }
     column_formatters_detail = {
-        ApiKeyDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        ApiKeyDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        ApiKeyDBM.extra_data: lambda m, a: format_json_(m.extra_data),
     }

{arpakitlib-1.8.99 → arpakitlib-1.8.100}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py

@@ -1,7 +1,7 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
-from project.sqladmin_.util.etc import format_datetime_
+from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
@@ -32,8 +32,18 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.slug,
     ]
     column_formatters = {
-        OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        OperationDBM.execution_start_dt: lambda m, _: format_datetime_(m.execution_start_dt),
+        OperationDBM.execution_finish_dt: lambda m, _: format_datetime_(m.execution_finish_dt),
+        OperationDBM.input_data: lambda m, a: format_json_for_preview_(m.input_data),
+        OperationDBM.output_data: lambda m, a: format_json_for_preview_(m.output_data),
+        OperationDBM.error_data: lambda m, a: format_json_for_preview_(m.error_data),
+        OperationDBM.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
     }
     column_formatters_detail = {
-        OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        OperationDBM.input_data: lambda m, a: format_json_(m.input_data),
+        OperationDBM.output_data: lambda m, a: format_json_(m.output_data),
+        OperationDBM.error_data: lambda m, a: format_json_(m.error_data),
+        OperationDBM.extra_data: lambda m, a: format_json_(m.extra_data),
     }

{arpakitlib-1.8.99 → arpakitlib-1.8.100}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py

@@ -1,7 +1,7 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
-from project.sqladmin_.util.etc import format_datetime_
+from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
 
@@ -27,8 +27,10 @@ class StoryLogMV(SimpleMV, model=StoryLogDBM):
         StoryLogDBM.slug,
     ]
     column_formatters = {
-        StoryLogDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        StoryLogDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        StoryLogDBM.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
     }
     column_formatters_detail = {
-        StoryLogDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        StoryLogDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        StoryLogDBM.extra_data: lambda m, a: format_json_(m.extra_data),
     }

{arpakitlib-1.8.99 → arpakitlib-1.8.100}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py

@@ -1,7 +1,7 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
-from project.sqladmin_.util.etc import format_datetime_
+from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
@@ -49,8 +49,10 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.tg_id
     ]
     column_formatters = {
-        UserDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        UserDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        UserDBM.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
     }
     column_formatters_detail = {
-        UserDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        UserDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        UserDBM.extra_data: lambda m, a: format_json_(m.extra_data),
     }

{arpakitlib-1.8.99 → arpakitlib-1.8.100}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py

@@ -1,7 +1,7 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
-from project.sqladmin_.util.etc import format_datetime_
+from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 
 
@@ -38,8 +38,10 @@ class UserTokenMV(SimpleMV, model=UserTokenDBM):
         UserTokenDBM.value,
     ]
     column_formatters = {
-        UserTokenDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        UserTokenDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        UserTokenDBM.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
     }
     column_formatters_detail = {
-        UserTokenDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+        UserTokenDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        UserTokenDBM.extra_data: lambda m, a: format_json_(m.extra_data),
     }

{arpakitlib-1.8.99 → arpakitlib-1.8.100}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/util/etc.py

@@ -18,7 +18,7 @@ def format_datetime_(datetime_: dt.datetime | None) -> str:
 def format_json_for_preview_(data: dict[str, Any] | list[Any] | None) -> str:
     if data is None:
         return ""
-    return f"JSON {type(data)} ({len(data)} элементов)"
+    return f"JSON {type(data)} {len(data)} элемент(ов)"
 
 
 def format_json_(data: dict[str, Any] | list[Any] | None) -> str:

{arpakitlib-1.8.99 → arpakitlib-1.8.100}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.99"
+version = "1.8.100"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }