arpakitlib 1.8.184__py3-none-any.whl → 1.8.186__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +1,4 @@
 {
   "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "44"
+  "arpakitlib_project_template_subversion": "45"
 }

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

@@ -1,3 +1,4 @@
+from arpakitlib.ar_sqladmin_util import get_string_info_from_model_view
 from project.sqladmin_.model_view.api_key import ApiKeyMV
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqladmin_.model_view.operation import OperationMV
@@ -5,3 +6,7 @@ from project.sqladmin_.model_view.story_log import StoryLogMV
 from project.sqladmin_.model_view.user import UserMV
 from project.sqladmin_.model_view.user_token import UserTokenMV
 from project.sqladmin_.model_view.verification_code import VerificationCodeMV
+
+
+if __name__ == '__main__':
+    print(get_string_info_from_model_view(class_=SimpleMV))

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

@@ -23,7 +23,9 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.input_data,
         OperationDBM.output_data,
         OperationDBM.error_data,
-        OperationDBM.extra_data
+        OperationDBM.extra_data,
+
+        "duration"
     ]
     column_details_list = [
         OperationDBM.id,
@@ -38,7 +40,9 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.input_data,
         OperationDBM.output_data,
         OperationDBM.error_data,
-        OperationDBM.extra_data
+        OperationDBM.extra_data,
+
+        "duration"
     ]
     form_columns = [
         OperationDBM.slug,
@@ -53,12 +57,17 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.extra_data
     ]
     form_overrides = {
-        OperationDBM.status.key: SelectField
+        OperationDBM.status.key: SelectField,
+        OperationDBM.type.key: SelectField
     }
     form_args = {
         OperationDBM.status.key: {
-            "choices": [(status, status) for status in OperationDBM.Statuses.values_list()],
-            "description": "Choose status"
+            "choices": [(v, v) for v in OperationDBM.Statuses.values_list()],
+            "description": f"Choose {OperationDBM.status.key}"
+        },
+        OperationDBM.type.key: {
+            "choices": [(v, v) for v in OperationDBM.Types.values_list()],
+            "description": f"Choose {OperationDBM.type.key}"
         }
     }
     column_sortable_list = sqlalchemy.inspect(OperationDBM).columns
@@ -77,6 +86,7 @@ class OperationMV(SimpleMV, model=OperationDBM):
         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),
+        "duration": lambda m, a: m.duration,
     }
     column_formatters_detail = {
         OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
@@ -84,4 +94,5 @@ class OperationMV(SimpleMV, model=OperationDBM):
         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),
+        "duration": lambda m, a: m.duration,
     }

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

@@ -43,12 +43,12 @@ class StoryLogMV(SimpleMV, model=StoryLogDBM):
     }
     form_args = {
         StoryLogDBM.level.key: {
-            "choices": [(level, level) for level in StoryLogDBM.Levels.values_list()],
-            "description": "Choose level"
+            "choices": [(v, v) for v in StoryLogDBM.Levels.values_list()],
+            "description": f"Choose {StoryLogDBM.level.key}"
         },
         StoryLogDBM.type.key: {
-            "choices": [(level, level) for level in StoryLogDBM.Types.values_list()],
-            "description": "Choose type"
+            "choices": [(v, v) for v in StoryLogDBM.Types.values_list()],
+            "description": f"Choose {StoryLogDBM.type.key}"
         }
     }
     column_sortable_list = sqlalchemy.inspect(StoryLogDBM).columns

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

@@ -60,8 +60,8 @@ class UserMV(SimpleMV, model=UserDBM):
     }
     form_args = {
         UserDBM.roles.key: {
-            "choices": [(role, role) for role in UserDBM.Roles.values_list()],
-            "description": "Choose roles"
+            "choices": [(v, v) for v in UserDBM.Roles.values_list()],
+            "description": f"Choose {UserDBM.roles.key}"
         }
     }
     column_sortable_list = sqlalchemy.inspect(UserDBM).columns

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

@@ -53,8 +53,8 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
     }
     form_args = {
         VerificationCodeDBM.type.key: {
-            "choices": [(status, status) for status in VerificationCodeDBM.Types.values_list()],
-            "description": "Choose type"
+            "choices": [(v, v) for v in VerificationCodeDBM.Types.values_list()],
+            "description": f"Choose {VerificationCodeDBM.type.key}"
         }
     }
     column_sortable_list = sqlalchemy.inspect(VerificationCodeDBM).columns

arpakitlib/ar_sqladmin_util.py

@@ -1,10 +1,23 @@
 from __future__ import annotations
 
+from typing import Any
+
 from sqladmin import ModelView
+from sqlalchemy.orm.attributes import InstrumentedAttribute
 
 
 def get_string_info_from_model_view(class_: type[ModelView]):
-    res = f"Model Views: {len(class_.__subclasses__())}"
+    lines = [f"ModelViews: {len(class_.__subclasses__())}"]
     for i, cls in enumerate(class_.__subclasses__()):
-        res += f"\n{i + 1}. {cls.__name__}"
-    return res
+        if hasattr(cls, "__name__"):
+            lines.append(f"{i + 1}. ModelView: {cls.__name__}")
+            for v in cls.column_list:
+                v: str | InstrumentedAttribute | Any
+                if isinstance(v, str):
+                    lines.append(f"   - {v}")
+                elif isinstance(v, InstrumentedAttribute):
+                    lines.append(f"   - {v}")
+                else:
+                    raise TypeError(f"unknown type, {type(v)=}")
+
+    return "\n".join(lines)

