arpakitlib 1.8.97__tar.gz → 1.8.98__tar.gz

{arpakitlib-1.8.97 → arpakitlib-1.8.98}/PKG-INFO

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

{arpakitlib-1.8.97 → arpakitlib-1.8.98}/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-1.8.97 → arpakitlib-1.8.98}/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-1.8.97 → arpakitlib-1.8.98}/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-1.8.97 → arpakitlib-1.8.98}/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-1.8.97 → arpakitlib-1.8.98}/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-1.8.97 → arpakitlib-1.8.98}/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-1.8.97 → arpakitlib-1.8.98}/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-1.8.97 → arpakitlib-1.8.98}/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-1.8.98/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")
+
+
+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 → arpakitlib-1.8.98}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.97"
+version = "1.8.98"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }