arpakitlib 1.7.71__tar.gz → 1.7.73__tar.gz

{arpakitlib-1.7.71 → arpakitlib-1.7.73}/PKG-INFO

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

{arpakitlib-1.7.71 → arpakitlib-1.7.73}/arpakitlib/ar_fastapi_util.py

@@ -25,7 +25,7 @@ from starlette import status
 from starlette.middleware.cors import CORSMiddleware
 from starlette.staticfiles import StaticFiles
 
-from arpakitlib.ar_base_worker_util import BaseWorker
+from arpakitlib.ar_base_worker_util import BaseWorker, safe_run_worker_in_background, SafeRunInBackgroundModes
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
@@ -110,11 +110,23 @@ class OperationSO(SimpleSO):
 
 
 class APIJSONResponse(fastapi.responses.JSONResponse):
-    def __init__(self, *, content: BaseSO, status_code: int = starlette.status.HTTP_200_OK):
+    def __init__(self, *, content: dict | list | BaseSO | None, status_code: int = starlette.status.HTTP_200_OK):
+        if isinstance(content, dict):
+            content = safely_transfer_to_json_str_to_json_obj(content)
+        elif isinstance(content, list):
+            content = safely_transfer_to_json_str_to_json_obj(content)
+        elif isinstance(content, BaseSO):
+            content = safely_transfer_to_json_str_to_json_obj(content.model_dump())
+        elif content is None:
+            content = None
+        else:
+            raise ValueError(f"unknown content type, type(content)={type(content)}")
+
         self.content_ = content
         self.status_code_ = status_code
+
         super().__init__(
-            content=safely_transfer_to_json_str_to_json_obj(content.model_dump()),
+            content=content,
             status_code=status_code
         )
 
@@ -225,6 +237,9 @@ def create_handle_exception(
         if error_so.error_code == BaseAPIErrorCodes.not_found:
             status_code = status.HTTP_404_NOT_FOUND
 
+        if error_so.error_code == BaseAPIErrorCodes.cannot_authorize:
+            status_code = status.HTTP_401_UNAUTHORIZED
+
         if _need_exc_info:
             _logger.error(str(exception), exc_info=exception)
         else:
@@ -424,7 +439,7 @@ class SafeRunWorkerStartupAPIEvent(BaseStartupAPIEvent):
 
     async def async_on_startup(self, *args, **kwargs):
         for worker in self.workers:
-            _ = worker.safe_run_in_background(safe_run_in_background_mode=self.safe_run_in_background_mode)
+            _ = safe_run_worker_in_background(worker=worker, mode=SafeRunInBackgroundModes.async_task)
 
 
 class InitFileStoragesInDir(BaseStartupAPIEvent):

{arpakitlib-1.7.71 → arpakitlib-1.7.73}/arpakitlib/ar_operation_execution_util.py

@@ -136,12 +136,6 @@ 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:
@@ -225,12 +219,6 @@ 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:

{arpakitlib-1.7.71 → arpakitlib-1.7.73}/pyproject.toml

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