arpakitlib 1.7.97__tar.gz → 1.7.99__tar.gz

{arpakitlib-1.7.97 → arpakitlib-1.7.99}/PKG-INFO

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

{arpakitlib-1.7.97 → arpakitlib-1.7.99}/arpakitlib/ar_base_worker_util.py

@@ -13,7 +13,7 @@ from uuid import uuid4
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_func_util import is_async_function, is_sync_function
-from arpakitlib.ar_sleep_util import sync_safe_sleep
+from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -57,7 +57,7 @@ class BaseWorker(ABC):
     def sync_run(self):
         self._logger.info(f"hello world, im {self.worker_fullname}")
 
-    def sync_run_on_error(self, exception: BaseException, **kwargs):
+    def sync_on_error(self, exception: BaseException, **kwargs):
         pass
 
     def sync_safe_run(self):
@@ -73,9 +73,9 @@ class BaseWorker(ABC):
             except BaseException as exception:
                 self._logger.error("error in sync_run", exc_info=exception)
                 try:
-                    self.sync_run_on_error(exception=exception)
+                    self.sync_on_error(exception=exception)
                 except BaseException as exception_:
-                    self._logger.error("error in sync_run_on_error", exc_info=exception_)
+                    self._logger.error("error in sync_on_error", exc_info=exception_)
                     raise exception_
                 sync_safe_sleep(self.timeout_after_err_in_run)
             sync_safe_sleep(self.timeout_after_run)
@@ -95,7 +95,7 @@ class BaseWorker(ABC):
     async def async_run(self):
         self._logger.info(f"hello world, im {self.worker_fullname}")
 
-    async def async_run_on_error(self, exception: BaseException, **kwargs):
+    async def async_on_error(self, exception: BaseException, **kwargs):
         pass
 
     async def async_safe_run(self):
@@ -111,12 +111,12 @@ class BaseWorker(ABC):
             except BaseException as exception:
                 self._logger.error("error in async_run", exc_info=exception)
                 try:
-                    await self.async_run_on_error(exception=exception)
+                    await self.async_on_error(exception=exception)
                 except BaseException as exception_:
-                    self._logger.error("error in async_run_on_error", exc_info=exception_)
+                    self._logger.error("error in async_on_error", exc_info=exception_)
                     raise exception_
-                sync_safe_sleep(self.timeout_after_err_in_run)
-            sync_safe_sleep(self.timeout_after_run)
+                await async_safe_sleep(self.timeout_after_err_in_run)
+            await async_safe_sleep(self.timeout_after_run)
 
 
 class SafeRunInBackgroundModes(Enumeration):

{arpakitlib-1.7.97 → arpakitlib-1.7.99}/arpakitlib/ar_fastapi_util.py

@@ -25,7 +25,7 @@ from starlette import status
 from starlette.middleware.cors import CORSMiddleware
 from starlette.staticfiles import StaticFiles
 
-from arpakitlib.ar_base_worker_util import BaseWorker, safe_run_worker_in_background, SafeRunInBackgroundModes
+from arpakitlib.ar_base_worker_util import BaseWorker, safe_run_worker_in_background
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
@@ -448,7 +448,7 @@ class SafeRunWorkerStartupAPIEvent(BaseStartupAPIEvent):
 
     async def async_on_startup(self, *args, **kwargs):
         for worker in self.workers:
-            _ = safe_run_worker_in_background(worker=worker, mode=SafeRunInBackgroundModes.async_task)
+            _ = safe_run_worker_in_background(worker=worker, mode=self.safe_run_in_background_mode)
 
 
 class InitFileStoragesInDir(BaseStartupAPIEvent):

{arpakitlib-1.7.97 → arpakitlib-1.7.99}/arpakitlib/ar_operation_execution_util.py

@@ -345,9 +345,6 @@ class OperationExecutorWorker(BaseWorker):
                 return
             self.sync_execute_operation(operation_dbm=operation_dbm, session=session)
 
-    def sync_run_on_error(self, exception: BaseException, **kwargs):
-        pass
-
     async def async_on_startup(self):
         self.sqlalchemy_db.init()
         await self.async_run_startup_funcs()
@@ -368,9 +365,6 @@ class OperationExecutorWorker(BaseWorker):
                 return
             await self.async_execute_operation(operation_dbm=operation_dbm, session=session)
 
-    async def async_run_on_error(self, exception: BaseException, **kwargs):
-        pass
-
 
 class ScheduledOperation(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)

{arpakitlib-1.7.97 → arpakitlib-1.7.99}/pyproject.toml

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