arpakitlib 1.8.173__py3-none-any.whl → 1.8.175__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": "38"
+  "arpakitlib_project_template_subversion": "40"
 }

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

@@ -22,6 +22,7 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
         VerificationCodeDBM.recipient,
         VerificationCodeDBM.user,
         VerificationCodeDBM.is_active,
+        VerificationCodeDBM.detail_data,
         VerificationCodeDBM.extra_data
     ]
     column_details_list = [
@@ -34,6 +35,7 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
         VerificationCodeDBM.recipient,
         VerificationCodeDBM.user,
         VerificationCodeDBM.is_active,
+        VerificationCodeDBM.detail_data,
         VerificationCodeDBM.extra_data
     ]
     form_columns = [
@@ -43,6 +45,7 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
         VerificationCodeDBM.recipient,
         VerificationCodeDBM.user,
         VerificationCodeDBM.is_active,
+        VerificationCodeDBM.detail_data,
         VerificationCodeDBM.extra_data
     ]
     form_overrides = {
@@ -66,10 +69,12 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
     ]
     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 = {

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

@@ -115,6 +115,15 @@ class UserDBM(SimpleDBM):
             parts.append(f"username={self.username}")
         return f"{self.entity_name} ({', '.join(parts)})"
 
+    @validates("fullname")
+    def _validate_fullname(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("email")
     def _validate_email(self, key, value, *args, **kwargs):
         if value is None:

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
+from typing import TYPE_CHECKING, Any
 
 import sqlalchemy
 from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
@@ -55,6 +55,13 @@ 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(
@@ -95,6 +102,14 @@ 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
+
     @property
     def sdp_allowed_types(self) -> list[str]:
         return self.Types.values_list()

{arpakitlib-1.8.173.dist-info → arpakitlib-1.8.175.dist-info}/METADATA

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

{arpakitlib-1.8.173.dist-info → arpakitlib-1.8.175.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=al7QVVaOS56rAPUM62qd71VafJLinL-rixn28o1gec0,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=KQiU8fIzG2SHazH_nhqCF8G1ZmtSYmexcc-JdJF4V8k,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
@@ -252,7 +252,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=EePtnFQsDKvhHcPYQU4ahgo24jC6uBZkuzu2alrTviE,2180
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=AbD0QPbAkwOE3i9aDirVBrIntQBCrU1xwX2IZlMS8Rk,2576
 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=8dfmXKVsmLNf6Id6Ql52uVaZuQtqNCq5nJgBOv3N66A,2883
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py,sha256=NVnF4SHJEGOFuZjLAzsT-fQr5VREYK4xcz5t1zG6JtM,3196
 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
@@ -264,9 +264,9 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=9j3QwBkaQSmsqXZbAYZDysGXP3xPPAHJfqIja5UnLcc,3229
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=op5cSkTlHJyGjULgcSWE9-_PNinKSneHLxhG5DUkd9M,5913
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=hMYVJq837ZeIO3J2neOAzuzxeZ7hdR5PY93-YdgHftU,2472
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=-gmBWOAHJsUl-YY7U_2ZcKK5GV9dPHpvpdTRQnfbA_0,7579
+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=xrrNPXn5PeCnZ2VWVBdXDUft83EEYtc6b4pvs0oh1uw,3078
+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_/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
@@ -411,8 +411,8 @@ arpakitlib/ar_sqlalchemy_util.py,sha256=w_tGPTWIMVjHkTEYo9tVe1sfK_4vvfd3zGATLiYC
 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.173.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.173.dist-info/METADATA,sha256=Ep4MVqwFvmYqwbsCKamEDUZZcCHCC0RXtBODLkZHivk,3706
-arpakitlib-1.8.173.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.173.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.173.dist-info/RECORD,,
+arpakitlib-1.8.175.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.175.dist-info/METADATA,sha256=eUV4XHSXNQ3sM5UR-rkT6G7sIhgw2xah0O2I9bBPw-s,3706
+arpakitlib-1.8.175.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.175.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.175.dist-info/RECORD,,