arpakitlib 1.7.131__tar.gz → 1.7.132__tar.gz

{arpakitlib-1.7.131 → arpakitlib-1.7.132}/PKG-INFO

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

{arpakitlib-1.7.131 → arpakitlib-1.7.132}/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-1.7.131 → arpakitlib-1.7.132}/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-1.7.132/arpakitlib/_arpakit_project_template/src/core/const.py

@@ -0,0 +1,47 @@
+import asyncio
+import os
+import pathlib
+
+from arpakitlib.ar_enumeration_util import Enumeration
+
+
+class ProjectPaths(Enumeration):
+    base_dirpath: str = str(pathlib.Path(__file__).parent.parent.parent)
+
+    env_filename: str = ".env"
+    env_filepath: str = os.path.join(base_dirpath, env_filename)
+
+    src_dirname: str = "src"
+    src_dirpath: str = os.path.join(base_dirpath, src_dirname)
+
+    manage_dirname: str = "manage"
+    manage_dirpath: str = os.path.join(base_dirpath, manage_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)
+
+
+def __example():
+    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():
+    pass
+
+
+if __name__ == '__main__':
+    __example()
+    asyncio.run(__async_example())

{arpakitlib-1.7.131 → arpakitlib-1.7.132}/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-1.7.131 → arpakitlib-1.7.132}/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 → arpakitlib-1.7.132}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.131"
+version = "1.7.132"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },

arpakitlib-1.7.131/arpakitlib/_arpakit_project_template/src/core/const.py

@@ -1,48 +0,0 @@
-import asyncio
-import os
-import pathlib
-
-BASE_DIRPATH: str = str(pathlib.Path(__file__).parent.parent.parent)
-
-ENV_FILENAME: str = ".env"
-
-ENV_FILEPATH: str = os.path.join(BASE_DIRPATH, ENV_FILENAME)
-
-SRC_DIRNAME: str = "src"
-
-SRC_DIRPATH: str = os.path.join(BASE_DIRPATH, SRC_DIRNAME)
-
-MANAGE_DIRNAME: str = "manage"
-
-MANAGE_DIRPATH: str = os.path.join(BASE_DIRPATH, MANAGE_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)
-
-
-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}")
-
-
-async def __async_example():
-    pass
-
-
-if __name__ == '__main__':
-    __example()
-    asyncio.run(__async_example())