arpakitlib 1.7.73__py3-none-any.whl → 1.7.74__py3-none-any.whl

arpakitlib/_arpakit_project_template/manage/json_beutify.py

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

arpakitlib/_arpakit_project_template/manage/settings_check.py

@@ -1,9 +1,9 @@
-from arpakitlib.ar_json_util import safely_transfer_to_json_str
+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_to_json_str(get_cached_settings().model_dump(mode="json")))
+    print(safely_transfer_obj_to_json_str(get_cached_settings().model_dump(mode="json")))
 
 
 if __name__ == '__main__':

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/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/ar_fastapi_util.py

@@ -29,7 +29,7 @@ from arpakitlib.ar_base_worker_util import BaseWorker, safe_run_worker_in_backgr
 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
@@ -112,11 +112,11 @@ class OperationSO(SimpleSO):
 class APIJSONResponse(fastapi.responses.JSONResponse):
     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)
+            content = safely_transfer_obj_to_json_str_to_json_obj(content)
         elif isinstance(content, list):
-            content = safely_transfer_to_json_str_to_json_obj(content)
+            content = safely_transfer_obj_to_json_str_to_json_obj(content)
         elif isinstance(content, BaseSO):
-            content = safely_transfer_to_json_str_to_json_obj(content.model_dump())
+            content = safely_transfer_obj_to_json_str_to_json_obj(content.model_dump())
         elif content is None:
             content = None
         else:
@@ -541,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
@@ -590,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/ar_json_util.py

@@ -1,29 +1,31 @@
 # arpakit
 
 import json
