arpakitlib 1.8.154__py3-none-any.whl → 1.8.156__py3-none-any.whl

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

@@ -3,17 +3,29 @@ import inspect
 import logging
 from typing import Any
 
+from pydantic import BaseModel, ConfigDict
 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
 
 _logger = logging.getLogger(__name__)
 
 
+class ExecuteWithStoryLogRes(BaseModel):
+    func_res: Any = None
+    story_log_dbm: StoryLogDBM | None = None
+    exception: Exception | None = None
+
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
+
+    def raise_if_exception(self):
+        if self.exception is not None:
+            raise self.exception
+
+
 def sync_execute_with_story_log(
         func,
         *,
@@ -24,126 +36,131 @@ def 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[Any, Any] | None = None,
-) -> Any:
+        raise_if_exception: bool = False
+) -> ExecuteWithStoryLogRes:
     if func_args is None:
         func_args = tuple()
     if func_kwargs is None:
         func_kwargs = {}
     if story_log_extra_data is None:
         story_log_extra_data = {}
+    story_log_extra_data = story_log_extra_data.copy()
+
+    execute_with_story_log_res = ExecuteWithStoryLogRes()
 
     try:
-        return func(*func_args, **func_kwargs)
+        execute_with_story_log_res.func_res = func(*func_args, **func_kwargs)
+        return execute_with_story_log_res
     except Exception as exception:
         _logger.error(f"Error in {func.__name__}", exc_info=True)
 
+        execute_with_story_log_res.exception = exception
+
         if story_log_title is None:
             story_log_title = f"Error in func {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
+            "wrapper_func_name": inspect.currentframe().f_code.co_name,
+            "called_func_name": func.__name__
         })
 
         if session_ is not None:
-            story_log_dbm = StoryLogDBM(
+            execute_with_story_log_res.story_log_dbm = StoryLogDBM(
                 level=story_log_level,
                 type=story_log_type,
                 title=story_log_title,
                 extra_data=story_log_extra_data
             )
-            session_.add(story_log_dbm)
+            session_.add(execute_with_story_log_res.story_log_dbm)
             session_.commit()
         else:
             with get_cached_sqlalchemy_db().new_session() as session:
-                story_log_dbm = StoryLogDBM(
+                execute_with_story_log_res.story_log_dbm = StoryLogDBM(
                     level=story_log_level,
                     type=story_log_type,
                     title=story_log_title,
                     extra_data=story_log_extra_data
                 )
-                session.add(story_log_dbm)
+                session.add(execute_with_story_log_res.story_log_dbm)
                 session.commit()
 
-        raise exception
+        if raise_if_exception:
+            raise
+
+        return execute_with_story_log_res
 
 
 async def async_execute_with_story_log(
-        func,
+        async_func,
         *,
-        func_args: tuple[Any] | None = None,
-        func_kwargs: dict[Any, Any] | None = None,
+        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 func_args is None:
-        func_args = ()
-    if func_kwargs is None:
-        func_kwargs = {}
+        raise_if_exception: bool = False
+) -> ExecuteWithStoryLogRes:
+    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 = {}
+    story_log_extra_data = story_log_extra_data.copy()
+
+    execute_with_story_log_res = ExecuteWithStoryLogRes()
 
     try:
-        return await func(*func_args, **func_kwargs)
+        execute_with_story_log_res.func_res = await async_func(*async_func_args, **async_func_kwargs)
+        return execute_with_story_log_res
     except Exception as exception:
-        _logger.error(f"Async error in {func.__name__}", exc_info=True)
+        _logger.error(f"Async error in {async_func.__name__}", exc_info=True)
+
+        execute_with_story_log_res.exception = exception
 
         if story_log_title is None:
-            story_log_title = f"Async error in func {func.__name__}: {type(exception).__name__}: {exception}"
+            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
+            "wrapper_func_name": inspect.currentframe().f_code.co_name,
+            "called_func_name": async_func.__name__
         })
 
         if async_session_ is not None:
-            story_log_dbm = StoryLogDBM(
+            execute_with_story_log_res.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)
+            async_session_.add(execute_with_story_log_res.story_log_dbm)
             await async_session_.commit()
         else:
             async with get_cached_sqlalchemy_db().new_async_session() as async_session:
-                story_log_dbm = StoryLogDBM(
+                execute_with_story_log_res.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)
+                async_session.add(execute_with_story_log_res.story_log_dbm)
                 await async_session.commit()
 
-        raise exception
+        if raise_if_exception:
+            raise
 
+        return execute_with_story_log_res
 
-async def __async_example():
-    setup_logging()
-
-    def hello_world():
-        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
-    # )
-    # await async_execute_with_story_log(
-    #     func=async_hello_world
-    # )
+async def __async_example():
+    pass
 
 
 if __name__ == '__main__':

arpakitlib/ar_sqlalchemy_util.py

@@ -220,6 +220,20 @@ class SQLAlchemyDb:
         self.remove_celery_tables_data()
         self._logger.info("all reinited")
 
+    def remove_rows_from_tables(self):
+        with self.new_session() as session:
+            for table_name, table in BaseDBM.metadata.tables.items():
+                session.execute(sqlalchemy.delete(table))
+            session.commit()
+        self._logger.info(f"rows from tables ({BaseDBM.metadata.tables.keys()}) were removed")
+
+    async def async_remove_rows_from_tables(self):
+        async with self.new_async_session() as async_session:
+            for table_name, table in BaseDBM.metadata.tables.items():
+                await async_session.execute(sqlalchemy.delete(table))
+            await async_session.commit()
+        self._logger.info(f"rows from tables ({BaseDBM.metadata.tables.keys()}) were removed")
+
     def check_conn(self):
         self.engine.connect()
         self._logger.info("db conn is good")

{arpakitlib-1.8.154.dist-info → arpakitlib-1.8.156.dist-info}/METADATA

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

{arpakitlib-1.8.154.dist-info → arpakitlib-1.8.156.dist-info}/RECORD

@@ -263,7 +263,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model
 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=nAbcbBVUkToZioyVKaiOM0d1mHP0yy4THnLOjf2zjTg,4985
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util/execute_func_with_story_log.py,sha256=HrDlG8Y1gbMNVIuDHvCndXbnp8vxc8T8l-_XBVn7zR8,6091
 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
@@ -402,13 +402,13 @@ 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=Jd33EX_fAso4bvrcDhNEYOUlUHkudbadNGOJDg7rqhQ,301
-arpakitlib/ar_sqlalchemy_util.py,sha256=Fo7xdHu1rjyHNj2XzN7r_yXbaajGK8dxBPsOL6-DzVU,10559
+arpakitlib/ar_sqlalchemy_util.py,sha256=J8AAPT0BgrrRYYkJJn_ezEla6YyF3OL34Q-DNpadziU,11285
 arpakitlib/ar_ssh_runner_util.py,sha256=yvAwza480MkHKvLkDEsR7JNh2bYNs6P9rCVo4NA85NE,6865
 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.154.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.154.dist-info/METADATA,sha256=j35xSpxIIkT96WiRVw0u3aeerw04TZfQdoEL2rbyQ2w,3706
-arpakitlib-1.8.154.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.154.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.154.dist-info/RECORD,,
+arpakitlib-1.8.156.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.156.dist-info/METADATA,sha256=w7-HsemfipWlnRI-TBdYbQY3yqWzPO7mHUBd3iuBZYI,3706
+arpakitlib-1.8.156.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.156.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.156.dist-info/RECORD,,