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

arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py

@@ -1,8 +1,8 @@
 # arpakit
 import datetime as dt
-from typing import Any, Optional, get_type_hints
+from typing import Any, Optional, get_type_hints, get_origin, Union, Annotated, get_args
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, ConfigDict
 from sqlalchemy import inspect
 from sqlalchemy.orm import ColumnProperty
 from sqlalchemy.sql.sqltypes import (
@@ -27,7 +27,7 @@ _SQLA_TYPE_MAP = {
     Text: str,
     UnicodeText: str,
     LargeBinary: bytes,
-    JSON: dict,
+    JSON: dict | list,
     DateTime: dt.datetime,
     Date: dt.date,
     Time: dt.time,
@@ -44,23 +44,70 @@ 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
 
 
+def _type_matches(*, type_: Any, allowed_types: list[type]) -> bool:
+    """
+    Возвращает True, если тип `tp` соответствует хоть одному из типов в `allowed`.
+    - поддерживает Union/Optional (перебирает аргументы),
+    - Annotated (смотрит на базовый тип),
+    - generics (List[int], Dict[str, Any]) — сравнивает по origin (list, dict, и т.п.).
+    """
+    if type_ is Any:
+        return True
+
+    origin = get_origin(type_)
+    if origin is Union:  # Optional/Union
+        return any(_type_matches(type_=arg, allowed_types=allowed_types) for arg in get_args(type_))
+    if origin is Annotated:
+        return _type_matches(type_=get_args(type_)[0], allowed_types=allowed_types)
+
+    # если это generic, сравним по origin (например, list/dict)
+    type_check = origin or type_
+
+    for allowed_type in allowed_types:
+        # точное совпадение по объекту типа
+        if type_check is allowed_type:
+            return True
+        # безопасная проверка наследования
+        try:
+            if isinstance(type_check, type) and isinstance(allowed_type, type) and issubclass(type_check, allowed_type):
+                return True
+        except Exception:
+            pass
+    return False
+
+
 def pydantic_schema_from_sqlalchemy_model(
         sqlalchemy_model: type,
         *,
@@ -70,9 +117,12 @@ def pydantic_schema_from_sqlalchemy_model(
         exclude_column_names: list[str] | None = None,
         include_properties: bool = False,
         include_property_names: list[str] | None = None,
+        include_property_types: list[type] | None = None,
         exclude_property_names: list[str] | None = None,
+        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.
@@ -125,9 +175,29 @@ 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:
+            property_name_to_type = {
+                k: v for k, v in property_name_to_type.items()
+                if _type_matches(type_=v, allowed_types=include_property_types)
+            }
+
+        # Затем исключающие типы (EXCLUDE)
+        if exclude_property_types:
+            property_name_to_type = {
+                k: v
+                for k, v in property_name_to_type.items()
+                if not _type_matches(type_=v, allowed_types=exclude_property_types)
+            }
+
+        # фильтр по префиксам
         if filter_property_prefixes:
             property_name_to_type = {
                 property_name: property_type
@@ -151,7 +221,7 @@ def pydantic_schema_from_sqlalchemy_model(
                 if property_name in exclude_property_names:
                     property_name_to_type.pop(property_name, None)
 
-        # удаляем префиксы
+        # удаление префиксов (без изменений)
         if remove_property_prefixes:
             renamed_property_name_to_type = {}
             for property_name, property_type in list(property_name_to_type.items()):
@@ -183,4 +253,8 @@ def pydantic_schema_from_sqlalchemy_model(
             annotations[property_name] = property_type
 
     attrs["__annotations__"] = annotations
+
+    if "model_config" not in attrs:
+        attrs["model_config"] = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
+
     return type(model_name, (base_model,), attrs)

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

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

{arpakitlib-1.8.254.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=-uaJcr3GqledUXk_uSFKfUX00gxX6WVAQs4mfxmXTWg,7399
+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.254.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.254.dist-info/METADATA,sha256=pnFWXrz2lu5ZwiVcwwpwa3gYAUHv_AZC6RDFUm7hpiw,3919
-arpakitlib-1.8.254.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.254.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.254.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,,