arpakitlib 1.7.60__py3-none-any.whl → 1.7.62__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/operation_execution/{start_operation_executor_for_dev_.py → start_operation_executor_worker_for_dev.py}

@@ -3,7 +3,7 @@ from src.core.util import get_cached_sqlalchemy_db, setup_logging
 from src.operation_execution.operation_executor import OperationExecutor
 
 
-def start_operation_executor_for_dev():
+def start_operation_executor_worker_for_dev():
     setup_logging()
     worker = OperationExecutorWorker(
         sqlalchemy_db=get_cached_sqlalchemy_db(),
@@ -14,4 +14,4 @@ def start_operation_executor_for_dev():
 
 
 if __name__ == '__main__':
-    start_operation_executor_for_dev()
+    start_operation_executor_worker_for_dev()

arpakitlib/ar_base_worker_util.py

@@ -43,7 +43,7 @@ class BaseWorker(ABC):
             )
             res.start()
         else:
-            raise ValueError(f"unrecognized safe_run_mode={safe_run_in_background_mode}")
+            raise ValueError(f"unknown safe_run_mode={safe_run_in_background_mode}")
         return res
 
     def sync_on_startup(self):
@@ -53,18 +53,27 @@ class BaseWorker(ABC):
         raise NotImplementedError()
 
     def sync_run_on_error(self, exception: BaseException, **kwargs):
-        self._logger.exception(exception)
+        pass
 
     def sync_safe_run(self):
-        self._logger.info("sync_safe_run")
-        self.sync_on_startup()
+        self._logger.info("start sync_safe_run")
+        try:
+            self.sync_on_startup()
+        except BaseException as exception:
+            self._logger.error("error in sync_on_startup", exc_info=exception)
+            raise exception
         while True:
             try:
                 self.sync_run()
                 if self.timeout_after_run is not None:
                     sync_safe_sleep(self.timeout_after_run)
             except BaseException as exception:
-                self.sync_run_on_error(exception=exception)
+                self._logger.error("error in sync_run", exc_info=exception)
+                try:
+                    self.sync_run_on_error(exception=exception)
+                except BaseException as exception_:
+                    self._logger.error("error in sync_run_on_error", exc_info=exception_)
+                    raise exception_
                 if self.timeout_after_err_in_run is not None:
                     sync_safe_sleep(self.timeout_after_err_in_run)
 
@@ -75,18 +84,27 @@ class BaseWorker(ABC):
         raise NotImplementedError()
 
     async def async_run_on_error(self, exception: BaseException, **kwargs):
-        self._logger.exception(exception)
+        pass
 
     async def async_safe_run(self):
-        self._logger.info("async_safe_run")
-        await self.async_on_startup()
+        self._logger.info("start async_safe_run")
+        try:
+            await self.async_on_startup()
+        except BaseException as exception:
+            self._logger.error("error in async_on_startup", exc_info=exception)
+            raise exception
         while True:
             try:
                 await self.async_run()
                 if self.timeout_after_run is not None:
                     await async_safe_sleep(self.timeout_after_run)
             except BaseException as exception:
-                await self.async_run_on_error(exception=exception)
+                self._logger.error("error in async_run", exc_info=exception)
+                try:
+                    await self.async_run_on_error(exception=exception)
+                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)
 

arpakitlib/ar_fastapi_util.py

@@ -633,6 +633,8 @@ def create_fastapi_app(
         media_dirpath: str | None = None,
         static_dirpath: str | None = None
 ):
+    _logger.info("start create_fastapi_app")
+
     setup_normal_logging(log_filepath=log_filepath)
 
     if contact is None:
