arpakitlib 1.8.261__py3-none-any.whl → 1.8.263__py3-none-any.whl

arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py

@@ -5,8 +5,6 @@ from pydantic import BaseModel, ConfigDict
 from sqlalchemy import inspect
 from sqlalchemy.orm import ColumnProperty, Mapped
 
-from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
-
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
@@ -117,7 +115,8 @@ def pydantic_schema_from_sqlalchemy_model(
         filter_property_prefixes: list[str] | None = None,
         remove_property_prefixes: list[str] | None = None,
         skip_property_if_cannot_define_type: bool = True,
-        skip_property_name_if_exists: bool = True
+        skip_property_name_if_exists: bool = True,
+        model_name_suffix: str = "Schema"
 ) -> type[BaseModel]:
     """
     Генерирует Pydantic-модель из колонок SQLAlchemy-модели и (опционально) из @property.
@@ -130,7 +129,7 @@ def pydantic_schema_from_sqlalchemy_model(
     - exclude_property_names: blacklist имён свойств (исключаются после whitelist'а).
     """
     mapper = inspect(sqlalchemy_model).mapper
-    model_name = model_name or f"{sqlalchemy_model.__name__}Schema"
+    model_name = model_name or f"{sqlalchemy_model.__name__}{model_name_suffix}"
 
     annotations: dict[str, Any] = {}
     attrs: dict[str, Any] = {}
@@ -139,7 +138,8 @@ def pydantic_schema_from_sqlalchemy_model(
     include_property_names = set(include_property_names or [])
     exclude_property_names = set(exclude_property_names or [])
     filter_property_prefixes = set(filter_property_prefixes or [])
-    remove_property_prefixes = set(remove_property_prefixes or [])
+    remove_property_prefixes = list(set(remove_property_prefixes or []))
+    remove_property_prefixes.sort(key=len, reverse=True)
 
     # 1) Колонки
     if include_columns:

{arpakitlib-1.8.261.dist-info → arpakitlib-1.8.263.dist-info}/METADATA

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

{arpakitlib-1.8.261.dist-info → arpakitlib-1.8.263.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=K2XCYp6tcRYKXljyfqgJ09B6qPZGsP7PazoAvnE5v-s,10330
+arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py,sha256=jUa9i3UWqK0Qyfq8jMcnwTUCoI3e_N4W36aEcxdLXBA,10388
 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.261.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.261.dist-info/METADATA,sha256=njGc54LxVJzDMEvck7dP82cipNhUByRon9zEyk4x7Tw,3919
-arpakitlib-1.8.261.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.261.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.261.dist-info/RECORD,,
+arpakitlib-1.8.263.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.263.dist-info/METADATA,sha256=KAWpe8qmsvYHYCXfgPTs-3uL2RtsITL3ElRQw9jksN4,3919
+arpakitlib-1.8.263.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.263.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.263.dist-info/RECORD,,