arpakitlib 1.8.183__py3-none-any.whl → 1.8.185__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": "43"
+  "arpakitlib_project_template_subversion": "45"
 }

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/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py

@@ -1,4 +1,4 @@
-from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base
+from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, get_string_info_from_declarative_base_2
 
 from project.sqlalchemy_db_.sqlalchemy_model.api_key import ApiKeyDBM
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
@@ -9,4 +9,4 @@ from project.sqlalchemy_db_.sqlalchemy_model.user_token import UserTokenDBM
 from project.sqlalchemy_db_.sqlalchemy_model.verification_code import VerificationCodeDBM
 
 if __name__ == '__main__':
-    print(get_string_info_from_declarative_base(SimpleDBM))
+    print(get_string_info_from_declarative_base_2(SimpleDBM))

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py

@@ -95,14 +95,16 @@ class SimpleDBM(BaseDBM):
     def id_and_long_id(self) -> str:
         return f"{self.id}--{self.long_id}"
 
-    @property
-    def sdp_id_and_long_id(self) -> str:
-        return self.id_and_long_id
-
     @property
     def entity_name(self) -> str:
         return self.__class__.__name__.removesuffix("DBM")
 
+    # ---SDP---
+
+    @property
+    def sdp_id_and_long_id(self) -> str:
+        return self.id_and_long_id
+
     @property
     def sdp_entity_name(self) -> str:
         return self.entity_name

{arpakitlib-1.8.183.dist-info → arpakitlib-1.8.185.dist-info}/METADATA

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

{arpakitlib-1.8.183.dist-info → arpakitlib-1.8.185.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=k8JxOeyPVpPzx8s47PQb5Ru_2p6e2HelazLMzXbZL0k,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
@@ -249,20 +249,20 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/event.py,sha256=LjAUY
 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/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
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_db.py,sha256=1y3FaMFzm_5UM2poqtBve_UP_mh1vjs--krq6yO8PsA,742
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=zRK-ao92u6Q-NNTtsPycTVEjzRjK5BOXgsUZRtNblpM,688
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=7PQqeYThEBXRrXwJZjuH7yAFu25DVr_IneuMwEF3kUE,731
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py,sha256=2X6VPkf1TKq-0319J0tL-rPMvgmkBCjim3Si1dZboMQ,1969
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=9j3QwBkaQSmsqXZbAYZDysGXP3xPPAHJfqIja5UnLcc,3229
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=y3g0j0vBs2ICuX4rHlqBbDO0C39q4LMirk9o6NFbrRU,3246
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=emIo83GUEoywgh4fGv2xDGIkCtSUPq_2ujRlLEc5woM,5930
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=CiNec-x5_z0Pr5Mt-RZXJ1tKJMRn_TAKIaOioG4NK7U,2489
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=22TE8y2Vm9byLLkIE6RVAMa29d9ILCVg1e1QYi4ONIQ,7898
@@ -413,8 +413,8 @@ arpakitlib/ar_sqlalchemy_util.py,sha256=EazddvNUZrotsbJMMYQ8RTG8tAc5hrN-CRfKnxkQ
 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.183.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.183.dist-info/METADATA,sha256=3rNIbGqmSmagyhKipA8Dkk9UzwfZThmiKS_CnEPk2Qg,3741
-arpakitlib-1.8.183.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.183.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.183.dist-info/RECORD,,
+arpakitlib-1.8.185.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.185.dist-info/METADATA,sha256=rjOJzJEr_sOqkZDu7rDPBkGD060JVoNHZJn01YJ0rZE,3741
+arpakitlib-1.8.185.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.185.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.185.dist-info/RECORD,,