arpakitlib 1.7.96__tar.gz → 1.7.97__tar.gz

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

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

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

@@ -34,7 +34,7 @@ class BaseWorker(ABC):
             worker_name = self.__class__.__name__
         self.worker_name = worker_name
         self.worker_creation_dt = now_utc_dt()
-        self.worker_id = f"{str(uuid4()).replace(' - ', '')}_{randint(1000, 9999)}"
+        self.worker_id = f"{str(uuid4()).replace('-', '')}_{randint(1000, 99999)}"
         self.worker_fullname = (
             f"{self.worker_name}_{self.worker_creation_dt.isoformat()}_{self.worker_id}"
         )

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

@@ -145,7 +145,7 @@ class BaseOperationExecutor:
         self._logger = logging.getLogger(self.__class__.__name__)
         self.sql_alchemy_db = sqlalchemy_db
 
-    def sync_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
+    def sync_execute_operation(self, operation_dbm: OperationDBM, session: Session) -> OperationDBM:
         if operation_dbm.type == BaseOperationTypes.healthcheck_:
             self._logger.info("healthcheck")
         elif operation_dbm.type == BaseOperationTypes.raise_fake_exception_:
@@ -172,13 +172,12 @@ class BaseOperationExecutor:
             }
         )
         session.commit()
-        session.refresh(operation_dbm)
 
         exception: BaseException | None = None
         traceback_str: str | None = None
 
         try:
-            self.sync_execute_operation(operation_dbm=operation_dbm)
+            self.sync_execute_operation(operation_dbm=operation_dbm, session=session)
         except BaseException as exception_:
             self._logger.error(
                 f"error in sync_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
@@ -213,7 +212,6 @@ class BaseOperationExecutor:
             )
             session.add(story_log_dbm)
             session.commit()
-            session.refresh(story_log_dbm)
 
         session.refresh(operation_dbm)
 
@@ -227,7 +225,7 @@ class BaseOperationExecutor:
 
         return operation_dbm
 
-    async def async_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
+    async def async_execute_operation(self, operation_dbm: OperationDBM, session: Session) -> OperationDBM:
         if operation_dbm.type == BaseOperationTypes.healthcheck_:
             self._logger.info("healthcheck")
         elif operation_dbm.type == BaseOperationTypes.raise_fake_exception_:
@@ -236,7 +234,7 @@ class BaseOperationExecutor:
         return operation_dbm
 
     async def async_safe_execute_operation(
-            self, operation_dbm: OperationDBM, worker: OperationExecutorWorker
+            self, operation_dbm: OperationDBM, worker: OperationExecutorWorker, session: Session
     ) -> OperationDBM:
         self._logger.info(
             f"start "
@@ -245,26 +243,21 @@ class BaseOperationExecutor:
             f"operation_dbm.status={operation_dbm.status}"
         )
 
-        with self.sql_alchemy_db.new_session() as session:
-            operation_dbm: OperationDBM = get_operation_by_id(
-                session=session, filter_operation_id=operation_dbm.id, raise_if_not_found=True, lock=True
-            )
-            operation_dbm.execution_start_dt = now_utc_dt()
-            operation_dbm.status = OperationDBM.Statuses.executing
-            operation_dbm.output_data = combine_dicts(
-                operation_dbm.output_data,
-                {
-                    worker.worker_fullname: True
-                }
-            )
-            session.commit()
-            session.refresh(operation_dbm)
+        operation_dbm.execution_start_dt = now_utc_dt()
+        operation_dbm.status = OperationDBM.Statuses.executing
+        operation_dbm.output_data = combine_dicts(
+            operation_dbm.output_data,
+            {
+                worker.worker_fullname: True
+            }
+        )
+        session.commit()
 
         exception: BaseException | None = None
         traceback_str: str | None = None
 
         try:
-            await self.async_execute_operation(operation_dbm=operation_dbm)
+            await self.async_execute_operation(operation_dbm=operation_dbm, session=session)
         except BaseException as exception_:
             self._logger.error(
                 f"error in async_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
@@ -273,40 +266,34 @@ class BaseOperationExecutor:
             exception = exception_
             traceback_str = traceback.format_exc()
 
-        with self.sql_alchemy_db.new_session() as session:
+        operation_dbm.execution_finish_dt = now_utc_dt()
+        if exception:
+            operation_dbm.status = OperationDBM.Statuses.executed_with_error
+            operation_dbm.error_data = combine_dicts(
+                {
+                    "exception_str": str(exception),
+                    "traceback_str": traceback_str
+                },
+                operation_dbm.error_data
+            )
+        else:
+            operation_dbm.status = OperationDBM.Statuses.executed_without_error
+        session.commit()
 
-            operation_dbm: OperationDBM = get_operation_by_id(
-                session=session, filter_operation_id=operation_dbm.id, raise_if_not_found=True, lock=True
+        if exception:
+            story_log_dbm = StoryLogDBM(
+                level=StoryLogDBM.Levels.error,
+                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),
+                    "traceback_str": traceback_str
+                }
             )
-            operation_dbm.execution_finish_dt = now_utc_dt()
-            if exception:
-                operation_dbm.status = OperationDBM.Statuses.executed_with_error
-                operation_dbm.error_data = combine_dicts(
-                    {
-                        "exception_str": str(exception),
-                        "traceback_str": traceback_str
-                    },
-                    operation_dbm.error_data
-                )
-            else:
-                operation_dbm.status = OperationDBM.Statuses.executed_without_error
+            session.add(story_log_dbm)
             session.commit()
 
-            if exception:
-                story_log_dbm = StoryLogDBM(
-                    level=StoryLogDBM.Levels.error,
-                    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),
-                        "traceback_str": traceback_str
-                    }
-                )
-                session.add(story_log_dbm)
-                session.commit()
-                session.refresh(story_log_dbm)
-
-            session.refresh(operation_dbm)
+        session.refresh(operation_dbm)
 
         self._logger.info(
             f"finish async_safe_execute_operation, "
@@ -365,18 +352,21 @@ class OperationExecutorWorker(BaseWorker):
         self.sqlalchemy_db.init()
         await self.async_run_startup_funcs()
 
-    async def async_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
-        return await self.operation_executor.async_safe_execute_operation(operation_dbm=operation_dbm, worker=self)
+    async def async_execute_operation(self, operation_dbm: OperationDBM, session: Session) -> OperationDBM:
+        return await self.operation_executor.async_safe_execute_operation(
+            operation_dbm=operation_dbm, worker=self, session=session
+        )
 
     async def async_run(self):
-        operation_dbm: OperationDBM | None = get_operation_for_execution(
-            sqlalchemy_db=self.sqlalchemy_db,
-            filter_operation_types=self.filter_operation_types,
-            lock=True
-        )
-        if not operation_dbm:
-            return
-        await self.async_execute_operation(operation_dbm=operation_dbm)
+        with self.sqlalchemy_db.new_session() as session:
+            operation_dbm: OperationDBM | None = get_operation_for_execution(
+                sqlalchemy_db=self.sqlalchemy_db,
+                filter_operation_types=self.filter_operation_types,
+                lock=True
+            )
+            if not operation_dbm:
+                return
+            await self.async_execute_operation(operation_dbm=operation_dbm, session=session)
 
     async def async_run_on_error(self, exception: BaseException, **kwargs):
         pass

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

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