arpakitlib 1.7.247__tar.gz → 1.7.249__tar.gz

{arpakitlib-1.7.247 → arpakitlib-1.7.249}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.7.247
+Version: 1.7.249
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.7.247 → arpakitlib-1.7.249}/arpakitlib/_arpakit_project_template/example.env

@@ -5,6 +5,7 @@
 # sql_db_port=
 # sql_db_database=
 # sql_db_url=
+# async_sql_db_url=
 # sql_db_echo=
 # api_init_sql_db_at_start=
 # api_title=

{arpakitlib-1.7.247 → arpakitlib-1.7.249}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -13,7 +13,7 @@ from src.core.const import ProjectPaths
 
 
 class Settings(SimpleSettings):
-    project_name: str = "{{PROJECT_NAME}}"
+    project_name: str | None = "{{PROJECT_NAME}}"
 
     sql_db_user: str | None = project_name
 
@@ -67,9 +67,9 @@ class Settings(SimpleSettings):
 
     api_init_sql_db_at_start: bool = True
 
-    api_title: str = project_name
+    api_title: str | None = project_name
 
-    api_description: str = f"{project_name} (arpakitlib)"
+    api_description: str | None = f"{project_name} (arpakitlib)"
 
     api_logging_func_before_response: bool = True
 

{arpakitlib-1.7.247 → arpakitlib-1.7.249}/arpakitlib/ar_base_worker_util.py

@@ -10,7 +10,6 @@ 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
@@ -22,25 +21,26 @@ class BaseWorker(ABC):
     def __init__(
             self,
             *,
-            timeout_after_run=timedelta(seconds=0.3),
-            timeout_after_err_in_run=timedelta(seconds=1),
+            timeout_after_run: timedelta = timedelta(seconds=0.3),
+            timeout_after_err_in_run: timedelta = timedelta(seconds=1),
             startup_funcs: list[Any] | None = None,
-            worker_name: str | None = None
+            worker_name: str | None = None,
+            **kwargs
     ):
+        self.timeout_after_run = timeout_after_run
+        self.timeout_after_err_in_run = timeout_after_err_in_run
         if startup_funcs is None:
             startup_funcs = []
         self.startup_funcs = startup_funcs
         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, 99999)}"
-        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
+
+    @property
+    def worker_fullname(self) -> str:
+        return f"{self.worker_name}_{self.worker_id}"
 
     def sync_run_startup_funcs(self):
         for startup_func in self.startup_funcs:

{arpakitlib-1.7.247 → arpakitlib-1.7.249}/arpakitlib/ar_operation_execution_util.py

@@ -141,7 +141,7 @@ def remove_operations(
 
 
 class BaseOperationExecutor:
-    def __init__(self, *, sqlalchemy_db: SQLAlchemyDB):
+    def __init__(self, *, sqlalchemy_db: SQLAlchemyDB, **kwargs):
         self._logger = logging.getLogger(self.__class__.__name__)
         self.sql_alchemy_db = sqlalchemy_db
 
@@ -314,9 +314,14 @@ class OperationExecutorWorker(BaseWorker):
             sqlalchemy_db: SQLAlchemyDB,
             operation_executor: BaseOperationExecutor | None = None,
             filter_operation_types: str | list[str] | None = None,
-            startup_funcs: list[Any] | None = None
+            startup_funcs: list[Any] | None = None,
+            **kwargs
     ):
-        super().__init__(startup_funcs=startup_funcs)
+        super().__init__(
+            timeout_after_run=timedelta(seconds=0.3),
+            timeout_after_err_in_run=timedelta(seconds=0.3),
+            startup_funcs=startup_funcs,
+        )
         self.sqlalchemy_db = sqlalchemy_db
         if operation_executor is None:
             operation_executor = BaseOperationExecutor(sqlalchemy_db=sqlalchemy_db)
@@ -383,7 +388,11 @@ class ScheduledOperationCreatorWorker(BaseWorker):
             scheduled_operations: ScheduledOperation | list[ScheduledOperation] | None = None,
             startup_funcs: list[Any] | None = None
     ):
-        super().__init__(startup_funcs=startup_funcs)
+        super().__init__(
+            timeout_after_run=timedelta(seconds=0.3),
+            timeout_after_err_in_run=timedelta(seconds=0.3),
+            startup_funcs=startup_funcs
+        )
         self.sqlalchemy_db = sqlalchemy_db
         if scheduled_operations is None:
             scheduled_operations = []

{arpakitlib-1.7.247 → arpakitlib-1.7.249}/arpakitlib/ar_sqlalchemy_model_util.py

@@ -67,6 +67,9 @@ class BaseDBM(DeclarativeBase):
 
         return res
 
+    def simple_dict_with_sd_properties(self) -> dict[str ,Any]:
+        return self.simple_dict(include_sd_properties=True)
+
     def simple_json(self, *, include_sd_properties: bool = True) -> str:
         return safely_transfer_obj_to_json_str(self.simple_dict(include_sd_properties=include_sd_properties))
 

{arpakitlib-1.7.247 → arpakitlib-1.7.249}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.247"
+version = "1.7.249"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },