arpakitlib 1.7.131__py3-none-any.whl → 1.7.133__py3-none-any.whl

arpakitlib/_arpakit_project_template/example.env

@@ -1,5 +1,6 @@
 # mode_type=
 # project_name=
+# sql_db_port=
 # sql_db_url=
 # sql_db_echo=
 # api_init_sql_db_at_start=

arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -7,7 +7,7 @@ from arpakitlib.ar_type_util import raise_for_type
 from src.api.event import StartupAPIEvent, ShutdownAPIEvent
 from src.api.router.main_router import main_api_router
 from src.api.transmitted_api_data import TransmittedAPIData
-from src.core.const import STATIC_DIRPATH
+from src.core.const import ProjectPaths
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging, get_cached_media_file_storage_in_dir, get_cached_cache_file_storage_in_dir, \
     get_cached_dump_file_storage_in_dir
@@ -63,7 +63,7 @@ def create_api_app() -> FastAPI:
         transmitted_api_data=transmitted_api_data,
         main_api_router=main_api_router,
         media_dirpath=settings.media_dirpath,
-        static_dirpath=STATIC_DIRPATH
+        static_dirpath=ProjectPaths.static_dirpath
     )
 
     if settings.api_enable_admin1:

arpakitlib/_arpakit_project_template/src/core/const.py

@@ -2,41 +2,40 @@ import asyncio
 import os
 import pathlib
 
-BASE_DIRPATH: str = str(pathlib.Path(__file__).parent.parent.parent)
+from arpakitlib.ar_enumeration_util import Enumeration
 
-ENV_FILENAME: str = ".env"
 
-ENV_FILEPATH: str = os.path.join(BASE_DIRPATH, ENV_FILENAME)
+class ProjectPaths(Enumeration):
+    base_dirpath: str = str(pathlib.Path(__file__).parent.parent.parent)
 
-SRC_DIRNAME: str = "src"
+    env_filename: str = ".env"
+    env_filepath: str = os.path.join(base_dirpath, env_filename)
 
-SRC_DIRPATH: str = os.path.join(BASE_DIRPATH, SRC_DIRNAME)
+    src_dirname: str = "src"
+    src_dirpath: str = os.path.join(base_dirpath, src_dirname)
 
-MANAGE_DIRNAME: str = "manage"
+    manage_dirname: str = "manage"
+    manage_dirpath: str = os.path.join(base_dirpath, manage_dirname)
 
-MANAGE_DIRPATH: str = os.path.join(BASE_DIRPATH, MANAGE_DIRNAME)
+    resource_dirname: str = "resource"
+    resource_dirpath: str = os.path.join(base_dirpath, resource_dirname)
 
-RESOURCE_DIRNAME: str = "resource"
-
-RESOURCE_DIRPATH: str = os.path.join(BASE_DIRPATH, RESOURCE_DIRNAME)
-
-STATIC_DIRNAME: str = "static"
-
-STATIC_DIRPATH: str = os.path.join(RESOURCE_DIRPATH, STATIC_DIRNAME)
+    static_dirname: str = "static"
+    static_dirpath: str = os.path.join(resource_dirpath, static_dirname)
 
 
 def __example():
-    print(f"BASE_DIRPATH: {BASE_DIRPATH}")
-    print(f"ENV_FILENAME: {ENV_FILENAME}")
-    print(f"ENV_FILEPATH: {ENV_FILEPATH}")
-    print(f"SRC_DIRNAME: {SRC_DIRNAME}")
-    print(f"SRC_DIRPATH: {SRC_DIRPATH}")
-    print(f"MANAGE_DIRNAME: {MANAGE_DIRNAME}")
-    print(f"MANAGE_DIRPATH: {MANAGE_DIRPATH}")
-    print(f"RESOURCE_DIRNAME: {RESOURCE_DIRNAME}")
-    print(f"RESOURCE_DIRPATH: {RESOURCE_DIRPATH}")
-    print(f"STATIC_DIRNAME: {STATIC_DIRNAME}")
-    print(f"STATIC_DIRPATH: {STATIC_DIRPATH}")
+    print(f"base_dirpath: {ProjectPaths.base_dirpath}")
+    print(f"env_filename: {ProjectPaths.env_filename}")
+    print(f"env_filepath: {ProjectPaths.env_filepath}")
+    print(f"src_dirname: {ProjectPaths.src_dirname}")
+    print(f"src_dirpath: {ProjectPaths.src_dirpath}")
+    print(f"manage_dirname: {ProjectPaths.manage_dirname}")
+    print(f"manage_dirpath: {ProjectPaths.manage_dirpath}")
+    print(f"resource_dirname: {ProjectPaths.resource_dirname}")
+    print(f"resource_dirpath: {ProjectPaths.resource_dirpath}")
+    print(f"static_dirname: {ProjectPaths.static_dirname}")
+    print(f"static_dirpath: {ProjectPaths.static_dirpath}")
 
 
 async def __async_example():

