arpakitlib 1.7.203__tar.gz → 1.7.213__tar.gz

{arpakitlib-1.7.203 → arpakitlib-1.7.213}/PKG-INFO

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

{arpakitlib-1.7.203 → arpakitlib-1.7.213}/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-1.7.203 → arpakitlib-1.7.213}/arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py

@@ -1,3 +1,6 @@
+import importlib
+from contextlib import suppress
+
 from fastapi import FastAPI
 from sqladmin import Admin
 
@@ -20,6 +23,9 @@ def add_admin1_in_app(*, app: FastAPI) -> FastAPI:
         title=get_cached_settings().project_name
     )
 
+    with suppress(Exception):
+        importlib.import_module("src.admin1.model_view")
+
     for model_view in SimpleModelView.all_subclasses:
         admin.add_model_view(model_view)
 

{arpakitlib-1.7.203 → arpakitlib-1.7.213}/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-1.7.203 → arpakitlib-1.7.213}/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-1.7.203 → arpakitlib-1.7.213}/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-1.7.203 → arpakitlib-1.7.213}/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-1.7.203 → arpakitlib-1.7.213}/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.203 → arpakitlib-1.7.213}/arpakitlib/ar_sqlalchemy_model_util.py

@@ -4,8 +4,7 @@ from datetime import datetime, timedelta
 from typing import Any
 from uuid import uuid4
 
-from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP, func
-from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP, func, JSON
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from arpakitlib.ar_datetime_util import now_utc_dt
@@ -103,7 +102,7 @@ class StoryLogDBM(SimpleDBM):
     )
     title: Mapped[str | None] = mapped_column(TEXT, index=True, default=None, nullable=True)
     data: Mapped[dict[str, Any]] = mapped_column(
-        JSONB, insert_default={}, server_default="{}", index=True, nullable=False
+        JSON, insert_default={}, server_default="{}", index=True, nullable=False
     )
 
 
@@ -131,13 +130,13 @@ class OperationDBM(SimpleDBM):
     execution_start_dt: Mapped[datetime | None] = mapped_column(TIMESTAMP(timezone=True), nullable=True)
     execution_finish_dt: Mapped[datetime | None] = mapped_column(TIMESTAMP(timezone=True), nullable=True)
     input_data: Mapped[dict[str, Any]] = mapped_column(
-        JSONB,
+        JSON,
         insert_default={},
         server_default="{}",
         nullable=False
     )
-    output_data: Mapped[dict[str, Any]] = mapped_column(JSONB, insert_default={}, server_default="{}", nullable=False)
-    error_data: Mapped[dict[str, Any]] = mapped_column(JSONB, insert_default={}, server_default="{}", nullable=False)
+    output_data: Mapped[dict[str, Any]] = mapped_column(JSON, insert_default={}, server_default="{}", nullable=False)
+    error_data: Mapped[dict[str, Any]] = mapped_column(JSON, insert_default={}, server_default="{}", nullable=False)
 
     def raise_if_executed_with_error(self):
         if self.status == self.Statuses.executed_with_error:

{arpakitlib-1.7.203 → arpakitlib-1.7.213}/pyproject.toml

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