arpakitlib 1.7.44__tar.gz → 1.7.45__tar.gz

{arpakitlib-1.7.44 → arpakitlib-1.7.45}/PKG-INFO

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

{arpakitlib-1.7.44 → arpakitlib-1.7.45}/arpakitlib/_arpakit_project_template/example.env

@@ -8,6 +8,7 @@
 # api_start_execute_operation_worker=
 # api_start_create_scheduled_operation_worker=
 # api_port=
+# api_correct_api_key=
 # var_dirname=
 # var_dirpath=
 # log_filename=

arpakitlib-1.7.45/arpakitlib/_arpakit_project_template/manage/settings_generate_env_example.py

@@ -0,0 +1,13 @@
+import os.path
+
+from src.core.const import BASE_DIRPATH
+from src.core.settings import Settings
+
+
+def command():
+    print(Settings.generate_env_example())
+    Settings.save_env_example_to_file(filepath=os.path.join(BASE_DIRPATH, "example.env"))
+
+
+if __name__ == '__main__':
+    command()

{arpakitlib-1.7.44 → arpakitlib-1.7.45}/arpakitlib/_arpakit_project_template/src/operation_execution/const.py

@@ -6,6 +6,4 @@ class OperationTypes(BaseOperationTypes):
 
 
 if __name__ == '__main__':
-    print(f"OperationTypes (len={len(OperationTypes.values_list())})")
-    for v in OperationTypes.values_list():
-        print(f"- {v}")
+    OperationTypes.print()

arpakitlib-1.7.45/arpakitlib/_arpakit_project_template/src/operation_execution/scheduled_operations.py

@@ -0,0 +1,25 @@
+from datetime import timedelta, time
+
+from arpakitlib.ar_operation_execution_util import ScheduledOperation, every_timedelta_is_time_func, \
+    between_different_times_is_time_func
+from arpakitlib.ar_sqlalchemy_model_util import BaseOperationTypes
+
+ALL_SCHEDULED_OPERATIONS = []
+
+healthcheck_1_scheduled_operation = ScheduledOperation(
+    type=BaseOperationTypes.healthcheck_,
+    input_data={"healthcheck_1": "healthcheck_1"},
+    is_time_func=every_timedelta_is_time_func(td=timedelta(seconds=15))
+)
+ALL_SCHEDULED_OPERATIONS.append(healthcheck_1_scheduled_operation)
+
+healthcheck_2_scheduled_operation = ScheduledOperation(
+    type=BaseOperationTypes.healthcheck_,
+    input_data={"healthcheck_2": "healthcheck_2"},
+    is_time_func=between_different_times_is_time_func(
+        from_time=time(hour=12, minute=0),
+        to_time=time(hour=12, minute=15)
+    ),
+    timeout_after_creation=timedelta(seconds=60)
+)
+ALL_SCHEDULED_OPERATIONS.append(healthcheck_2_scheduled_operation)

{arpakitlib-1.7.44 → arpakitlib-1.7.45}/arpakitlib/ar_operation_execution_util.py

@@ -16,6 +16,7 @@ from sqlalchemy.orm import Session
 from arpakitlib.ar_base_worker_util import BaseWorker
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
+from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 from arpakitlib.ar_sqlalchemy_model_util import OperationDBM, StoryLogDBM, BaseOperationTypes
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
 
@@ -292,6 +293,7 @@ class ScheduledOperation(BaseModel):
     type: str
     input_data: dict[str, Any] | None = None
     is_time_func: Callable[[], bool]
+    timeout_after_creation: timedelta | None = None
 
 
 class ScheduledOperationCreatorWorker(BaseWorker):
@@ -315,6 +317,8 @@ class ScheduledOperationCreatorWorker(BaseWorker):
         self.sqlalchemy_db.init()
 
     def sync_run(self):
+        timeout = None
+
         for scheduled_operation in self.scheduled_operations:
             if not scheduled_operation.is_time_func():
                 continue
