arpakitlib 1.7.124__tar.gz → 1.7.130__tar.gz

{arpakitlib-1.7.124 → arpakitlib-1.7.130}/PKG-INFO

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

{arpakitlib-1.7.124 → arpakitlib-1.7.130}/arpakitlib/_arpakit_project_template/README.md

@@ -1,4 +1,4 @@
-# {PROJECT_NAME}
+# {{PROJECT_NAME}}
 
 ...
 

arpakitlib-1.7.130/arpakitlib/_arpakit_project_template/manage/docker_run_postgres_for_dev.sh

@@ -0,0 +1,4 @@
+cd ..
+docker rm {{PROJECT_NAME}}_postgres
+docker run --name {{PROJECT_NAME}}_postgres -d -p {{SQL_DB_PORT}}:5432 -e POSTGRES_USER={{PROJECT_NAME}} -e POSTGRES_PASSWORD={{PROJECT_NAME}} -e POSTGRES_DB={{PROJECT_NAME}} postgres:16 -c max_connections=100
+docker start {{PROJECT_NAME}}_postgres

arpakitlib-1.7.130/arpakitlib/_arpakit_project_template/manage/docker_start_postgres_for_dev.sh

@@ -0,0 +1,2 @@
+cd ..
+docker start {{PROJECT_NAME}}_postgres

arpakitlib-1.7.130/arpakitlib/_arpakit_project_template/manage/docker_stop_postgres_for_dev.sh

@@ -0,0 +1,2 @@
+cd ..
+docker stop {{PROJECT_NAME}}_postgres

{arpakitlib-1.7.124 → arpakitlib-1.7.130}/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_company_origin.sh

@@ -1,7 +1,7 @@
 cd ..
 
 git remote remove arpakit_company_github_1
-git remote add arpakit_company_github_1 git@github.com:ARPAKIT-Company/{PROJECT_NAME}.git
+git remote add arpakit_company_github_1 git@github.com:ARPAKIT-Company/{{PROJECT_NAME}}.git
 
 git remote remove arpakit_company_gitlab_1
-git remote add arpakit_company_gitlab_1 git@gitlab.com:ARPAKIT-Company/{PROJECT_NAME}.git
+git remote add arpakit_company_gitlab_1 git@gitlab.com:ARPAKIT-Company/{{PROJECT_NAME}}.git

arpakitlib-1.7.130/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh

@@ -0,0 +1,7 @@
+cd ..
+
+git remote remove arpakit_github_1
+git remote add arpakit_github_1 git@github.com:arpakit/{{PROJECT_NAME}}.git
+
+git remote remove arpakit_gitlab_1
+git remote add arpakit_gitlab_1 git@gitlab.com:arpakit/{{PROJECT_NAME}}.git

arpakitlib-1.7.124/arpakitlib/_arpakit_project_template/manage/json_beutify.py → arpakitlib-1.7.130/arpakitlib/_arpakit_project_template/manage/json_beautify.py

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

arpakitlib-1.7.130/arpakitlib/_arpakit_project_template/manage/poetry_show_arpakitlib.sh

@@ -0,0 +1,2 @@
+cd ..
+poetry show arpakitlib --latest

{arpakitlib-1.7.124 → arpakitlib-1.7.130}/arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py

@@ -4,6 +4,7 @@ from sqladmin import Admin
 from src.admin1.admin_auth import AdminAuth
 from src.admin1.model_view import MODEL_VIEWS
 from src.api.transmitted_api_data import TransmittedAPIData
+from src.core.settings import get_cached_settings
 
 
 def add_admin1_in_app(*, app: FastAPI) -> FastAPI:
@@ -16,7 +17,7 @@ def add_admin1_in_app(*, app: FastAPI) -> FastAPI:
         engine=transmitted_api_data.sqlalchemy_db.engine,
         base_url="/admin1",
         authentication_backend=authentication_backend,
-        title="{PROJECT_NAME}"
+        title=get_cached_settings().project_name
     )
 
     for model_view in MODEL_VIEWS:

{arpakitlib-1.7.124 → arpakitlib-1.7.130}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -11,19 +11,21 @@ from src.core.const import BASE_DIRPATH, ENV_FILEPATH
 
 
 class Settings(SimpleSettings):
