arpakitlib 1.7.125__py3-none-any.whl → 1.7.126__py3-none-any.whl

arpakitlib/_arpakit_project_template/README.md

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

arpakitlib/_arpakit_project_template/manage/docker_run_postgres_for_dev.sh

@@ -1,4 +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
+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/_arpakit_project_template/manage/docker_start_postgres_for_dev.sh

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

arpakitlib/_arpakit_project_template/manage/docker_stop_postgres_for_dev.sh

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

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/_arpakit_project_template/manage/git_set_arpakit_origin.sh

@@ -1,7 +1,7 @@
 cd ..
 
 git remote remove arpakit_github_1
-git remote add arpakit_github_1 git@github.com:arpakit/{PROJECT_NAME}.git
+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
+git remote add arpakit_gitlab_1 git@gitlab.com:arpakit/{{PROJECT_NAME}}.git

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/_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/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.125.dist-info → arpakitlib-1.7.126.dist-info}/METADATA

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

{arpakitlib-1.7.125.dist-info → arpakitlib-1.7.126.dist-info}/RECORD

@@ -4,14 +4,14 @@ arpakitlib/_arpakit_project_template/.python-version,sha256=XMd40XBnlTFfBSmMldd-
 arpakitlib/_arpakit_project_template/ARPAKITLIB,sha256=3-iAkMXtesLzJXHw_IIv2k2M0oH8cTjHzW22Vvbi0IE,4
 arpakitlib/_arpakit_project_template/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
 arpakitlib/_arpakit_project_template/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib/_arpakit_project_template/README.md,sha256=EEoHPZrJQtLS3fKD3JvoPhkGhjfuDihxK5fmAGwihCQ,65
+arpakitlib/_arpakit_project_template/README.md,sha256=sHJKzTQBul4SDS13ad2RuIDsvNcZoI5dEecKFAESPKY,67
 arpakitlib/_arpakit_project_template/example.env,sha256=CtNXgvXe8PfULfLpLdrLUrtOhwc4Ax4vEPvxvRb1Eds,543
 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
-arpakitlib/_arpakit_project_template/manage/docker_run_postgres_for_dev.sh,sha256=EKytHfg5nDIen_QZhltfU7fHNJ68cSbM2ab13smKnTk,276
-arpakitlib/_arpakit_project_template/manage/docker_start_postgres_for_dev.sh,sha256=vY_NMqqZzYhrRMyZhZkJ5ppOJnzhpvHr82U3zTXJWPw,43
-arpakitlib/_arpakit_project_template/manage/docker_stop_postgres_for_dev.sh,sha256=Mlerpr5giJvpAtmYsudx-bYb4SuL1Hw7iF1Jv_b061k,41
+arpakitlib/_arpakit_project_template/manage/docker_run_postgres_for_dev.sh,sha256=nsFInQpyvXVmmtIjFlYm-PhYOgJMdVZiOV8WJitjqDg,290
+arpakitlib/_arpakit_project_template/manage/docker_start_postgres_for_dev.sh,sha256=8BFspWCH-dNDJlzI7G7Cpathqxg8INna0BeVqgB0Uvc,45
+arpakitlib/_arpakit_project_template/manage/docker_stop_postgres_for_dev.sh,sha256=03rAb9mQE878l9aPFsFJnzyOFK71376M6FGndG9c42Q,43
 arpakitlib/_arpakit_project_template/manage/git_branch.sh,sha256=yMwBwT866WjxowbDrNHRDh8yod4eSn7JZnXUlQvrcOk,17
 arpakitlib/_arpakit_project_template/manage/git_commit.sh,sha256=AW1NEel-ZHaYeVWFlRbgZSYPQdnVKsTkpR_07RQL1Mw,42
 arpakitlib/_arpakit_project_template/manage/git_push_arpakit_company_github_1.sh,sha256=Sx-OegryHeNTIfAOoCfj3Z3CF-XKEY0AJF5HVJAgGpU,70
@@ -19,8 +19,8 @@ arpakitlib/_arpakit_project_template/manage/git_push_arpakit_company_gitlab_1.sh
 arpakitlib/_arpakit_project_template/manage/git_push_arpakit_github_1.sh,sha256=j2wTeg7_tmJiWEtNAXpXjRSizEauoqF9uM679n6zidU,62
 arpakitlib/_arpakit_project_template/manage/git_push_arpakit_gitlab_1.sh,sha256=W-85-OhGYLTijzM39G0Es74Y0VdbczELwS12owHN_Gs,62
 arpakitlib/_arpakit_project_template/manage/git_remote_v.sh,sha256=DIcyWmY_mve_CmM1SND2gYgAGO7HaLtso3zvJfMqTRI,19
