arpakitlib 1.8.97__py3-none-any.whl → 1.8.99__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py

@@ -1,9 +1,10 @@
 from fastapi import FastAPI
+from sqladmin import Admin
+
 from project.core.settings import get_cached_settings
 from project.sqladmin_.admin_authorize import SQLAdminAuth
 from project.sqladmin_.model_view import SimpleMV
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
-from sqladmin import Admin
 
 
 def add_sqladmin_in_app(

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py

@@ -2,11 +2,12 @@ import logging
 
 import fastapi
 import sqlalchemy
+from sqladmin.authentication import AuthenticationBackend
+
 from arpakitlib.ar_str_util import make_none_if_blank, strip_if_not_none
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM, UserDBM
-from sqladmin.authentication import AuthenticationBackend
 
 SQLADMIN_AUTHORIZE_KEY = "sqladmin_authorize_key"
 

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py

@@ -2,6 +2,7 @@ import logging
 
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
+
 from project.core.settings import get_cached_settings
 from project.core.util import setup_logging
 from project.sqladmin_.add_admin_in_app import add_sqladmin_in_app

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

@@ -1,12 +1,14 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
+from project.sqladmin_.util.etc import format_datetime_
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
 
 
 class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
     name = "ApiKey"
     name_plural = "ApiKeys"
+    icon = "fa-solid fa-key"
     column_list = sqlalchemy.inspect(ApiKeyDBM).columns
     form_columns = [
         ApiKeyDBM.slug,
@@ -24,3 +26,9 @@ class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
         ApiKeyDBM.slug,
         ApiKeyDBM.value,
     ]
+    column_formatters = {
+        ApiKeyDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }
+    column_formatters_detail = {
+        ApiKeyDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }

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

@@ -1,12 +1,14 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
+from project.sqladmin_.util.etc import format_datetime_
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
 class OperationMV(SimpleMV, model=OperationDBM):
     name = "Operation"
     name_plural = "Operations"
+    icon = "fa-solid fa-gears"
     column_list = sqlalchemy.inspect(OperationDBM).columns
     form_columns = [
         OperationDBM.slug,
@@ -29,3 +31,9 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.long_id,
         OperationDBM.slug,
     ]
+    column_formatters = {
+        OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }
+    column_formatters_detail = {
+        OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }

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

@@ -1,12 +1,14 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
+from project.sqladmin_.util.etc import format_datetime_
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
 
 class StoryLogMV(SimpleMV, model=StoryLogDBM):
     name = "StoryLog"
     name_plural = "StoryLogs"
+    icon = "fa-solid fa-history"
     column_list = sqlalchemy.inspect(StoryLogDBM).columns
     form_columns = [
         StoryLogDBM.slug,
@@ -24,3 +26,9 @@ class StoryLogMV(SimpleMV, model=StoryLogDBM):
         StoryLogDBM.long_id,
         StoryLogDBM.slug,
     ]
+    column_formatters = {
+        StoryLogDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }
+    column_formatters_detail = {
+        StoryLogDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }

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

@@ -1,6 +1,7 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
+from project.sqladmin_.util.etc import format_datetime_
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
@@ -47,3 +48,9 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.password,
         UserDBM.tg_id
     ]
+    column_formatters = {
+        UserDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }
+    column_formatters_detail = {
+        UserDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }

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

@@ -1,6 +1,7 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
+from project.sqladmin_.util.etc import format_datetime_
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 
 
@@ -36,3 +37,9 @@ class UserTokenMV(SimpleMV, model=UserTokenDBM):
         UserTokenDBM.slug,
         UserTokenDBM.value,
     ]
+    column_formatters = {
+        UserTokenDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }
+    column_formatters_detail = {
+        UserTokenDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt)
+    }

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/util/etc.py

@@ -0,0 +1,40 @@
+import datetime as dt
+from typing import Any
+
+from markupsafe import Markup
+from pygments import highlight
+from pygments.formatters.html import HtmlFormatter
+from pygments.lexers.data import JsonLexer
+
+from arpakitlib.ar_json_util import transfer_data_to_json_str
+
+
+def format_datetime_(datetime_: dt.datetime | None) -> str:
+    if datetime_ is None:
+        return ""
+    return datetime_.strftime("%Y-%m-%d %H:%M:%S %Z%z")
+
+
+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)} элементов)"
+
+
+def format_json_(data: dict[str, Any] | list[Any] | None) -> str:
+    if data is None:
+        return Markup("")
+    highlighted_json = highlight(
+        transfer_data_to_json_str(data, beautify=True),
+        JsonLexer(),
+        HtmlFormatter()
+    )
+    return Markup(highlighted_json)
+
+
+def format_link_(
+        link: str | None = None,
+) -> str:
+    if link is None:
+        return ""
+    return Markup(f'<a href="{link}" target="_blank">{link}</a>')

{arpakitlib-1.8.97.dist-info → arpakitlib-1.8.99.dist-info}/METADATA

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

{arpakitlib-1.8.97.dist-info → arpakitlib-1.8.99.dist-info}/RECORD

@@ -223,18 +223,20 @@ arpakitlib/_arpakit_project_template_v_5/project/site/exception_handler.py,sha25
 arpakitlib/_arpakit_project_template_v_5/project/site/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/site/router/main_router.py,sha256=J5jNfgd-3OiWTtuubimEUz6wrOogupj9PkUdDmwz-2U,62
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py,sha256=9ecDreptxM1dDLDdn-aNGRmN1Q-mW4Sq3dYvfHbDHiM,850
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py,sha256=pAloalyOeRCWitdhlF4aOFkODYv5EWyKwhiQofxaWfo,4982
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py,sha256=JTXLf18DQVsZtoe6yFpZIVJI95rgJofnTe9YKyVwwhQ,851
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py,sha256=tmvYx5hFO2RqHmhKktpMRJaBuT6vDHBOsQujihO7sMw,4983
 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=UYT7DwJoA5hnkL7fCcdRqxvozqA-BvNO8VYHXuDRlhI,1297
+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=rQ1xKXYJVSXGRisJ5XZeFIvH_iRWJjqwHzcAZs8n2Z8,689
+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/common.py,sha256=US1tueTCPvAdse6TLT6yRLUHbvwGGagApYhFJzE_6Yc,576
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=ZPoq3SueGJfR_aWk-a6dIHRNmO1Qa-8kHUW0aR4ZW3g,920
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=GMSICxW_A8RTCtoENDEjce-R8GRLKtHa-OU5OLMdH5s,720
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=jZfMgtyxU5eCStu-9jv9SrAgUAAVeO1_mQvzPI_rV4A,1212
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=GJQXMAHvieMQ15WEp0mNS1aXEuWHwhSwTmOw-ebkV50,1042
+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_/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/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
@@ -384,8 +386,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.97.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.97.dist-info/METADATA,sha256=LM9KBMYvoRgyQzhQatdHX9WXGs6dCqmIdar21jLY680,3470
-arpakitlib-1.8.97.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.97.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.97.dist-info/RECORD,,
+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,,