arpakitlib 1.8.250__py3-none-any.whl → 1.8.252__py3-none-any.whl

arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py

@@ -1,6 +1,6 @@
 # arpakit
 import datetime as dt
-from typing import Any, Optional
+from typing import Any, Optional, get_type_hints
 
 from pydantic import BaseModel, Field
 from sqlalchemy import inspect
@@ -11,6 +11,7 @@ from sqlalchemy.sql.sqltypes import (
     DateTime, Date, Time,
     Float, Numeric, DECIMAL, LargeBinary, JSON
 )
+
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 _SQLA_TYPE_MAP = {
@@ -43,51 +44,143 @@ 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]:
+    """
+    Находит все @property в классе и вытаскивает их возвращаемый тип.
+    Если тип не удаётся получить — подставляем Any.
+    """
+    props: dict[str, Any] = {}
+    for 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:
+                ret_type = Any
+            props[name] = ret_type
+    return props
+
+
 def pydantic_schema_from_sqlalchemy_model(
         sqlalchemy_model: type,
         *,
-        name: str | None = None,
+        model_name: str | None = None,
         base_model: type[BaseModel] = BaseModel,
-        include_defaults: bool = False,
+        include_column_defaults: bool = False,
         exclude_column_names: list[str] | None = None,
+        include_properties: bool = False,
+        include_property_names: list[str] | None = None,
+        exclude_property_names: list[str] | None = None,
+        filter_property_prefixes: list[str] | None = None,
+        remove_prefixes: list[str] | None = None,
 ) -> type[BaseModel]:
     """
-    Генерирует Pydantic-модель только из колонок SQLAlchemy-модели.
-    - include_defaults: добавлять ли default/server_default.
+    Генерирует Pydantic-модель из колонок SQLAlchemy-модели и (опционально) из @property.
+
+    - include_column_defaults: добавлять ли default/server_default у колонок.
     - exclude_column_names: список имён колонок, которые нужно пропустить.
+
+    - include_properties: включать ли свойства (@property). По умолчанию False.
+    - include_property_names: whitelist имён свойств (если задан, берём только их).
+    - exclude_property_names: blacklist имён свойств (исключаются после whitelist'а).
     """
     mapper = inspect(sqlalchemy_model).mapper
-    model_name = name or f"{sqlalchemy_model.__name__}Schema"
+    model_name = model_name or f"{sqlalchemy_model.__name__}Schema"
 
     annotations: dict[str, Any] = {}
     attrs: dict[str, Any] = {}
-    exclude_column_names = set(exclude_column_names or [])
 
+    exclude_column_names = set(set(exclude_column_names) or [])
+    include_property_names = set(set(include_property_names) or [])
+    exclude_property_names = set(set(exclude_property_names) or [])
+    filter_property_prefixes = list(set(filter_property_prefixes) or [])
+    remove_prefixes = list(set(remove_prefixes) or [])
+
+    # 1) Колонки
     for prop in mapper.attrs:
         if not isinstance(prop, ColumnProperty):
             continue
         if prop.key in exclude_column_names:
             continue
 
-        col = prop.columns[0]
-        py_t = _python_type_from_col(col)
+        column = prop.columns[0]
+        column_type = _python_type_from_col(column)
 
         # Аннотация типа
-        if col.nullable:
-            annotations[prop.key] = Optional[py_t]  # type: ignore[name-defined]
+        if column.nullable:
+            annotations[prop.key] = Optional[column_type]  # type: ignore[name-defined]
         else:
-            annotations[prop.key] = py_t
+            annotations[prop.key] = column_type
 
-        # Если нужно — добавляем дефолт
-        if include_defaults:
+        # Дефолты, если нужно
+        if include_column_defaults:
             default_value = None
-            if col.default is not None and col.default.is_scalar:
-                default_value = col.default.arg
-            elif col.server_default is not None and getattr(col.server_default.arg, "text", None):
-                default_value = col.server_default.arg.text
+            if column.default is not None and getattr(column.default, "is_scalar", False):
+                default_value = column.default.arg
+            elif column.server_default is not None and getattr(column.server_default.arg, "text", None):
+                default_value = column.server_default.arg.text
 
             if default_value is not None:
                 attrs[prop.key] = Field(default=default_value)
 
