arpakitlib 1.8.214__tar.gz → 1.8.216__tar.gz

{arpakitlib-1.8.214 → arpakitlib-1.8.216}/PKG-INFO

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

arpakitlib-1.8.216/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -0,0 +1,4 @@
+{
+  "arpakitlib_project_template_version": "5",
+  "arpakitlib_project_template_subversion": "53"
+}

{arpakitlib-1.8.214 → arpakitlib-1.8.216}/arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py

@@ -28,7 +28,7 @@ def create_api_app(*, prefix: str = "/api") -> FastAPI:
         version=get_cached_settings().api_version,
         docs_url=None,
         redoc_url=None,
-        openapi_url="/openapi",
+        openapi_url=get_cached_settings().api_openapi_url,
         on_startup=get_startup_api_events(),
         on_shutdown=get_shutdown_api_events(),
         contact={
@@ -46,7 +46,11 @@ def create_api_app(*, prefix: str = "/api") -> FastAPI:
         allow_headers=["*"],
     )
 
-    add_local_openapi_ui_to_api_app(app=api_app)
+    add_local_openapi_ui_to_api_app(
+        app=api_app,
+        docs_url=get_cached_settings().api_docs_url,
+        redoc_url=get_cached_settings().api_redoc_url
+    )
 
     add_exception_handler_to_api_app(app=api_app)
 

{arpakitlib-1.8.214 → arpakitlib-1.8.216}/arpakitlib/_arpakit_project_template_v_5/project/api/openapi_ui.py

@@ -4,9 +4,11 @@ from fastapi.openapi.docs import get_swagger_ui_html, get_redoc_html
 
 def add_local_openapi_ui_to_api_app(
         *,
-        app: FastAPI
+        app: FastAPI,
+        docs_url: str = "/docs",
+        redoc_url: str = "/redocs",
 ):
