arpakitlib 1.8.152__py3-none-any.whl → 1.8.155__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py

@@ -25,7 +25,7 @@ class StoryLogDBM(SimpleDBM):
         error_in_execute_operation = "error_in_execute_operation"
         error_in_api = "error_in_api"
         error_in_tg_bot = "error_in_tg_bot"
-        error_in_sync_execute_with_story_log = "error_in_sync_execute_with_story_log"
+        error_in_execute_with_story_log = "error_in_execute_with_story_log"
 
     level: Mapped[str] = mapped_column(
         sqlalchemy.TEXT,

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util/execute_func_with_story_log.py

@@ -1,9 +1,12 @@
+import asyncio
+import inspect
 import logging
-from typing import Callable, Any
+from typing import Any
 
-from arpakitlib.ar_exception_util import exception_to_traceback_str
+from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
+from arpakitlib.ar_exception_util import exception_to_traceback_str
 from project.core.util import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
@@ -12,15 +15,15 @@ _logger = logging.getLogger(__name__)
 
 
 def sync_execute_with_story_log(
-        func: Callable,
+        func,
         *,
-        func_args: tuple | None = None,
-        func_kwargs: dict | None = None,
+        func_args: tuple[Any] | None = None,
+        func_kwargs: dict[Any, Any] | None = None,
         session_: Session | None = None,
         story_log_level: str = StoryLogDBM.Levels.error,
-        story_log_type: str = StoryLogDBM.Types.error_in_sync_execute_with_story_log,
+        story_log_type: str = StoryLogDBM.Types.error_in_execute_with_story_log,
         story_log_title: str | None = None,
-        story_log_extra_data: dict | None = None,
+        story_log_extra_data: dict[Any, Any] | None = None,
 ) -> Any:
     if func_args is None:
         func_args = tuple()
@@ -39,7 +42,8 @@ def sync_execute_with_story_log(
         story_log_extra_data.update({
             "exception": str(exception),
             "exception_traceback": exception_to_traceback_str(exception=exception),
-            "exception_type_name": type(exception).__name__
+            "exception_type_name": type(exception).__name__,
+            "func_name": inspect.currentframe().f_code.co_name
         })
 
         if session_ is not None:
@@ -65,17 +69,82 @@ def sync_execute_with_story_log(
         raise exception
 
 
-def __example():
+async def async_execute_with_story_log(
+        async_func,
+        *,
+        async_func_args: tuple[Any] | None = None,
+        async_func_kwargs: dict[Any, Any] | None = None,
+        async_session_: AsyncSession | None = None,
+        story_log_level: str = StoryLogDBM.Levels.error,
+        story_log_type: str = StoryLogDBM.Types.error_in_execute_with_story_log,
+        story_log_title: str | None = None,
+        story_log_extra_data: dict[Any, Any] | None = None,
+) -> Any:
+    if async_func_args is None:
+        async_func_args = ()
+    if async_func_kwargs is None:
+        async_func_kwargs = {}
+    if story_log_extra_data is None:
+        story_log_extra_data = {}
+
+    try:
+        return await async_func(*async_func_args, **async_func_kwargs)
+    except Exception as exception:
+        _logger.error(f"Async error in {async_func.__name__}", exc_info=True)
+
+        if story_log_title is None:
+            story_log_title = f"Async error in func {async_func.__name__}: {type(exception).__name__}: {exception}"
+
+        story_log_extra_data.update({
+            "exception": str(exception),
+            "exception_traceback": exception_to_traceback_str(exception=exception),
+            "exception_type_name": type(exception).__name__,
+            "func_name": inspect.currentframe().f_code.co_name
+        })
+
+        if async_session_ is not None:
+            story_log_dbm = StoryLogDBM(
+                level=story_log_level,
+                type=story_log_type,
+                title=story_log_title,
+                extra_data=story_log_extra_data
+            )
+            async_session_.add(story_log_dbm)
+            await async_session_.commit()
+        else:
+            async with get_cached_sqlalchemy_db().new_async_session() as async_session:
+                story_log_dbm = StoryLogDBM(
+                    level=story_log_level,
+                    type=story_log_type,
+                    title=story_log_title,
+                    extra_data=story_log_extra_data
+                )
+                async_session.add(story_log_dbm)
+                await async_session.commit()
+
+        raise exception
+
+
+async def __async_example():
     setup_logging()
 
     def hello_world():
-        print(1)
-        raise ValueError("1111111")
+        print(inspect.currentframe().f_code.co_name)
+        # raise ValueError("1111111")
+
+    print(hello_world())
+
+    # async def async_hello_world():
+    #     print(1)
+    #     raise ValueError("1111111")
 
-    sync_execute_with_story_log(
-        func=hello_world
-    )
+    # sync_execute_with_story_log(
+    #     func=hello_world
+    # )
+    # await async_execute_with_story_log(
+    #     func=async_hello_world
+    # )
 
 
 if __name__ == '__main__':
-    __example()
+    asyncio.run(__async_example())

{arpakitlib-1.8.152.dist-info → arpakitlib-1.8.155.dist-info}/METADATA

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

{arpakitlib-1.8.152.dist-info → arpakitlib-1.8.155.dist-info}/RECORD

@@ -258,12 +258,12 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py,sha256=2X6VPkf1TKq-0319J0tL-rPMvgmkBCjim3Si1dZboMQ,1969
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=9j3QwBkaQSmsqXZbAYZDysGXP3xPPAHJfqIja5UnLcc,3229
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=op5cSkTlHJyGjULgcSWE9-_PNinKSneHLxhG5DUkd9M,5913
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=u4bXqP0tul7wwypWnqSKdvn6N2DJPdmOi_CBy_JMFrk,2482
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=hMYVJq837ZeIO3J2neOAzuzxeZ7hdR5PY93-YdgHftU,2472
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=-gmBWOAHJsUl-YY7U_2ZcKK5GV9dPHpvpdTRQnfbA_0,7579
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=hX6nHvVvhg5YB3vCjsku4TDoY5Jk1FsuDu5elbcF7VE,1886
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/verification_code.py,sha256=xrrNPXn5PeCnZ2VWVBdXDUft83EEYtc6b4pvs0oh1uw,3078
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util/execute_func_with_story_log.py,sha256=dZxt9y4YCX_8Pu00QojnmfFI4H93-rs8UuSiNT098eA,2499
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util/execute_func_with_story_log.py,sha256=TVdhSL7g_L6tW5-DSZTFUJbCQtXlv2Fs_A6PaLZawdQ,5057
 arpakitlib/_arpakit_project_template_v_5/project/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_api_keys.py,sha256=9F2bMfymaqx_Czh_tF945BKpKqNrVNjSIfCQl13Dkxw,911
 arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py,sha256=F7vCmfWjItw5QzYR7_OAPSHdJt9louuvqXvcfOkU0AU,2246
@@ -407,8 +407,8 @@ arpakitlib/ar_ssh_runner_util.py,sha256=yvAwza480MkHKvLkDEsR7JNh2bYNs6P9rCVo4NA8
 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.152.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.152.dist-info/METADATA,sha256=87EE4vtrA0N8mTZmUnJsr_OdGDe53fCesdp8DoViueM,3706
-arpakitlib-1.8.152.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.152.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.152.dist-info/RECORD,,
+arpakitlib-1.8.155.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.155.dist-info/METADATA,sha256=QKV0wMCBp4PPJHanz2EEe30ZmJyGGfrt_Tt3wdP7Gq4,3706
+arpakitlib-1.8.155.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.155.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.155.dist-info/RECORD,,