+    # 2) Свойства (@property)
+    if include_properties:
+        property_name_to_type = _get_property_name_to_type_from_model_class(sqlalchemy_model)
+
+        # фильтр по префиксам (если задан и не пуст)
+        if filter_property_prefixes:
+            property_name_to_type = {
+                property_name: property_type
+                for property_name, property_type in property_name_to_type.items()
+                if any(property_name.startswith(v) for v in filter_property_prefixes)
+            }
+
+        # whitelist по именам
+        if include_property_names:
+            property_name_to_type = {
+                k: v
+                for k, v in property_name_to_type.items()
+                if k in include_property_names
+            }
+        else:
+            property_name_to_type = dict(property_name_to_type)
+
+        # blacklist по именам
+        if exclude_property_names:
+            for property_name in list(property_name_to_type.keys()):
+                if property_name in exclude_property_names:
+                    property_name_to_type.pop(property_name, None)
+
+        # удаляем префиксы
+        if remove_prefixes:
+            renamed_property_name_to_type = {}
+            for property_name, property_type in property_name_to_type.items():
+                new_property_name = property_name
+                for prefix in remove_prefixes:
+                    if new_property_name.startswith(prefix):
+                        new_property_name = new_property_name[len(prefix):].strip()
+                        break
+                if new_property_name != property_name:
+                    property_name_to_type.pop(property_name)
+                    # избегаем коллизий
+                    if (
+                            new_property_name not in annotations
+                            and new_property_name not in property_name_to_type
+                            and new_property_name not in renamed_property_name_to_type
+                    ):
+                        renamed_property_name_to_type[new_property_name] = property_type
+                    else:
+                        raise ValueError(
+                            f"Property name '{property_name}' after removing prefix "
+                            f"conflicts with existing name '{new_property_name}'"
+                        )
+            property_name_to_type.update(renamed_property_name_to_type)
+
+        # добавляем (колонки в приоритете)
+        for property_name, property_type in property_name_to_type.items():
+            if property_name in annotations:
+                continue
+            annotations[property_name] = property_type
+
     attrs["__annotations__"] = annotations
     return type(model_name, (base_model,), attrs)

arpakitlib/ar_sqlalchemy_util.py

@@ -174,6 +174,7 @@ class BaseDBM(DeclarativeBase):
             exclude_sd_properties: Collection[str] | None = None,
             include_columns_and_sd_properties: Collection[str] | None = None,
             prefix: str = "sdp_",
+            remove_prefix: bool = True,
             kwargs: dict[str, Any] | None = None
     ) -> dict[str, Any]:
         if exclude_columns is None:
@@ -199,7 +200,9 @@ class BaseDBM(DeclarativeBase):
                 if not attr_name.startswith(prefix) or not isinstance(getattr(type(self), attr_name, None), property):
                     continue
 
-                sd_property_name = attr_name.removeprefix(prefix)
+                sd_property_name = attr_name
+                if remove_prefix:
+                    sd_property_name = sd_property_name.removeprefix(prefix)
 
                 if (
                         include_columns_and_sd_properties is not None

{arpakitlib-1.8.250.dist-info → arpakitlib-1.8.252.dist-info}/METADATA

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

{arpakitlib-1.8.250.dist-info → arpakitlib-1.8.252.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=_5Y79kQ4lLIOL6_afIFVwxY1EXzTMpi-veRR-WkPFOs,2879
+arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py,sha256=Dy53opHf_WjAMUC_PpvLkYXnrKOlqhbuNeEqlwIWJ8E,7369
 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
@@ -426,12 +426,12 @@ 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=5I7KsKCzJc9hxpn2_0r__RcbqcKpTs_PDw_f5_0P7Xw,16050
+arpakitlib/ar_sqlalchemy_util.py,sha256=FDva9onjtCPrYZYIHHb93NMwD1WlmaORjiWgPRJQKoU,16180
 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.250.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.250.dist-info/METADATA,sha256=T4V7KUip-9Bg5nzPDEWl9peAgaitrQnWrlNqYpIY194,3919
-arpakitlib-1.8.250.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.250.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.250.dist-info/RECORD,,
+arpakitlib-1.8.252.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.252.dist-info/METADATA,sha256=y2bDBx7FFGVOBgDvKBp20DIzFNfjhHBMqJJ5G9HUXf4,3919
+arpakitlib-1.8.252.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.252.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.252.dist-info/RECORD,,