-    project_name: str = "{PROJECT_NAME}"
+    project_name: str = "{{PROJECT_NAME}}"
+
+    sql_db_port: int | None = int("{{SQL_DB_PORT}}") if "{{SQL_DB_PORT}}".strip() else None
 
     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
+        f"postgresql://{{PROJECT_NAME}}:{{PROJECT_NAME}}@127.0.0.1:{sql_db_port}/{{PROJECT_NAME}}"
+    ) if sql_db_port is not None else None
 
     sql_db_echo: bool = False
 
     api_init_sql_db_at_start: bool = True
 
-    api_title: str = "{PROJECT_NAME}"
+    api_title: str = project_name
 
-    api_description: str = "{PROJECT_NAME} (arpakitlib)"
+    api_description: str = f"{project_name} (arpakitlib)"
 
     api_create_story_log_before_response_in_handle_exception: bool = True
 
@@ -31,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().isdigit() else None
+    api_port: int | None = int("{{API_PORT}}") if "{{API_PORT}}".strip() else None
 
     api_correct_api_key: str | None = "1"
 

{arpakitlib-1.7.124 → arpakitlib-1.7.130}/arpakitlib/ar_arpakit_project_template_util.py

@@ -69,11 +69,11 @@ def init_arpakit_project_template(
                 with open(os.path.join(root, file), "r", encoding="utf-8") as _file:
                     _content = _file.read()
                 if project_name is not None:
-                    _content = _content.replace("{PROJECT_NAME}", project_name)
+                    _content = _content.replace("{{PROJECT_NAME}}", project_name)
                 if sql_db_port is not None:
-                    _content = _content.replace("{SQL_DB_PORT}", str(sql_db_port))
+                    _content = _content.replace("{{SQL_DB_PORT}}", str(sql_db_port))
                 if api_port is not None:
-                    _content = _content.replace("{API_PORT}", str(api_port))
+                    _content = _content.replace("{{API_PORT}}", str(api_port))
                 res[rel_path] = _content
         return res
 

{arpakitlib-1.7.124 → arpakitlib-1.7.130}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.124"
+version = "1.7.130"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },
@@ -72,6 +72,7 @@ name = "testpypi"
 url = "https://test.pypi.org/legacy/"
 priority = "explicit"
 
+
 [project.scripts]
 arpakitlib = "arpakitlib.ar_arpakitlib_cli_util:execute_arpakitlib_cli"
 

arpakitlib-1.7.124/arpakitlib/_arpakit_project_template/manage/docker_run_postgres_for_dev.sh

@@ -1,4 +0,0 @@
-cd ..
-docker rm {PROJECT_NAME}_postgres
-docker run --name {PROJECT_NAME}_postgres -d -p {SQL_DB_PORT}:5432 -e POSTGRES_USER={PROJECT_NAME} -e POSTGRES_PASSWORD={PROJECT_NAME} -e POSTGRES_DB={PROJECT_NAME} postgres:16 -c max_connections=100
-docker start {PROJECT_NAME}_postgres

arpakitlib-1.7.124/arpakitlib/_arpakit_project_template/manage/docker_start_postgres_for_dev.sh

@@ -1,2 +0,0 @@
-cd ..
-docker start {PROJECT_NAME}_postgres

arpakitlib-1.7.124/arpakitlib/_arpakit_project_template/manage/docker_stop_postgres_for_dev.sh

@@ -1,2 +0,0 @@
-cd ..
-docker stop {PROJECT_NAME}_postgres

arpakitlib-1.7.124/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh

@@ -1,7 +0,0 @@
-cd ..
-
-git remote remove arpakit_github_1
-git remote add arpakit_github_1 git@github.com:arpakit/{PROJECT_NAME}.git
-
-git remote remove arpakit_gitlab_1
-git remote add arpakit_gitlab_1 git@gitlab.com:arpakit/{PROJECT_NAME}.git

arpakitlib-1.7.124/arpakitlib/_arpakit_project_template/manage/poetry_show_arpakitlib.sh

@@ -1,2 +0,0 @@
-cd ..
-poetry show arpakitlib --no-dev