arpakitlib 1.7.91__tar.gz → 1.7.94__tar.gz

{arpakitlib-1.7.91 → arpakitlib-1.7.94}/PKG-INFO

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

{arpakitlib-1.7.91 → arpakitlib-1.7.94}/arpakitlib/ar_base_worker_util.py

@@ -6,11 +6,14 @@ import multiprocessing
 import threading
 from abc import ABC
 from datetime import timedelta
+from random import randint
 from typing import Any
+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, async_safe_sleep
+from arpakitlib.ar_sleep_util import sync_safe_sleep
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -19,17 +22,25 @@ class BaseWorker(ABC):
     def __init__(
             self,
             *,
-            timeout_after_run=timedelta(seconds=0.1),
+            timeout_after_run=timedelta(seconds=0.3),
             timeout_after_err_in_run=timedelta(seconds=1),
-            startup_funcs: list[Any] | None = None
+            startup_funcs: list[Any] | None = None,
+            worker_name: str | None = None
     ):
         if startup_funcs is None:
             startup_funcs = []
         self.startup_funcs = startup_funcs
-        self.worker_name = self.__class__.__name__
-        self._logger = logging.getLogger(self.worker_name)
-        self.timeout_after_run = timeout_after_run.total_seconds()
-        self.timeout_after_err_in_run = timeout_after_err_in_run.total_seconds()
+        if worker_name is None:
+            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_fullname = (
+            f"{self.worker_name}_{self.worker_creation_dt.isoformat()}_{self.worker_id}"
+        )
+        self._logger = logging.getLogger(self.worker_fullname)
+        self.timeout_after_run = timeout_after_run
+        self.timeout_after_err_in_run = timeout_after_err_in_run
 
     def sync_run_startup_funcs(self):
         for startup_func in self.startup_funcs:
@@ -41,10 +52,10 @@ class BaseWorker(ABC):
                 raise TypeError("no sync and not async")
 
     def sync_on_startup(self):
-        pass
+        self.sync_run_startup_funcs()
 
     def sync_run(self):
-        self._logger.info("hello world")
+        self._logger.info(f"hello world, im {self.worker_fullname}")
 
     def sync_run_on_error(self, exception: BaseException, **kwargs):
         pass
@@ -66,8 +77,8 @@ class BaseWorker(ABC):
                 except BaseException as exception_:
                     self._logger.error("error in sync_run_on_error", exc_info=exception_)
                     raise exception_
-            if self.timeout_after_run is not None:
-                sync_safe_sleep(self.timeout_after_run)
+                sync_safe_sleep(self.timeout_after_err_in_run)
+            sync_safe_sleep(self.timeout_after_run)
 
     async def async_run_startup_funcs(self):
         for startup_func in self.startup_funcs:
@@ -79,10 +90,10 @@ class BaseWorker(ABC):
                 raise TypeError("no sync and not async")
 
     async def async_on_startup(self):
-        pass
+        await self.async_run_startup_funcs()
 
     async def async_run(self):
-        self._logger.info("hello world")
+        self._logger.info(f"hello world, im {self.worker_fullname}")
 
     async def async_run_on_error(self, exception: BaseException, **kwargs):
         pass
@@ -104,8 +115,8 @@ class BaseWorker(ABC):
                 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)
+                sync_safe_sleep(self.timeout_after_err_in_run)
+            sync_safe_sleep(self.timeout_after_run)
 
 
 class SafeRunInBackgroundModes(Enumeration):
@@ -136,6 +147,15 @@ def safe_run_worker_in_background(*, worker: BaseWorker, mode: str) -> (
     return res
 
 
+def safe_run_workers_in_background(
+        *, workers: list[BaseWorker], mode: str
+) -> list[asyncio.Task] | list[threading.Thread] | list[multiprocessing.Process]:
+    res = []
+    for worker in workers:
+        res.append(safe_run_worker_in_background(worker=worker, mode=mode))
+    return res
+
+
 def __example():
     pass
 

{arpakitlib-1.7.91 → arpakitlib-1.7.94}/arpakitlib/ar_operation_execution_util.py

@@ -11,6 +11,7 @@ from typing import Any, Callable
 from pydantic import ConfigDict
 from pydantic.v1 import BaseModel
 from sqlalchemy import asc
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import Session
 
 from arpakitlib.ar_base_worker_util import BaseWorker
@@ -61,7 +62,8 @@ def get_operation_by_id(
         session: Session | None = None,
         sqlalchemy_db: SQLAlchemyDB | None = None,
         filter_operation_id: int,
-        raise_if_not_found: bool = False
+        raise_if_not_found: bool = False,
+        lock: bool = False
 ) -> OperationDBM | None:
     def func(session_: Session):
         query = (
@@ -69,8 +71,16 @@ def get_operation_by_id(
             .query(OperationDBM)
             .filter(OperationDBM.id == filter_operation_id)
         )
+
+        if lock:
+            query = query.with_for_update()
+
         if raise_if_not_found:
-            return query.one()
+            try:
+                return query.one()
+            except NoResultFound:
+                if raise_if_not_found:
+                    raise ValueError("Operation not found")
         else:
             return query.one_or_none()
 
@@ -138,7 +148,9 @@ class BaseOperationExecutor:
             raise Exception("raise_fake_exception")
         return operation_dbm
 
-    def sync_safe_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
+    def sync_safe_execute_operation(
+            self, operation_dbm: OperationDBM, worker: OperationExecutorWorker
+    ) -> OperationDBM:
         self._logger.info(
             f"start "
             f"operation_dbm.id={operation_dbm.id}, "
@@ -152,6 +164,12 @@ class BaseOperationExecutor:
             )
             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)
 
@@ -221,7 +239,9 @@ class BaseOperationExecutor:
             raise Exception("raise_fake_exception")
         return operation_dbm
 
-    async def async_safe_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
+    async def async_safe_execute_operation(
+            self, operation_dbm: OperationDBM, worker: OperationExecutorWorker
+    ) -> OperationDBM:
         self._logger.info(
             f"start "
             f"operation_dbm.id={operation_dbm.id}, "
@@ -235,6 +255,12 @@ class BaseOperationExecutor:
             )
             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)
 
