arpakitlib 1.7.63__py3-none-any.whl → 1.7.65__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -1,6 +1,6 @@
 from fastapi import FastAPI
 
-from arpakitlib.ar_base_worker_util import BaseWorker
+from arpakitlib.ar_base_worker_util import SafeRunInBackgroundModes
 from arpakitlib.ar_fastapi_util import create_fastapi_app, InitSqlalchemyDBStartupAPIEvent, InitFileStoragesInDir, \
     create_handle_exception, create_story_log_before_response_in_handle_exception, DEFAULT_CONTACT, \
     SafeRunWorkerStartupAPIEvent
@@ -22,18 +22,25 @@ def create_api_app() -> FastAPI:
     setup_logging()
 
     settings = get_cached_settings()
+
     sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sql_db_url is not None else None
+
     transmitted_api_data = TransmittedAPIData(
         settings=settings,
         sqlalchemy_db=sqlalchemy_db
     )
 
     funcs_before_response = []
+
     if settings.api_create_story_log_before_response_in_handle_exception:
         raise_for_type(sqlalchemy_db, SQLAlchemyDB)
         funcs_before_response.append(
-            create_story_log_before_response_in_handle_exception(sqlalchemy_db=sqlalchemy_db)
+            create_story_log_before_response_in_handle_exception(
+                sqlalchemy_db=sqlalchemy_db,
+                ignore_api_error_code_not_found=True
+            )
         )
+
     handle_exception = create_handle_exception(
         funcs_before_response=funcs_before_response,
         async_funcs_after_response=[]
@@ -66,7 +73,7 @@ def create_api_app() -> FastAPI:
                         filter_operation_types=None
                     )
                 ],
-                safe_run_in_background_mode=BaseWorker.SafeRunInBackgroundModes.async_task
+                safe_run_in_background_mode=SafeRunInBackgroundModes.async_task
             )
         )
 
@@ -80,7 +87,7 @@ def create_api_app() -> FastAPI:
                         scheduled_operations=ALL_SCHEDULED_OPERATIONS
                     )
                 ],
-                safe_run_in_background_mode=BaseWorker.SafeRunInBackgroundModes.async_task
+                safe_run_in_background_mode=SafeRunInBackgroundModes.async_task
             )
         )
 

arpakitlib/ar_base_worker_util.py

@@ -14,49 +14,23 @@ _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
 class BaseWorker(ABC):
-    class SafeRunInBackgroundModes(Enumeration):
-        async_task = "async_task"
-        thread = "thread"
-        process = "process"
-
     def __init__(self):
         self.worker_name = self.__class__.__name__
         self._logger = logging.getLogger(self.worker_name)
         self.timeout_after_run = timedelta(seconds=0.1).total_seconds()
         self.timeout_after_err_in_run = timedelta(seconds=1).total_seconds()
 
-    def safe_run_in_background(self, *, safe_run_in_background_mode: str) -> (
-            asyncio.Task | threading.Thread | multiprocessing.Process
-    ):
-        if safe_run_in_background_mode == self.SafeRunInBackgroundModes.async_task:
-            res: asyncio.Task = asyncio.create_task(self.async_safe_run())
-        elif safe_run_in_background_mode == self.SafeRunInBackgroundModes.thread:
-            res: threading.Thread = threading.Thread(
-                target=self.sync_safe_run,
-                daemon=True
-            )
-            res.start()
-        elif safe_run_in_background_mode == self.SafeRunInBackgroundModes.process:
-            res: multiprocessing.Process = multiprocessing.Process(
-                target=self.sync_safe_run,
-                daemon=True
-            )
-            res.start()
-        else:
-            raise ValueError(f"unknown safe_run_mode={safe_run_in_background_mode}")
-        return res
-
     def sync_on_startup(self):
         pass
 
     def sync_run(self):
-        raise NotImplementedError()
+        self._logger.info("hello world")
 
     def sync_run_on_error(self, exception: BaseException, **kwargs):
         pass
 
     def sync_safe_run(self):
-        self._logger.info("start sync_safe_run")
+        self._logger.info("start")
         try:
             self.sync_on_startup()
         except BaseException as exception:
@@ -65,8 +39,6 @@ class BaseWorker(ABC):
         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._logger.error("error in sync_run", exc_info=exception)
                 try:
@@ -74,14 +46,14 @@ 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_err_in_run is not None:
-                    sync_safe_sleep(self.timeout_after_err_in_run)
+            if self.timeout_after_run is not None:
+                sync_safe_sleep(self.timeout_after_run)
 
     async def async_on_startup(self):
         pass
 
     async def async_run(self):
-        raise NotImplementedError()
+        self._logger.info("hello world")
 
     async def async_run_on_error(self, exception: BaseException, **kwargs):
         pass
