arpakitlib 1.7.72__tar.gz → 1.7.74__tar.gz

{arpakitlib-1.7.72 → arpakitlib-1.7.74}/PKG-INFO

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

arpakitlib-1.7.74/arpakitlib/_arpakit_project_template/manage/json_beutify.py

@@ -0,0 +1,10 @@
+from arpakitlib.ar_json_util import safely_transfer_str_to_json_obj_to_json_str
+
+
+def command():
+    s = input("JSON:\n")
+    print(safely_transfer_str_to_json_obj_to_json_str(s))
+
+
+if __name__ == '__main__':
+    command()

arpakitlib-1.7.74/arpakitlib/_arpakit_project_template/manage/settings_check.py

@@ -0,0 +1,10 @@
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
+from src.core.settings import get_cached_settings
+
+
+def command():
+    print(safely_transfer_obj_to_json_str(get_cached_settings().model_dump(mode="json")))
+
+
+if __name__ == '__main__':
+    command()

{arpakitlib-1.7.72 → arpakitlib-1.7.74}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -5,12 +5,14 @@ from typing import Any
 
 import pytz
 
-from arpakitlib.ar_json_util import safely_transfer_to_json_str
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 from arpakitlib.ar_settings_util import SimpleSettings
 from src.core.const import BASE_DIRPATH, ENV_FILEPATH
 
 
 class Settings(SimpleSettings):
+    project_name: str = "{PROJECT_NAME}"
+
     sql_db_url: str | None = (
         "postgresql://{PROJECT_NAME}:{PROJECT_NAME}@127.0.0.1:{SQL_DB_PORT}/{PROJECT_NAME}"
     ) if (str("{PROJECT_NAME}") and str("{SQL_DB_PORT}").strip().isdigit()) else None
@@ -70,7 +72,7 @@ def get_cached_settings() -> Settings:
 
 
 def __example():
-    print(safely_transfer_to_json_str(get_cached_settings().model_dump(mode="json")))
+    print(safely_transfer_obj_to_json_str(get_cached_settings().model_dump(mode="json")))
 
 
 async def __async_example():

{arpakitlib-1.7.72 → arpakitlib-1.7.74}/arpakitlib/ar_arpakit_schedule_uust_api_client_util.py

@@ -17,7 +17,7 @@ from pydantic import ConfigDict, BaseModel
 
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
-from arpakitlib.ar_json_util import safely_transfer_to_json_str
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 from arpakitlib.ar_sleep_util import async_safe_sleep
 from arpakitlib.ar_type_util import raise_for_type
 
@@ -53,7 +53,7 @@ class BaseAPIModel(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
 
     def simple_json(self) -> str:
-        return safely_transfer_to_json_str(self.model_dump(mode="json"))
+        return safely_transfer_obj_to_json_str(self.model_dump(mode="json"))
 
 
 class GroupAPIModel(BaseAPIModel):

{arpakitlib-1.7.72 → arpakitlib-1.7.74}/arpakitlib/ar_fastapi_util.py

@@ -25,11 +25,11 @@ 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
-from arpakitlib.ar_json_util import safely_transfer_to_json_str_to_json_obj
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str_to_json_obj
 from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
@@ -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_obj_to_json_str_to_json_obj(content)
+        elif isinstance(content, list):
+            content = safely_transfer_obj_to_json_str_to_json_obj(content)
+        elif isinstance(content, BaseSO):
+            content = safely_transfer_obj_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
         )
 
