arpakitlib 1.7.61__tar.gz → 1.7.62__tar.gz

{arpakitlib-1.7.61 → arpakitlib-1.7.62}/PKG-INFO

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

arpakitlib-1.7.61/arpakitlib/_arpakit_project_template/src/operation_execution/start_operation_executor_for_dev_.py → arpakitlib-1.7.62/arpakitlib/_arpakit_project_template/src/operation_execution/start_operation_executor_worker_for_dev.py

@@ -3,7 +3,7 @@ from src.core.util import get_cached_sqlalchemy_db, setup_logging
 from src.operation_execution.operation_executor import OperationExecutor
 
 
-def start_operation_executor_for_dev():
+def start_operation_executor_worker_for_dev():
     setup_logging()
     worker = OperationExecutorWorker(
         sqlalchemy_db=get_cached_sqlalchemy_db(),
@@ -14,4 +14,4 @@ def start_operation_executor_for_dev():
 
 
 if __name__ == '__main__':
-    start_operation_executor_for_dev()
+    start_operation_executor_worker_for_dev()

{arpakitlib-1.7.61 → arpakitlib-1.7.62}/arpakitlib/ar_base_worker_util.py

@@ -43,7 +43,7 @@ class BaseWorker(ABC):
             )
             res.start()
         else:
-            raise ValueError(f"unrecognized safe_run_mode={safe_run_in_background_mode}")
+            raise ValueError(f"unknown safe_run_mode={safe_run_in_background_mode}")
         return res
 
     def sync_on_startup(self):
@@ -53,18 +53,27 @@ class BaseWorker(ABC):
         raise NotImplementedError()
 
     def sync_run_on_error(self, exception: BaseException, **kwargs):
-        self._logger.exception(exception)
+        pass
 
     def sync_safe_run(self):
-        self._logger.info("sync_safe_run")
-        self.sync_on_startup()
+        self._logger.info("start sync_safe_run")
+        try:
+            self.sync_on_startup()
+        except BaseException as exception:
+            self._logger.error("error in sync_on_startup", exc_info=exception)
+            raise exception
         while True:
             try:
                 self.sync_run()
                 if self.timeout_after_run is not None:
                     sync_safe_sleep(self.timeout_after_run)
             except BaseException as exception:
-                self.sync_run_on_error(exception=exception)
+                self._logger.error("error in sync_run", exc_info=exception)
+                try:
+                    self.sync_run_on_error(exception=exception)
+                except BaseException as exception_:
+                    self._logger.error("error in sync_run_on_error", exc_info=exception_)
+                    raise exception_
                 if self.timeout_after_err_in_run is not None:
                     sync_safe_sleep(self.timeout_after_err_in_run)
 
@@ -75,18 +84,27 @@ class BaseWorker(ABC):
         raise NotImplementedError()
 
     async def async_run_on_error(self, exception: BaseException, **kwargs):
-        self._logger.exception(exception)
+        pass
 
     async def async_safe_run(self):
-        self._logger.info("async_safe_run")
-        await self.async_on_startup()
+        self._logger.info("start async_safe_run")
+        try:
+            await self.async_on_startup()
+        except BaseException as exception:
+            self._logger.error("error in async_on_startup", exc_info=exception)
+            raise exception
         while True:
             try:
                 await self.async_run()
                 if self.timeout_after_run is not None:
                     await async_safe_sleep(self.timeout_after_run)
             except BaseException as exception:
-                await self.async_run_on_error(exception=exception)
+                self._logger.error("error in async_run", exc_info=exception)
+                try:
+                    await self.async_run_on_error(exception=exception)
+                except BaseException as exception_:
+                    self._logger.error("error in async_run_on_error", exc_info=exception_)
+                    raise exception_
                 if self.timeout_after_err_in_run is not None:
                     await async_safe_sleep(self.timeout_after_err_in_run)
 

{arpakitlib-1.7.61 → arpakitlib-1.7.62}/arpakitlib/ar_fastapi_util.py

@@ -633,6 +633,8 @@ def create_fastapi_app(
         media_dirpath: str | None = None,
         static_dirpath: str | None = None
 ):
+    _logger.info("start create_fastapi_app")
+
     setup_normal_logging(log_filepath=log_filepath)
 
     if contact is None:
