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

arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py

@@ -72,7 +72,7 @@ def pydantic_schema_from_sqlalchemy_model(
         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,
+        remove_property_prefixes: list[str] | None = None,
 ) -> type[BaseModel]:
     """
     Генерирует Pydantic-модель из колонок SQLAlchemy-модели и (опционально) из @property.
@@ -90,11 +90,11 @@ def pydantic_schema_from_sqlalchemy_model(
     annotations: dict[str, Any] = {}
     attrs: dict[str, Any] = {}
 
-    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 [])
+    exclude_column_names = set(exclude_column_names or [])
+    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 [])
 
     # 1) Колонки
     for prop in mapper.attrs:
@@ -152,11 +152,11 @@ def pydantic_schema_from_sqlalchemy_model(
                     property_name_to_type.pop(property_name, None)
 
         # удаляем префиксы
-        if remove_prefixes:
+        if remove_property_prefixes:
             renamed_property_name_to_type = {}
-            for property_name, property_type in property_name_to_type.items():
+            for property_name, property_type in list(property_name_to_type.items()):
                 new_property_name = property_name
-                for prefix in remove_prefixes:
+                for prefix in remove_property_prefixes:
                     if new_property_name.startswith(prefix):
                         new_property_name = new_property_name[len(prefix):].strip()
                         break
@@ -177,7 +177,7 @@ def pydantic_schema_from_sqlalchemy_model(
             property_name_to_type.update(renamed_property_name_to_type)
 
         # добавляем (колонки в приоритете)
-        for property_name, property_type in property_name_to_type.items():
+        for property_name, property_type in list(property_name_to_type.items()):
             if property_name in annotations:
                 continue
             annotations[property_name] = property_type

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

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

{arpakitlib-1.8.252.dist-info → arpakitlib-1.8.254.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=Dy53opHf_WjAMUC_PpvLkYXnrKOlqhbuNeEqlwIWJ8E,7369
+arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py,sha256=-uaJcr3GqledUXk_uSFKfUX00gxX6WVAQs4mfxmXTWg,7399
 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.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,,
+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,,