arpakitlib/_arpakit_project_template/src/core/generate_settings_env_example.py

@@ -1,7 +1,7 @@
 import os.path
 
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
-from src.core.const import BASE_DIRPATH
+from src.core.const import ProjectPaths
 from src.core.settings import Settings, get_cached_settings
 from src.core.util import setup_logging
 
@@ -9,7 +9,7 @@ from src.core.util import setup_logging
 def command():
     setup_logging()
     print(safely_transfer_obj_to_json_str(get_cached_settings().model_dump(mode="json")))
-    Settings.save_env_example_to_file(filepath=os.path.join(BASE_DIRPATH, "example.env"))
+    Settings.save_env_example_to_file(filepath=os.path.join(ProjectPaths.base_dirpath, "example.env"))
 
 
 if __name__ == '__main__':

arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -7,13 +7,13 @@ import pytz
 
 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
+from src.core.const import ProjectPaths
 
 
 class Settings(SimpleSettings):
     project_name: str = "{{PROJECT_NAME}}"
 
-    sql_db_port: int | None = int("{{SQL_DB_PORT}}") if "{{SQL_DB_PORT}}".strip() else None
+    sql_db_port: int | None = int("{{SQL_DB_PORT}}") if "{{SQL_DB_PORT}}".strip().isdigit() else None
 
     sql_db_url: str | None = (
         f"postgresql://{{PROJECT_NAME}}:{{PROJECT_NAME}}@127.0.0.1:{sql_db_port}/{{PROJECT_NAME}}"
@@ -33,7 +33,7 @@ class Settings(SimpleSettings):
 
     api_start_scheduled_operation_creator_worker: bool = False
 
-    api_port: int | None = int("{{API_PORT}}") if "{{API_PORT}}".strip() else None
+    api_port: int | None = int("{{API_PORT}}") if "{{API_PORT}}".strip().isdigit() else None
 
     api_correct_api_key: str | None = "1"
 
@@ -43,7 +43,7 @@ class Settings(SimpleSettings):
 
     var_dirname: str | None = "var"
 
-    var_dirpath: str | None = os.path.join(BASE_DIRPATH, var_dirname)
+    var_dirpath: str | None = os.path.join(ProjectPaths.base_dirpath, var_dirname)
 
     log_filename: str | None = "story.log"
 
@@ -74,8 +74,8 @@ class Settings(SimpleSettings):
 
 @lru_cache()
 def get_cached_settings() -> Settings:
-    if os.path.exists(ENV_FILEPATH):
-        return Settings(_env_file=ENV_FILEPATH, _env_file_encoding="utf-8")
+    if os.path.exists(ProjectPaths.env_filepath):
+        return Settings(_env_file=ProjectPaths.env_filepath, _env_file_encoding="utf-8")
     return Settings()
 
 

{arpakitlib-1.7.131.dist-info → arpakitlib-1.7.133.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.7.131
+Version: 1.7.133
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.7.131.dist-info → arpakitlib-1.7.133.dist-info}/RECORD

@@ -5,7 +5,7 @@ arpakitlib/_arpakit_project_template/ARPAKITLIB,sha256=3-iAkMXtesLzJXHw_IIv2k2M0
 arpakitlib/_arpakit_project_template/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
 arpakitlib/_arpakit_project_template/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
 arpakitlib/_arpakit_project_template/README.md,sha256=AwqCtmMeywF2dJhZbKwCBA_wPnLF_VmoLGfPbFjH3bM,62
-arpakitlib/_arpakit_project_template/example.env,sha256=CtNXgvXe8PfULfLpLdrLUrtOhwc4Ax4vEPvxvRb1Eds,543
+arpakitlib/_arpakit_project_template/example.env,sha256=dJC2sjtywxm6ChP5jtIicGaaPvhI0NMNIhMmScg69b8,558
 arpakitlib/_arpakit_project_template/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/docker_ps.sh,sha256=uwm8vHgeuNLCOn0o9hgP_uc-PUkS9FwLyzZh6ItZ3do,15
 arpakitlib/_arpakit_project_template/manage/docker_ps_a.sh,sha256=nOQejihYlzstg9oROvYwHIsSLt2Sw0DWQEeT3GBaBNs,18
@@ -69,7 +69,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=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template/src/api/const.py,sha256=7d4qD5hedqr7QxVzbfsA7E1bNZn2Pm2U8joXGtpANu0,287
-arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=1R9nbDOw5Z7Ns5TJMy5MUlyp54VIBQ15oI02V1lHoYo,2758
+arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=5NJ50NqReuCTs-CH4_C_lcgpqKR9XuBONJOl2IRqOQI,2769
 arpakitlib/_arpakit_project_template/src/api/event.py,sha256=z3lNppog2x4a7phr4HmTQVWLt_LPI-357WeijbEeQRQ,3255
 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=Yv699WCJDcdiJMXFg1kPTvolqj-NAGoXfqe-vzbMzIU,228
@@ -89,9 +89,9 @@ arpakitlib/_arpakit_project_template/src/business_service/hello_world.py,sha256=
 arpakitlib/_arpakit_project_template/src/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/core/check_logging.py,sha256=TXAG-v7rH3uSSyCgraEX-3gbDs4J2MGGaBJb1P-xj18,227
 arpakitlib/_arpakit_project_template/src/core/check_settings.py,sha256=m0fTAAFET2n6iE_rrFrWEHgKuJOKbJfkNRpIGsE69qU,328
-arpakitlib/_arpakit_project_template/src/core/const.py,sha256=CZZew674y7LhCAlYhvuF5cV4Zb9nQ17j2Tcuj2GEBf4,1232
-arpakitlib/_arpakit_project_template/src/core/generate_settings_env_example.py,sha256=DUfZtJL_iajxdihgPpO1b2Wg9Owe_3AYSUqIlBgCIEI,484
-arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=Cy0iqZfitLtkVaPn5xjijFMpMq9UvtsXf-Id_mSqJQQ,2428
+arpakitlib/_arpakit_project_template/src/core/const.py,sha256=86zjRG3umtjQWYUMPKGaNwHnXM-WSOF-2l0A-Le51kI,1504
+arpakitlib/_arpakit_project_template/src/core/generate_settings_env_example.py,sha256=0EB_GTdwD0fk0Vl5pm3ZjH7Ot2u1lDmxA5btxvbcb4g,497
+arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=PhxYn8WvGVVev5qXGJSxPuOstByVmcruviiN3llGN9U,2473
 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/check_conn_sqlalchemy_db.py,sha256=wv1N33nTGpsT9nk94OePlOSZ-O9UVKlMfRf8y5UeK1Y,213
@@ -183,9 +183,9 @@ arpakitlib/ar_str_util.py,sha256=yU5gOwNXUQaH5b_tM5t6fXUn9oUcv5EQbVnq2wXXIpQ,337
 arpakitlib/ar_type_util.py,sha256=BJ5FcS5Vkj9KFNJgoh0qGLazy-wCubqhND3vle0yOTo,3717
 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.131.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.131.dist-info/METADATA,sha256=tp9mOyRhyqbjnnbqWjg3uqTJAiIn71YBG3wkuKmn2gw,3176
-arpakitlib-1.7.131.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.131.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.131.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.131.dist-info/RECORD,,
+arpakitlib-1.7.133.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.133.dist-info/METADATA,sha256=WBe4s7OEA_uOGC6DQKPyGS6p_lhm0-36f3flzT_Gl_I,3176
+arpakitlib-1.7.133.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.133.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.133.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.133.dist-info/RECORD,,