@@ -327,10 +331,22 @@ class ScheduledOperationCreatorWorker(BaseWorker):
                 session.commit()
                 session.refresh(operation_dbm)
 
-    def async_on_startup(self):
+            if scheduled_operation.timeout_after_creation is not None:
+                if timeout is not None:
+                    if scheduled_operation.timeout_after_creation > timeout:
+                        timeout = scheduled_operation.timeout_after_creation
+                else:
+                    timeout = scheduled_operation.timeout_after_creation
+
+        if timeout is not None:
+            sync_safe_sleep(n=timeout)
+
+    async def async_on_startup(self):
         self.sqlalchemy_db.init()
 
-    def async_run(self):
+    async def async_run(self):
+        timeout: timedelta | None = None
+
         for scheduled_operation in self.scheduled_operations:
             if not scheduled_operation.is_time_func():
                 continue
@@ -343,6 +359,16 @@ class ScheduledOperationCreatorWorker(BaseWorker):
                 session.commit()
                 session.refresh(operation_dbm)
 
+            if scheduled_operation.timeout_after_creation is not None:
+                if timeout is not None:
+                    if scheduled_operation.timeout_after_creation > timeout:
+                        timeout = scheduled_operation.timeout_after_creation
+                else:
+                    timeout = scheduled_operation.timeout_after_creation
+
+        if timeout is not None:
+            await async_safe_sleep(n=timeout)
+
 
 def every_timedelta_is_time_func(*, td: timedelta) -> Callable:
     last_now_utc_dt = now_utc_dt()

{arpakitlib-1.7.44 → arpakitlib-1.7.45}/arpakitlib/ar_settings_util.py

@@ -35,8 +35,8 @@ class SimpleSettings(BaseSettings):
         return v
 
     @property
-    def is_mode_type_dev(self) -> bool:
-        return self.mode_type == self.ModeTypes.dev
+    def is_mode_type_not_prod(self) -> bool:
+        return self.mode_type == self.ModeTypes.not_prod
 
     @property
     def is_mode_type_prod(self) -> bool:
@@ -45,3 +45,10 @@ class SimpleSettings(BaseSettings):
     @classmethod
     def generate_env_example(cls) -> str:
         return generate_env_example(settings_class=cls)
+
+    @classmethod
+    def save_env_example_to_file(cls, filepath: str) -> str:
+        env_example = cls.generate_env_example()
+        with open(filepath, mode="w") as f:
+            f.write(env_example)
+        return env_example

{arpakitlib-1.7.44 → arpakitlib-1.7.45}/pyproject.toml

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

arpakitlib-1.7.44/arpakitlib/_arpakit_project_template/manage/settings_generate_env_example.py

@@ -1,15 +0,0 @@
-import os.path
-
-from src.core.const import BASE_DIRPATH
-from src.core.settings import Settings
-
-
-def command():
-    env_example = Settings.generate_env_example()
-    print(env_example)
-    with open(os.path.join(BASE_DIRPATH, "example.env"), mode="w") as f:
-        f.write(env_example)
-
-
-if __name__ == '__main__':
-    command()

arpakitlib-1.7.44/arpakitlib/_arpakit_project_template/src/operation_execution/scheduled_operations.py

@@ -1,13 +0,0 @@
-from datetime import timedelta
-
-from arpakitlib.ar_operation_execution_util import ScheduledOperation, every_timedelta_is_time_func
-from arpakitlib.ar_sqlalchemy_model_util import BaseOperationTypes
-
-ALL_SCHEDULED_OPERATIONS = []
-
-healthcheck_scheduled_operation = ScheduledOperation(
-    type=BaseOperationTypes.healthcheck_,
-    input_data={},
-    is_time_func=every_timedelta_is_time_func(td=timedelta(seconds=5))
-)
-ALL_SCHEDULED_OPERATIONS.append(healthcheck_scheduled_operation)