arpakitlib 1.7.140__tar.gz → 1.7.211__tar.gz

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/PKG-INFO

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

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/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.140 → arpakitlib-1.7.211}/arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py

@@ -1,8 +1,11 @@
+import importlib
+from contextlib import suppress
+
 from fastapi import FastAPI
 from sqladmin import Admin
 
+from arpakitlib.ar_sqladmin_util import SimpleModelView
 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
 
@@ -20,7 +23,10 @@ def add_admin1_in_app(*, app: FastAPI) -> FastAPI:
         title=get_cached_settings().project_name
     )
 
-    for model_view in MODEL_VIEWS:
+    with suppress(Exception):
+        importlib.import_module("src.admin1.model_view")
+
+    for model_view in SimpleModelView.all_subclasses:
         admin.add_model_view(model_view)
 
     return app

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/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.140 → arpakitlib-1.7.211}/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.140 → arpakitlib-1.7.211}/arpakitlib/_arpakit_project_template/src/api/router/v1/get_api_error_info.py

@@ -12,6 +12,7 @@ api_router = APIRouter()
 
 @api_router.get(
     "",
+    name="Get API Error info",
     response_model=APIErrorInfoSO | ErrorSO,
     status_code=status.HTTP_200_OK
 )

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/arpakitlib/_arpakit_project_template/src/api/router/v1/main_router.py

@@ -4,8 +4,12 @@ from src.api.router.v1 import get_api_error_info
 
 main_v1_api_router = APIRouter()
 
+# API Error Info
+
 main_v1_api_router.include_router(
     router=get_api_error_info.api_router,
     prefix="/get_api_error_info",
     tags=["API Error Info"]
 )
+
+# ...

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/arpakitlib/_arpakit_project_template/src/api/schema/v1/out.py

@@ -4,3 +4,5 @@ from arpakitlib.ar_fastapi_util import BaseSO
 class APIErrorInfoSO(BaseSO):
     api_error_codes: list[str] = []
     api_error_specification_codes: list[str] = []
+
+# ...

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/arpakitlib/_arpakit_project_template/src/api/transmitted_api_data.py

@@ -11,3 +11,5 @@ class TransmittedAPIData(BaseTransmittedAPIData):
     media_file_storage_in_dir: FileStorageInDir | None = None
     cache_file_storage_in_dir: FileStorageInDir | None = None
     dump_file_storage_in_dir: FileStorageInDir | None = None
+
+    # ...

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/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.140 → arpakitlib-1.7.211}/arpakitlib/_arpakit_project_template/src/db/_reinit_sqlalchemy_db.py

@@ -5,7 +5,7 @@ from src.db.util import get_cached_sqlalchemy_db
 
 def _reinit_sqlalchemy_db():
     setup_logging()
-    get_cached_settings().raise_if_mode_type_not_prod()
+    get_cached_settings().raise_if_mode_type_prod()
     get_cached_sqlalchemy_db().reinit()
 
 

arpakitlib-1.7.211/arpakitlib/_arpakit_project_template/src/db/const.py

@@ -0,0 +1 @@
+# ...

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/arpakitlib/_arpakit_project_template/src/operation_execution/scheduled_operations.py

@@ -7,7 +7,7 @@ from src.core.settings import get_cached_settings
 
 SCHEDULED_OPERATIONS = []
 