@@ -427,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):
@@ -529,14 +541,14 @@ def base_api_auth(
             raise APIException(
                 status_code=starlette.status.HTTP_401_UNAUTHORIZED,
                 error_code=BaseAPIErrorCodes.cannot_authorize,
-                error_data=safely_transfer_to_json_str_to_json_obj(api_auth_data.model_dump())
+                error_data=safely_transfer_obj_to_json_str_to_json_obj(api_auth_data.model_dump())
             )
 
         if require_token_string and not api_auth_data.token_string:
             raise APIException(
                 status_code=starlette.status.HTTP_401_UNAUTHORIZED,
                 error_code=BaseAPIErrorCodes.cannot_authorize,
-                error_data=safely_transfer_to_json_str_to_json_obj(api_auth_data.model_dump())
+                error_data=safely_transfer_obj_to_json_str_to_json_obj(api_auth_data.model_dump())
             )
 
         return api_auth_data
@@ -578,7 +590,7 @@ def is_api_key_correct_api_auth(
             raise APIException(
                 status_code=starlette.status.HTTP_401_UNAUTHORIZED,
                 error_code=BaseAPIErrorCodes.cannot_authorize,
-                error_data=safely_transfer_to_json_str_to_json_obj(check_api_key_api_auth_data.model_dump())
+                error_data=safely_transfer_obj_to_json_str_to_json_obj(check_api_key_api_auth_data.model_dump())
             )
 
         return check_api_key_api_auth_data

arpakitlib-1.7.74/arpakitlib/ar_json_util.py

@@ -0,0 +1,36 @@
+# arpakit
+
+import json
+from typing import Any
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+def safely_transfer_str_to_json_obj(data: str) -> dict[Any, Any] | list[Any] | None:
+    if not isinstance(data, str):
+        raise ValueError("not isinstance(data, str)")
+    return json.loads(data)
+
+
+def safely_transfer_obj_to_json_str(data: dict[Any, Any] | list[Any] | None) -> str:
+    if not isinstance(data, dict) and not isinstance(data, list) and data is not None:
+        raise ValueError("not isinstance(data, dict) and not isinstance(data, list) and data is not None")
+    return json.dumps(data, ensure_ascii=False, indent=2, default=str)
+
+
+def safely_transfer_obj_to_json_str_to_json_obj(
+        data: dict[Any, Any] | list[Any] | None
+) -> dict[Any, Any] | list[Any] | None:
+    return safely_transfer_str_to_json_obj(safely_transfer_obj_to_json_str(data))
+
+
+def safely_transfer_str_to_json_obj_to_json_str(data: str) -> str:
+    return safely_transfer_obj_to_json_str(safely_transfer_str_to_json_obj(data))
+
+
+def __example():
+    pass
+
+
+if __name__ == '__main__':
+    __example()

{arpakitlib-1.7.72 → arpakitlib-1.7.74}/arpakitlib/ar_sqlalchemy_model_util.py

@@ -10,7 +10,7 @@ from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_enumeration_util import Enumeration
-from arpakitlib.ar_json_util import safely_transfer_to_json_str
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -44,7 +44,7 @@ class BaseDBM(DeclarativeBase):
         return res
 
     def simple_json(self, *, include_sd_properties: bool = True) -> str:
-        return safely_transfer_to_json_str(self.simple_dict(include_sd_properties=include_sd_properties))
+        return safely_transfer_obj_to_json_str(self.simple_dict(include_sd_properties=include_sd_properties))
 
 
 class SimpleDBM(BaseDBM):

{arpakitlib-1.7.72 → arpakitlib-1.7.74}/arpakitlib/ar_ssh_runner_util.py

@@ -11,7 +11,7 @@ import asyncssh
 import paramiko
 from pydantic import BaseModel
 
-from arpakitlib.ar_json_util import safely_transfer_to_json_str
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -61,7 +61,7 @@ class SSHRunRes(BaseModel):
         }
 
     def simple_json(self) -> str:
-        return safely_transfer_to_json_str(self.simple_dict())
+        return safely_transfer_obj_to_json_str(self.simple_dict())
 
     def __repr__(self) -> str:
         return self.simple_json()

{arpakitlib-1.7.72 → arpakitlib-1.7.74}/pyproject.toml

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

arpakitlib-1.7.72/arpakitlib/_arpakit_project_template/manage/json_beutify.py

@@ -1,10 +0,0 @@
-from arpakitlib.ar_json_util import safely_transfer_to_json_obj_to_json_str
-
-
-def command():
-    s = input("JSON:\n")
-    print(safely_transfer_to_json_obj_to_json_str(s))
-
-
-if __name__ == '__main__':
-    command()

arpakitlib-1.7.72/arpakitlib/_arpakit_project_template/manage/settings_check.py

@@ -1,10 +0,0 @@
-from arpakitlib.ar_json_util import safely_transfer_to_json_str
-from src.core.settings import get_cached_settings
-
-
-def command():
-    print(safely_transfer_to_json_str(get_cached_settings().model_dump(mode="json")))
-
-
-if __name__ == '__main__':
-    command()

arpakitlib-1.7.72/arpakitlib/ar_json_util.py

@@ -1,34 +0,0 @@
-# arpakit
-
-import json
-from typing import Union, Any
-
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
-
-def safely_transfer_to_json_obj(data: str) -> Union[dict, list]:
-    if not isinstance(data, str):
-        raise ValueError("not isinstance(data, str)")
-    return json.loads(data)
-
-
-def safely_transfer_to_json_str(data: Union[dict[str, Any], list[Any]]) -> str:
-    if not isinstance(data, dict) and not isinstance(data, list):
-        raise ValueError("not isinstance(data, dict) and not isinstance(data, list)")
-    return json.dumps(data, ensure_ascii=False, indent=2, default=str)
-
-
-def safely_transfer_to_json_str_to_json_obj(data: Union[dict[str, Any], list[Any]]) -> Union[dict, list]:
-    return safely_transfer_to_json_obj(safely_transfer_to_json_str(data))
-
-
-def safely_transfer_to_json_obj_to_json_str(data: str) -> str:
-    return safely_transfer_to_json_str(safely_transfer_to_json_obj(data))
-
-
-def __example():
-    pass
-
-
-if __name__ == '__main__':
-    __example()