arpakitlib 1.8.224__py3-none-any.whl → 1.8.226__py3-none-any.whl

arpakitlib/ar_logging_util.py

@@ -21,7 +21,7 @@ _logging_was_setup: bool = False
 
 def setup_normal_logging(log_filepath: Optional[str] = None):
     global _logging_was_setup
-    if _normal_logging_was_setup is True:
+    if _logging_was_setup:
         return
 
     if log_filepath:

arpakitlib/clone_pydantic_model_fields.py

@@ -1,8 +1,11 @@
+# arpakit
 from typing import Any, Type, Iterable
 
 from pydantic import BaseModel, create_model
 from pydantic_core import PydanticUndefined
 
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
 
 def clone_pydantic_model_fields(
         *,

arpakitlib/pydantic_schema_from_sqlalchemy_model.py

@@ -1,3 +1,4 @@
+# arpakit
 import datetime as dt
 from typing import Any, Optional
 
@@ -10,6 +11,7 @@ from sqlalchemy.sql.sqltypes import (
     DateTime, Date, Time,
     Float, Numeric, DECIMAL, LargeBinary, JSON
 )
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 _SQLA_TYPE_MAP = {
     Boolean: bool,

arpakitlib/raise_own_exception_if_exception.py

@@ -0,0 +1,95 @@
+from __future__ import annotations
+
+import inspect
+from functools import wraps
+from typing import Any, Callable, Awaitable, Tuple, TypeVar, ParamSpec, cast
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+PARAMS_SPEC = ParamSpec("PARAMS_SPEC")
+RESULT_SPEC = TypeVar("RESULT_SPEC")
+
+
+def raise_own_exception_if_exception(
+        *,
+        catching_exceptions: type[BaseException] | Tuple[type[BaseException], ...] | None = Exception,
+        except_catching_exceptions: type[BaseException] | Tuple[type[BaseException], ...] | None = None,
+        own_exception: type[Exception],
+        kwargs_in_own_exception: dict[str, Any] | None = None,
+) -> (
+        Callable[[Callable[PARAMS_SPEC, RESULT_SPEC] | Callable[PARAMS_SPEC, Awaitable[RESULT_SPEC]]],
+        Callable[PARAMS_SPEC, RESULT_SPEC] | Callable[PARAMS_SPEC, Awaitable[RESULT_SPEC]]]
+):
+    """
+    Ловит любые Exception и оборачивает в own_exception(**kwargs_).
+    Исключения из except_exceptions пропускает как есть.
+    Работает и для sync, и для async функций.
+    """
+
+    # normalize catching_exceptions -> tuple[type, ...]
+    if catching_exceptions is None:
+        catching_exceptions = (Exception,)
+    elif isinstance(catching_exceptions, tuple):
+        catching_exceptions = catching_exceptions
+    else:
+        catching_exceptions = (catching_exceptions,)
+
+    # Нормализуем except_exceptions к кортежу типов
+    if except_catching_exceptions is None:
+        except_catching_exceptions = ()
+    elif isinstance(except_catching_exceptions, tuple):
+        except_catching_exceptions = except_catching_exceptions
+    elif except_catching_exceptions:
+        except_catching_exceptions = (except_catching_exceptions,)
+    else:
+        except_catching_exceptions = ()
+
+    kwargs_in_own_exception = dict(kwargs_in_own_exception or {})
+    kwargs_in_own_exception["catching_exceptions"] = catching_exceptions
+    kwargs_in_own_exception["except_catching_exceptions"] = except_catching_exceptions
+    kwargs_in_own_exception["own_exception"] = own_exception
+
+    # Если явно передали пустой набор для ловли — возвращаем функцию как есть
+    if not catching_exceptions:
+        def _passthrough_decorator(func):
+            return func
+
+        return _passthrough_decorator
+
+    def decorator(func: Callable[PARAMS_SPEC, RESULT_SPEC] | Callable[PARAMS_SPEC, Awaitable[RESULT_SPEC]]):
+        if inspect.iscoroutinefunction(func):
+            @wraps(func)
+            async def async_wrapper(*args: PARAMS_SPEC.args, **kwargs: PARAMS_SPEC.kwargs) -> RESULT_SPEC:
+                try:
+                    return await cast(Callable[PARAMS_SPEC, Awaitable[RESULT_SPEC]], func)(*args, **kwargs)
+                except catching_exceptions as caught_exception:  # ловим ТОЛЬКО нужные типы
+                    if except_catching_exceptions and isinstance(caught_exception, except_catching_exceptions):
+                        raise  # пропускаем как есть
+                    copied_kwargs_in_own_exception = kwargs_in_own_exception.copy()
+                    copied_kwargs_in_own_exception["caught_exception"] = caught_exception
+                    copied_kwargs_in_own_exception["caught_exception_str"] = str(caught_exception)
+                    try:
+                        raise own_exception(kwargs_=copied_kwargs_in_own_exception) from caught_exception
+                    except TypeError:
+                        raise own_exception() from caught_exception
+
+            return cast(Callable[PARAMS_SPEC, Awaitable[RESULT_SPEC]], async_wrapper)
+
+        @wraps(func)
+        def wrapper(*args: PARAMS_SPEC.args, **kwargs: PARAMS_SPEC.kwargs) -> RESULT_SPEC:
+            try:
+                return cast(Callable[PARAMS_SPEC, RESULT_SPEC], func)(*args, **kwargs)
+            except catching_exceptions as caught_exception:
+                if except_catching_exceptions and isinstance(caught_exception, except_catching_exceptions):
+                    raise
+                copied_kwargs_in_own_exception = kwargs_in_own_exception.copy()
+                copied_kwargs_in_own_exception["caught_exception"] = caught_exception
+                copied_kwargs_in_own_exception["caught_exception_str"] = str(caught_exception)
+                try:
+                    raise own_exception(kwargs_=copied_kwargs_in_own_exception) from caught_exception
+                except TypeError:
+                    raise own_exception() from caught_exception
+
+        return cast(Callable[PARAMS_SPEC, RESULT_SPEC], wrapper)
+
+    return decorator

{arpakitlib-1.8.224.dist-info → arpakitlib-1.8.226.dist-info}/METADATA

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

{arpakitlib-1.8.224.dist-info → arpakitlib-1.8.226.dist-info}/RECORD

@@ -397,7 +397,7 @@ arpakitlib/ar_json_util.py,sha256=jnVfpQ6QSDq8NgIlh_6ZzXDveOiybr7QSQkXutE7d2s,26
 arpakitlib/ar_jwt_util.py,sha256=Rhm4ywoTAn6yOV8NLjDASfAtAtheROxxDP40G3XjnuQ,761
 arpakitlib/ar_list_of_dicts_to_xlsx.py,sha256=MyjEl4Jl4beLVZqLVQMMv0-XDtBD3Xh4Z_ZPDJeFu04,745
 arpakitlib/ar_list_util.py,sha256=2woOAHAU8oTIiVjZ8GLnx15odEaoQUq3Q0JPxlufFF0,457
-arpakitlib/ar_logging_util.py,sha256=teqLzOkY-toeOAWtsGnW3iIfrR0NwG7jJ-dBzPrFUvU,1667
+arpakitlib/ar_logging_util.py,sha256=sirPRd-jiHrXKNJSmuJHWhtFJ-xzGCQ98otOo2RMbVU,1652
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=XmY1kswz8j9oo5f9CxRu0_zgfvxWrXPYKOj6MM04sGk,2604
 arpakitlib/ar_openai_api_client_util.py,sha256=dWgsSPXtxNBxS5VRi_NharGQrUXF_YjIfhU3Bj5cW9M,5651
@@ -415,10 +415,11 @@ arpakitlib/ar_sqlalchemy_util.py,sha256=aNHK7kT1VNSHmGx8m6KsaLOZ9ofO7pFa10rW4vZe
 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/pydantic_schema_from_sqlalchemy_model.py,sha256=bjLNfeJRZonvVl7pnczwL8OzxbIGawulp30K-xYY7yA,2833
-arpakitlib-1.8.224.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.224.dist-info/METADATA,sha256=IKpdAaVIOetmht0Iy7_y7cqDlLXTQ8ibECaM4ejrQsE,3741
-arpakitlib-1.8.224.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.224.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.224.dist-info/RECORD,,
+arpakitlib/clone_pydantic_model_fields.py,sha256=xxLwtvJzDf8EWMvBE4psWIj8c-cyeCxLRX76oCY_4zk,1214
+arpakitlib/pydantic_schema_from_sqlalchemy_model.py,sha256=_5Y79kQ4lLIOL6_afIFVwxY1EXzTMpi-veRR-WkPFOs,2879
+arpakitlib/raise_own_exception_if_exception.py,sha256=XfLYQzfStHJMlaqCOvRuXZBRzcUn2Cj2a-vKJ_hspf8,4686
+arpakitlib-1.8.226.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.226.dist-info/METADATA,sha256=rYAW_KpprE59zdjhtSM_hTkmWIfIYd_Oo6xBLZBmyc0,3741
+arpakitlib-1.8.226.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.226.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.226.dist-info/RECORD,,