arpakitlib 1.7.201__py3-none-any.whl → 1.7.203__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py

@@ -1,8 +1,8 @@
 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 +20,7 @@ def add_admin1_in_app(*, app: FastAPI) -> FastAPI:
         title=get_cached_settings().project_name
     )
 
-    for model_view in MODEL_VIEWS:
+    for model_view in SimpleModelView.all_subclasses:
         admin.add_model_view(model_view)
 
     return app

arpakitlib/_arpakit_project_template/src/admin1/model_view.py

@@ -1,19 +1 @@
-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 = []
-
 # ...

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/ar_sqladmin_util.py

@@ -0,0 +1,101 @@
+# 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 = "Operation"
+    name_plural = "Operations"
+    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.201.dist-info → arpakitlib-1.7.203.dist-info}/METADATA

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

{arpakitlib-1.7.201.dist-info → arpakitlib-1.7.203.dist-info}/RECORD

@@ -60,9 +60,9 @@ arpakitlib/_arpakit_project_template/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 arpakitlib/_arpakit_project_template/src/additional_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/additional_model/additional_model.py,sha256=rCjK4hbog2kF-37SGHet0mrSjGXrAi1LxCgLT1IzzW8,141
 arpakitlib/_arpakit_project_template/src/admin1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py,sha256=P1G7ppaec1tFkbKSFlf1CmvIfz9FpT2OPqQtXUVWmlA,755
+arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py,sha256=NcDav2QnMxK10tuI1X1chz6iTrtgcOylIwWxHmH-7p0,784
 arpakitlib/_arpakit_project_template/src/admin1/admin_auth.py,sha256=qEC7gMy9E6mwuQRxnSsmVthXahVai4zjiC6Z8O3MZn8,804
-arpakitlib/_arpakit_project_template/src/admin1/model_view.py,sha256=kSscddS6RDZS1VpX0t1n0sjoCjT5O7U8d5YRmT3dauQ,357
+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
@@ -125,7 +125,7 @@ arpakitlib/ar_arpakitlib_cli_util.py,sha256=8lhEDxnwMSRX2PGV2xQtQru1AYKSA92SVolo
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
 arpakitlib/ar_base_worker_util.py,sha256=Qm_C7PFH5W-LPu1AGX1zp29zbqZ04i71Su1U-eeQBkA,5674
 arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weRfJ0,3476
-arpakitlib/ar_class_util.py,sha256=bCCDbyNwavCrTC77jOtS1IWAHNo4kdr4afq2knJExHU,467
+arpakitlib/ar_class_util.py,sha256=Eb4orGm2EFSaHfmrY2A_Nis5iwFMDKFaz1_nxTnfmnQ,487
 arpakitlib/ar_datetime_util.py,sha256=Xe1NiT9oPQzNSG7RVRkhukhbg4i-hhS5ImmV7sPUc8o,971
 arpakitlib/ar_dict_util.py,sha256=cF5LQJ6tLqyGoEXfDljMDZrikeZoWPw7CgINHIFGvXM,419
 arpakitlib/ar_dream_ai_api_client_util.py,sha256=QF9XK7xK5ny1fvkcG4e0pfCySNNFRNPy0x0cmxfsAak,2818
@@ -175,6 +175,7 @@ arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=0Ns0mMEXYEkVmP6YTAXHyNcrhNsvCJ8X-G_5XwILhJ4,6855
 arpakitlib/ar_settings_util.py,sha256=752EDXXnrA1uUbSD4InCHCZWEodLBwVUHrgOdOD2Xhw,1856
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
+arpakitlib/ar_sqladmin_util.py,sha256=vQTRlf36VjW6l_zslZmjkHinMVuQfI-QZsXIlnXUpgE,2634
 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
@@ -182,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.201.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.201.dist-info/METADATA,sha256=v1XvtNmqV3cjn7ikIWY2LyEdF3l_asczHVTtcg98jRU,3176
-arpakitlib-1.7.201.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.201.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.201.dist-info/RECORD,,
+arpakitlib-1.7.203.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.203.dist-info/METADATA,sha256=DJhWigr5MUGWWHvT8WOtVqQlIrWxoG2BsIhLrSeTSsU,3176
+arpakitlib-1.7.203.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.203.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.203.dist-info/RECORD,,