arpakitlib 1.8.193__py3-none-any.whl → 1.8.195__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py

@@ -12,6 +12,22 @@ from project.sqladmin_.util.etc import format_json_for_preview_, format_datetime
 from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
 
 
+def get_default_column_formatters() -> dict[Any, Any]:
+    return {
+        SimpleDBM.ColumnNames.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        SimpleDBM.ColumnNames.detail_data: lambda m, a: format_json_for_preview_(m.detail_data),
+        SimpleDBM.ColumnNames.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
+    }
+
+def get_default_column_formatters_detail() -> dict[Any, Any]:
+    return {
+        SimpleDBM.ColumnNames.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        SimpleDBM.ColumnNames.detail_data: lambda m, a: format_json_(m.detail_data),
+        SimpleDBM.ColumnNames.extra_data: lambda m, a: format_json_(m.extra_data),
+    }
+
+
+
 class SimpleMV(ModelView):
     can_create = True
     can_edit = True
@@ -24,10 +40,11 @@ class SimpleMV(ModelView):
     save_as_continue = True
     export_types = ["xlsx"]
     form_include_pk = True
-
     column_default_sort = [
         (SimpleDBM.ColumnNames.creation_dt, True)
     ]
+    column_formatters = get_default_column_formatters()
+    column_formatters_detail = get_default_column_formatters_detail()
 
     @classmethod
     def get_default_column_searchable_list(cls) -> list[str]:
@@ -62,19 +79,11 @@ class SimpleMV(ModelView):
 
     @classmethod
     def get_default_column_formatters(cls) -> dict[Any, Any]:
-        return {
-            SimpleDBM.ColumnNames.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
-            SimpleDBM.ColumnNames.detail_data: lambda m, a: format_json_for_preview_(m.detail_data),
-            SimpleDBM.ColumnNames.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
-        }
+        return get_default_column_formatters()
 
     @classmethod
     def get_default_column_formatters_detail(cls) -> dict[Any, Any]:
-        return {
-            SimpleDBM.ColumnNames.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
-            SimpleDBM.ColumnNames.detail_data: lambda m, a: format_json_(m.detail_data),
-            SimpleDBM.ColumnNames.extra_data: lambda m, a: format_json_(m.extra_data),
-        }
+        return get_default_column_formatters_detail()
 
     async def export_data(
             self,

arpakitlib/ar_sqlalchemy_util.py

@@ -77,6 +77,7 @@ class BaseDBM(DeclarativeBase):
             include_sd_properties: Collection[str] | None = None,
             exclude_sd_properties: Collection[str] | None = None,
             include_columns_and_sd_properties: Collection[str] | None = None,
+            prefix: str = "sdp_",
             kwargs: dict[str, Any] | None = None
     ) -> dict[str, Any]:
         if exclude_columns is None:
@@ -99,10 +100,10 @@ class BaseDBM(DeclarativeBase):
 
         if need_include_sd_properties:
             for attr_name in dir(self):
-                if not attr_name.startswith("sdp_") or not isinstance(getattr(type(self), attr_name, None), property):
+                if not attr_name.startswith(prefix) or not isinstance(getattr(type(self), attr_name, None), property):
                     continue
 
-                sd_property_name = attr_name.removeprefix("sdp_")
+                sd_property_name = attr_name.removeprefix(prefix)
 
                 if (
                         include_columns_and_sd_properties is not None

{arpakitlib-1.8.193.dist-info → arpakitlib-1.8.195.dist-info}/METADATA

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

{arpakitlib-1.8.193.dist-info → arpakitlib-1.8.195.dist-info}/RECORD

@@ -248,7 +248,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.p
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/event.py,sha256=LjAUYNlsX9Sj_QLMzYuTQbbYYbIMHhbsSjTXt-G7lOE,849
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/__init__.py,sha256=aKX6k2bEVvfXa9dATYts-sUoWgf4MV3H_PiiUceejr4,596
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py,sha256=VTpepKLCKrPnftGD-8Ibp75S0dwUrLlUytRfcXDDcKg,1597
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=vI9yDb2344l5dNfXTZYrjfGCSDbA4EvXqW9yaKEwjAQ,4879
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=TzOUfsKOAysS9X41mYkoY_hgnEcEXYoobZBlyr5T_vY,5186
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=3jvDgLyOJe7U1UmJFgYOh6tlATM60PCCnIJDSFUW4tk,3595
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=KTyvMty9bozjnC0bSDoTtK1H4LTFfbX_MwqP72Ip5D0,2194
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=AhK-2YocK1dM2wMxX_xF0qnsMiI5Pu0Arj5yfDe8Noo,2669
@@ -409,12 +409,12 @@ arpakitlib/ar_schedule_uust_api_client_util.py,sha256=rXI2_3OTaIBgR-GixM1Ti-Ue1f
 arpakitlib/ar_settings_util.py,sha256=Y5wi_cmsjDjfJpM0VJHjbo0NoVPKfypKaD1USowwDtQ,1327
 arpakitlib/ar_sleep_util.py,sha256=ggaj7ML6QK_ADsHMcyu6GUmUpQ_9B9n-SKYH17h-9lM,1045
 arpakitlib/ar_sqladmin_util.py,sha256=SEoaowAPF3lhxPsNjwmOymNJ55Ty9rmzvsDm7gD5Ceo,861
-arpakitlib/ar_sqlalchemy_util.py,sha256=vdhSLtSNVrWejDzR2XEfwNSXgR4QJ-IqaJryEp1apFk,12296
+arpakitlib/ar_sqlalchemy_util.py,sha256=hiDh1GrFHmnqa6lJPMq4fb9m3_fs-eDKuRQzbFxIvFA,12330
 arpakitlib/ar_str_util.py,sha256=2lGpnXDf2h1cBZpVf5i1tX_HCv5iBd6IGnrCw4QWWlY,4350
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
-arpakitlib-1.8.193.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.193.dist-info/METADATA,sha256=y8q-Osr4a4Bm4b_aQPmeIaHYA-f1wL7sykYt7LExuek,3741
-arpakitlib-1.8.193.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.193.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.193.dist-info/RECORD,,
+arpakitlib-1.8.195.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.195.dist-info/METADATA,sha256=d-LmKxyO9bCPjp94N2XPvQzqduVRuXoI1cjiGPrlg84,3741
+arpakitlib-1.8.195.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.195.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.195.dist-info/RECORD,,