arpakitlib 1.8.249__py3-none-any.whl → 1.8.251__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/api/raise_own_exception_if_exception_in_api_router.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 import fastapi
-from arpakitlib.raise_own_exception_if_exception import raise_own_exception_if_exception
+from arpakitlib.ar_raise_own_exception_if_exception import raise_own_exception_if_exception
 
 from project.api.api_exception import APIException
 from project.api.schema.out.common.error import ErrorCommonSO

arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from arpakitlib.pydantic_schema_from_sqlalchemy_model import pydantic_schema_from_sqlalchemy_model
+from arpakitlib.ar_pydantic_schema_from_sqlalchemy_model import pydantic_schema_from_sqlalchemy_model
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 

arpakitlib/ar_pydantic_schema_from_sqlalchemy_model.py

@@ -0,0 +1,149 @@
+# arpakit
+import datetime as dt
+from typing import Any, Optional, get_type_hints
+
+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
+)
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+_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 _collect_properties_with_types(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,
+        base_model: type[BaseModel] = BaseModel,
+        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,
+) -> type[BaseModel]:
+    """
+    Генерирует 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"
+
+    annotations: dict[str, Any] = {}
+    attrs: dict[str, Any] = {}
+
+    exclude_column_names = set(exclude_column_names or [])
+    include_property_names = set(include_property_names or [])
+    exclude_property_names = set(exclude_property_names or [])
+
+    # 1) Колонки
+    for prop in mapper.attrs:
+        if not isinstance(prop, ColumnProperty):
+            continue
+        if prop.key in exclude_column_names:
+            continue
+
+        column = prop.columns[0]
+        column_type = _python_type_from_col(column)
+
+        # Аннотация типа
+        if column.nullable:
+            annotations[prop.key] = Optional[column_type]  # type: ignore[name-defined]
+        else:
+            annotations[prop.key] = column_type
+
+        # Дефолты, если нужно
+        if include_column_defaults:
+            default_value = None
+            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 = _collect_properties_with_types(sqlalchemy_model)
+
+        # 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(name, None)
+
+        # Добавляем аннотации свойств (колонки имеют приоритет)
+        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_really_validate_url.py

@@ -0,0 +1,47 @@
+from urllib.parse import urlparse
+
+
+class ReallyValidateUrlException(Exception):
+    def __init__(self, url: str, error_message: str):
+        self.url = url
+        self.error_message = error_message
+
+    def __str__(self) -> str:
+        return f"{self.__class__.__name__}, {self.url=}, {self.error_message}"
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}, {self.url=}, {self.error_message}"
+
+
+def really_validate_url(url: str) -> None:
+    result = urlparse(url)
+
+    if not result.scheme:
+        raise ReallyValidateUrlException(
+            url=url,
+            error_message="URL must include a scheme (e.g., http/https)."
+        )
+
+    if not result.netloc:
+        raise ReallyValidateUrlException(
+            url=url,
+            error_message="URL must include a domain or host."
+        )
+
+    # Optional: restrict allowed schemes
+    if result.scheme not in ("http", "https", "ftp"):
+        raise ReallyValidateUrlException(
+            url=url,
+            error_message=f"Unsupported scheme: {result.scheme}"
+        )
+
+    # If everything is fine — return None (no errors)
+    return None
+
+
+def is_really_url_valid(email: str) -> bool:
+    try:
+        really_validate_url(url=email)
+    except ReallyValidateUrlException:
+        return False
+    return True

arpakitlib/ar_sqlalchemy_util.py

@@ -299,7 +299,7 @@ class SQLAlchemyDb:
         self._logger.info("alembic tables data were removed")
 
     def ensure_check_constraints(self):
-        from arpakitlib.ensure_sqlalchemy_check_constraints import ensure_sqlalchemy_check_constraints
+        from arpakitlib.ar_ensure_sqlalchemy_check_constraints import ensure_sqlalchemy_check_constraints
         ensure_sqlalchemy_check_constraints(base_=self.base_dbm, engine=self.engine)
 
     def init(self, ensure_check_constraints: bool = True):

{arpakitlib-1.8.249.dist-info → arpakitlib-1.8.251.dist-info}/METADATA

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

{arpakitlib-1.8.249.dist-info → arpakitlib-1.8.251.dist-info}/RECORD

@@ -101,7 +101,7 @@ arpakitlib/_arpakit_project_template_v_5/project/api/middleware/__init__.py,sha2
 arpakitlib/_arpakit_project_template_v_5/project/api/middleware/add_api_middlewares.py,sha256=TrWn0yPDCn0yTlHqLf19ypGtRumNjDxm0sM60yVsqXE,468
 arpakitlib/_arpakit_project_template_v_5/project/api/middleware/limit_content_length.py,sha256=cEtGcJSh3e2EyuQCFqKzRcrl3qS6oIvpSv5UEbYsvR4,1622
 arpakitlib/_arpakit_project_template_v_5/project/api/openapi_ui.py,sha256=7yg9ZNu6BjTAregnfbRFpwvqa-gTIY6o6NCz5pmsbeo,976
-arpakitlib/_arpakit_project_template_v_5/project/api/raise_own_exception_if_exception_in_api_router.py,sha256=EtkoPfsGPz4Qma4ZvYlPtPlxaRPH93cX4D0YpEL9ql0,1410
+arpakitlib/_arpakit_project_template_v_5/project/api/raise_own_exception_if_exception_in_api_router.py,sha256=7zssLmFEfZ5WvC-ZW1bPyn_HrYNPjvK_Q9Ln1-xH3O4,1413
 arpakitlib/_arpakit_project_template_v_5/project/api/response.py,sha256=xZMymP2BuQaRNVWLeIp3UgUUo-MFN8MJnsn9Al4vOb8,1028
 arpakitlib/_arpakit_project_template_v_5/project/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -237,7 +237,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=tcva9-NB0irswjg6RirZ9-pmckuZwoAr8-DUiPB2ASI,424
+arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py,sha256=CIv4vQfBLhlIh92fiLhmyTXSZXjDovxTFZtUBDnWyFY,427
 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
@@ -388,15 +388,18 @@ arpakitlib/ar_base_worker_util.py,sha256=e-Vj9w1D-59KN3Zz7TQlOB2lW4fZphJlsPpFkmX
 arpakitlib/ar_blank_util.py,sha256=qFUdY8usL_pRYamz8Rw1fW3fzNIgrLmpdYP8q-_PQvw,2281
 arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weRfJ0,3476
 arpakitlib/ar_class_util.py,sha256=i76pQW_7k_S2m_DlQh6xNjtggv9Col3WSx9W_bwk98E,722
+arpakitlib/ar_clone_pydantic_model_fields.py,sha256=xxLwtvJzDf8EWMvBE4psWIj8c-cyeCxLRX76oCY_4zk,1214
 arpakitlib/ar_datetime_util.py,sha256=Xe1NiT9oPQzNSG7RVRkhukhbg4i-hhS5ImmV7sPUc8o,971
 arpakitlib/ar_dict_util.py,sha256=oet-9AJEjQZfG_EI82BuYW0jdW2NQxKjPXol_nfTXjw,447
 arpakitlib/ar_dream_ai_api_client_util.py,sha256=Z1oii_XSsgunYx17SdcHl54S4KPQti7-MJs0xXZ8vL0,2830
 arpakitlib/ar_encrypt_decrypt_util.py,sha256=GhWnp7HHkbhwFVVCzO1H07m-5gryr4yjWsXjOaNQm1Y,520
+arpakitlib/ar_ensure_sqlalchemy_check_constraints.py,sha256=JJbgaUiLT8D8oDVevP25wlMz1BTtx0JMasJ_ILyIJ3o,5328
 arpakitlib/ar_enumeration_util.py,sha256=XoFInWtGzbIr6fJq0un5nettaDfOLAyY84ovwj7n_7g,3030
 arpakitlib/ar_exception_util.py,sha256=3hZKsj34TZVdmd4JAQz7w515smWqB8o3gTwAEjuMdnI,408
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=Zh922S6-aIy0p_Fen8GTTrGpixpPQ6c-wFLukiSK4Ck,4091
 arpakitlib/ar_file_util.py,sha256=GUdJYm1tUZnYpY-SIPRHAZBHGra8NKy1eYEI0D5AfhY,489
 arpakitlib/ar_func_util.py,sha256=lG0bx_DtxWN4skbUim0liRZ6WUyLVV8Qfk6iZNtCZOs,1042
+arpakitlib/ar_generate_simple_code.py,sha256=EkrebrTi7sArSRAuxvN5BPm_A0-dFSCZgdoJhx5kPhk,344
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
 arpakitlib/ar_http_request_util.py,sha256=PCUtGOQIvNScrLqD_9Z8LqT-7a-lP2y-Y-CH5vGdn7Q,7663
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
@@ -411,7 +414,11 @@ 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=NuvydQe7Cih6dW5H53GB6BsG2oFKgf27F3iJxuPO2J0,5364
+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
+arpakitlib/ar_really_validate_url.py,sha256=aaSPVMbz2DSqlC2yk2g44-kTIiHlITfJwIG97L-Y93U,1309
 arpakitlib/ar_retry_func_util.py,sha256=LB4FJRsu2cssnPw6X8bCEcaGpQsXhkLkgeU37w1t9fU,2250
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
 arpakitlib/ar_safe_func.py,sha256=c2P1hzB8uQn3l8cAr2nttfHbrM-4QrxgDejk_jM1OVE,2321
@@ -419,18 +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=U_pb6oKKaLH_JcCh_6Zvm3DRpv79EOUxhr5kD3h-G3Y,16047
+arpakitlib/ar_sqlalchemy_util.py,sha256=5I7KsKCzJc9hxpn2_0r__RcbqcKpTs_PDw_f5_0P7Xw,16050
 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=xxLwtvJzDf8EWMvBE4psWIj8c-cyeCxLRX76oCY_4zk,1214
-arpakitlib/ensure_sqlalchemy_check_constraints.py,sha256=JJbgaUiLT8D8oDVevP25wlMz1BTtx0JMasJ_ILyIJ3o,5328
-arpakitlib/generate_simple_code.py,sha256=EkrebrTi7sArSRAuxvN5BPm_A0-dFSCZgdoJhx5kPhk,344
-arpakitlib/pydantic_schema_from_sqlalchemy_model.py,sha256=_5Y79kQ4lLIOL6_afIFVwxY1EXzTMpi-veRR-WkPFOs,2879
-arpakitlib/raise_own_exception_if_exception.py,sha256=A6TuNSBk1pHaQ_qxnUmE2LgsNGA1IGqX26b1_HEA4Nc,5978
-arpakitlib/really_validate_email.py,sha256=HBfhyiDB3INI6Iq6hR2WOMKA5wVWWRl0Qun-x__OZ9o,1201
-arpakitlib-1.8.249.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.249.dist-info/METADATA,sha256=Cg-pyrGVi2RHXny_fIxg3kprdoJHO2OBqYa7Dggujn0,3919
-arpakitlib-1.8.249.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.249.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.249.dist-info/RECORD,,
+arpakitlib-1.8.251.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.251.dist-info/METADATA,sha256=qCRaVdN1qqbRnIqYG7bYL2J3i6_sDOIpxqO7SG1BLNA,3919
+arpakitlib-1.8.251.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.251.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.251.dist-info/RECORD,,

arpakitlib/pydantic_schema_from_sqlalchemy_model.py

@@ -1,93 +0,0 @@
-# arpakit
-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
-)
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
-_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)