arpakitlib 1.7.202__tar.gz → 1.7.204__tar.gz

{arpakitlib-1.7.202 → arpakitlib-1.7.204}/PKG-INFO

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

{arpakitlib-1.7.202 → arpakitlib-1.7.204}/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.204/arpakitlib/_arpakit_project_template/src/operation_execution/util.py

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

{arpakitlib-1.7.202 → arpakitlib-1.7.204}/arpakitlib/ar_class_util.py

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

{arpakitlib-1.7.202 → arpakitlib-1.7.204}/arpakitlib/ar_sqladmin_util.py

@@ -19,7 +19,7 @@ def create_combined_meta(*metas):
     return CombinedMeta
 
 
-class BaseModelView(ModelView, metaclass=create_combined_meta(CollectingSubclassesMeta, ModelViewMeta)):
+class SimpleModelView(ModelView, metaclass=create_combined_meta(CollectingSubclassesMeta, ModelViewMeta)):
     can_create = True
     can_edit = True
     can_delete = True
@@ -32,7 +32,7 @@ class BaseModelView(ModelView, metaclass=create_combined_meta(CollectingSubclass
     export_types = ["xlsx", "csv", "json"]
 
 
-class OperationMV(BaseModelView, model=OperationDBM):
+class OperationMV(SimpleModelView, model=OperationDBM):
     name = "Operation"
     name_plural = "Operations"
     column_list = [
@@ -65,7 +65,7 @@ class OperationMV(BaseModelView, model=OperationDBM):
     ]
 
 
-class StoryLogMV(BaseModelView, model=StoryLogDBM):
+class StoryLogMV(SimpleModelView, model=StoryLogDBM):
     name = "Operation"
     name_plural = "Operations"
     column_list = [
@@ -89,3 +89,13 @@ class StoryLogMV(BaseModelView, model=StoryLogDBM):
         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.202 → arpakitlib-1.7.204}/pyproject.toml

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

arpakitlib-1.7.202/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 = []
-
-# ...