arpakitlib 1.8.215__py3-none-any.whl → 1.8.216__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": "52"
+  "arpakitlib_project_template_subversion": "53"
 }

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

@@ -19,6 +19,7 @@ def get_default_column_formatters() -> dict[Any, Any]:
         SimpleDBM.ColumnNames.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
     }
 
+
 def get_default_column_formatters_detail() -> dict[Any, Any]:
     return {
         SimpleDBM.ColumnNames.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
@@ -36,7 +37,6 @@ def get_default_column_searchable_list() -> list[str]:
     return [SimpleDBM.ColumnNames.id, SimpleDBM.ColumnNames.long_id, SimpleDBM.ColumnNames.uuid]
 
 
-
 class SimpleMV(ModelView):
     can_create = True
     can_edit = True
@@ -65,27 +65,19 @@ class SimpleMV(ModelView):
     @classmethod
     def get_default_column_list(cls) -> list[str]:
         from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
-        return SimpleDBM.get_mapped_column_names()
+        return SimpleDBM.get_column_and_relationship_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()
+        return SimpleDBM.get_column_and_relationship_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)
+        res = SimpleDBM.get_column_and_relationship_names_(
+            include_column_pk=False
+        )
         return res
 
     @classmethod

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

@@ -143,10 +143,6 @@ class SimpleDBM(BaseDBM):
     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/ar_sqlalchemy_util.py

@@ -68,21 +68,54 @@ class BaseDBM(DeclarativeBase):
         return self._bus_data
 
     @classmethod
-    def get_table_column_names_(
+    def get_column_names_(
             cls,
             *,
             include_pk: bool = True,
-            exclude_columns: list[str] | None = None
+            exclude_names: list[str] | None = None
     ) -> list[str]:
-        exclude_columns = set(exclude_columns or [])
-        result = []
-        for c in cls.__table__.columns:
+        if exclude_names is None:
+            exclude_names = []
+        res = []
+        for c in inspect(cls).columns:
             if not include_pk and c.primary_key:
                 continue
-            if c.name in exclude_columns:
+            if c.key in exclude_names:
                 continue
-            result.append(c.name)
-        return result
+            res.append(c)
+        return res
+
+    @classmethod
+    def get_relationship_names_(
+            cls,
+            *,
+            exclude_names: list[str] | None = None
+    ) -> list[str]:
+        if exclude_names is None:
+            exclude_names = []
+        res = []
+        for c in inspect(cls).relationships:
+            if c.key in exclude_names:
+                continue
+            res.append(c)
+        return res
+
+    @classmethod
+    def get_column_and_relationship_names_(
+            cls,
+            *,
+            include_column_names: bool = True,
+            include_column_pk: bool = True,
+            exclude_column_names: list[str] | None = None,
+            include_relationship_names: bool = True,
+            exclude_relationship_names: list[str] | None = None,
+    ) -> list[str]:
+        res = []
+        if include_column_names:
+            res += cls.get_column_names_(include_pk=include_column_pk, exclude_names=exclude_column_names)
+        if include_relationship_names:
+            res += cls.get_relationship_names_(exclude_names=exclude_relationship_names)
+        return res
 
     @classmethod
     def get_sd_property_names(

{arpakitlib-1.8.215.dist-info → arpakitlib-1.8.216.dist-info}/METADATA

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

{arpakitlib-1.8.215.dist-info → arpakitlib-1.8.216.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=IFyJL9VUoIuOAYeuLFLptd5jQMJjnRqfWOrkib9CM8E,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=aoHu_XuInN6u9CGw16RqSp5JF_iOvjJ0xoCaXOJtX_M,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
@@ -250,7 +250,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=U4KbXPAoyvgUB2BoPYUOPKLpHQLOdvZp-JdeVnC1MPY,5573
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=1jGRO2xgNc_DwlhMoZD9C8HZi2qghjrBSnDf2dxB20Y,5150
 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/user.py,sha256=AhK-2YocK1dM2wMxX_xF0qnsMiI5Pu0Arj5yfDe8Noo,2669
@@ -264,7 +264,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=OuHmYkFUPnSQ5QV8UiAjBax5GLNGGGh1zOYSjKp3nqw,4598
+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/user.py,sha256=22TE8y2Vm9byLLkIE6RVAMa29d9ILCVg1e1QYi4ONIQ,7898
@@ -411,13 +411,13 @@ arpakitlib/ar_schedule_uust_api_client_util.py,sha256=rXI2_3OTaIBgR-GixM1Ti-Ue1f
 arpakitlib/ar_settings_util.py,sha256=Y5wi_cmsjDjfJpM0VJHjbo0NoVPKfypKaD1USowwDtQ,1327
 arpakitlib/ar_sleep_util.py,sha256=ggaj7ML6QK_ADsHMcyu6GUmUpQ_9B9n-SKYH17h-9lM,1045
 arpakitlib/ar_sqladmin_util.py,sha256=SEoaowAPF3lhxPsNjwmOymNJ55Ty9rmzvsDm7gD5Ceo,861
-arpakitlib/ar_sqlalchemy_util.py,sha256=CX9Uc2Jri3qxEljRuMvcFjf_SQU5AdJjGBYSheAGWG4,13276
+arpakitlib/ar_sqlalchemy_util.py,sha256=QJWW8AgnFH-7vJ2OBfWxg7_IWNfVTMnXpWCRxkT2A_4,14338
 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/clone_pydantic_model_fields.py,sha256=Gn9_AIjKknN1eIYK_xH_cMyff3hjOpfwRqs583-rnJs,1167
-arpakitlib-1.8.215.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.215.dist-info/METADATA,sha256=jHca9GY9lhfzCk8iIAl0Vpf9pNTgmWt73oaz6fzlvhM,3741
-arpakitlib-1.8.215.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.215.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.215.dist-info/RECORD,,
+arpakitlib-1.8.216.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.216.dist-info/METADATA,sha256=8VLikpn99aNZWDVqVrcnDqV0Q2P7FIN_3FKJZlWgomI,3741
+arpakitlib-1.8.216.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.216.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.216.dist-info/RECORD,,