arpakitlib 1.8.108__py3-none-any.whl → 1.8.110__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": "24"
+  "arpakitlib_project_template_subversion": "25"
 }

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

@@ -9,7 +9,26 @@ class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
     name = "ApiKey"
     name_plural = "ApiKeys"
     icon = "fa-solid fa-key"
-    column_list = sqlalchemy.inspect(ApiKeyDBM).columns
+    column_list = [
+        ApiKeyDBM.id,
+        ApiKeyDBM.long_id,
+        ApiKeyDBM.slug,
+        ApiKeyDBM.creation_dt,
+        ApiKeyDBM.title,
+        ApiKeyDBM.value,
+        ApiKeyDBM.is_active,
+        ApiKeyDBM.extra_data
+    ]
+    column_details_list = [
+        ApiKeyDBM.id,
+        ApiKeyDBM.long_id,
+        ApiKeyDBM.slug,
+        ApiKeyDBM.creation_dt,
+        ApiKeyDBM.title,
+        ApiKeyDBM.value,
+        ApiKeyDBM.is_active,
+        ApiKeyDBM.extra_data
+    ]
     form_columns = [
         ApiKeyDBM.slug,
         ApiKeyDBM.title,
@@ -22,8 +41,6 @@ class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
     ]
     column_searchable_list = [
         ApiKeyDBM.id,
-        ApiKeyDBM.long_id,
-        ApiKeyDBM.slug,
         ApiKeyDBM.value,
     ]
     column_formatters = {

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

@@ -1,4 +1,5 @@
 import sqlalchemy
+from sqladmin.fields import SelectField
 
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
@@ -9,7 +10,21 @@ class OperationMV(SimpleMV, model=OperationDBM):
     name = "Operation"
     name_plural = "Operations"
     icon = "fa-solid fa-gears"
-    column_list = sqlalchemy.inspect(OperationDBM).columns
+    column_list = [
+        OperationDBM.id,
+        OperationDBM.long_id,
+        OperationDBM.slug,
+        OperationDBM.creation_dt,
+        OperationDBM.status,
+        OperationDBM.type,
+        OperationDBM.title,
+        OperationDBM.execution_start_dt,
+        OperationDBM.execution_finish_dt,
+        OperationDBM.input_data,
+        OperationDBM.output_data,
+        OperationDBM.error_data,
+        OperationDBM.extra_data
+    ]
     form_columns = [
         OperationDBM.slug,
         OperationDBM.status,
@@ -22,14 +37,22 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.error_data,
         OperationDBM.extra_data
     ]
+    form_overrides = {
+        OperationDBM.status.key: SelectField
+    }
+    form_args = {
+        OperationDBM.status.key: {
+            "choices": [(status, status) for status in OperationDBM.Statuses.values_list()],
+            "description": "Choose status"
+        }
+    }
     column_sortable_list = sqlalchemy.inspect(OperationDBM).columns
     column_default_sort = [
         (OperationDBM.creation_dt, True)
     ]
     column_searchable_list = [
         OperationDBM.id,
-        OperationDBM.long_id,
-        OperationDBM.slug,
+        OperationDBM.long_id
     ]
     column_formatters = {
         OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),

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

@@ -1,4 +1,5 @@
 import sqlalchemy
+from wtforms import SelectMultipleField
 
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
@@ -36,6 +37,15 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.tg_bot_last_action_dt,
         UserDBM.extra_data
     ]
+    form_overrides = {
+        UserDBM.roles.key: SelectMultipleField
+    }
+    form_args = {
+        UserDBM.roles.key: {
+            "choices": [(role, role) for role in UserDBM.Roles.values_list()],
+            "description": "Choose user roles"
+        }
+    }
     column_sortable_list = sqlalchemy.inspect(UserDBM).columns
     column_default_sort = [
         (UserDBM.creation_dt, True)

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

@@ -2,7 +2,7 @@ import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
-from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
+from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM, UserDBM
 
 
 class UserTokenMV(SimpleMV, model=UserTokenDBM):
@@ -45,3 +45,11 @@ class UserTokenMV(SimpleMV, model=UserTokenDBM):
         UserTokenDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
         UserTokenDBM.extra_data: lambda m, a: format_json_(m.extra_data),
     }
