arpakitlib 1.8.99__py3-none-any.whl → 1.8.101__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": "21"
+  "arpakitlib_project_template_subversion": "22"
 }

arpakitlib/_arpakit_project_template_v_5/project/business_service/create_first_admin.py

@@ -0,0 +1,37 @@
+import logging
+
+from project.core.util import setup_logging
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+_logger = logging.getLogger(__name__)
+
+
+def create_first_admin():
+    with get_cached_sqlalchemy_db().new_session() as session:
+        user_dbm = (
+            session
+            .query(UserDBM)
+            .filter(UserDBM.roles.any(UserDBM.Roles.admin))
+            .first()
+        )
+        if user_dbm is not None:
+            _logger.info("first admin already exists")
+            return
+        user_dbm = UserDBM(
+            username="admin",
+            roles=[UserDBM.Roles.client, UserDBM.Roles.admin],
+            password="admin",
+        )
+        session.add(user_dbm)
+        session.commit()
+        _logger.info("first admin was created")
+
+
+def command():
+    setup_logging()
+    create_first_admin()
+
+
+if __name__ == '__main__':
+    command()

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/_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/_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/_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/_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/_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.dist-info → arpakitlib-1.8.101.dist-info}/METADATA

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

{arpakitlib-1.8.99.dist-info → arpakitlib-1.8.101.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=venTIy_RqpxyWRH5vD97JdtvE3PFVKeDXpib2U_2GEo,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=ZneHlEsk8wRJSuHj4ZP4GeF5uLsCc2qGMz5Ibx8EJms,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
@@ -159,6 +159,7 @@ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py,
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user_token.py,sha256=iiuZXu_zo3FJX0W5qyyMGasUx-_d32yjqc_2KY3xpUA,513
 arpakitlib/_arpakit_project_template_v_5/project/api/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/business_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template_v_5/project/business_service/create_first_admin.py,sha256=2TzUxP8XY1ijTMXzpjfwelWgtqDmuX9_VmN915cvfkI,959
 arpakitlib/_arpakit_project_template_v_5/project/business_service/hello_world.py,sha256=lvWlVF6SlnC33swSCd-_QK6guxBg50myOd8cPS7hZrA,251
 arpakitlib/_arpakit_project_template_v_5/project/business_service/remove_operations.py,sha256=E2F8xonPeZovKKOHv-XDmsQUHvks8A6R89PVhF_pAQI,1780
 arpakitlib/_arpakit_project_template_v_5/project/celery_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -229,14 +230,14 @@ 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=MtEk37LR9xg5XltEbIAw1hh74BsS70I2G3C21QSbjVQ,357
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py,sha256=vSXw1wTpSwzz6l6qrgrzkCiklZmilZE6L2eBMxPDbk4,997
+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/common.py,sha256=US1tueTCPvAdse6TLT6yRLUHbvwGGagApYhFJzE_6Yc,576
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=DMgo4237FzmCc5hIC7ck9Ys1WhlonqBl09_NmszgD0U,1236
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=suHGfQpcgfDIEKaczuwbbxLsOzbZlBtmEuKYPXeATtQ,1036
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=7qJMaMMy9sAAbl7s7CfP6Hybdyzk6a1xTdZMTGHE_PI,1487
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=vUr1rz7H_e6qlmz5Y3isAgtK1_2F1JHojklfnkaBJIY,1327
+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/story_log.py,sha256=yTBHnL8em7d96o-tL2OsKQEryDQfDYFeEUpkNTjfHQI,1236
+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_/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/util/etc.py,sha256=WRb7JUYGNvT_9O4-M8EO_z6pa1s63WIxkYy-N-iwKts,1070
+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
@@ -386,8 +387,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.99.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.99.dist-info/METADATA,sha256=QQOeAsA4FsE29ntPwQm5utHgq-XTijuYt04Ih_ljyFc,3470
-arpakitlib-1.8.99.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.99.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.99.dist-info/RECORD,,
+arpakitlib-1.8.101.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.101.dist-info/METADATA,sha256=5q2R3PZ1Dl8y5OnfmjaCSxE1q_acj9SFDf9euTsjmMk,3471
+arpakitlib-1.8.101.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.101.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.101.dist-info/RECORD,,