PyPI - arpakitlib - Versions diffs - 1.8.219__tar.gz → 1.8.221__tar.gz - Mend

@@ -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

@@ -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()
     ))

@@ -0,0 +1,18 @@
+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():
+    a = pydantic_schema_from_sqlalchemy_model(sqlalchemy_model=UserDBM, include_defaults=True)
+    print(a())
+async def __async_sandbox():
+    pass
+if __name__ == '__main__':
+    __sandbox()
+    asyncio.run(__async_sandbox())

@@ -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

@@ -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)

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.219"
+version = "1.8.221"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }

arpakitlib 1.8.219__tar.gz → 1.8.221__tar.gz

arpakitlib 1.8.219tar.gz → 1.8.221tar.gz