@@ -688,6 +690,8 @@ def create_fastapi_app(
 
     app.include_router(router=main_api_router)
 
+    _logger.info("finish create_fastapi_app")
+
     return app
 
 

{arpakitlib-1.7.61 → arpakitlib-1.7.62}/arpakitlib/ar_logging_util.py

@@ -28,13 +28,13 @@ def setup_normal_logging(log_filepath: Optional[str] = None):
     if log_filepath:
         init_log_file(log_filepath=log_filepath)
 
-    logger = logging.getLogger(__name__)
+    logger = logging.getLogger()
     logger.setLevel(logging.INFO)
 
     stream_handler = logging.StreamHandler()
     stream_handler.setLevel(logging.INFO)
     stream_formatter = logging.Formatter(
-        "%(asctime)s | %(levelname)s | %(name)s | %(filename)s:%(lineno)d - %(message)s",
+        "%(asctime)s | %(levelname)s | %(name)s | %(filename)s:%(funcName)s:%(lineno)d - %(message)s",
         datefmt="%d.%m.%Y %I:%M:%S%p"
     )
     stream_handler.setFormatter(stream_formatter)
@@ -44,7 +44,7 @@ def setup_normal_logging(log_filepath: Optional[str] = None):
         file_handler = logging.FileHandler(log_filepath)
         file_handler.setLevel(logging.WARNING)
         file_formatter = logging.Formatter(
-            "%(asctime)s | %(levelname)s | %(name)s | %(filename)s:%(lineno)d - %(message)s",
+            "%(asctime)s | %(levelname)s | %(name)s | %(filename)s:%(funcName)s:%(lineno)d - %(message)s",
             datefmt="%d.%m.%Y %I:%M:%S%p"
         )
         file_handler.setFormatter(file_formatter)

{arpakitlib-1.7.61 → arpakitlib-1.7.62}/arpakitlib/ar_operation_execution_util.py

@@ -140,9 +140,10 @@ class BaseOperationExecutor:
 
     def sync_safe_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
         self._logger.info(
-            f"start sync_safe_execute_operation"
-            f", operation_dbm.id={operation_dbm.id}"
-            f", operation_dbm.type={operation_dbm.type}"
+            f"start 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}"
         )
 
         with self.sql_alchemy_db.new_session() as session:
@@ -160,7 +161,10 @@ class BaseOperationExecutor:
         try:
             self.sync_execute_operation(operation_dbm=operation_dbm)
         except BaseException as exception_:
-            self._logger.error(f"Error while executing operation (id={operation_dbm.id})", exc_info=exception_)
+            self._logger.error(
+                f"error in sync_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                exc_info=exception_
+            )
             exception = exception_
             traceback_str = traceback.format_exc()
 
@@ -186,7 +190,7 @@ class BaseOperationExecutor:
             if exception:
                 story_log_dbm = StoryLogDBM(
                     level=StoryLogDBM.Levels.error,
-                    title=f"Error while executing operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                    title=f"error in sync_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
                     data={
                         "operation_id": operation_dbm.id,
                         "exception_str": str(exception),
@@ -200,11 +204,11 @@ class BaseOperationExecutor:
             session.refresh(operation_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}"
+            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}"
         )
 
         return operation_dbm
@@ -219,9 +223,10 @@ class BaseOperationExecutor:
 
     async def async_safe_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
         self._logger.info(
-            f"start async_safe_execute_operation"
-            f", operation_dbm.id={operation_dbm.id}"
-            f", operation_dbm.type={operation_dbm.type}"
+            f"start 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}"
         )
 
         with self.sql_alchemy_db.new_session() as session:
@@ -239,7 +244,10 @@ class BaseOperationExecutor:
         try:
             await self.async_execute_operation(operation_dbm=operation_dbm)
         except BaseException as exception_:
-            self._logger.error(f"Error while executing operation (id={operation_dbm.id})", exc_info=exception_)
+            self._logger.error(
+                f"error in async_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                exc_info=exception_
+            )
             exception = exception_
             traceback_str = traceback.format_exc()
 
@@ -265,7 +273,7 @@ class BaseOperationExecutor:
             if exception:
                 story_log_dbm = StoryLogDBM(
                     level=StoryLogDBM.Levels.error,
-                    title=f"Error while executing operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                    title=f"error in async_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
                     data={
                         "operation_id": operation_dbm.id,
                         "exception_str": str(exception),
@@ -279,11 +287,11 @@ class BaseOperationExecutor:
             session.refresh(operation_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}"
+            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
@@ -320,14 +328,12 @@ class OperationExecutorWorker(BaseWorker):
             sqlalchemy_db=self.sqlalchemy_db,
             filter_operation_types=self.filter_operation_types
         )
-
         if not operation_dbm:
             return
-
         self.sync_execute_operation(operation_dbm=operation_dbm)
 
     def sync_run_on_error(self, exception: BaseException, **kwargs):
-        self._logger.exception(exception)
+        pass
 
     async def async_on_startup(self):
         self.sqlalchemy_db.init()
@@ -340,14 +346,12 @@ class OperationExecutorWorker(BaseWorker):
             sqlalchemy_db=self.sqlalchemy_db,
             filter_operation_types=self.filter_operation_types
         )
-
         if not operation_dbm:
             return
-
         await self.async_execute_operation(operation_dbm=operation_dbm)
 
     async def async_run_on_error(self, exception: BaseException, **kwargs):
-        self._logger.exception(exception)
+        pass
 
 
 class ScheduledOperation(BaseModel):
@@ -383,8 +387,10 @@ class ScheduledOperationCreatorWorker(BaseWorker):
         timeout = None
 
         for scheduled_operation in self.scheduled_operations:
+
             if not scheduled_operation.is_time_func():
                 continue
+
             with self.sqlalchemy_db.new_session() as session:
                 operation_dbm = OperationDBM(
                     type=scheduled_operation.type,
@@ -411,8 +417,10 @@ class ScheduledOperationCreatorWorker(BaseWorker):
         timeout: timedelta | None = None
 
         for scheduled_operation in self.scheduled_operations:
+
             if not scheduled_operation.is_time_func():
                 continue
+
             with self.sqlalchemy_db.new_session() as session:
                 operation_dbm = OperationDBM(
                     type=scheduled_operation.type,

{arpakitlib-1.7.61 → arpakitlib-1.7.62}/pyproject.toml

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