arpakitlib 1.8.276__py3-none-any.whl → 1.8.278__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py

@@ -1,8 +1,15 @@
 import asyncio
 
+from arpakitlib.ar_pydantic_schema_from_sqlalchemy_model import _get_property_name_to_type_from_model_class
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
 
 def __sandbox():
-    pass
+    res = _get_property_name_to_type_from_model_class(
+        model_class=UserDBM
+    )
+    for a,b in res.items():
+        print(a, b)
 
 
 async def __async_sandbox():

arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py

@@ -33,13 +33,24 @@ def _get_property_name_to_type_from_model_class(
         exclude_property_types: list[type] | None = None,
 ) -> dict[str, Any]:
     """
-    Находит все @property в классе и вытаскивает их возвращаемый тип.
-    Если тип не удаётся получить — подставляем Any.
+    Находит все @property в классе и его родителях, и вытаскивает их возвращаемый тип.
+    Если тип не удаётся получить — подставляем Any (в зависимости от skip_property_if_cannot_define_type).
     """
     exclude_property_names = set(exclude_property_names or [])
     props: dict[str, Any] = {}
-    for property_name, attr in vars(model_class).items():
-        if isinstance(attr, property):
+
+    for cls in reversed(model_class.__mro__):
+
+        if cls is object:
+            continue
+
+        for property_name, attr in cls.__dict__.items():
+            if not isinstance(attr, property):
+                continue
+
+            if property_name in exclude_property_names:
+                continue
+
             try:
                 hints = get_type_hints(attr.fget) if attr.fget else {}
                 ret_type = hints.get("return", Any)
@@ -48,13 +59,12 @@ def _get_property_name_to_type_from_model_class(
                     ret_type = Any
                 else:
                     raise
-            if exclude_property_names:
-                if property_name in exclude_property_names:
-                    continue
-            if exclude_property_types:
-                if _type_matches(type_=ret_type, allowed_types=exclude_property_types):
-                    continue
+
+            if exclude_property_types and _type_matches(type_=ret_type, allowed_types=exclude_property_types):
+                continue
+
             props[property_name] = ret_type
+
     return props
 
 

{arpakitlib-1.8.276.dist-info → arpakitlib-1.8.278.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arpakitlib
-Version: 1.8.276
+Version: 1.8.278
 Summary: arpakitlib
 License: Apache-2.0
 License-File: LICENSE
@@ -50,6 +50,7 @@ Requires-Dist: pydantic-settings (>=2.7.1,<3.0.0)
 Requires-Dist: pyjwt (>=2.10.1,<3.0.0)
 Requires-Dist: pymongo (>=4.10.1,<5.0.0)
 Requires-Dist: pytelegrambotapi (>=4.27.0,<5.0.0)
+Requires-Dist: pytest (>=8.4.2,<9.0.0)
 Requires-Dist: pytz (>=2024.2,<2025.0)
 Requires-Dist: pyzabbix (>=1.3.1,<2.0.0)
 Requires-Dist: qrcode (>=8.2,<9.0)

{arpakitlib-1.8.276.dist-info → arpakitlib-1.8.278.dist-info}/RECORD

@@ -238,7 +238,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sandbox/__init__.py,sha256=47DE
 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=CIv4vQfBLhlIh92fiLhmyTXSZXjDovxTFZtUBDnWyFY,427
-arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
+arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py,sha256=Oalf7__usi-AkxjoeKQgrbdvaK7Mevh6i92u0Upoq50,460
 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
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_7.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
@@ -415,7 +415,7 @@ arpakitlib/ar_need_type_util.py,sha256=XmY1kswz8j9oo5f9CxRu0_zgfvxWrXPYKOj6MM04s
 arpakitlib/ar_openai_api_client_util.py,sha256=dWgsSPXtxNBxS5VRi_NharGQrUXF_YjIfhU3Bj5cW9M,5651
 arpakitlib/ar_parse_command.py,sha256=1WTdQoWVshoDZ1jDaKeTzajfqaYHP3FNO0-REyo1aMY,3003
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
-arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py,sha256=jUa9i3UWqK0Qyfq8jMcnwTUCoI3e_N4W36aEcxdLXBA,10388
+arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py,sha256=SddmsEdRdVbmdZ5aSuwy6DfGYmYx_JO6lKzuEJeBAV8,10553
 arpakitlib/ar_raise_own_exception_if_exception.py,sha256=A6TuNSBk1pHaQ_qxnUmE2LgsNGA1IGqX26b1_HEA4Nc,5978
 arpakitlib/ar_rat_func_util.py,sha256=Ca10o3RJwyx_DJLxjTxgHDO6NU3M6CWgUR4bif67OE4,2006
 arpakitlib/ar_really_validate_email.py,sha256=HBfhyiDB3INI6Iq6hR2WOMKA5wVWWRl0Qun-x__OZ9o,1201
@@ -431,8 +431,8 @@ arpakitlib/ar_sqlalchemy_drop_check_constraints.py,sha256=XEqnMrIwSYasW_UOJ8xU-J
 arpakitlib/ar_sqlalchemy_util.py,sha256=nUDCxhu0l8P0eBCdLyXej3_yLvBlB3LrGhMWzAekm5E,16532
 arpakitlib/ar_str_util.py,sha256=2lGpnXDf2h1cBZpVf5i1tX_HCv5iBd6IGnrCw4QWWlY,4350
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
-arpakitlib-1.8.276.dist-info/METADATA,sha256=mTUGXK-3Vr9PbhhG-IZiFZ37jfjurTscAhqK_3ZvOMg,4021
-arpakitlib-1.8.276.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-arpakitlib-1.8.276.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.276.dist-info/licenses/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.276.dist-info/RECORD,,
+arpakitlib-1.8.278.dist-info/METADATA,sha256=JIGTnl0xkixaDHFeMBYeirksr7HESqO9xDP-ztWSo-s,4060
+arpakitlib-1.8.278.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+arpakitlib-1.8.278.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.278.dist-info/licenses/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.278.dist-info/RECORD,,