arpakitlib 1.7.206__py3-none-any.whl → 1.7.212__py3-none-any.whl

arpakitlib/_arpakit_project_template/example.env

@@ -1,6 +1,9 @@
 # mode_type=
 # project_name=
+# sql_db_user=
+# sql_db_password=
 # sql_db_port=
+# sql_db_database=
 # sql_db_url=
 # sql_db_echo=
 # api_init_sql_db_at_start=

arpakitlib/_arpakit_project_template/src/api/_start_api_with_reload.py

@@ -1,9 +1,11 @@
 import uvicorn
 
 from src.core.settings import get_cached_settings
+from src.core.util import setup_logging
 
 
 def _start_api_for_dev_with_reload():
+    setup_logging()
     uvicorn.run(
         "src.api.asgi:app",
         port=get_cached_settings().api_port,

arpakitlib/_arpakit_project_template/src/api/_start_api_without_reload.py

@@ -1,9 +1,11 @@
 import uvicorn
 
 from src.core.settings import get_cached_settings
+from src.core.util import setup_logging
 
 
 def _start_api_for_dev_without_reload():
+    setup_logging()
     uvicorn.run(
         "src.api.asgi:app",
         port=get_cached_settings().api_port,

arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -3,6 +3,8 @@ from functools import lru_cache
 from typing import Any
 
 import pytz
+from pydantic import field_validator
+from pydantic_core.core_schema import ValidationInfo
 
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 from arpakitlib.ar_settings_util import SimpleSettings
@@ -12,11 +14,27 @@ from src.core.const import ProjectPaths
 class Settings(SimpleSettings):
     project_name: str = "{{PROJECT_NAME}}"
 
+    sql_db_user: str | None = project_name
+
+    sql_db_password: str | None = project_name
+
     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}}"
-    ) if sql_db_port is not None else None
+    sql_db_database: str | None = project_name
+
+    sql_db_url: str | None = None
+
+    @field_validator("sql_db_url", mode="after")
+    def validate_sql_db_url(cls, v: Any, validation_info: ValidationInfo) -> str | None:
+        if v is not None:
+            return None
+        user = validation_info.data.get('sql_db_user')
+        password = validation_info.data.get('sql_db_password')
+        port = validation_info.data.get('sql_db_port')
+        database = validation_info.data.get('sql_db_database')
+        if user is not None and password is not None and port is not None and database is not None:
+            return f"postgresql://{user}:{password}@127.0.0.1:{port}/{database}"
+        return None
 
     sql_db_echo: bool = False
 

arpakitlib/ar_settings_util.py

@@ -1,8 +1,8 @@
 # arpakit
 
-from typing import Union
+from typing import Union, Any
 
-from pydantic import ConfigDict, field_validator
+from pydantic import ConfigDict, field_validator, model_validator
 from pydantic_core import PydanticUndefined
 from pydantic_settings import BaseSettings
 
@@ -31,6 +31,14 @@ class SimpleSettings(BaseSettings):
 
     mode_type: str = ModeTypes.not_prod
 
+    @model_validator(mode="before")
+    @classmethod
+    def validate_all_fields(cls, values: dict[str, Any]) -> dict[str, Any]:
+        for key, value in values.items():
+            if isinstance(value, str) and value.lower().strip() in {"null", "none", "nil"}:
+                values[key] = None
+        return values
+
     @field_validator("mode_type")
     @classmethod
     def validate_mode_type(cls, v: str):

arpakitlib/ar_sqladmin_util.py

@@ -56,7 +56,9 @@ class OperationMV(SimpleModelView, model=OperationDBM):
         OperationDBM.output_data,
         OperationDBM.error_data
     ]