@@ -96,8 +68,6 @@ class BaseWorker(ABC):
         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:
                 self._logger.error("error in async_run", exc_info=exception)
                 try:
@@ -105,8 +75,36 @@ 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)
+            if self.timeout_after_err_in_run is not None:
+                await async_safe_sleep(self.timeout_after_err_in_run)
+
+
+class SafeRunInBackgroundModes(Enumeration):
+    async_task = "async_task"
+    thread = "thread"
+    process = "process"
+
+
+def safe_run_worker_in_background(*, worker: BaseWorker, mode: str) -> (
+        asyncio.Task | threading.Thread | multiprocessing.Process
+):
+    if mode == SafeRunInBackgroundModes.async_task:
+        res: asyncio.Task = asyncio.create_task(worker.async_safe_run())
+    elif mode == SafeRunInBackgroundModes.thread:
+        res: threading.Thread = threading.Thread(
+            target=worker.sync_safe_run,
+            daemon=True
+        )
+        res.start()
+    elif mode == SafeRunInBackgroundModes.process:
+        res: multiprocessing.Process = multiprocessing.Process(
+            target=worker.sync_safe_run,
+            daemon=True
+        )
+        res.start()
+    else:
+        raise ValueError(f"unknown safe_run_mode={mode}")
+    return res
 
 
 def __example():

arpakitlib/ar_fastapi_util.py

@@ -176,6 +176,7 @@ def create_handle_exception(
                 "exception_str": str(exception),
                 "request.method": str(request.method),
                 "request.url": str(request.url),
+                "request.headers": str(request.headers),
             }
         )
 
@@ -254,7 +255,8 @@ def create_handle_exception(
 
 def create_story_log_before_response_in_handle_exception(
         *,
-        sqlalchemy_db: SQLAlchemyDB
+        sqlalchemy_db: SQLAlchemyDB,
+        ignore_api_error_code_not_found: bool = True
 ) -> Callable:
     def func(
             *,
@@ -264,6 +266,8 @@ def create_story_log_before_response_in_handle_exception(
             exception: Exception,
             **kwargs
     ) -> (int, ErrorSO, dict[str, Any]):
+        if ignore_api_error_code_not_found and error_so.error_code == BaseAPIErrorCodes.not_found:
+            return status_code, error_so, kwargs
         sqlalchemy_db.init()
         traceback_str = "".join(traceback.format_exception(type(exception), exception, exception.__traceback__))
         with sqlalchemy_db.new_session() as session:

arpakitlib/ar_logging_util.py

@@ -2,7 +2,6 @@
 
 import logging
 import os
-from functools import wraps
 from typing import Optional
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -34,7 +33,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:%(funcName)s:%(lineno)d - %(message)s",
+        "%(asctime)s | %(levelname)s | %(filename)s | %(name)s:%(funcName)s:%(lineno)d - %(message)s",
         datefmt="%d.%m.%Y %I:%M:%S%p"
     )
     stream_handler.setFormatter(stream_formatter)
@@ -44,7 +43,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:%(funcName)s:%(lineno)d - %(message)s",
+            "%(asctime)s | %(levelname)s | %(filename)s | %(name)s:%(funcName)s:%(lineno)d - %(message)s",
             datefmt="%d.%m.%Y %I:%M:%S%p"
         )
         file_handler.setFormatter(file_formatter)
@@ -55,38 +54,6 @@ def setup_normal_logging(log_filepath: Optional[str] = None):
     logger.info("normal logging was setup")
 
 