-    @app.get("/docs", include_in_schema=False)
+    @app.get(docs_url, include_in_schema=False)
     async def custom_swagger_ui_html():
         return get_swagger_ui_html(
             openapi_url=app.openapi_url,
@@ -16,7 +18,7 @@ def add_local_openapi_ui_to_api_app(
             swagger_favicon_url="/static/openapi-favicon.png"
         )
 
-    @app.get("/redoc", include_in_schema=False)
+    @app.get(redoc_url, include_in_schema=False)
     async def custom_redoc_html():
         return get_redoc_html(
             openapi_url=app.openapi_url,

{arpakitlib-1.8.214 → arpakitlib-1.8.216}/arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -123,6 +123,12 @@ class Settings(SimpleSettings):
 
     api_workers: int = 4
 
+    api_docs_url: str = "/secret/docs"
+
+    api_redoc_url: str = "/secret/redoc"
+
+    api_openapi_url: str = "/secret/openapi"
+
     sqladmin_secret_key: str | None = "85a9583cb91c4de7a78d7eb1e5306a04418c9c43014c447ea8ec8dd5deb4cf71"
 
     sqladmin_authorize_keys: list[str] | None = ["1"]

{arpakitlib-1.8.214 → arpakitlib-1.8.216}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py

@@ -19,6 +19,7 @@ def get_default_column_formatters() -> dict[Any, Any]:
         SimpleDBM.ColumnNames.extra_data: lambda m, a: format_json_for_preview_(m.extra_data),
     }
 
+
 def get_default_column_formatters_detail() -> dict[Any, Any]:
     return {
         SimpleDBM.ColumnNames.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
@@ -36,7 +37,6 @@ def get_default_column_searchable_list() -> list[str]:
     return [SimpleDBM.ColumnNames.id, SimpleDBM.ColumnNames.long_id, SimpleDBM.ColumnNames.uuid]
 
 
-
 class SimpleMV(ModelView):
     can_create = True
     can_edit = True
@@ -65,27 +65,19 @@ class SimpleMV(ModelView):
     @classmethod
     def get_default_column_list(cls) -> list[str]:
         from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
-        return SimpleDBM.get_mapped_column_names()
+        return SimpleDBM.get_column_and_relationship_names_()
 
     @classmethod
     def get_default_column_details_list(cls) -> list[str]:
         from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
-        return SimpleDBM.get_mapped_column_names()
+        return SimpleDBM.get_column_and_relationship_names_()
 
     @classmethod
     def get_default_form_columns(cls) -> list[str]:
         from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
-        res = SimpleDBM.get_mapped_column_names()
-        if SimpleDBM.ColumnNames.id in res:
-            res.remove(SimpleDBM.ColumnNames.id)
-        if SimpleDBM.ColumnNames.long_id in res:
-            res.remove(SimpleDBM.ColumnNames.long_id)
-        if SimpleDBM.ColumnNames.uuid in res:
-            res.remove(SimpleDBM.ColumnNames.uuid)
-        if SimpleDBM.ColumnNames.slug in res:
-            res.remove(SimpleDBM.ColumnNames.slug)
-        if SimpleDBM.ColumnNames.creation_dt in res:
-            res.remove(SimpleDBM.ColumnNames.creation_dt)
+        res = SimpleDBM.get_column_and_relationship_names_(
+            include_column_pk=False
+        )
         return res
 
     @classmethod

{arpakitlib-1.8.214 → arpakitlib-1.8.216}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py

@@ -143,10 +143,6 @@ class SimpleDBM(BaseDBM):
     def uuid_as_str(self) -> str:
         return str(self.uuid)
 
-    @classmethod
-    def get_mapped_column_names(cls) -> list[str]:
-        return [k for k, v in SimpleDBM.__dict__.items() if isinstance(v, Mapped)]
-
     # ---SDP---
 
     @property

{arpakitlib-1.8.214 → arpakitlib-1.8.216}/arpakitlib/ar_sqlalchemy_util.py

@@ -68,21 +68,54 @@ class BaseDBM(DeclarativeBase):
         return self._bus_data
 
     @classmethod
-    def get_table_column_names_(
+    def get_column_names_(
             cls,
             *,
             include_pk: bool = True,
-            exclude_columns: list[str] | None = None
+            exclude_names: list[str] | None = None
     ) -> list[str]:
-        exclude_columns = set(exclude_columns or [])
-        result = []
-        for c in cls.__table__.columns:
+        if exclude_names is None:
+            exclude_names = []
+        res = []
+        for c in inspect(cls).columns:
             if not include_pk and c.primary_key:
                 continue
-            if c.name in exclude_columns:
+            if c.key in exclude_names:
                 continue
-            result.append(c.name)
-        return result
+            res.append(c)
+        return res
+
+    @classmethod
+    def get_relationship_names_(
+            cls,
+            *,
+            exclude_names: list[str] | None = None
+    ) -> list[str]:
+        if exclude_names is None:
+            exclude_names = []
+        res = []
+        for c in inspect(cls).relationships:
+            if c.key in exclude_names:
+                continue
+            res.append(c)
+        return res
+
+    @classmethod
+    def get_column_and_relationship_names_(
+            cls,
+            *,
+            include_column_names: bool = True,
+            include_column_pk: bool = True,
+            exclude_column_names: list[str] | None = None,
+            include_relationship_names: bool = True,
+            exclude_relationship_names: list[str] | None = None,
+    ) -> list[str]:
+        res = []
+        if include_column_names:
+            res += cls.get_column_names_(include_pk=include_column_pk, exclude_names=exclude_column_names)
+        if include_relationship_names:
+            res += cls.get_relationship_names_(exclude_names=exclude_relationship_names)
+        return res
 
     @classmethod
     def get_sd_property_names(

{arpakitlib-1.8.214 → arpakitlib-1.8.216}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.214"
+version = "1.8.216"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }

arpakitlib-1.8.214/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +0,0 @@
-{
-  "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "51"
-}