arpakitlib 1.8.191__py3-none-any.whl → 1.8.193__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": "46"
+  "arpakitlib_project_template_subversion": "48"
 }

arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operations.py

@@ -2,7 +2,7 @@ from datetime import timedelta
 from typing import Any, Callable
 
 from pydantic import ConfigDict
-from pydantic.v1 import BaseModel
+from pydantic import BaseModel
 
 from project.operation_execution.util import every_timedelta_is_time_func
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
@@ -17,25 +17,25 @@ class ScheduledOperation(BaseModel):
     timeout_after_creation: timedelta | None = None
 
 
-healthcheck_every_0_01_seconds_scheduled_operation = ScheduledOperation(
+healthcheck_every_0_01_seconds_so = ScheduledOperation(
     type=OperationDBM.Types.healthcheck_,
     input_data={"healthcheck": "healthcheck"},
     is_time_func=every_timedelta_is_time_func(td=timedelta(seconds=0.01))
 )
 
-healthcheck_every_3_seconds_scheduled_operation = ScheduledOperation(
+healthcheck_every_3_seconds_so = ScheduledOperation(
     type=OperationDBM.Types.healthcheck_,
     input_data={"healthcheck": "healthcheck"},
     is_time_func=every_timedelta_is_time_func(td=timedelta(seconds=3))
 )
 
-healthcheck_every_24_hours_scheduled_operation = ScheduledOperation(
+healthcheck_every_24_hours_so = ScheduledOperation(
     type=OperationDBM.Types.healthcheck_,
     input_data={"healthcheck": "healthcheck"},
     is_time_func=every_timedelta_is_time_func(td=timedelta(hours=24))
 )
 
-raise_fake_error_every_3_seconds_scheduled_operation = ScheduledOperation(
+raise_fake_error_every_3_seconds_so = ScheduledOperation(
     type=OperationDBM.Types.raise_fake_error_,
     input_data={"raise_fake_error": "raise_fake_error"},
     is_time_func=every_timedelta_is_time_func(td=timedelta(seconds=3))
@@ -44,6 +44,6 @@ raise_fake_error_every_3_seconds_scheduled_operation = ScheduledOperation(
 
 def get_scheduled_operations() -> list[ScheduledOperation]:
     res = []
-    res.append(healthcheck_every_3_seconds_scheduled_operation)
-    res.append(healthcheck_every_24_hours_scheduled_operation)
+    res.append(healthcheck_every_3_seconds_so)
+    res.append(healthcheck_every_24_hours_so)
     return res

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

@@ -8,6 +8,8 @@ from openpyxl import Workbook
 from sqladmin import ModelView
 
 from arpakitlib.ar_datetime_util import now_utc_dt
+from project.sqladmin_.util.etc import format_json_for_preview_, format_datetime_, format_json_
+from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
 
 
 class SimpleMV(ModelView):
@@ -23,6 +25,57 @@ class SimpleMV(ModelView):
     export_types = ["xlsx"]
     form_include_pk = True
 
+    column_default_sort = [
+        (SimpleDBM.ColumnNames.creation_dt, True)
+    ]
+
+    @classmethod
+    def get_default_column_searchable_list(cls) -> list[str]:
+        from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
+        return [SimpleDBM.ColumnNames.id, SimpleDBM.ColumnNames.long_id, SimpleDBM.ColumnNames.uuid]
+
+    @classmethod
+    def get_default_column_list(cls) -> list[str]:
+        from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
+        return SimpleDBM.get_mapped_column_names()
+
+    @classmethod
+    def get_default_column_details_list(cls) -> list[str]:
+        from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
+        return SimpleDBM.get_mapped_column_names()
+
+    @classmethod
+    def get_default_form_columns(cls) -> list[str]:
+        from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
+        res = SimpleDBM.get_mapped_column_names()
+        if SimpleDBM.ColumnNames.id in res:
+            res.remove(SimpleDBM.ColumnNames.id)
+        if SimpleDBM.ColumnNames.long_id in res:
+            res.remove(SimpleDBM.ColumnNames.long_id)
+        if SimpleDBM.ColumnNames.uuid in res:
+            res.remove(SimpleDBM.ColumnNames.uuid)
+        if SimpleDBM.ColumnNames.slug in res:
+            res.remove(SimpleDBM.ColumnNames.slug)
+        if SimpleDBM.ColumnNames.creation_dt in res:
+            res.remove(SimpleDBM.ColumnNames.creation_dt)
+        return res
+
+    @classmethod
+    def get_default_column_formatters(cls) -> dict[Any, Any]:
+        return {
+            SimpleDBM.ColumnNames.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+            SimpleDBM.ColumnNames.detail_data: lambda m, a: format_json_for_preview_(m.detail_data),
+            SimpleDBM.ColumnNames.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
+        }
+
+    @classmethod
+    def get_default_column_formatters_detail(cls) -> dict[Any, Any]:
+        return {
+            SimpleDBM.ColumnNames.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+            SimpleDBM.ColumnNames.detail_data: lambda m, a: format_json_(m.detail_data),
+            SimpleDBM.ColumnNames.extra_data: lambda m, a: format_json_(m.extra_data),
+        }
+
     async def export_data(
             self,
             data: List[Any],

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

@@ -1,8 +1,9 @@
+import uuid
 from datetime import datetime
 from typing import Any
 from uuid import uuid4
 
-import sqlalchemy
+import sqlalchemy.dialects.postgresql
 from sqlalchemy import func
 from sqlalchemy.orm import mapped_column, Mapped, validates
 
@@ -28,6 +29,15 @@ def make_slug_from_string(string: str) -> str:
 class SimpleDBM(BaseDBM):
     __abstract__ = True
 
+    class ColumnNames:
+        id = "id"
+        long_id = "long_id"
+        uuid = "uuid"
+        slug = "slug"
+        creation_dt = "creation_dt"
+        detail_data = "detail_data"
+        extra_data = "extra_data"
+
     id: Mapped[int] = mapped_column(
         sqlalchemy.BIGINT,
         nullable=False,
@@ -43,6 +53,14 @@ class SimpleDBM(BaseDBM):
         server_default=func.gen_random_uuid(),
         sort_order=-102,
     )
+    uuid: Mapped[sqlalchemy.dialects.postgresql.UUID] = mapped_column(
+        sqlalchemy.UUID(as_uuid=True),
+        nullable=False,
+        unique=True,
+        insert_default=uuid.uuid4,
+        server_default=func.gen_random_uuid(),
+        sort_order=-102,
+    )
     slug: Mapped[str | None] = mapped_column(
         sqlalchemy.TEXT,
         nullable=True,
@@ -99,6 +117,14 @@ class SimpleDBM(BaseDBM):
     def entity_name(self) -> str:
         return self.__class__.__name__.removesuffix("DBM")
 
+    @property
+    def uuid_as_str(self) -> str:
+        return str(self.uuid)
+
+    @classmethod
+    def get_mapped_column_names(cls) -> list[str]:
+        return [k for k, v in SimpleDBM.__dict__.items() if isinstance(v, Mapped)]
+
     # ---SDP---
 
     @property

{arpakitlib-1.8.191.dist-info → arpakitlib-1.8.193.dist-info}/METADATA

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

{arpakitlib-1.8.191.dist-info → arpakitlib-1.8.193.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=GUwpn6VLQB618HdTf74tKA5xJ4O7qzo9pOfNQ6w9suw,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=nOUaX-jQTf_-6LEz8gh0OAvYNYmtEoMPAzb6Ix3xfQI,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
@@ -195,7 +195,7 @@ arpakitlib/_arpakit_project_template_v_5/project/operation_execution/__init__.py
 arpakitlib/_arpakit_project_template_v_5/project/operation_execution/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template_v_5/project/operation_execution/operation_executor_worker.py,sha256=GlJYHw63RONeTfQa6goLoFSlcLp0m7CcAYai-1RtSl0,12130
 arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operation_creator_worker.py,sha256=WzZC6r0GVSwOpphsxqpRZIdeewK_wzi3YshjLOutYGA,4524
-arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operations.py,sha256=WZyRWzrLvGre_1TjWy0I8V7WfKFZJ0f_8LuZZNrzgy8,1712
+arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operations.py,sha256=4Wo-tuC2AbeCYTa5_snMJ2EkXwASCe08vXNnM5feJos,1607
 arpakitlib/_arpakit_project_template_v_5/project/operation_execution/util.py,sha256=sqHF2AU5Y5IurYHcIH2bu3-JbS1amLO3GD13Zvy8epM,923
 arpakitlib/_arpakit_project_template_v_5/project/resource/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/1,sha256=IIO7Wvjwlr2-LPSQ7Y8O35hcI6t0_s8zqITDxkYCO8I,11
@@ -248,7 +248,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.p
 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=aKX6k2bEVvfXa9dATYts-sUoWgf4MV3H_PiiUceejr4,596
 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/common.py,sha256=vI9yDb2344l5dNfXTZYrjfGCSDbA4EvXqW9yaKEwjAQ,4879
 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=AhK-2YocK1dM2wMxX_xF0qnsMiI5Pu0Arj5yfDe8Noo,2669
@@ -262,7 +262,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/const.py,sha256=
 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=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=y3g0j0vBs2ICuX4rHlqBbDO0C39q4LMirk9o6NFbrRU,3246
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=OsnGHOmco4FsQOe8MfGPFTbwCohXXB-eINNsDh43wzs,3997
 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=vdhSLtSNVrWejDzR2XEfwNSXgR4QJ-IqaJryEp1a
 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.191.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.191.dist-info/METADATA,sha256=R9QrtPOqAvYAJuoZCN4n0kf8UwfGn0ITv2ToqNQdTQ8,3741
-arpakitlib-1.8.191.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.191.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.191.dist-info/RECORD,,
+arpakitlib-1.8.193.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.193.dist-info/METADATA,sha256=y8q-Osr4a4Bm4b_aQPmeIaHYA-f1wL7sykYt7LExuek,3741
+arpakitlib-1.8.193.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.193.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.193.dist-info/RECORD,,