arpakitlib 1.7.44__py3-none-any.whl → 1.7.45__py3-none-any.whl

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/_arpakit_project_template/manage/settings_generate_env_example.py

@@ -5,10 +5,8 @@ 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)
+    print(Settings.generate_env_example())
+    Settings.save_env_example_to_file(filepath=os.path.join(BASE_DIRPATH, "example.env"))
 
 
 if __name__ == '__main__':

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/_arpakit_project_template/src/operation_execution/scheduled_operations.py

@@ -1,13 +1,25 @@
-from datetime import timedelta
+from datetime import timedelta, time
 
-from arpakitlib.ar_operation_execution_util import ScheduledOperation, every_timedelta_is_time_func
+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_scheduled_operation = ScheduledOperation(
+healthcheck_1_scheduled_operation = ScheduledOperation(
     type=BaseOperationTypes.healthcheck_,
-    input_data={},
-    is_time_func=every_timedelta_is_time_func(td=timedelta(seconds=5))
+    input_data={"healthcheck_1": "healthcheck_1"},
+    is_time_func=every_timedelta_is_time_func(td=timedelta(seconds=15))
 )
-ALL_SCHEDULED_OPERATIONS.append(healthcheck_scheduled_operation)
+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/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/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.dist-info → arpakitlib-1.7.45.dist-info}/METADATA

@@ -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.dist-info → arpakitlib-1.7.45.dist-info}/RECORD

@@ -6,7 +6,7 @@ arpakitlib/_arpakit_project_template/AUTHOR.md,sha256=d5QAx-1vbHfYYABpNQ0Yfjaxsw
 arpakitlib/_arpakit_project_template/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
 arpakitlib/_arpakit_project_template/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
 arpakitlib/_arpakit_project_template/README.md,sha256=EEoHPZrJQtLS3fKD3JvoPhkGhjfuDihxK5fmAGwihCQ,65
-arpakitlib/_arpakit_project_template/example.env,sha256=p5qdXuMHudefuGVkf1dcqSDlS3Xx2TjvebeufaROMOE,439
+arpakitlib/_arpakit_project_template/example.env,sha256=CgmnowXuyz3_VGVPtS4e2hGupEIa_zeWY5zfOjsW4pc,462
 arpakitlib/_arpakit_project_template/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/docker_ps.sh,sha256=uwm8vHgeuNLCOn0o9hgP_uc-PUkS9FwLyzZh6ItZ3do,15
 arpakitlib/_arpakit_project_template/manage/docker_ps_a.sh,sha256=nOQejihYlzstg9oROvYwHIsSLt2Sw0DWQEeT3GBaBNs,18
@@ -59,7 +59,7 @@ arpakitlib/_arpakit_project_template/manage/sandbox/sandbox_7.py,sha256=WdE1IWyO
 arpakitlib/_arpakit_project_template/manage/sandbox/sandbox_8.sh,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/sandbox/sandbox_9.sh,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/settings_check.py,sha256=DeOGoWXgk2_VXpCIFbQgf1k2zcnv4hOLWIVc5BDv80c,260
-arpakitlib/_arpakit_project_template/manage/settings_generate_env_example.py,sha256=pRTr6SzBJxDUaxTXZgLJr7rJawHyvpyTJbrJSZW0hEc,330
+arpakitlib/_arpakit_project_template/manage/settings_generate_env_example.py,sha256=BLLeF4JenexXbO1mMj8X-lB81TG3-QTmN4DjPYEUI8o,288
 arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_check_conn.py,sha256=3Q4QfvFVBZsbMMH5yr6v3a6v6UjQuIEIujlxGpvykNA,190
 arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_init.py,sha256=FqKVuakafDndHKBsyPcSowhss6MZb0Soy5oREUPVLUw,184
 arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_reinit.py,sha256=twBWh64WU-sqHUte8v9ZJUZ_bCsFABExgIWLOnfLu4w,186
@@ -94,9 +94,9 @@ arpakitlib/_arpakit_project_template/src/db/__init__.py,sha256=47DEQpj8HBSa-_TIm
 arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py,sha256=nXtayUkBaVb6tWx5qJgXZLbLOTVAjnSLpSDxBm7yZLc,234
 arpakitlib/_arpakit_project_template/src/db/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/operation_execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template/src/operation_execution/const.py,sha256=4wOXu1042rDeNMe0KhMEhRVtJajQfoYMeqqaQ_UICkk,287