@@ -688,6 +690,8 @@ def create_fastapi_app(
 
     app.include_router(router=main_api_router)
 
+    _logger.info("finish create_fastapi_app")
+
     return app
 
 

arpakitlib/ar_logging_util.py

@@ -34,7 +34,7 @@ def setup_normal_logging(log_filepath: Optional[str] = None):
     stream_handler = logging.StreamHandler()
     stream_handler.setLevel(logging.INFO)
     stream_formatter = logging.Formatter(
-        "%(asctime)s | %(levelname)s | %(name)s - %(message)s",
+        "%(asctime)s | %(levelname)s | %(name)s | %(filename)s:%(funcName)s:%(lineno)d - %(message)s",
         datefmt="%d.%m.%Y %I:%M:%S%p"
     )
     stream_handler.setFormatter(stream_formatter)
@@ -44,7 +44,7 @@ def setup_normal_logging(log_filepath: Optional[str] = None):
         file_handler = logging.FileHandler(log_filepath)
         file_handler.setLevel(logging.WARNING)
         file_formatter = logging.Formatter(
-            "%(asctime)s | %(levelname)s | %(name)s | %(filename)s:%(lineno)d - %(message)s",
+            "%(asctime)s | %(levelname)s | %(name)s | %(filename)s:%(funcName)s:%(lineno)d - %(message)s",
             datefmt="%d.%m.%Y %I:%M:%S%p"
         )
         file_handler.setFormatter(file_formatter)

arpakitlib/ar_operation_execution_util.py

@@ -140,9 +140,10 @@ class BaseOperationExecutor:
 
     def sync_safe_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
         self._logger.info(
-            f"start sync_safe_execute_operation"
-            f", operation_dbm.id={operation_dbm.id}"
-            f", operation_dbm.type={operation_dbm.type}"
+            f"start sync_safe_execute_operation, "
+            f"operation_dbm.id={operation_dbm.id}, "
+            f"operation_dbm.type={operation_dbm.type}, "
+            f"operation_dbm.status={operation_dbm.status}"
         )
 
         with self.sql_alchemy_db.new_session() as session:
@@ -160,7 +161,10 @@ class BaseOperationExecutor:
         try:
             self.sync_execute_operation(operation_dbm=operation_dbm)
         except BaseException as exception_:
-            self._logger.error(f"Error while executing operation (id={operation_dbm.id})", exc_info=exception_)
+            self._logger.error(
+                f"error in sync_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                exc_info=exception_
+            )
             exception = exception_
             traceback_str = traceback.format_exc()
 
@@ -186,7 +190,7 @@ class BaseOperationExecutor:
             if exception:
                 story_log_dbm = StoryLogDBM(
                     level=StoryLogDBM.Levels.error,
-                    title=f"Error while executing operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                    title=f"error in sync_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
                     data={
                         "operation_id": operation_dbm.id,
                         "exception_str": str(exception),
@@ -200,11 +204,11 @@ class BaseOperationExecutor:
             session.refresh(operation_dbm)
 
         self._logger.info(
-            f"finish sync_safe_execute_operation"
-            f", operation_dbm.id={operation_dbm.id}"
-            f", operation_dbm.type={operation_dbm.type}"
-            f", operation_dbm.status={operation_dbm.status}"
-            f", operation_dbm.duration={operation_dbm.duration}"
+            f"finish sync_safe_execute_operation, "
+            f"operation_dbm.id={operation_dbm.id}, "
+            f"operation_dbm.type={operation_dbm.type}, "
+            f"operation_dbm.status={operation_dbm.status}, "
+            f"operation_dbm.duration={operation_dbm.duration}"
         )
 
         return operation_dbm
@@ -219,9 +223,10 @@ class BaseOperationExecutor:
 
     async def async_safe_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
         self._logger.info(
-            f"start async_safe_execute_operation"
-            f", operation_dbm.id={operation_dbm.id}"
-            f", operation_dbm.type={operation_dbm.type}"
+            f"start async_safe_execute_operation, "
+            f"operation_dbm.id={operation_dbm.id}, "
+            f"operation_dbm.type={operation_dbm.type}, "
+            f"operation_dbm.status={operation_dbm.status}"
         )
 
         with self.sql_alchemy_db.new_session() as session:
@@ -239,7 +244,10 @@ class BaseOperationExecutor:
         try:
             await self.async_execute_operation(operation_dbm=operation_dbm)
         except BaseException as exception_:
-            self._logger.error(f"Error while executing operation (id={operation_dbm.id})", exc_info=exception_)
+            self._logger.error(
+                f"error in async_execute_operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                exc_info=exception_
+            )
             exception = exception_
             traceback_str = traceback.format_exc()
 
@@ -265,7 +273,7 @@ class BaseOperationExecutor:
             if exception:
                 story_log_dbm = StoryLogDBM(
                     level=StoryLogDBM.Levels.error,
-                    title=f"Error while executing operation (id={operation_dbm.id}, type={operation_dbm.type})",
+                    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),
@@ -279,11 +287,11 @@ class BaseOperationExecutor:
             session.refresh(operation_dbm)
 
         self._logger.info(
-            f"finish async_safe_execute_operation"
-            f", operation_dbm.id={operation_dbm.id}"
-            f", operation_dbm.type={operation_dbm.type}"
-            f", operation_dbm.status={operation_dbm.status}"
-            f", operation_dbm.duration={operation_dbm.duration}"
+            f"finish async_safe_execute_operation, "
+            f"operation_dbm.id={operation_dbm.id}, "
+            f"operation_dbm.type={operation_dbm.type}, "
+            f"operation_dbm.status={operation_dbm.status}, "
+            f"operation_dbm.duration={operation_dbm.duration}"
         )
 
         return operation_dbm
@@ -320,14 +328,12 @@ class OperationExecutorWorker(BaseWorker):
             sqlalchemy_db=self.sqlalchemy_db,
             filter_operation_types=self.filter_operation_types
         )
-
         if not operation_dbm:
             return
-
         self.sync_execute_operation(operation_dbm=operation_dbm)
 
     def sync_run_on_error(self, exception: BaseException, **kwargs):
-        self._logger.exception(exception)
+        pass
 
     async def async_on_startup(self):
         self.sqlalchemy_db.init()
@@ -340,14 +346,12 @@ class OperationExecutorWorker(BaseWorker):
             sqlalchemy_db=self.sqlalchemy_db,
             filter_operation_types=self.filter_operation_types
         )
-
         if not operation_dbm:
             return
-
         await self.async_execute_operation(operation_dbm=operation_dbm)
 
     async def async_run_on_error(self, exception: BaseException, **kwargs):
-        self._logger.exception(exception)
+        pass
 
 
 class ScheduledOperation(BaseModel):
@@ -383,8 +387,10 @@ class ScheduledOperationCreatorWorker(BaseWorker):
         timeout = None
 
         for scheduled_operation in self.scheduled_operations:
+
             if not scheduled_operation.is_time_func():
                 continue
+
             with self.sqlalchemy_db.new_session() as session:
                 operation_dbm = OperationDBM(
                     type=scheduled_operation.type,
@@ -411,8 +417,10 @@ class ScheduledOperationCreatorWorker(BaseWorker):
         timeout: timedelta | None = None
 
         for scheduled_operation in self.scheduled_operations:
+
             if not scheduled_operation.is_time_func():
                 continue
+
             with self.sqlalchemy_db.new_session() as session:
                 operation_dbm = OperationDBM(
                     type=scheduled_operation.type,

arpakitlib/ar_schedule_uust_api_client_util.py

@@ -87,6 +87,9 @@ class ScheduleUUSTAPIClient:
             proxy_url_=self.api_proxy_url,
             raise_for_status_=True
         )
+        json_data = await response.json()
+        if "error" in json_data.keys():
+            raise Exception(f"error in json_data, {json_data}")
         return response
 
     async def get_current_week(self) -> int:
@@ -176,20 +179,28 @@ class ScheduleUUSTAPIClient:
 
     async def check_conn(self):
         await self.get_current_week()
+        self._logger.info(f"connection is good")
 
     async def is_conn_good(self):
         try:
             await self.check_conn()
         except Exception as e:
-            self._logger.error(e)
+            self._logger.error(f"connection is bad", exc_info=e)
             return False
         return True
 
     async def check_all(self):
-        await self.get_groups()
-        await self.get_teachers()
-        await self.get_current_semester()
-        await self.get_current_week()
+        groups = await self.get_groups()
+        self._logger.info(f"groups len: {len(groups)}")
+
+        teachers = await self.get_teachers()
+        self._logger.info(f"teachers len: {len(teachers)}")
+
+        current_semester = await self.get_current_semester()
+        self._logger.info(f"current_semester: {current_semester}")
+
+        current_week = await self.get_current_week()
+        self._logger.info(f"current_week: {current_week}")
 
 
 def __example():

{arpakitlib-1.7.60.dist-info → arpakitlib-1.7.62.dist-info}/METADATA

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

{arpakitlib-1.7.60.dist-info → arpakitlib-1.7.62.dist-info}/RECORD

@@ -101,8 +101,8 @@ arpakitlib/_arpakit_project_template/src/operation_execution/__init__.py,sha256=
 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=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/operation_execution/start_operation_executor_worker_for_dev.py,sha256=DC0UYP6XpFz-AoatzvqYSBqSYRwK7mvIUhbqxDkaiPk,603
+arpakitlib/_arpakit_project_template/src/operation_execution/start_scheduled_operation_creator_worker_for_dev.py,sha256=RyHCafGTJaY-o3mgt7MReqgJ2txoBDhhsFzrjRiZWe4,574
 arpakitlib/_arpakit_project_template/src/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/test_data/make_test_data_1.py,sha256=3WVPgRsNCIxWpA-6t_Phe-nFULdHPhS1S_DO11XRmqk,80
 arpakitlib/_arpakit_project_template/src/test_data/make_test_data_2.py,sha256=MVDc71sj5I1muWin50GwrSxMwYtOOSDOtRmeFErHcXs,80
@@ -118,7 +118,7 @@ arpakitlib/ar_arpakit_project_template_util.py,sha256=AswzQvvb-zfUyrcP4EP0K756YL
 arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=SYWWQDohPnw0qpBIu2hEvGZRVdaI4NUUQdEjnMnseo4,18237
 arpakitlib/ar_arpakitlib_cli_util.py,sha256=ZktW3T6YRSM4_IDjbVhO3erceiQ5N6Gab_O-LtglfAI,3117
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
-arpakitlib/ar_base_worker_util.py,sha256=vb7JrqiYvG7yw7-gZAP-oFwEEMqOuBGCpMJ5lw8wF-E,3382
+arpakitlib/ar_base_worker_util.py,sha256=41MvFpS1YzaHchcNOVIuqYP4q3BXycpGPvylb10IbDI,4228
 arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weRfJ0,3476
 arpakitlib/ar_datetime_util.py,sha256=Xe1NiT9oPQzNSG7RVRkhukhbg4i-hhS5ImmV7sPUc8o,971
 arpakitlib/ar_dict_util.py,sha256=cF5LQJ6tLqyGoEXfDljMDZrikeZoWPw7CgINHIFGvXM,419
@@ -146,7 +146,7 @@ arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css,sha256=jzPZlgJTFwSdSphk9C
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map,sha256=5wq8eXMLU6Zxb45orZPL1zAsBFJReFw6GjYqGpUX3hg,262650
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js,sha256=ffrLZHHEQ_g84A-ul3yWa10Kk09waOAxHcQXPuZuavg,339292
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map,sha256=9UhIW7MqCOZPAz1Sl1IKfZUuhWU0p-LJqrnjjJD9Xhc,1159454
-arpakitlib/ar_fastapi_util.py,sha256=e4Tgz7sPJk-wqMc2sNsBZ7ZVXo2lMnaOq5WY7CbgvMk,24203
+arpakitlib/ar_fastapi_util.py,sha256=mkgM3_5ff6BUv-YuG6JyjQ1ez1l2FJqXrIAGGHWRU6w,24296
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_file_util.py,sha256=07xCF7paAUP2JUyfpeX0l3N1oCSma7qAcBmrCIZVi3g,452
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -157,15 +157,15 @@ arpakitlib/ar_json_util.py,sha256=GwHDdrBWiJBHSc07Qe0aN1Gp_uM0pYpTwzU9JAgsKAo,97
 arpakitlib/ar_jwt_util.py,sha256=Rhm4ywoTAn6yOV8NLjDASfAtAtheROxxDP40G3XjnuQ,761
 arpakitlib/ar_list_of_dicts_to_xlsx.py,sha256=MyjEl4Jl4beLVZqLVQMMv0-XDtBD3Xh4Z_ZPDJeFu04,745
 arpakitlib/ar_list_util.py,sha256=2woOAHAU8oTIiVjZ8GLnx15odEaoQUq3Q0JPxlufFF0,457
-arpakitlib/ar_logging_util.py,sha256=Q9nI2au8a48wPQlueBUyAi3X4q-m59S2K9aNc1i21RA,2606
+arpakitlib/ar_logging_util.py,sha256=5HF1mdQeJCroWHLMPQ6c7WLlbpYHB1h3I3X3faXFMRM,2658
 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=XMS5bLM-NubLv7HuTnt0Vi6YnE42pu3dJso7HRpBBKk,17454
+arpakitlib/ar_operation_execution_util.py,sha256=1oobZxK9DBXMOKQKiqhvbatgqs7PUJfChXW1O6sgz44,17666
 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_schedule_uust_api_client_util.py,sha256=rAIxrAwURes5kuviFi2MA1VgOaWCZQtqmqsTf0QlAvY,6634
 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
@@ -175,9 +175,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.60.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.60.dist-info/METADATA,sha256=i3KUi4t4rbu-G6m4pHJtxGu5MPdcRIpOwyh71pi3QM4,2824
-arpakitlib-1.7.60.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.60.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.60.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.60.dist-info/RECORD,,
+arpakitlib-1.7.62.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.62.dist-info/METADATA,sha256=CGbVkqo03xPXSliWMN8Y12D0ag2FN_OtXAqYnNzQazc,2824
+arpakitlib-1.7.62.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.62.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.62.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.62.dist-info/RECORD,,