-def log_func():
-    def decorator(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            function_path = f"{func.__module__}:{func.__qualname__}"
-            logger = logging.getLogger(__name__)
-            logger.info(f"start func {function_path}")
-            result = func(*args, **kwargs)
-            logger.info(f"finish func {function_path}")
-            return result
-
-        return wrapper
-
-    return decorator
-
-
-def log_async_func():
-    def decorator(func):
-        @wraps(func)
-        async def async_wrapper(*args, **kwargs):
-            function_path = f"{func.__module__}:{func.__qualname__}"
-            logger = logging.getLogger(__name__)
-            logger.info(f"start async func {function_path}")
-            result = await func(*args, **kwargs)
-            logger.info(f"finish async func {function_path}")
-            return result
-
-        return async_wrapper
-
-    return decorator
-
-
 def __example():
     pass
 

arpakitlib/ar_operation_execution_util.py

@@ -136,11 +136,17 @@ class BaseOperationExecutor:
         elif operation_dbm.type == BaseOperationTypes.raise_fake_exception_:
             self._logger.info("raise_fake_exception")
             raise Exception("raise_fake_exception")
+        else:
+            raise Exception(
+                f"unknown operation_dbm.type,"
+                f" operation_dbm.id={operation_dbm.id},"
+                f" operation_dbm.type={operation_dbm.type}"
+            )
         return operation_dbm
 
     def sync_safe_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
         self._logger.info(
-            f"start sync_safe_execute_operation, "
+            f"start "
             f"operation_dbm.id={operation_dbm.id}, "
             f"operation_dbm.type={operation_dbm.type}, "
             f"operation_dbm.status={operation_dbm.status}"
@@ -219,11 +225,17 @@ class BaseOperationExecutor:
         elif operation_dbm.type == BaseOperationTypes.raise_fake_exception_:
             self._logger.info("raise_fake_exception")
             raise Exception("raise_fake_exception")
+        else:
+            raise Exception(
+                f"unknown operation_dbm.type,"
+                f" operation_dbm.id={operation_dbm.id},"
+                f" operation_dbm.type={operation_dbm.type}"
+            )
         return operation_dbm
 
     async def async_safe_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
         self._logger.info(
-            f"start async_safe_execute_operation, "
+            f"start "
             f"operation_dbm.id={operation_dbm.id}, "
             f"operation_dbm.type={operation_dbm.type}, "
             f"operation_dbm.status={operation_dbm.status}"

{arpakitlib-1.7.63.dist-info → arpakitlib-1.7.65.dist-info}/METADATA

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

{arpakitlib-1.7.63.dist-info → arpakitlib-1.7.65.dist-info}/RECORD

@@ -74,7 +74,7 @@ arpakitlib/_arpakit_project_template/src/api/__init__.py,sha256=47DEQpj8HBSa-_TI
 arpakitlib/_arpakit_project_template/src/api/asgi.py,sha256=a5UBxOyNC8NG3E0ayhiDo3t5tPoB3WtOf2gbZJFWBAA,74
 arpakitlib/_arpakit_project_template/src/api/auth.py,sha256=Ljq_VjjiAaW3HEzq60nkSI-HkHfuv6j5-8Q6Qs8V9bU,261
 arpakitlib/_arpakit_project_template/src/api/const.py,sha256=7d4qD5hedqr7QxVzbfsA7E1bNZn2Pm2U8joXGtpANu0,287
-arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=yEhwKpgSP0eCewXwEiSlKMtRm7fKOhZt_vhXssIjnUw,4491
+arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=sSVf1Ft8VqdW_IAApYsL4C9mnK4M0wNUw8YafKXYJO4,4571
 arpakitlib/_arpakit_project_template/src/api/event.py,sha256=58wCVyVSIe_kydWi44M0Wvp7bTnV8xvO30gMXzjbFYc,750
 arpakitlib/_arpakit_project_template/src/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/api/router/main_router.py,sha256=__Z-pGoeooYCub7besFXGJJvZR3V-4IakXd3cKo6ZIM,209
@@ -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=41MvFpS1YzaHchcNOVIuqYP4q3BXycpGPvylb10IbDI,4228
+arpakitlib/ar_base_worker_util.py,sha256=o7RksRG-f8Xf6xEhNFx-ddhnZfF_yq2OhhxHEI6_YJk,3760
 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=mkgM3_5ff6BUv-YuG6JyjQ1ez1l2FJqXrIAGGHWRU6w,24296
+arpakitlib/ar_fastapi_util.py,sha256=eOErnvI8ujwC_yN0XGN2xHm2RUoDk103OCpIkFGJ8A4,24555
 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,11 +157,11 @@ 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=gP5OqpafgdrjlpfPyz0ENEA1gGh2J7ZKHqr3EWZ-IJ4,2628
+arpakitlib/ar_logging_util.py,sha256=jkc1qH7STKAjuwV7ipWqMA5Tn0LogQZ78BV6HCwW57A,1696
 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=1oobZxK9DBXMOKQKiqhvbatgqs7PUJfChXW1O6sgz44,17666
+arpakitlib/ar_operation_execution_util.py,sha256=F3gX2ZaR-tMFEKjVptpmX2kBTwtyr9Wfp9qNS0DR0Gk,18049
 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
@@ -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.63.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.63.dist-info/METADATA,sha256=iZqft8zFKWYKyiwRuf1iA2uWMwiwi1dp5Jyzn0kK0mI,2824
-arpakitlib-1.7.63.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.63.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.63.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.63.dist-info/RECORD,,
+arpakitlib-1.7.65.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.65.dist-info/METADATA,sha256=47wQBgu-D9rSBd4fqxWGyUXaVjQxxEJxPo5mOvhL38o,2824
+arpakitlib-1.7.65.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.65.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.65.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.65.dist-info/RECORD,,