-from typing import Union, Any
+from typing import Any
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
-def safely_transfer_to_json_obj(data: str) -> Union[dict, list]:
+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_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)")
+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_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_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_to_json_obj_to_json_str(data: str) -> str:
-    return safely_transfer_to_json_str(safely_transfer_to_json_obj(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():

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/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.73.dist-info → arpakitlib-1.7.74.dist-info}/METADATA

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

{arpakitlib-1.7.73.dist-info → arpakitlib-1.7.74.dist-info}/RECORD

@@ -28,7 +28,7 @@ arpakitlib/_arpakit_project_template/manage/git_set_arpakit_company_origin.sh,sh
 arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh,sha256=uMtOEDLe_L8SD5cqZ1ZU_pC2C5ZOD-eM8igf1z0LUIk,225
 arpakitlib/_arpakit_project_template/manage/git_status.sh,sha256=N9JGYX5_UfCdirw4EQYzu4sS7pMLGrF4-QrTSTcpUtA,16
 arpakitlib/_arpakit_project_template/manage/hello_world.py,sha256=1b1YIedAgtvBttAcKBeF03XsJ_pVKIThsr-0MYw0Uxg,83
-arpakitlib/_arpakit_project_template/manage/json_beutify.py,sha256=mzmt-5piAHqgihLsqOpPx1JjDc1qA5F1XHBxDdR-BxY,215
+arpakitlib/_arpakit_project_template/manage/json_beutify.py,sha256=PChWwFEKQisArptVW7lMMwlEbtKdeCP_IkQ0OXz-J08,223
 arpakitlib/_arpakit_project_template/manage/logging_check.py,sha256=rfrl4MK5ItRKaLKb0UU_EfQLckRQSYJ1S_2VAQJQ2Yk,212
 arpakitlib/_arpakit_project_template/manage/note/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/note/note_1.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,7 +59,7 @@ arpakitlib/_arpakit_project_template/manage/sandbox/sandbox_6.py,sha256=WdE1IWyO
 arpakitlib/_arpakit_project_template/manage/sandbox/sandbox_7.py,sha256=WdE1IWyObxVUT9jE3qgNMaFXXkKV6nUI0ZToLT1uhdk,155
 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_check.py,sha256=T9u9NwmuiyFasXuuomJkrT9Btb3CbnytuftPDn0vkkg,268
 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=wv1N33nTGpsT9nk94OePlOSZ-O9UVKlMfRf8y5UeK1Y,213
 arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_init.py,sha256=cBkdDS4i1dbt0HsV6vyTTZvtCXYTfCdkvCHgVFrafUU,207
@@ -93,7 +93,7 @@ arpakitlib/_arpakit_project_template/src/api/util.py,sha256=47DEQpj8HBSa-_TImW-5
 arpakitlib/_arpakit_project_template/src/business_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/core/const.py,sha256=CZZew674y7LhCAlYhvuF5cV4Zb9nQ17j2Tcuj2GEBf4,1232
-arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=QbW0A2UuYMmYG4wOHPbsrm0YdaqA3a1rsmA7k2gQyv8,2147
+arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=VR2wHHkiTc4GKfddt-UeeQ1zZREL1njBRuHsi7JWLuQ,2197
 arpakitlib/_arpakit_project_template/src/core/util.py,sha256=5R8gvcZdvuDQes45FBnLC2IDv2Jhajp1VhJJYNKYjMQ,1539
 arpakitlib/_arpakit_project_template/src/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py,sha256=nXtayUkBaVb6tWx5qJgXZLbLOTVAjnSLpSDxBm7yZLc,234
@@ -117,7 +117,7 @@ arpakitlib/ar_additional_model_util.py,sha256=GFg-glLCxH9X95R2bhTJsscVwv37FgE1qb
 arpakitlib/ar_aiogram_util.py,sha256=5JPCDZpdBGTE-EIWPRez9amCZAX7XemFIVu5YrQK7Pw,12264
 arpakitlib/ar_arpakit_lib_module_util.py,sha256=NUMNT-AFE6cSmrd4wGKVoCBzfJZeNb7zNWn7aU7qybI,5632
 arpakitlib/ar_arpakit_project_template_util.py,sha256=AswzQvvb-zfUyrcP4EP0K756YL-oC8fA9VperlPf_d0,3699
-arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=LG0-An6KgC_hew548cyWAfRkpBH2vlnYgTqnPC07Yvk,19215
+arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=jGbP6egs2yhgfheyqhM0J-SeM2qp2YrW7dV-u9djv4Q,19223
 arpakitlib/ar_arpakitlib_cli_util.py,sha256=8lhEDxnwMSRX2PGV2xQtQru1AYKSA92SVolol5u7iBk,3154
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
 arpakitlib/ar_base_worker_util.py,sha256=o7RksRG-f8Xf6xEhNFx-ddhnZfF_yq2OhhxHEI6_YJk,3760
@@ -148,14 +148,14 @@ 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=UstW6ivH_sRXyREnl8OsImqOmFggmDH4MYMl0YGMc7Q,25349
+arpakitlib/ar_fastapi_util.py,sha256=g_qUH_THm9OuWoKFcDHFYe-yhl3hqSExs3BJfFuGV7g,25377
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_file_util.py,sha256=GUdJYm1tUZnYpY-SIPRHAZBHGra8NKy1eYEI0D5AfhY,489
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
 arpakitlib/ar_http_request_util.py,sha256=Kp2wKU4wGPsJ6m5sLwCEKWMs3Uqa59SUxhBevU6Gk_s,4328
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
 arpakitlib/ar_json_db_util.py,sha256=CEyhIU4WuNmX5mqwBVYxUKSdpFelXvWmf_tJ1fuxMSE,7187
-arpakitlib/ar_json_util.py,sha256=GwHDdrBWiJBHSc07Qe0aN1Gp_uM0pYpTwzU9JAgsKAo,972
+arpakitlib/ar_json_util.py,sha256=wJOsN8N7Rs7r8cTgMDXrmFa1GOkcD-LghqFEYXc8zGA,1083
 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
@@ -170,16 +170,16 @@ arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=rAIxrAwURes5kuviFi2MA1VgOaWCZQtqmqsTf0QlAvY,6634
 arpakitlib/ar_settings_util.py,sha256=EFRh5WrB_iaqwxy0rGAtnyGtA6JkNCan-Y_Y6XWb4UY,1583
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
-arpakitlib/ar_sqlalchemy_model_util.py,sha256=TFGOAgpxcnBV_u7yZrLCkf1ldlB4Of8vIRsyk9kyP5c,4987
+arpakitlib/ar_sqlalchemy_model_util.py,sha256=AuD0L4b-h0g3VqGoFHWK5JIet_Jxpg49o754cK8ben0,4995
 arpakitlib/ar_sqlalchemy_util.py,sha256=Hcg1THrDsSR_-8dsY1CG3NWPEv0FqCbkPXFXLtjlSJ0,4207
-arpakitlib/ar_ssh_runner_util.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
+arpakitlib/ar_ssh_runner_util.py,sha256=e9deuUdBW7Eh0Exx2nTBhk57SaOZYaJaSjNk8q6dbJk,6804
 arpakitlib/ar_str_util.py,sha256=tFoGSDYoGpfdVHWor5Li9pEOFmDFlHkX-Z8iOy1LK7Y,3537
 arpakitlib/ar_type_util.py,sha256=46ZMuWls3uN0Re5T0sfEAmyNUDnxn9yvj6dHivSDZKs,3915
 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.73.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.73.dist-info/METADATA,sha256=UZrOUY7CneX39dLf-oXrO3md1TeMvDTHJuqRM4w1e2I,2824
-arpakitlib-1.7.73.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.73.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.73.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.73.dist-info/RECORD,,
+arpakitlib-1.7.74.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.74.dist-info/METADATA,sha256=GTwTwdkpBy9SAiKi0w1BSDyRPZzVA0BG6kruYP95DqY,2824
+arpakitlib-1.7.74.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.74.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.74.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.74.dist-info/RECORD,,