arpakitlib 1.8.219__py3-none-any.whl → 1.8.221__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/api/schema/util/{schema_from_dbm.py → create_obj_schema_from_dbm.py}

@@ -1,11 +1,10 @@
 from typing import Type
 
-from pydantic import BaseModel
-
 from arpakitlib.ar_sqlalchemy_util import BaseDBM
+from pydantic import BaseModel
 
 
-def schema_from_dbm(*, schema: Type[BaseModel], dbm: BaseDBM, **kwargs) -> BaseModel:
+def create_obj_schema_from_dbm(*, schema: Type[BaseModel], dbm: BaseDBM, **kwargs) -> BaseModel:
     return schema.model_validate(dbm.simple_dict(
         include_columns_and_sd_properties=schema.model_fields.keys()
     ))

arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py

@@ -1,8 +1,12 @@
 import asyncio
 
+from arpakitlib.pydantic_schema_from_sqlalchemy_model import pydantic_schema_from_sqlalchemy_model
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
 
 def __sandbox():
-    pass
+    a = pydantic_schema_from_sqlalchemy_model(sqlalchemy_model=UserDBM, include_defaults=True)
+    print(a())
 
 
 async def __async_sandbox():

arpakitlib/ar_sqlalchemy_util.py

@@ -89,32 +89,54 @@ class BaseDBM(DeclarativeBase):
     def get_relationship_names_(
             cls,
             *,
+            exclude_one_to_many: bool = False,
+            exclude_many_to_one: bool = False,
+            exclude_many_to_many: bool = False,
+            exclude_viewonly: bool = False,
             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:
+        for r in inspect(cls).relationships:
+            if r.key in exclude_names:
                 continue
-            res.append(c.key)
+            if exclude_viewonly and r.viewonly:
+                continue
+            if exclude_one_to_many and r.direction is sqlalchemy.orm.ONETOMANY:
+                continue
+            if exclude_many_to_one and r.direction is sqlalchemy.orm.MANYTOONE:
+                continue
+            if exclude_many_to_many and r.direction is sqlalchemy.orm.MANYTOMANY:
+                continue
+            res.append(r.key)
         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_one_to_many: bool = False,
+            exclude_many_to_one: bool = False,
+            exclude_many_to_many: bool = False,
             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)
+            res += cls.get_relationship_names_(
+                exclude_names=exclude_relationship_names,
+                exclude_one_to_many=exclude_one_to_many,
+                exclude_many_to_one=exclude_many_to_one,
+                exclude_many_to_many=exclude_many_to_many,
+            )
         return res
 
     @classmethod

arpakitlib/pydantic_schema_from_sqlalchemy_model.py

@@ -0,0 +1,91 @@
+import datetime as dt
+from typing import Any, Optional
+
+from pydantic import BaseModel, Field
+from sqlalchemy import inspect
+from sqlalchemy.orm import ColumnProperty
+from sqlalchemy.sql.sqltypes import (
+    Boolean, Integer, BigInteger, SmallInteger,
+    String, Text, Unicode, UnicodeText,
+    DateTime, Date, Time,
+    Float, Numeric, DECIMAL, LargeBinary, JSON
+)
+
+_SQLA_TYPE_MAP = {
+    Boolean: bool,
+    Integer: int,
+    BigInteger: int,
+    SmallInteger: int,
+    Float: float,
+    Numeric: float,
+    DECIMAL: float,
+    String: str,
+    Unicode: str,
+    Text: str,
+    UnicodeText: str,
+    LargeBinary: bytes,
+    JSON: dict,
+    DateTime: dt.datetime,
+    Date: dt.date,
+    Time: dt.time,
+}
+
+
+def _python_type_from_col(col) -> type | str:
+    try:
+        return col.type.python_type
+    except Exception:
+        for sa_t, py_t in _SQLA_TYPE_MAP.items():
+            if isinstance(col.type, sa_t):
+                return py_t
+        return Any
+
+
+def pydantic_schema_from_sqlalchemy_model(
+        sqlalchemy_model: type,
+        *,
+        name: str | None = None,
+        base_model: type[BaseModel] = BaseModel,
+        include_defaults: bool = False,
+        exclude_column_names: list[str] | None = None,
+) -> type[BaseModel]:
+    """
+    Генерирует Pydantic-модель только из колонок SQLAlchemy-модели.
+    - include_defaults: добавлять ли default/server_default.
+    - exclude_column_names: список имён колонок, которые нужно пропустить.
+    """
+    mapper = inspect(sqlalchemy_model).mapper
+    model_name = name or f"{sqlalchemy_model.__name__}Schema"
+
+    annotations: dict[str, Any] = {}
+    attrs: dict[str, Any] = {}
+    exclude_column_names = set(exclude_column_names or [])
+
+    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)
+
+        # Аннотация типа
+        if col.nullable:
+            annotations[prop.key] = Optional[py_t]  # type: ignore[name-defined]
+        else:
+            annotations[prop.key] = py_t
+
+        # Если нужно — добавляем дефолт
+        if include_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 default_value is not None:
+                attrs[prop.key] = Field(default=default_value)
+
+    attrs["__annotations__"] = annotations
+    return type(model_name, (base_model,), attrs)

{arpakitlib-1.8.219.dist-info → arpakitlib-1.8.221.dist-info}/METADATA

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

{arpakitlib-1.8.219.dist-info → arpakitlib-1.8.221.dist-info}/RECORD

@@ -168,7 +168,7 @@ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/common.p
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py,sha256=AvYwqaowd1V_6VQjrIGxt8SwqNEgmirLcHbtSHPwWmQ,1080
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user_token.py,sha256=iiuZXu_zo3FJX0W5qyyMGasUx-_d32yjqc_2KY3xpUA,513
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/util/schema_from_dbm.py,sha256=vq8vtttJPmtiOXWNie4OGI-psbh3jnURtq3M7asiQOk,321
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/util/create_obj_schema_from_dbm.py,sha256=7HizltD9MyK1nltQQHAjy69TCOuFDkkgtFJDr7DjLxU,331
 arpakitlib/_arpakit_project_template_v_5/project/api/start_api.py,sha256=P5KMtYXujQUP2uAAKgUFyCxG99Fj2vfNf1ZEm8eFH80,532
 arpakitlib/_arpakit_project_template_v_5/project/api/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/business_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -229,7 +229,7 @@ arpakitlib/_arpakit_project_template_v_5/project/resource/templates/simple_email
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
+arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py,sha256=tcva9-NB0irswjg6RirZ9-pmckuZwoAr8-DUiPB2ASI,424
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 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
@@ -411,13 +411,14 @@ 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=lJ6lMGf6tkdgdYsJAClTzW1kEem5F-NbOwXx2r__Jnw,14346
+arpakitlib/ar_sqlalchemy_util.py,sha256=Ia8eR-XiB9nZWwknLqqySS5L4RlKFe1bkTZ15rpLD8U,15270
 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.219.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.219.dist-info/METADATA,sha256=YeogpjKj15CfLs0qYRw3PMPzeieIGTq3nn9A_WC4Jjo,3741
-arpakitlib-1.8.219.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.219.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.219.dist-info/RECORD,,
+arpakitlib/pydantic_schema_from_sqlalchemy_model.py,sha256=bjLNfeJRZonvVl7pnczwL8OzxbIGawulp30K-xYY7yA,2833
+arpakitlib-1.8.221.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.221.dist-info/METADATA,sha256=-RqKllIWyEjPQbbvpX2G9z6OpQwHUf15Ztn1MNOKnRw,3741
+arpakitlib-1.8.221.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.221.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.221.dist-info/RECORD,,