-    column_default_sort = [(OperationDBM.creation_dt, True)]
+    column_default_sort = [
+        (OperationDBM.creation_dt, True)
+    ]
     column_searchable_list = [
         OperationDBM.id,
         OperationDBM.long_id,
@@ -66,8 +68,8 @@ class OperationMV(SimpleModelView, model=OperationDBM):
 
 
 class StoryLogMV(SimpleModelView, model=StoryLogDBM):
-    name = "Operation"
-    name_plural = "Operations"
+    name = "StoryLog"
+    name_plural = "StoryLogs"
     column_list = [
         StoryLogDBM.id,
         StoryLogDBM.long_id,
@@ -81,7 +83,9 @@ class StoryLogMV(SimpleModelView, model=StoryLogDBM):
         StoryLogDBM.title,
         StoryLogDBM.data
     ]
-    column_default_sort = [(StoryLogDBM.creation_dt, True)]
+    column_default_sort = [
+        (StoryLogDBM.creation_dt, True)
+    ]
     column_searchable_list = [
         StoryLogDBM.id,
         StoryLogDBM.long_id,

{arpakitlib-1.7.206.dist-info → arpakitlib-1.7.212.dist-info}/METADATA

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

{arpakitlib-1.7.206.dist-info → arpakitlib-1.7.212.dist-info}/RECORD

@@ -4,7 +4,7 @@ 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/README.md,sha256=AwqCtmMeywF2dJhZbKwCBA_wPnLF_VmoLGfPbFjH3bM,62
-arpakitlib/_arpakit_project_template/example.env,sha256=dJC2sjtywxm6ChP5jtIicGaaPvhI0NMNIhMmScg69b8,558
+arpakitlib/_arpakit_project_template/example.env,sha256=Ko4SnDj-vlgfjmSDiZsu3qw8SJQaDgeTCnwc5RZfHFI,611
 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
@@ -64,8 +64,8 @@ arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py,sha256=7zF-9
 arpakitlib/_arpakit_project_template/src/admin1/admin_auth.py,sha256=qEC7gMy9E6mwuQRxnSsmVthXahVai4zjiC6Z8O3MZn8,804
 arpakitlib/_arpakit_project_template/src/admin1/model_view.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template/src/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template/src/api/_start_api_with_reload.py,sha256=3IjlhcleK2JoG-rYDHxVKpJA8uq4dTW_-_lbgPXsufI,333
-arpakitlib/_arpakit_project_template/src/api/_start_api_without_reload.py,sha256=SRU3vahgxvVAzb8nIRDspXusK8_SS5QGblJE824Y12s,340
+arpakitlib/_arpakit_project_template/src/api/_start_api_with_reload.py,sha256=rqcjJ9ceDsyFwFUE-PAJXb3CHlIk0ww7-UQ9XxvGh0A,393
+arpakitlib/_arpakit_project_template/src/api/_start_api_without_reload.py,sha256=bM3FItgtj0UizGDo_9CvykioSFZF_HWr3uZdd__B4cY,400
 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
@@ -89,7 +89,7 @@ arpakitlib/_arpakit_project_template/src/core/_check_logging.py,sha256=APQp8jQa3
 arpakitlib/_arpakit_project_template/src/core/_check_settings.py,sha256=BQUcr-yj3cxz5GQo0jXe99wMoqHKrrrKD3-UovsJAt0,284
 arpakitlib/_arpakit_project_template/src/core/_generate_settings_env_example.py,sha256=SiEJe8AYQPOWicsaCwf9RdXp6UAmfkBdBT18AAInGb4,483
 arpakitlib/_arpakit_project_template/src/core/const.py,sha256=e2Y0NIQHfzm3bmnbQnGy3Z5YKt6OYnIsRoqVY8oIV2E,1008
-arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=Sie05LqTfxBOqnYz8trM3sAQdfYAJSQ2Xv4Xwt0aJbI,2348
+arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=a_HfbAkl0hUbDJHDsdkjL3rLAcC8Mkaf9hXZgc5laRc,3065
 arpakitlib/_arpakit_project_template/src/core/util.py,sha256=mcikqcjljZa2qhYeoR1tR9JUSprrVSod8XcIK_PqS6o,1547
 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=GPK7-w7x8ESqbZ0v1nI8m_ysWfnmjgRwyyh6kM8vYBQ,249
@@ -173,9 +173,9 @@ arpakitlib/ar_parse_command.py,sha256=-s61xcATIsfw1eV_iD3xi-grsitbGzSDoAFc5V0OFy
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=0Ns0mMEXYEkVmP6YTAXHyNcrhNsvCJ8X-G_5XwILhJ4,6855
-arpakitlib/ar_settings_util.py,sha256=752EDXXnrA1uUbSD4InCHCZWEodLBwVUHrgOdOD2Xhw,1856
+arpakitlib/ar_settings_util.py,sha256=rnoTqbRuhiq7294D4crD5kbnU8-gNWJbwGU_Ls2gJoU,2199
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
-arpakitlib/ar_sqladmin_util.py,sha256=vQTRlf36VjW6l_zslZmjkHinMVuQfI-QZsXIlnXUpgE,2634
+arpakitlib/ar_sqladmin_util.py,sha256=6Nv9VQssk9PB0piyuss__soYKdjVhdbIeXIv4AgUxmQ,2660
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=nKJGN32eg3Gn5kmJwHdVJznPT5TydLsfUfwJGdypdUo,6264
 arpakitlib/ar_sqlalchemy_util.py,sha256=Hcg1THrDsSR_-8dsY1CG3NWPEv0FqCbkPXFXLtjlSJ0,4207
 arpakitlib/ar_ssh_runner_util.py,sha256=e9deuUdBW7Eh0Exx2nTBhk57SaOZYaJaSjNk8q6dbJk,6804
@@ -183,8 +183,8 @@ arpakitlib/ar_str_util.py,sha256=yU5gOwNXUQaH5b_tM5t6fXUn9oUcv5EQbVnq2wXXIpQ,337
 arpakitlib/ar_type_util.py,sha256=9C3ErtUVs0tAUqtK-foFzjJOykfBOntfCz2IogDOgfA,4134
 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.206.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.206.dist-info/METADATA,sha256=MwALBdVyl8K4gLJ9C-_MruUGQ1Caln_f7eJOPIthOXw,3176
-arpakitlib-1.7.206.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.206.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.206.dist-info/RECORD,,
+arpakitlib-1.7.212.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.212.dist-info/METADATA,sha256=F1DoUYryVsjSst03zhO0qKSffrGXtmoClJoQt2uC36M,3176
+arpakitlib-1.7.212.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.212.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.212.dist-info/RECORD,,