arpakitlib 1.8.255__py3-none-any.whl → 1.8.256__py3-none-any.whl

arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py

@@ -44,20 +44,35 @@ def _python_type_from_col(col) -> type | str:
         return Any
 
 
-def _get_property_name_to_type_from_model_class(model_class: type) -> dict[str, Any]:
+def _get_property_name_to_type_from_model_class(
+        *,
+        model_class: type,
+        skip_property_if_cannot_define_type: bool = True,
+        exclude_property_names: list[str] | None = None,
+        exclude_property_types: list[type] | None = None,
+) -> dict[str, Any]:
     """
     Находит все @property в классе и вытаскивает их возвращаемый тип.
     Если тип не удаётся получить — подставляем Any.
     """
+    exclude_property_names = set(exclude_property_names or [])
     props: dict[str, Any] = {}
-    for name, attr in vars(model_class).items():
+    for property_name, attr in vars(model_class).items():
         if isinstance(attr, property):
             try:
                 hints = get_type_hints(attr.fget) if attr.fget else {}
                 ret_type = hints.get("return", Any)
             except Exception:
+                if skip_property_if_cannot_define_type:
+                    continue
                 ret_type = Any
-            props[name] = ret_type
+            if exclude_property_names:
+                if property_name in exclude_property_names:
+                    continue
+            if exclude_property_types:
+                if not _type_matches(type_=ret_type, allowed_types=exclude_property_types):
+                    continue
+            props[property_name] = ret_type
     return props
 
 
@@ -107,6 +122,7 @@ def pydantic_schema_from_sqlalchemy_model(
         exclude_property_types: list[type] | None = None,
         filter_property_prefixes: list[str] | None = None,
         remove_property_prefixes: list[str] | None = None,
+        skip_property_if_cannot_define_type: bool = True
 ) -> type[BaseModel]:
     """
     Генерирует Pydantic-модель из колонок SQLAlchemy-модели и (опционально) из @property.
@@ -159,7 +175,12 @@ def pydantic_schema_from_sqlalchemy_model(
 
     # 2) Свойства (@property)
     if include_properties:
-        property_name_to_type = _get_property_name_to_type_from_model_class(sqlalchemy_model)
+        property_name_to_type = _get_property_name_to_type_from_model_class(
+            model_class=sqlalchemy_model,
+            skip_property_if_cannot_define_type=skip_property_if_cannot_define_type,
+            exclude_property_names=list(exclude_property_names),
+            exclude_property_types=exclude_property_types
+        )
 
         # (НОВОЕ) фильтр по типам, если задан
         if include_property_types:

{arpakitlib-1.8.255.dist-info → arpakitlib-1.8.256.dist-info}/METADATA

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

{arpakitlib-1.8.255.dist-info → arpakitlib-1.8.256.dist-info}/RECORD

@@ -414,7 +414,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=-cygl5zkbQuKQ1vp3RSbyLka7w9uackcGIsuCbq7jxU,9728
+arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py,sha256=qk439Ii9WFo8vqESt6w93HkRe5XvjOiy-PGa0wXazVg,10677
 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
@@ -430,8 +430,8 @@ arpakitlib/ar_sqlalchemy_util.py,sha256=FDva9onjtCPrYZYIHHb93NMwD1WlmaORjiWgPRJQ
 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.255.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.255.dist-info/METADATA,sha256=UzSoTiAnAf8JvaX4DOOPyfHzUnH3fk4EwFfh4zvVMnA,3919
-arpakitlib-1.8.255.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.255.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.255.dist-info/RECORD,,
+arpakitlib-1.8.256.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.256.dist-info/METADATA,sha256=9PSap0kkeDfMLn2Zv9uffEhxTtP5Y68sT5-eoerWx7M,3919
+arpakitlib-1.8.256.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.256.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.256.dist-info/RECORD,,