@@ -305,19 +331,15 @@ class OperationExecutorWorker(BaseWorker):
             sqlalchemy_db: SQLAlchemyDB,
             operation_executor: BaseOperationExecutor | None = None,
             filter_operation_types: str | list[str] | None = None,
-            timeout_after_run=timedelta(seconds=0.1),
-            timeout_after_err_in_run=timedelta(seconds=1),
             startup_funcs: list[Any] | None = None
     ):
-        super().__init__(
-            timeout_after_run=timeout_after_run,
-            timeout_after_err_in_run=timeout_after_err_in_run,
-            startup_funcs=startup_funcs
-        )
+        super().__init__(startup_funcs=startup_funcs)
         self.sqlalchemy_db = sqlalchemy_db
         if operation_executor is None:
             operation_executor = BaseOperationExecutor(sqlalchemy_db=sqlalchemy_db)
         self.operation_executor = operation_executor
+        if isinstance(filter_operation_types, str):
+            filter_operation_types = [filter_operation_types]
         self.filter_operation_types = filter_operation_types
 
     def sync_on_startup(self):
@@ -325,7 +347,7 @@ class OperationExecutorWorker(BaseWorker):
         self.sync_run_startup_funcs()
 
     def sync_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
-        return self.operation_executor.sync_safe_execute_operation(operation_dbm=operation_dbm)
+        return self.operation_executor.sync_safe_execute_operation(operation_dbm=operation_dbm, worker=self)
 
     def sync_run(self):
         operation_dbm: OperationDBM | None = get_operation_for_execution(
@@ -344,7 +366,7 @@ class OperationExecutorWorker(BaseWorker):
         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)
+        return await self.operation_executor.async_safe_execute_operation(operation_dbm=operation_dbm, worker=self)
 
     async def async_run(self):
         operation_dbm: OperationDBM | None = get_operation_for_execution(
@@ -373,19 +395,15 @@ class ScheduledOperationCreatorWorker(BaseWorker):
             self,
             *,
             sqlalchemy_db: SQLAlchemyDB,
-            scheduled_operations: list[ScheduledOperation] | None = None,
-            timeout_after_run=timedelta(seconds=0.1),
-            timeout_after_err_in_run=timedelta(seconds=1),
+            scheduled_operations: ScheduledOperation | list[ScheduledOperation] | None = None,
             startup_funcs: list[Any] | None = None
     ):
-        super().__init__(
-            timeout_after_run=timeout_after_run,
-            timeout_after_err_in_run=timeout_after_err_in_run,
-            startup_funcs=startup_funcs
-        )
+        super().__init__(startup_funcs=startup_funcs)
         self.sqlalchemy_db = sqlalchemy_db
         if scheduled_operations is None:
             scheduled_operations = []
+        if isinstance(scheduled_operations, ScheduledOperation):
+            scheduled_operations = [scheduled_operations]
         self.scheduled_operations = scheduled_operations
 
     def sync_on_startup(self):

{arpakitlib-1.7.91 → arpakitlib-1.7.94}/arpakitlib/ar_sqlalchemy_model_util.py

@@ -4,7 +4,7 @@ from datetime import datetime, timedelta
 from typing import Any
 from uuid import uuid4
 
-from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP
+from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP, func
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
@@ -78,10 +78,12 @@ class SimpleDBM(BaseDBM):
         INTEGER, primary_key=True, autoincrement=True, sort_order=-3, nullable=False
     )
     long_id: Mapped[str] = mapped_column(
-        TEXT, insert_default=generate_default_long_id, unique=True, sort_order=-2, nullable=False
+        TEXT, insert_default=generate_default_long_id, server_default=func.gen_random_uuid(),
+        unique=True, sort_order=-2, nullable=False
     )
     creation_dt: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=True), insert_default=now_utc_dt, index=True, sort_order=-1, nullable=False
+        TIMESTAMP(timezone=True), insert_default=now_utc_dt, server_default=func.now(),
+        index=True, sort_order=-1, nullable=False
     )
 
     def __repr__(self):

{arpakitlib-1.7.91 → arpakitlib-1.7.94}/pyproject.toml

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