arpakitlib 1.7.35__tar.gz → 1.7.37__tar.gz

{arpakitlib-1.7.35 → arpakitlib-1.7.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.7.35
+Version: 1.7.37
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

arpakitlib-1.7.37/arpakitlib/_arpakit_project_template/manage/settings_check.py

@@ -0,0 +1,10 @@
+from arpakitlib.ar_json_util import safely_transfer_to_json_str
+from src.core.settings import get_cached_settings
+
+
+def command():
+    print(safely_transfer_to_json_str(get_cached_settings().model_dump(mode="json")))
+
+
+if __name__ == '__main__':
+    command()

{arpakitlib-1.7.35 → arpakitlib-1.7.37}/arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -85,7 +85,7 @@ def create_api_app() -> FastAPI:
 
     shutdown_api_events = []
 
-    startup_api_events.append(ShutdownAPIEvent(transmitted_api_data=transmitted_api_data))
+    shutdown_api_events.append(ShutdownAPIEvent(transmitted_api_data=transmitted_api_data))
 
     api_app = create_fastapi_app(
         title=settings.api_title.strip(),

{arpakitlib-1.7.35 → arpakitlib-1.7.37}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -14,7 +14,7 @@ class Settings(SimpleSettings):
 
     sql_db_echo: bool = False
 
-    api_init_sql_db_at_start: bool = False
+    api_init_sql_db_at_start: bool = True
 
     api_title: str = "{PROJECT_NAME}"
 

{arpakitlib-1.7.35 → arpakitlib-1.7.37}/arpakitlib/ar_base_worker_util.py

@@ -56,6 +56,7 @@ class BaseWorker(ABC):
         self._logger.exception(exception)
 
     def sync_safe_run(self):
+        self._logger.info("sync_safe_run")
         self.sync_on_startup()
         while True:
             try:
@@ -77,6 +78,7 @@ class BaseWorker(ABC):
         self._logger.exception(exception)
 
     async def async_safe_run(self):
+        self._logger.info("async_safe_run")
         await self.async_on_startup()
         while True:
             try:

{arpakitlib-1.7.35 → arpakitlib-1.7.37}/arpakitlib/ar_operation_execution_util.py

@@ -96,7 +96,7 @@ class BaseOperationExecutor:
         try:
             self.sync_execute_operation(operation_dbm=operation_dbm)
         except BaseException as exception_:
-            self._logger.exception(exception_)
+            self._logger.error(f"Error while executing operation (id={operation_dbm.id})", exc_info=exception_)
             exception = exception_
             traceback_str = traceback.format_exc()
 
@@ -116,25 +116,27 @@ class BaseOperationExecutor:
                 operation_dbm.status = OperationDBM.Statuses.executed_without_error
             session.commit()
 
-            story_log_dbm = StoryLogDBM(
-                level=StoryLogDBM.Levels.error,
-                title="Error in sync_execute_operation",
-                data={
-                    "operation_id": operation_dbm.id,
-                    "exception_str": str(exception),
-                    "traceback_str": traceback_str
-                }
-            )
-            session.add(story_log_dbm)
-            session.commit()
+            if exception:
+                story_log_dbm = StoryLogDBM(
+                    level=StoryLogDBM.Levels.error,
+                    title=f"Error while executing operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                    data={
+                        "operation_id": operation_dbm.id,
+                        "exception_str": str(exception),
+                        "traceback_str": traceback_str
+                    }
+                )
+                session.add(story_log_dbm)
+                session.commit()
+                session.refresh(story_log_dbm)
 
             session.refresh(operation_dbm)
-            session.refresh(story_log_dbm)
 
         self._logger.info(
             f"finish sync_safe_execute_operation"
             f", operation_dbm.id={operation_dbm.id}"
             f", operation_dbm.type={operation_dbm.type}"
+            f", operation_dbm.status={operation_dbm.status}"
             f", operation_dbm.duration={operation_dbm.duration}"
         )
 
@@ -170,7 +172,7 @@ class BaseOperationExecutor:
         try:
             await self.async_execute_operation(operation_dbm=operation_dbm)
         except BaseException as exception_:
-            self._logger.exception(exception_)
+            self._logger.error(f"Error while executing operation (id={operation_dbm.id})", exc_info=exception_)
             exception = exception_
             traceback_str = traceback.format_exc()
 
@@ -190,25 +192,28 @@ class BaseOperationExecutor:
                 operation_dbm.status = OperationDBM.Statuses.executed_without_error
             session.commit()
 
-            story_log_dbm = StoryLogDBM(
-                level=StoryLogDBM.Levels.error,
-                title="Error in async_execute_operation",
-                data={
-                    "operation_id": operation_dbm.id,
-                    "exception_str": str(exception),
-                    "traceback_str": traceback_str
-                }
-            )
-            session.add(story_log_dbm)
-            session.commit()
+            if exception:
+                story_log_dbm = StoryLogDBM(
+                    level=StoryLogDBM.Levels.error,
+                    title=f"Error while executing operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                    data={
+                        "operation_id": operation_dbm.id,
+                        "exception_str": str(exception),
+                        "traceback_str": traceback_str
+                    }
+                )
+                session.add(story_log_dbm)
+                session.commit()
+                session.refresh(story_log_dbm)
 
             session.refresh(operation_dbm)
-            session.refresh(story_log_dbm)
 
         self._logger.info(
             f"finish async_safe_execute_operation"
             f", operation_dbm.id={operation_dbm.id}"
             f", operation_dbm.type={operation_dbm.type}"
+            f", operation_dbm.status={operation_dbm.status}"
+            f", operation_dbm.duration={operation_dbm.duration}"
         )
 
         return operation_dbm

{arpakitlib-1.7.35 → arpakitlib-1.7.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.7.35"
+version = "1.7.37"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"

arpakitlib-1.7.35/arpakitlib/_arpakit_project_template/manage/settings_check.py

@@ -1,9 +0,0 @@
-from src.core.settings import get_cached_settings
-
-
-def command():
-    print(get_cached_settings())
-
-
-if __name__ == '__main__':
-    command()