arpakitlib 1.8.218__py3-none-any.whl → 1.8.220__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": "54"
+  "arpakitlib_project_template_subversion": "55"
 }

arpakitlib/_arpakit_project_template_v_5/project/api/schema/util/{schema_from_dbm.py → create_obj_schema_from_dbm.py}

@@ -4,7 +4,7 @@ from arpakitlib.ar_sqlalchemy_util import BaseDBM
 from pydantic import BaseModel
 
 
-def schema_from_dbm(*, schema: Type[BaseModel], dbm: BaseDBM, **kwargs) -> BaseModel:
+def create_obj_schema_from_dbm(*, schema: Type[BaseModel], dbm: BaseDBM, **kwargs) -> BaseModel:
     return schema.model_validate(dbm.simple_dict(
         include_columns_and_sd_properties=schema.model_fields.keys()
-    ))
+    ))

arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operations.py

@@ -1,8 +1,8 @@
 from datetime import timedelta
 from typing import Any, Callable
 
-from pydantic import ConfigDict
 from pydantic import BaseModel
+from pydantic import ConfigDict
 
 from project.operation_execution.util import every_timedelta_is_time_func
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM

arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py

@@ -1,8 +1,12 @@
 import asyncio
 
+from arpakitlib.pydantic_schema_from_sqlalchemy_model import pydantic_schema_from_sqlalchemy_model
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
 
 def __sandbox():
-    pass
+    a = pydantic_schema_from_sqlalchemy_model(sqlalchemy_model=UserDBM, include_defaults=True)
+    print(a())
 
 
 async def __async_sandbox():

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

@@ -7,6 +7,5 @@ from project.sqladmin_.model_view.user import UserMV
 from project.sqladmin_.model_view.user_token import UserTokenMV
 from project.sqladmin_.model_view.verification_code import VerificationCodeMV
 
-
 if __name__ == '__main__':
     print(get_string_info_from_model_view(class_=SimpleMV))

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

@@ -1,54 +1,17 @@
 import sqlalchemy
 
 from project.sqladmin_.model_view.common import SimpleMV
-from project.sqladmin_.util.etc import format_datetime_, format_json_, format_json_for_preview_
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
 
 
 class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
-    name = "ApiKey"
-    name_plural = "ApiKeys"
+    name = ApiKeyDBM.get_cls_entity_name()
+    name_plural = ApiKeyDBM.get_cls_entity_name_plural()
     icon = "fa-solid fa-key"
-    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,
-        ApiKeyDBM.value,
-        ApiKeyDBM.is_active,
-    ]
+    column_list = ApiKeyDBM.get_column_and_relationship_names_()
+    column_details_list = ApiKeyDBM.get_column_and_relationship_names_() + ApiKeyDBM.get_sd_property_names()
+    form_columns = ApiKeyDBM.get_column_and_relationship_names_(include_column_pk=False)
     column_sortable_list = sqlalchemy.inspect(ApiKeyDBM).columns