arpakitlib/ar_sqlalchemy_util.py

@@ -314,10 +314,10 @@ def get_string_info_from_declarative_base(class_: type[DeclarativeBase]):
 
 
 def get_string_info_from_declarative_base_2(class_: type[DeclarativeBase]) -> str:
-    lines: list[str] = []
-    for cls in class_.__subclasses__():
+    lines: list[str] = [f"DBModels: {len(class_.__subclasses__())}"]
+    for i, cls in enumerate(class_.__subclasses__()):
         if hasattr(cls, "__tablename__"):
-            lines.append(f"Table: {cls.__tablename__}")
+            lines.append(f"{i + 1}. DBModel: {cls.__tablename__}")
             mapper = inspect(cls)
             for column in mapper.columns:
                 lines.append(f"   - {column.name} ({column.type})")

{arpakitlib-1.8.184.dist-info → arpakitlib-1.8.186.dist-info}/METADATA

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

{arpakitlib-1.8.184.dist-info → arpakitlib-1.8.186.dist-info}/RECORD

@@ -8,7 +8,7 @@ arpakitlib/_arpakit_project_template_v_5/alembic/env.py,sha256=Qesmnj5A2kB-Doeuf
 arpakitlib/_arpakit_project_template_v_5/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 arpakitlib/_arpakit_project_template_v_5/alembic/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/alembic.ini,sha256=8fuyeEvGBiPGbxEFy8ISBV3xX_fgVmuhEGpB10_B5Uo,3733
-arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=Px9gc6sM6iyerd9pn9P-mnUjPPgnH8pdSvKwLJc8EP4,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=NJYmP3Ip2h0QJ4bRaW6pQjNWP--54opz50U72nADw9w,98
 arpakitlib/_arpakit_project_template_v_5/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/command/alembic_history.sh,sha256=OMnDNtHIksGh9iavWnzbtxcudZW4vjdcISsBXvzZSPw,22
 arpakitlib/_arpakit_project_template_v_5/command/alembic_revision_autogenerate.sh,sha256=yW2i-SBOtBx15Ya0poVQqKkJM5t2JZp06r9AEW-DmGE,46
@@ -246,14 +246,14 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py,sh
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/asgi.py,sha256=DRlRPkcOGXOccfP73oKEXolZTsc5VWdQgEG-qoW03ms,99
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py,sha256=JGCHgqJJvAjpc8xnbXPqCeUiLeKO7eo6OA6uPYzzqlk,1308
 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=dc_swzjkRDj85SWQ3cGGgsrp_cq5evUYQYUg0g7C5nw,435
+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=s8mmdwb5eRcdNM_lZpj2UOhvc1ckRhUubjniQ-dDIK0,2504
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=KUC-EZYFlLca92b6PwI0l5leOT8DzjlWm6y-a0PCvQc,3234
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=EePtnFQsDKvhHcPYQU4ahgo24jC6uBZkuzu2alrTviE,2180
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=AbD0QPbAkwOE3i9aDirVBrIntQBCrU1xwX2IZlMS8Rk,2576
+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=JR6wQnBEe6dxWPQCEvAjkakbDUnczvPuW5HdQN8nAS0,2582
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=pyeyDTg4rss8-67hIE3-SQlAvNfje6HazuaVnyFBpN8,2054
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py,sha256=NVnF4SHJEGOFuZjLAzsT-fQr5VREYK4xcz5t1zG6JtM,3196
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py,sha256=CDJQvzdLLxE08XNWvII2r7YAy4fYbyr9FmY-9o4V2Qo,3208
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/start_sqladmin.py,sha256=jaAOq7Kf7HYziJslWbjqzr41kX4dJ9CXDPtMXj8rWok,384
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/util/etc.py,sha256=jm65ZB0K8e6WpgcL2Y6pxcIuQjioIyMtBIOOFbbWfgk,1070
@@ -408,13 +408,13 @@ arpakitlib/ar_safe_func.py,sha256=ayX0K107yoqPDjpJ4fLvhMg-RX6qQ_w9z9py9i_3dLk,21
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=rXI2_3OTaIBgR-GixM1Ti-Ue1f9nOcO3EUpYRqdGpYM,6973
 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=Jd33EX_fAso4bvrcDhNEYOUlUHkudbadNGOJDg7rqhQ,301
-arpakitlib/ar_sqlalchemy_util.py,sha256=EazddvNUZrotsbJMMYQ8RTG8tAc5hrN-CRfKnxkQK_I,12196
+arpakitlib/ar_sqladmin_util.py,sha256=zE2rn52IM7V7Tn2d3bG5336qWhJBayHhxnSTLE6GY7U,827
+arpakitlib/ar_sqlalchemy_util.py,sha256=I7PHI8ynFVeiVbDTYkUReZIVb7_bskB1B6pwVIhF7Uc,12264
 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.184.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.184.dist-info/METADATA,sha256=P5207REs47HxsyZEl-GNA3sQrAQQGRi5YIGmYMdpN9E,3741
-arpakitlib-1.8.184.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.184.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.184.dist-info/RECORD,,
+arpakitlib-1.8.186.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.186.dist-info/METADATA,sha256=UIRbASMCSMtJ8DmKQAJIrxmY0B66EHTJ1rS8XDSmB6Q,3741
+arpakitlib-1.8.186.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.186.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.186.dist-info/RECORD,,