-arpakitlib/_arpakit_project_template/manage/git_set_arpakit_company_origin.sh,sha256=qTi-SxgC6CfCTEAje0_XFcQ9wpuiyAZEU4MANeJjdWA,274
-arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh,sha256=uMtOEDLe_L8SD5cqZ1ZU_pC2C5ZOD-eM8igf1z0LUIk,225
+arpakitlib/_arpakit_project_template/manage/git_set_arpakit_company_origin.sh,sha256=x17EhSFaeabf83DvEkIAvH8DMKD7dKfssRtQltua5Ak,278
+arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh,sha256=qnzpxiR448EmhNzag_9YXlTRD5Cjq0CqulobQhBthSg,229
 arpakitlib/_arpakit_project_template/manage/git_status.sh,sha256=N9JGYX5_UfCdirw4EQYzu4sS7pMLGrF4-QrTSTcpUtA,16
 arpakitlib/_arpakit_project_template/manage/hello_world.py,sha256=OxvwkWqjmhhvMPG1TiQTo52hgEyzZfzUPoij0wmFmWA,95
 arpakitlib/_arpakit_project_template/manage/json_beautify.py,sha256=AwBtDjb92LpGy9M3XGBoLOIQKlOPtm5pLl47i7xJpZY,239
@@ -62,7 +62,7 @@ arpakitlib/_arpakit_project_template/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 arpakitlib/_arpakit_project_template/src/additional_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/additional_model/additional_model.py,sha256=4KCOvto9Hj5eMYpvfaJChghhR9bkCvKluGGPWrTezoY,134
 arpakitlib/_arpakit_project_template/src/admin1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py,sha256=dWPhsBgXAFKF6qDKknY_hLG1HAH1NWN_OBqztXj9FLU,687
+arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py,sha256=P1G7ppaec1tFkbKSFlf1CmvIfz9FpT2OPqQtXUVWmlA,755
 arpakitlib/_arpakit_project_template/src/admin1/admin_auth.py,sha256=qEC7gMy9E6mwuQRxnSsmVthXahVai4zjiC6Z8O3MZn8,804
 arpakitlib/_arpakit_project_template/src/admin1/model_view.py,sha256=kSscddS6RDZS1VpX0t1n0sjoCjT5O7U8d5YRmT3dauQ,357
 arpakitlib/_arpakit_project_template/src/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -91,7 +91,7 @@ arpakitlib/_arpakit_project_template/src/core/check_logging.py,sha256=TXAG-v7rH3
 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=Q58I0qHbVCfPtZxGcFKPdFMC8KGWiSR0OsxP_kr4-nc,2378
+arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=Cy0iqZfitLtkVaPn5xjijFMpMq9UvtsXf-Id_mSqJQQ,2428
 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
@@ -121,7 +121,7 @@ arpakitlib/api_key_util.py,sha256=E84JlJXiDHtxLQmV8BNHvqNKu_G8-Dox0XxknYJQ37Q,42
 arpakitlib/ar_additional_model_util.py,sha256=GFg-glLCxH9X95R2bhTJsscVwv37FgE1qbaAAyXrnIE,917
 arpakitlib/ar_aiogram_util.py,sha256=5JPCDZpdBGTE-EIWPRez9amCZAX7XemFIVu5YrQK7Pw,12264
 arpakitlib/ar_arpakit_lib_module_util.py,sha256=UEPU8wk29R_bBP_RENnhXYzNbj_RF9FWjowrj_yxWLA,5931
-arpakitlib/ar_arpakit_project_template_util.py,sha256=AswzQvvb-zfUyrcP4EP0K756YL-oC8fA9VperlPf_d0,3699
+arpakitlib/ar_arpakit_project_template_util.py,sha256=c7yc8w2IvZGH5hH8eOpL7JuD005hUxZ0GVDcSkJF5iI,3705
 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
@@ -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.125.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.125.dist-info/METADATA,sha256=YkGVTIsydX_zDZycFsLojuEMuK-wcpUTOntRABGRBLw,3176
-arpakitlib-1.7.125.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.125.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.125.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.125.dist-info/RECORD,,
+arpakitlib-1.7.126.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.126.dist-info/METADATA,sha256=zvk78qIa_lx6IZ53CwYBX5btGHJZ273RW6QEJJZD6rc,3176
+arpakitlib-1.7.126.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.126.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.126.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.126.dist-info/RECORD,,