-    column_default_sort = [
-        (ApiKeyDBM.creation_dt, True)
-    ]
-    column_searchable_list = [
-        ApiKeyDBM.id,
-        ApiKeyDBM.long_id,
+    column_searchable_list = SimpleMV.get_default_column_searchable_list() + [
         ApiKeyDBM.value,
     ]
-    column_formatters = {
-        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.extra_data: lambda m, a: format_json_(m.extra_data),
-    }

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

@@ -7,60 +7,12 @@ from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
 class OperationMV(SimpleMV, model=OperationDBM):
-    name = "Operation"
-    name_plural = "Operations"
+    name = OperationDBM.get_cls_entity_name()
+    name_plural = OperationDBM.get_cls_entity_name_plural()
     icon = "fa-solid fa-gears"
-    column_list = [
-        OperationDBM.id,
-        OperationDBM.long_id,
-        OperationDBM.slug,
-        OperationDBM.creation_dt,
-        OperationDBM.status,
-        OperationDBM.type,
-        OperationDBM.marker,
-        OperationDBM.title,
-        OperationDBM.execution_start_dt,
-        OperationDBM.execution_finish_dt,
-        OperationDBM.input_data,
-        OperationDBM.output_data,
-        OperationDBM.error_data,
-        OperationDBM.extra_data,
-
-        OperationDBM.duration.fget.__name__,
-        OperationDBM.duration_as_str.fget.__name__
-    ]
-    column_details_list = [
-        OperationDBM.id,
-        OperationDBM.long_id,
-        OperationDBM.slug,
-        OperationDBM.creation_dt,
-        OperationDBM.status,
-        OperationDBM.type,
-        OperationDBM.marker,
-        OperationDBM.title,
-        OperationDBM.execution_start_dt,
-        OperationDBM.execution_finish_dt,
-        OperationDBM.input_data,
-        OperationDBM.output_data,
-        OperationDBM.error_data,
-        OperationDBM.extra_data,
-
-        OperationDBM.duration.fget.__name__,
-        OperationDBM.duration_as_str.fget.__name__
-    ]
-    form_columns = [
-        OperationDBM.slug,
-        OperationDBM.status,
-        OperationDBM.type,
-        OperationDBM.marker,
-        OperationDBM.title,
-        OperationDBM.execution_start_dt,
-        OperationDBM.execution_finish_dt,
-        OperationDBM.input_data,
-        OperationDBM.output_data,
-        OperationDBM.error_data,
-        OperationDBM.extra_data
-    ]
+    column_list = OperationDBM.get_column_and_relationship_names_()
+    column_details_list = OperationDBM.get_column_and_relationship_names_() + OperationDBM.get_sd_property_names()
+    form_columns = OperationDBM.get_column_and_relationship_names_(include_column_pk=False)
     form_overrides = {
         OperationDBM.status.key: SelectField,
         OperationDBM.type.key: SelectField
@@ -76,26 +28,19 @@ class OperationMV(SimpleMV, model=OperationDBM):
         }
     }
     column_sortable_list = sqlalchemy.inspect(OperationDBM).columns
-    column_default_sort = [
-        (OperationDBM.creation_dt, True)
-    ]
-    column_searchable_list = [
-        OperationDBM.id,
-        OperationDBM.long_id
-    ]
     column_formatters = {
-        OperationDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        **SimpleMV.get_default_column_formatters(),
         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),