+arpakitlib/_arpakit_project_template/src/operation_execution/const.py,sha256=HjupGEDUWVijQlbzxZPI9vBbAVOETUYzYU9pdnc9IcI,176
 arpakitlib/_arpakit_project_template/src/operation_execution/operation_executor.py,sha256=5sZpn3tVxnmcuIVRD5sbBhiMY5SAqPCc4tHzoNzDe4c,619
-arpakitlib/_arpakit_project_template/src/operation_execution/scheduled_operations.py,sha256=slgfIZikNcTPchjb8hxpf1aGCqlN0Q4VO-LxbptNOCA,484
+arpakitlib/_arpakit_project_template/src/operation_execution/scheduled_operations.py,sha256=hBPZIOJAX7ym54s2tJ2QRky15FqqDF9r4yTr8Nh2YqI,985
 arpakitlib/_arpakit_project_template/src/operation_execution/start_operation_executor_for_dev_.py,sha256=N-X3kvjQZeEDxp2Z7DDrr4hR-wR9LmFMLPAA8tzo87A,589
 arpakitlib/_arpakit_project_template/src/operation_execution/start_scheduled_operation_creator_for_dev.py,sha256=RyHCafGTJaY-o3mgt7MReqgJ2txoBDhhsFzrjRiZWe4,574
 arpakitlib/_arpakit_project_template/src/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -156,12 +156,12 @@ arpakitlib/ar_logging_util.py,sha256=Gyd7B9k0glIXPm6dASiigWLq9LC9lw6vhXTCeWpY5PY
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=xq5bbAXJG-93CRVZUcLW0ZdM22rj-ZUW17C5hX_5grg,1699
 arpakitlib/ar_openai_api_client_util.py,sha256=dHUbfg1sVVCjsNl_fra3iCMEz1bR-Hk9fE-DdYbu7Wc,1215
-arpakitlib/ar_operation_execution_util.py,sha256=EZMQbjvp3EDFEfUYAdRV7_qtdqIW-qJrmVWpv5plxas,13874
+arpakitlib/ar_operation_execution_util.py,sha256=EL7X7vN2GlOjlps3lCNoJPOP5lyqpbz4VTKmOWz7gVE,14948
 arpakitlib/ar_parse_command.py,sha256=-s61xcATIsfw1eV_iD3xi-grsitbGzSDoAFc5V0OFy4,3447
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=JD-hRUQSs-euK0zq9w_4QUfGO00yWM08gllWUVKTtHc,6109
-arpakitlib/ar_settings_util.py,sha256=95SaC8ROUoFFIZvGsOUmz4OEyn-KospL_EqjFYAJs9U,1231
+arpakitlib/ar_settings_util.py,sha256=gnuC8rs7IkyXkRWurrV-K0jObDMMxeH_1NdfJLkekHA,1473
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=TFGOAgpxcnBV_u7yZrLCkf1ldlB4Of8vIRsyk9kyP5c,4987
 arpakitlib/ar_sqlalchemy_util.py,sha256=Hcg1THrDsSR_-8dsY1CG3NWPEv0FqCbkPXFXLtjlSJ0,4207
@@ -170,9 +170,9 @@ arpakitlib/ar_str_util.py,sha256=oCEtQ_TTn35OEz9jCNLjbhopq76JmaifD_iYR-nEJJ4,214
 arpakitlib/ar_type_util.py,sha256=e6Ch8I_B3FMJMj-fiZvTwtGde4hxSa48fGt5g8RlV6I,2301
 arpakitlib/ar_yookassa_api_client_util.py,sha256=sh4fcUkAkdOetFn9JYoTvjcSXP-M1wU04KEY-ECLfLg,5137
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.7.44.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.44.dist-info/METADATA,sha256=9Rsxl80OE2FYpC5fZKMwsvGOHbxY3o0t7djohbxNnzs,2824
-arpakitlib-1.7.44.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.44.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.44.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.44.dist-info/RECORD,,
+arpakitlib-1.7.45.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.45.dist-info/METADATA,sha256=7WXqfpqnXNdClOAoxKGuDN9DwBfiMcVB7MO203v_cyU,2824
+arpakitlib-1.7.45.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.45.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.45.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.45.dist-info/RECORD,,