+    form_ajax_refs = {
+        UserTokenDBM.user.key: {
+            "fields": [UserDBM.id.key, UserDBM.email.key],
+            "placeholder": "Search by id or email",
+            "minimum_input_length": 1,
+            "page_size": 10,
+        }
+    }

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

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import sqlalchemy
+from sqladmin.fields import SelectField
 
 from project.sqladmin_.model_view import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
@@ -32,16 +33,23 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
         VerificationCodeDBM.is_active,
         VerificationCodeDBM.extra_data
     ]
+    form_overrides = {
+        VerificationCodeDBM.type.key: SelectField
+    }
+    form_args = {
+        VerificationCodeDBM.type.key: {
+            "choices": [(status, status) for status in VerificationCodeDBM.Types.values_list()],
+            "description": "Choose type"
+        }
+    }
     column_sortable_list = sqlalchemy.inspect(VerificationCodeDBM).columns
     column_default_sort = [
         (VerificationCodeDBM.creation_dt, True)
     ]
     column_searchable_list = [
         VerificationCodeDBM.id,
-        VerificationCodeDBM.long_id,
-        VerificationCodeDBM.slug,
         VerificationCodeDBM.value,
-        VerificationCodeDBM.recipient,
+        VerificationCodeDBM.recipient
     ]
     column_formatters = {
         VerificationCodeDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),

{arpakitlib-1.8.108.dist-info → arpakitlib-1.8.110.dist-info}/METADATA

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

{arpakitlib-1.8.108.dist-info → arpakitlib-1.8.110.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=rqII_y4Uc4rsf3NPxaIMjyTBO2LmKeQxG1JaQIxxNLA,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=ci8A7G6hZkXMNSaZE5P8knBMo4tQBtmS61Zkl6fzll4,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
@@ -232,13 +232,13 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/asgi.py,sha256=DRlRPk
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py,sha256=x5F8--5KA4cmTrb6kAAmp6fVd2TiqxPOzxqUkSEhSG4,1298
 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/api_key.py,sha256=SNk66VApMLgfOHB8grLDiYnm8KYZTmw7eoOdBmkZCfw,1193
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py,sha256=VZKCG2GQworbmB_PPHPU10qMf5IThP0LN27k50XlHlg,1570
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=US1tueTCPvAdse6TLT6yRLUHbvwGGagApYhFJzE_6Yc,576
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=lIwqYRd2n-wPAKtDlPpNqNHAcSxJDMbtfh8upShqN1I,2112
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=4BFJEp_yIpZltfEjsBC__J_BfgIBYzOc6LeoWFxP1MI,2785
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=8N9ahbCzNVczqgO_g0luRqP8luCv5bmCLoz66UYZ0mU,1427
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=7pjzmIe-Nit2Bk3GL4H7sLem46UcHN1sLc5ZrWd3xQQ,1679
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=q1kjGEkNvaMmbxnpMmR66qF1CdkIChC_SF3YVJnYsks,1529
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py,sha256=llFZ3KDtv0M-wAC77IGAiF9TM8fO83w1xlTWr_t-vHk,1900
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=-QxTreqrSZkIUDrTWkkTH8jI--tH7kXwpWq9TRn_1X4,1984
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=gGhpfqwydZ5VA6vdvNblp3NQHqXZLd1K3OxcYVU1SoM,1789
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py,sha256=_uuBUTkV7cAhHxaBVYk8JSp5voATOc-Kgq36-nC_o-w,2159
 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
@@ -392,8 +392,8 @@ arpakitlib/ar_ssh_runner_util.py,sha256=yvAwza480MkHKvLkDEsR7JNh2bYNs6P9rCVo4NA8
 arpakitlib/ar_str_util.py,sha256=CAv0wH8nP5Ja59S-hEdmNhNrM_Fwy935d0zntLpJkx8,4309
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
-arpakitlib-1.8.108.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.108.dist-info/METADATA,sha256=jgzV39GScpi1sgRSiPkI7Bbt520miM5phD-0PlF6x2c,3566
-arpakitlib-1.8.108.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.108.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.108.dist-info/RECORD,,
+arpakitlib-1.8.110.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.110.dist-info/METADATA,sha256=xOyDGGFbdSk39F8anU0TMvHPZ8oxurhPYItXElio5Vs,3566
+arpakitlib-1.8.110.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.110.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.110.dist-info/RECORD,,