+        **SimpleMV.get_default_column_formatters_detail(),
+        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_(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

@@ -2,68 +2,28 @@ 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_
 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 = [
-        StoryLogDBM.id,
-        StoryLogDBM.long_id,
-        StoryLogDBM.slug,
-        StoryLogDBM.creation_dt,
-        StoryLogDBM.level,
-        StoryLogDBM.type,
-        StoryLogDBM.title,
-        StoryLogDBM.extra_data
-    ]
-    column_details_list = [
-        StoryLogDBM.id,
-        StoryLogDBM.long_id,
-        StoryLogDBM.slug,
-        StoryLogDBM.creation_dt,
-        StoryLogDBM.level,
-        StoryLogDBM.type,
-        StoryLogDBM.title,
-        StoryLogDBM.extra_data
-    ]
-    form_columns = [
-        StoryLogDBM.slug,
-        StoryLogDBM.level,
-        StoryLogDBM.type,
-        StoryLogDBM.title,
-        StoryLogDBM.extra_data
-    ]
+    name = StoryLogDBM.get_cls_entity_name()
+    name_plural = StoryLogDBM.get_cls_entity_name_plural()
+    icon = "fa-solid fa-book"
+    column_list = StoryLogDBM.get_column_and_relationship_names_()
+    column_details_list = StoryLogDBM.get_column_and_relationship_names_() + StoryLogDBM.get_sd_property_names()
+    form_columns = StoryLogDBM.get_column_and_relationship_names_(include_column_pk=False)
     form_overrides = {
         StoryLogDBM.level.key: SelectField,
         StoryLogDBM.type.key: SelectField,
     }
     form_args = {
         StoryLogDBM.level.key: {
-            "choices": [(v, v) for v in StoryLogDBM.Levels.values_list()],
+            "choices": [(level, level) for level in StoryLogDBM.Levels.values_list()],
             "description": f"Choose {StoryLogDBM.level.key}"
         },
         StoryLogDBM.type.key: {
-            "choices": [(v, v) for v in StoryLogDBM.Types.values_list()],
+            "choices": [(level, level) for level in StoryLogDBM.Types.values_list()],
             "description": f"Choose {StoryLogDBM.type.key}"
         }
     }
     column_sortable_list = sqlalchemy.inspect(StoryLogDBM).columns
-    column_default_sort = [
-        (StoryLogDBM.creation_dt, True)
-    ]
-    column_searchable_list = [
-        StoryLogDBM.id,
-        StoryLogDBM.long_id,
-    ]
-    column_formatters = {
-        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.extra_data: lambda m, a: format_json_(m.extra_data),
-    }

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

@@ -1,63 +1,23 @@
 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, UserDBM
 
 
 class UserTokenMV(SimpleMV, model=UserTokenDBM):
-    name = "UserToken"
-    name_plural = "UserTokens"
-    icon = "fa-solid fa-fingerprint"
-    column_list = [
-        UserTokenDBM.id,
-        UserTokenDBM.long_id,
-        UserTokenDBM.slug,
-        UserTokenDBM.creation_dt,
-        UserTokenDBM.value,
-        UserTokenDBM.user,
-        UserTokenDBM.is_active,
-        UserTokenDBM.extra_data,
-    ]
-    column_details_list = [
-        UserTokenDBM.id,
-        UserTokenDBM.long_id,
-        UserTokenDBM.slug,
-        UserTokenDBM.creation_dt,
-        UserTokenDBM.value,
-        UserTokenDBM.user,
-        UserTokenDBM.is_active,
-        UserTokenDBM.extra_data,
-    ]
-    form_columns = [
-        UserTokenDBM.slug,
-        UserTokenDBM.creation_dt,
-        UserTokenDBM.value,
-        UserTokenDBM.user,
-        UserTokenDBM.is_active,
-        UserTokenDBM.extra_data
-    ]
+    name = UserTokenDBM.get_cls_entity_name()
+    name_plural = UserTokenDBM.get_cls_entity_name_plural()
+    icon = "fa-solid fa-shield-halved"
+    column_list = UserTokenDBM.get_column_and_relationship_names_()
+    column_details_list = UserTokenDBM.get_column_and_relationship_names_() + UserTokenDBM.get_sd_property_names()
+    form_columns = UserTokenDBM.get_column_and_relationship_names_(include_column_pk=False)
     column_sortable_list = sqlalchemy.inspect(UserTokenDBM).columns
-    column_default_sort = [
-        (UserTokenDBM.creation_dt, True)
-    ]
-    column_searchable_list = [
-        UserTokenDBM.id,
-        UserTokenDBM.long_id,
+    column_searchable_list = SimpleMV.get_default_column_searchable_list() + [
         UserTokenDBM.value,
     ]
-    column_formatters = {
-        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.extra_data: lambda m, a: format_json_(m.extra_data),
-    }
     form_ajax_refs = {
         UserTokenDBM.user.key: {
-            "fields": [UserDBM.id.key, UserDBM.email.key, UserDBM.username.key],
-            "placeholder": "Search by id or email",
+            "fields": [UserDBM.id.key],
             "minimum_input_length": 1,
             "page_size": 10,
         }

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

@@ -4,83 +4,32 @@ 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_
 from project.sqlalchemy_db_.sqlalchemy_model import VerificationCodeDBM, UserDBM
 
 
 class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
-    name = "VerificationCode"
-    name_plural = "VerificationCodes"
-    icon = "fa-solid fa-envelope"
-    column_list = [
-        VerificationCodeDBM.id,
-        VerificationCodeDBM.long_id,
-        VerificationCodeDBM.slug,
-        VerificationCodeDBM.creation_dt,
-        VerificationCodeDBM.type,
-        VerificationCodeDBM.value,
-        VerificationCodeDBM.recipient,
-        VerificationCodeDBM.user,
-        VerificationCodeDBM.is_active,
-        VerificationCodeDBM.detail_data,
-        VerificationCodeDBM.extra_data
-    ]
-    column_details_list = [
-        VerificationCodeDBM.id,
-        VerificationCodeDBM.long_id,
-        VerificationCodeDBM.slug,
-        VerificationCodeDBM.creation_dt,
-        VerificationCodeDBM.type,
-        VerificationCodeDBM.value,
-        VerificationCodeDBM.recipient,
-        VerificationCodeDBM.user,
-        VerificationCodeDBM.is_active,
-        VerificationCodeDBM.detail_data,
-        VerificationCodeDBM.extra_data
-    ]
-    form_columns = [
-        VerificationCodeDBM.slug,
-        VerificationCodeDBM.type,
-        VerificationCodeDBM.value,
-        VerificationCodeDBM.recipient,
-        VerificationCodeDBM.user,
-        VerificationCodeDBM.is_active,
-        VerificationCodeDBM.detail_data,
-        VerificationCodeDBM.extra_data
-    ]
+    name = VerificationCodeDBM.get_cls_entity_name()
+    name_plural = VerificationCodeDBM.get_cls_entity_name_plural()
+    icon = "fa-solid fa-shield"
+    column_list = VerificationCodeDBM.get_column_and_relationship_names_()
+    column_details_list = VerificationCodeDBM.get_column_and_relationship_names_() + VerificationCodeDBM.get_sd_property_names()
+    form_columns = VerificationCodeDBM.get_column_and_relationship_names_(include_column_pk=False)
     form_overrides = {
         VerificationCodeDBM.type.key: SelectField
     }
     form_args = {
         VerificationCodeDBM.type.key: {
-            "choices": [(v, v) for v in VerificationCodeDBM.Types.values_list()],
+            "choices": [(status, status) for status in VerificationCodeDBM.Types.values_list()],
             "description": f"Choose {VerificationCodeDBM.type.key}"
         }
     }
     column_sortable_list = sqlalchemy.inspect(VerificationCodeDBM).columns
-    column_default_sort = [
-        (VerificationCodeDBM.creation_dt, True)
-    ]
-    column_searchable_list = [
-        VerificationCodeDBM.id,
-        VerificationCodeDBM.long_id,
-        VerificationCodeDBM.value,
+    column_searchable_list = SimpleMV.get_default_column_searchable_list() + [
         VerificationCodeDBM.recipient
     ]
-    column_formatters = {
-        VerificationCodeDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
-        VerificationCodeDBM.detail_data: lambda m, _: format_json_for_preview_(m.detail_data),
-        VerificationCodeDBM.extra_data: lambda m, _: format_json_for_preview_(m.extra_data)
-    }
-    column_formatters_detail = {
-        VerificationCodeDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
-        VerificationCodeDBM.detail_data: lambda m, _: format_json_for_preview_(m.detail_data),
-        VerificationCodeDBM.extra_data: lambda m, a: format_json_(m.extra_data),
-    }
     form_ajax_refs = {
         VerificationCodeDBM.user.key: {
             "fields": [UserDBM.id.key, UserDBM.email.key, UserDBM.username.key],
-            "placeholder": "Search by id or email",
             "minimum_input_length": 1,
             "page_size": 10,
         }

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

@@ -1,4 +1,4 @@
-from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, get_string_info_from_declarative_base_2
+from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base_2
 
 from project.sqlalchemy_db_.sqlalchemy_model.api_key import ApiKeyDBM
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM

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

@@ -9,6 +9,7 @@ from sqlalchemy.orm import mapped_column, Mapped, validates
 
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, BaseDBM
+from arpakitlib.ar_str_util import make_none_if_blank
 
 
 def generate_default_long_id() -> str:
@@ -45,6 +46,7 @@ class SimpleDBM(BaseDBM):
         uuid = "uuid"
         slug = "slug"
         creation_dt = "creation_dt"
+        private_comment = "private_comment"
         detail_data = "detail_data"
         extra_data = "extra_data"
 
@@ -53,7 +55,7 @@ class SimpleDBM(BaseDBM):
         nullable=False,
         primary_key=True,
         autoincrement=True,
-        sort_order=-103,
+        sort_order=-104,
     )
     long_id: Mapped[str] = mapped_column(
         sqlalchemy.TEXT,
@@ -61,7 +63,7 @@ class SimpleDBM(BaseDBM):
         unique=True,
         insert_default=generate_default_long_id,
         server_default=func.gen_random_uuid(),
-        sort_order=-102,
+        sort_order=-103,
     )
     uuid: Mapped[sqlalchemy.dialects.postgresql.UUID] = mapped_column(
         sqlalchemy.UUID(as_uuid=True),
@@ -85,7 +87,11 @@ class SimpleDBM(BaseDBM):
         server_default=func.now(),
         sort_order=-100,
     )
-    extra_data: Mapped[dict[str, Any]] = mapped_column(
+    private_comment: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT,
+        nullable=True,
+    )
+    detail_data: Mapped[dict[str, Any]] = mapped_column(
         sqlalchemy.JSON,
         nullable=False,
         index=False,
@@ -93,6 +99,14 @@ class SimpleDBM(BaseDBM):
         server_default="{}",
         sort_order=1000,
     )
+    extra_data: Mapped[dict[str, Any]] = mapped_column(
+        sqlalchemy.JSON,
+        nullable=False,
+        index=False,
+        insert_default={},
+        server_default="{}",
+        sort_order=1001,
+    )
 
     def __repr__(self) -> str:
         parts = [f"id={self.id}"]
@@ -100,6 +114,8 @@ class SimpleDBM(BaseDBM):
             parts.append(f"slug={self.slug}")
         return f"{self.entity_name} ({', '.join(parts)})"
 
+    # ---validators---
+
     @validates("slug")
     def _validate_slug(self, key, value, *args, **kwargs):
         if value is None:
@@ -111,6 +127,23 @@ class SimpleDBM(BaseDBM):
             raise ValueError(f"{key=}, {value=}, value contains spaces")
         return value
 
+    @validates("private_comment")
+    def _validate_private_comment(self, key, value, *args, **kwargs):
+        if value is None:
+            return None
+        if not isinstance(value, str):
+            raise ValueError(f"{key=}, {value=}, value is not str")
+        value = make_none_if_blank(value.strip())
+        return value
+
+    @validates("detail_data")
+    def _validate_detail_data(self, key, value, *args, **kwargs):
+        if value is None:
+            value = {}
+        if not isinstance(value, dict):
+            raise ValueError(f"{key=}, {value=}, value is not dict")
+        return value
+
     @validates("extra_data")
     def _validate_extra_data(self, key, value, *args, **kwargs):
         if value is None:
@@ -119,10 +152,16 @@ class SimpleDBM(BaseDBM):
             raise ValueError(f"{key=}, {value=}, value is not dict")
         return value
 
+    # ---more---
+
     @property
     def id_and_long_id(self) -> str:
         return f"{self.id}--{self.long_id}"
 
+    @property
+    def id_and_long_id_and_uuid(self) -> str:
+        return f"{self.id}--{self.long_id}--{str(self.uuid)}"
+
     @classmethod
     def get_cls_entity_name(cls) -> str:
         return cls.__name__.removesuffix("DBM")
@@ -145,13 +184,21 @@ class SimpleDBM(BaseDBM):
 
     # ---SDP---
 
+    @property
+    def sdp_entity_name(self) -> str:
+        return self.entity_name
+
+    @property
+    def sdp_entity_name_plural(self) -> str:
+        return self.entity_name_plural
+
     @property
     def sdp_id_and_long_id(self) -> str:
         return self.id_and_long_id
 
     @property
-    def sdp_entity_name(self) -> str:
-        return self.entity_name
+    def sdp_id_and_long_id_and_uuid(self) -> str:
+        return self.id_and_long_id_and_uuid
 
 
 def get_simple_dbm_class() -> type[SimpleDBM]:

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

@@ -30,7 +30,7 @@ class OperationDBM(SimpleDBM):
         raise_fake_error_ = "raise_fake_error"
 
     class Markers(Enumeration):
-        nothing = "nothing"
+        pass
 
     status: Mapped[str] = mapped_column(
         sqlalchemy.TEXT,
@@ -180,48 +180,56 @@ class OperationDBM(SimpleDBM):
             return None
         return self.execution_finish_dt - self.execution_start_dt
 
+    # ---SDP---
+
     @property
-    def duration_as_str(self) -> str | None:
-        if self.duration is None:
-            return None
-        return str(self.duration)
+    def sdp_allowed_statuses(self) -> list[str]:
+        return self.Statuses.values_list()
 
     @property
-    def duration_total_seconds(self) -> float | None:
-        if self.duration is None:
-            return None
-        return self.duration.total_seconds()
+    def sdp_allowed_types(self) -> list[str]:
+        return self.Types.values_list()
 
-    # ---SDP---
+    @property
+    def sdp_allowed_markers(self) -> list[str]:
+        return self.Markers.values_list()
+
+    @property
+    def sdp_has_input_data(self) -> bool:
+        return bool(self.input_data)
+
+    @property
+    def sdp_has_output_data(self) -> bool:
+        return bool(self.output_data)
+
+    @property
+    def sdp_has_error_data(self) -> bool:
+        return bool(self.error_data)
 
     @property
     def sdp_duration(self) -> timedelta | None:
-        """
-        При использовании у данной модели .simple_dict данное свойство будет представлено как поле.
-        То есть префикс sdp_ и даёт этот бонус.
-        """
         return self.duration
 
     @property
     def sdp_duration_as_str(self) -> str | None:
-        """
-        При использовании у данной модели .simple_dict данное свойство будет представлено как поле.
-        То есть префикс sdp_ и даёт этот бонус.
-        """
-        return self.duration_as_str
+        if self.duration is None:
+            return None
+        return str(self.duration)
 
     @property
     def sdp_duration_total_seconds(self) -> float | None:
-        """
-        При использовании у данной модели .simple_dict данное свойство будет представлено как поле.
-        То есть префикс sdp_ и даёт этот бонус.
-        """
-        return self.duration_total_seconds
+        if self.duration is None:
+            return None
+        return self.duration.total_seconds()
 
     @property
-    def sdp_allowed_statuses(self) -> list[str]:
-        return self.Statuses.values_list()
+    def sdp_duration_total_minutes(self) -> float | None:
+        if self.duration is None:
+            return None
+        return self.duration.total_seconds() / 60
 
     @property
-    def sdp_allowed_types(self) -> list[str]:
-        return self.Types.values_list()
+    def sdp_duration_total_hours(self) -> float | None:
+        if self.duration is None:
+            return None
+        return self.duration.total_seconds() / 60 / 60

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

@@ -75,6 +75,8 @@ class StoryLogDBM(SimpleDBM):
         value = make_none_if_blank(value.strip())
         return value
 
+    # ---more---
+
     # ---SDP---
 
     @property

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

@@ -60,6 +60,8 @@ class UserTokenDBM(SimpleDBM):
         ]
         return f"{self.entity_name} ({', '.join(parts)})"
 
+    # ---validators---
+
     @validates("value")
     def _validate_value(self, key, value, *args, **kwargs):
         if not isinstance(value, str):
@@ -68,3 +70,7 @@ class UserTokenDBM(SimpleDBM):
         if not value:
             raise ValueError(f"{key=}, {value=}, value is empty")
         return value
+
+    # ---more---
+
+    # ---SDP---

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

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from random import randint
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 import sqlalchemy
 from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
@@ -55,13 +55,6 @@ class VerificationCodeDBM(SimpleDBM):
         insert_default=True,
         server_default="true"
     )
-    detail_data: Mapped[dict[str, Any]] = mapped_column(
-        sqlalchemy.JSON,
-        nullable=False,
-        index=False,
-        insert_default={},
-        server_default="{}",
-    )
 
     # one to many
     user: Mapped[UserDBM | None] = relationship(
@@ -82,6 +75,8 @@ class VerificationCodeDBM(SimpleDBM):
             parts.append(f"user_id={self.user_id}")
         return f"{self.entity_name} ({', '.join(parts)})"
 
+    # ---validators---
+
     @validates("type")
     def _validate_type(self, key, value, *args, **kwargs):
         if not isinstance(value, str):
@@ -102,13 +97,9 @@ class VerificationCodeDBM(SimpleDBM):
         value = make_none_if_blank(value.strip())
         return value
 
-    @validates("detail_data")
-    def _validate_detail_data(self, key, value, *args, **kwargs):
-        if value is None:
-            value = {}
-        if not isinstance(value, dict):
-            raise ValueError(f"{key=}, {value=}, value is not dict")
-        return value
+    # ---more---
+
+    # ---SDP---
 
     @property
     def sdp_allowed_types(self) -> list[str]:

arpakitlib/pydantic_schema_from_sqlalchemy_model.py

@@ -0,0 +1,91 @@
+import datetime as dt
+from typing import Any, Optional
+
+from pydantic import BaseModel, Field
+from sqlalchemy import inspect
+from sqlalchemy.orm import ColumnProperty
+from sqlalchemy.sql.sqltypes import (
+    Boolean, Integer, BigInteger, SmallInteger,
+    String, Text, Unicode, UnicodeText,
+    DateTime, Date, Time,
+    Float, Numeric, DECIMAL, LargeBinary, JSON
+)
+
+_SQLA_TYPE_MAP = {
+    Boolean: bool,
+    Integer: int,
+    BigInteger: int,
+    SmallInteger: int,
+    Float: float,
+    Numeric: float,
+    DECIMAL: float,
+    String: str,
+    Unicode: str,
+    Text: str,
+    UnicodeText: str,
+    LargeBinary: bytes,
+    JSON: dict,
+    DateTime: dt.datetime,
+    Date: dt.date,
+    Time: dt.time,
+}
+
+
+def _python_type_from_col(col) -> type | str:
+    try:
+        return col.type.python_type
+    except Exception:
+        for sa_t, py_t in _SQLA_TYPE_MAP.items():
+            if isinstance(col.type, sa_t):
+                return py_t
+        return Any
+
+
+def pydantic_schema_from_sqlalchemy_model(
+        sqlalchemy_model: type,
+        *,
+        name: str | None = None,
+        base_model: type[BaseModel] = BaseModel,
+        include_defaults: bool = False,
+        exclude_column_names: list[str] | None = None,
+) -> type[BaseModel]:
+    """
+    Генерирует Pydantic-модель только из колонок SQLAlchemy-модели.
+    - include_defaults: добавлять ли default/server_default.
+    - exclude_column_names: список имён колонок, которые нужно пропустить.
+    """
+    mapper = inspect(sqlalchemy_model).mapper
+    model_name = name or f"{sqlalchemy_model.__name__}Schema"
+
+    annotations: dict[str, Any] = {}
+    attrs: dict[str, Any] = {}
+    exclude_column_names = set(exclude_column_names or [])
+
+    for prop in mapper.attrs:
+        if not isinstance(prop, ColumnProperty):
+            continue
+        if prop.key in exclude_column_names:
+            continue
+
+        col = prop.columns[0]
+        py_t = _python_type_from_col(col)
+
+        # Аннотация типа
+        if col.nullable:
+            annotations[prop.key] = Optional[py_t]  # type: ignore[name-defined]
+        else:
+            annotations[prop.key] = py_t
+
+        # Если нужно — добавляем дефолт
+        if include_defaults:
+            default_value = None
+            if col.default is not None and col.default.is_scalar:
+                default_value = col.default.arg
+            elif col.server_default is not None and getattr(col.server_default.arg, "text", None):
+                default_value = col.server_default.arg.text
+
+            if default_value is not None:
+                attrs[prop.key] = Field(default=default_value)
+
+    attrs["__annotations__"] = annotations
+    return type(model_name, (base_model,), attrs)

{arpakitlib-1.8.218.dist-info → arpakitlib-1.8.220.dist-info}/METADATA

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

{arpakitlib-1.8.218.dist-info → arpakitlib-1.8.220.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=uk-Wu_6L9MZFmxQgc-PKw5-qdmdYS_Nra2I9KCu6ZQA,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=gZOXWHexAQHHW5DKdaqdCpdaJx-0obJc76fydlyb-wk,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
@@ -168,7 +168,7 @@ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/common.p
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py,sha256=AvYwqaowd1V_6VQjrIGxt8SwqNEgmirLcHbtSHPwWmQ,1080
 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/schema/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/util/schema_from_dbm.py,sha256=nJ2YNRzcydXDJG8V5_MiI3ODi140D_itayjk-caJe0o,319
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/util/create_obj_schema_from_dbm.py,sha256=7HizltD9MyK1nltQQHAjy69TCOuFDkkgtFJDr7DjLxU,331
 arpakitlib/_arpakit_project_template_v_5/project/api/start_api.py,sha256=P5KMtYXujQUP2uAAKgUFyCxG99Fj2vfNf1ZEm8eFH80,532
 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
@@ -197,7 +197,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=ygGavnIOrOqjtTsi1nhZXKGwwtjTaHbNT9KWZaTDLI4,12967
 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=4Wo-tuC2AbeCYTa5_snMJ2EkXwASCe08vXNnM5feJos,1607
+arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operations.py,sha256=zi1FOBBYV99hQHAF4mQZ4I93pN6Q8nm5RIhSjsEpXGc,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
@@ -229,7 +229,7 @@ arpakitlib/_arpakit_project_template_v_5/project/resource/templates/simple_email
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_2.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
-arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
+arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py,sha256=tcva9-NB0irswjg6RirZ9-pmckuZwoAr8-DUiPB2ASI,424
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_5.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_6.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
@@ -248,28 +248,28 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py,sh
 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=JGCHgqJJvAjpc8xnbXPqCeUiLeKO7eo6OA6uPYzzqlk,1308
 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/__init__.py,sha256=upngi5hsrv6f5M-_R0r_DfERl8jzTnZ6VOum71xiGcY,595
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py,sha256=AfWtDIf0Z7GVEsnGw921u3VbkxhFIffR8u8MfspldSs,750
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=ajqXQft-RsyVCGGf23_8c38Wf-B6KDYWv4wAGR1qYm4,4475
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=IqW9eh0u3-WFkE1oA3yjEboUW2F2zF4cKsp4_FNy2RE,3746
-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/operation.py,sha256=vf-j9QT_eHNevNy3Pbq6U2Wc7IADDM4tgdNwYd5nQ5A,2362
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=-GEfclV8sccXukxn9A1KDE1_CyBarA7EtGue8rgfn8w,1221
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=AhK-2YocK1dM2wMxX_xF0qnsMiI5Pu0Arj5yfDe8Noo,2669
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=pyeyDTg4rss8-67hIE3-SQlAvNfje6HazuaVnyFBpN8,2054
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py,sha256=CDJQvzdLLxE08XNWvII2r7YAy4fYbyr9FmY-9o4V2Qo,3208
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=i3oqyAAtC7pYhuCGEiBxNeBjLQxAGVtiNwa3vrZE1v0,982
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py,sha256=adAuoDqOuvbzJfndZPwJ7y_uGcp6jequI9G9kzoDaDg,1490
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/start_sqladmin.py,sha256=jaAOq7Kf7HYziJslWbjqzr41kX4dJ9CXDPtMXj8rWok,384
 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
 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
-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/__init__.py,sha256=UkP3s2W_9Xk3ugOdgDXJFDDlJfuroBqrPusaDbwe4o8,692
 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=ynp36o48B_HNMJSAc-mw40LzhoFLSXyOWw3JOPc8gKo,4446
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=-7uzlux8B7wtqhSd4b_06M40yTDySPIngm3Cwun2lSA,7378
-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/common.py,sha256=NsZbGGJvsn1IgfUQ9J4_6qBQyNBADDmt2Q8waRePD0c,5851
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=6mDtD20H0bQEoSwReLPzaqNp6vLHgOQ7D1DD7KC7zIU,7111
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=Xou8XvEGQfLuEHH5RKdq6pXCZWMhmtyshQvvohT-Go8,2507
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=22TE8y2Vm9byLLkIE6RVAMa29d9ILCVg1e1QYi4ONIQ,7898
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=dCCiRZcOiUpqd-DZZ-A6tVM0PzJwa030KFOzPXNyM7A,1929
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/verification_code.py,sha256=3fNkUwWEdt6l3Snwr_ktMqzTeo2hm04hPlznCLr2izg,3548
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=Yy4XZLHJqNEt_SlQOcVCDwHqxpuBwtOmyOfGKbYqKeo,1988
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/verification_code.py,sha256=xM5e9C8ELI1RJBAaSXZPn9Qpwl4DT2TgRvbYOxsKZsM,3137
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util/execute_func_with_story_log.py,sha256=HrDlG8Y1gbMNVIuDHvCndXbnp8vxc8T8l-_XBVn7zR8,6091
 arpakitlib/_arpakit_project_template_v_5/project/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -416,8 +416,9 @@ arpakitlib/ar_str_util.py,sha256=2lGpnXDf2h1cBZpVf5i1tX_HCv5iBd6IGnrCw4QWWlY,435
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/clone_pydantic_model_fields.py,sha256=Gn9_AIjKknN1eIYK_xH_cMyff3hjOpfwRqs583-rnJs,1167
-arpakitlib-1.8.218.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.218.dist-info/METADATA,sha256=NlgCzO5BIIrf3lgE7zpMTs6MNYwh3YkxGtW7R1HQ1vA,3741
-arpakitlib-1.8.218.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.218.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.218.dist-info/RECORD,,
+arpakitlib/pydantic_schema_from_sqlalchemy_model.py,sha256=bjLNfeJRZonvVl7pnczwL8OzxbIGawulp30K-xYY7yA,2833
+arpakitlib-1.8.220.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.220.dist-info/METADATA,sha256=CZDGfdCQIX96yHZbsEbkmS7rA4kbjdORbcNV8qfugN0,3741
+arpakitlib-1.8.220.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.220.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.220.dist-info/RECORD,,