-if get_cached_settings().is_mode_type_prod:
+if get_cached_settings().is_mode_type_not_prod:
     healthcheck_1_scheduled_operation = ScheduledOperation(
         type=BaseOperationTypes.healthcheck_,
         input_data={"healthcheck_1": "healthcheck_1"},

arpakitlib-1.7.211/arpakitlib/_arpakit_project_template/src/operation_execution/util.py

@@ -0,0 +1 @@
+# ...

arpakitlib-1.7.211/arpakitlib/ar_class_util.py

@@ -0,0 +1,17 @@
+# arpakit
+
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+class CollectingSubclassesMeta(type):
+    """
+    Метакласс для автоматического сбора всех наследников в поле ALL_SUBCLASSES.
+    """
+
+    def __init__(cls, name, bases, dct, **kwargs):
+        super().__init__(name, bases, dct, **kwargs)
+        if not hasattr(cls, "all_subclasses"):
+            cls.all_subclasses = []
+        elif bases:
+            cls.all_subclasses.append(cls)

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/arpakitlib/ar_operation_execution_util.py

@@ -411,6 +411,7 @@ class ScheduledOperationCreatorWorker(BaseWorker):
                 session.add(operation_dbm)
                 session.commit()
                 session.refresh(operation_dbm)
+                self._logger.info(f"scheduled operation (id={operation_dbm.id}) was created")
 
             if scheduled_operation.timeout_after_creation is not None:
                 if timeout is not None:

arpakitlib-1.7.211/arpakitlib/ar_sqladmin_util.py

@@ -0,0 +1,105 @@
+# arpakit
+from sqladmin import ModelView
+from sqladmin.models import ModelViewMeta
+
+from arpakitlib.ar_class_util import CollectingSubclassesMeta
+from arpakitlib.ar_sqlalchemy_model_util import OperationDBM, StoryLogDBM
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+def create_combined_meta(*metas):
+    """
+    Создает объединённый метакласс для устранения конфликтов.
+    """
+
+    class CombinedMeta(*metas):
+        pass
+
+    return CombinedMeta
+
+
+class SimpleModelView(ModelView, metaclass=create_combined_meta(CollectingSubclassesMeta, ModelViewMeta)):
+    can_create = True
+    can_edit = True
+    can_delete = True
+    can_view_details = True
+    can_export = True
+    page_size = 50
+    page_size_options = [25, 50, 100, 200]
+    save_as = True
+    save_as_continue = True
+    export_types = ["xlsx", "csv", "json"]
+
+
+class OperationMV(SimpleModelView, model=OperationDBM):
+    name = "Operation"
+    name_plural = "Operations"
+    column_list = [
+        OperationDBM.id,
+        OperationDBM.long_id,
+        OperationDBM.creation_dt,
+        OperationDBM.status,
+        OperationDBM.type,
+        OperationDBM.execution_start_dt,
+        OperationDBM.execution_finish_dt,
+        OperationDBM.input_data,
+        OperationDBM.output_data,
+        OperationDBM.error_data
+    ]
+    form_columns = [
+        OperationDBM.status,
+        OperationDBM.type,
+        OperationDBM.execution_start_dt,
+        OperationDBM.execution_finish_dt,
+        OperationDBM.input_data,
+        OperationDBM.output_data,
+        OperationDBM.error_data
+    ]
+    column_default_sort = [
+        (OperationDBM.creation_dt, True)
+    ]
+    column_searchable_list = [
+        OperationDBM.id,
+        OperationDBM.long_id,
+        OperationDBM.status,
+        OperationDBM.type,
+    ]
+
+
+class StoryLogMV(SimpleModelView, model=StoryLogDBM):
+    name = "StoryLog"
+    name_plural = "StoryLogs"
+    column_list = [
+        StoryLogDBM.id,
+        StoryLogDBM.long_id,
+        StoryLogDBM.creation_dt,
+        StoryLogDBM.level,
+        StoryLogDBM.title,
+        StoryLogDBM.data
+    ]
+    form_columns = [
+        StoryLogDBM.level,
+        StoryLogDBM.title,
+        StoryLogDBM.data
+    ]
+    column_default_sort = [
+        (StoryLogDBM.creation_dt, True)
+    ]
+    column_searchable_list = [
+        StoryLogDBM.id,
+        StoryLogDBM.long_id,
+        StoryLogDBM.level,
+        StoryLogDBM.title,
+        StoryLogDBM.data
+    ]
+
+
+def __example():
+    print(len(SimpleModelView.all_subclasses))
+    for model_view in SimpleModelView.all_subclasses:
+        print(model_view)
+
+
+if __name__ == '__main__':
+    __example()

{arpakitlib-1.7.140 → arpakitlib-1.7.211}/pyproject.toml

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

arpakitlib-1.7.140/arpakitlib/_arpakit_project_template/src/admin1/model_view.py

@@ -1,19 +0,0 @@
-from sqladmin import ModelView
-
-
-class BaseModelView(ModelView):
-    can_create = True
-    can_edit = True
-    can_delete = True
-    can_view_details = True
-    can_export = True
-    page_size = 50
-    page_size_options = [25, 50, 100, 200]
-    save_as = True
-    save_as_continue = True
-    export_types = ["xlsx", "csv", "json"]
-
-
-MODEL_VIEWS = []
-
-# ...