brilliance-admin 0.44.10__py3-none-any.whl → 0.44.11__py3-none-any.whl

brilliance_admin/api/routers.py

@@ -4,7 +4,7 @@ from .views.schema import router as schema_router
 from .views.table import router as schema_table
 from .views.auth import router as schema_auth
 from .views.autocomplete import router as schema_autocomplete
-from .views.graphs import router as schema_graphs
+from .views.dashboard import router as schema_dashboard
 from .views.settings import router as schema_settings
 from .views.index import router as schema_index
 
@@ -13,6 +13,6 @@ brilliance_admin_router.include_router(schema_router)
 brilliance_admin_router.include_router(schema_table)
 brilliance_admin_router.include_router(schema_auth)
 brilliance_admin_router.include_router(schema_autocomplete)
-brilliance_admin_router.include_router(schema_graphs)
+brilliance_admin_router.include_router(schema_dashboard)
 brilliance_admin_router.include_router(schema_settings)
 brilliance_admin_router.include_router(schema_index)

brilliance_admin/api/views/{graphs.py → dashboard.py}

@@ -4,21 +4,21 @@ from fastapi.responses import JSONResponse
 from brilliance_admin.api.utils import get_category
 from brilliance_admin.exceptions import AdminAPIException
 from brilliance_admin.schema.admin_schema import AdminSchema
-from brilliance_admin.schema.graphs.category_graphs import CategoryGraphs, GraphData, GraphsDataResult
+from brilliance_admin.schema.dashboard.category_dashboard import CategoryDashboard, DashboardData, DashboardContainer
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.utils import get_logger
 
-router = APIRouter(prefix="/graph", tags=["Category - Graph"])
+router = APIRouter(prefix="/dashboard", tags=["Category - Dashboard"])
 
 logger = get_logger()
 
 
 @router.post(path='/{group}/{category}/')
-async def graph_data(request: Request, group: str, category: str, data: GraphData) -> GraphsDataResult:
+async def dashboard_data(request: Request, group: str, category: str, data: DashboardData) -> DashboardContainer:
     schema: AdminSchema = request.app.state.schema
-    schema_category, user = await get_category(request, group, category, check_type=CategoryGraphs)
+    schema_category, user = await get_category(request, group, category, check_type=CategoryDashboard)
 
-    result: GraphsDataResult = await schema_category.get_data(data, user)
+    result: DashboardContainer = await schema_category.get_data(data, user)
 
     language_slug = request.headers.get('Accept-Language')
     language_context: LanguageContext = schema.get_language_context(language_slug)

brilliance_admin/schema/__init__.py

@@ -2,6 +2,6 @@
 # flake8: noqa: F405
 from .admin_schema import AdminSchema, AdminSchemaData
 from .category import CategoryGroup, CategoryLink
-from .graphs import *
+from .dashboard import *
 from .table import *
 from .table.category_table import CategoryTable

brilliance_admin/schema/admin_schema.py

@@ -40,6 +40,7 @@ class AdminSettingsData(DataclassBase):
     login_greetings_message: SupportsStr | None
     navbar_density: str
     languages: Dict[str, str] | None
+    main_page: str | None = None
 
 
 @dataclass
@@ -54,6 +55,8 @@ class AdminSchema:
     categories: List[BaseCategory]
     auth: Any
 
+    main_page: str | None = None
+
     title: SupportsStr | None = 'Admin'
     description: SupportsStr | None = None
     login_greetings_message: SupportsStr | None = None
@@ -118,6 +121,7 @@ class AdminSchema:
 
         return AdminSettingsData(
             title=self.title,
+            main_page=self.main_page,
             description=self.description,
             login_greetings_message=self.login_greetings_message,
             navbar_density=self.navbar_density,

brilliance_admin/schema/category.py

@@ -95,7 +95,7 @@ class TableInfoSchemaData(DataclassBase):
 
 
 @dataclass
-class GraphInfoSchemaData(DataclassBase):
+class DashboardInfoSchemaData(DataclassBase):
     search_enabled: bool
     search_help: str | None
 
@@ -112,7 +112,7 @@ class CategorySchemaData(DataclassBase):
     categories: dict = Field(default_factory=dict)
 
     table_info: TableInfoSchemaData | None = None
-    graph_info: GraphInfoSchemaData | None = None
+    dashboard_info: DashboardInfoSchemaData | None = None
 
     link: str | None = None
 

brilliance_admin/schema/dashboard/__init__.py

@@ -0,0 +1 @@
+from .category_dashboard import CategoryDashboard

brilliance_admin/schema/dashboard/category_dashboard.py

@@ -0,0 +1,87 @@
+from typing import Any, Dict, List
+
+from pydantic import BaseModel, Field, field_serializer
+
+from brilliance_admin.schema.category import BaseCategory, DashboardInfoSchemaData
+from brilliance_admin.schema.table.fields_schema import FieldsSchema
+from brilliance_admin.translations import LanguageContext
+from brilliance_admin.utils import SupportsStr
+
+
+class DashboardData(BaseModel):
+    search: str | None = None
+    filters: Dict[str, Any] = Field(default_factory=dict)
+
+
+class ChartData(BaseModel):
+    data: dict
+    options: dict
+    width: int | None = None
+    height: int = 50
+    type: str = 'line'
+
+    component_type: str = 'chart'
+
+
+class Subcard(BaseModel):
+    title: SupportsStr
+    value: SupportsStr
+    color: str | None = None
+
+
+class PeriodGraph(BaseModel):
+    title: SupportsStr
+    value: SupportsStr
+    change: int | float | None = None
+    subcards: List[Subcard] = Field(default_factory=list)
+    values: List[List[int | float]] = Field(default_factory=list)
+    vertical: List[SupportsStr] = Field(default_factory=list)
+    horizontal: List[SupportsStr] = Field(default_factory=list)
+    component_type: str = 'period_graph'
+
+    @field_serializer('horizontal', 'vertical')
+    def serialize_str_list(self, val: list) -> list:
+        return [str(v) for v in val]
+
+
+class SmallGraph(BaseModel):
+    title: SupportsStr
+    value: SupportsStr
+    change: int | float | None = None
+    points: Dict[SupportsStr, float | int] = Field(default_factory=list)
+    component_type: str = 'small_graph'
+
+
+class DashboardContainer(BaseModel):
+    cols: int | None = None
+    md: int | None = None
+    lg: int | None = None
+    sm: int | None = None
+
+    component_type: str = 'container'
+    components: List[Any] = Field(default_factory=list)
+
+
+class CategoryDashboard(BaseCategory):
+    _type_slug: str = 'dashboard'
+
+    search_enabled: bool = False
+    search_help: SupportsStr | None = None
+
+    table_filters: FieldsSchema | None = None
+
+    def generate_schema(self, user, language_context: LanguageContext) -> DashboardInfoSchemaData:
+        schema = super().generate_schema(user, language_context)
+        dashboard_info = DashboardInfoSchemaData(
+            search_enabled=self.search_enabled,
+            search_help=language_context.get_text(self.search_help),
+        )
+
+        if self.table_filters:
+            dashboard_info.table_filters = self.table_filters.generate_schema(user, language_context)
+
+        schema.dashboard_info = dashboard_info
+        return schema
+
+    async def get_data(self, data: DashboardData, user) -> DashboardContainer:
+        raise NotImplementedError('get_data is not implemented')

brilliance_admin/translations.py

@@ -21,6 +21,9 @@ class TranslateText(DataclassBase):
     def __init__(self, slug: str):
         self.slug = slug
 
+    def __hash__(self):
+        return hash(self.slug)
+
     @pydantic.model_serializer(mode='plain')
     def serialize_model(self, info: pydantic.SerializationInfo) -> str:
         ctx = info.context or {}

{brilliance_admin-0.44.10.dist-info → brilliance_admin-0.44.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.44.10
+Version: 0.44.11
 Summary: Simple and lightweight data managment framework powered by FastAPI and Vue3 Vuetify all-in-one. Some call it heavenly in its brilliance.
 License-Expression: MIT
 Requires-Python: >=3.10

{brilliance_admin-0.44.10.dist-info → brilliance_admin-0.44.11.dist-info}/RECORD

@@ -2,15 +2,15 @@ brilliance_admin/__init__.py,sha256=qxGzLVhFNm2FKL2lVt7bEFb6pTPqyXEQvUsDfyfv6SM,
 brilliance_admin/auth.py,sha256=d57XRfLJIbOosLP1-0SCFkePPT8M5WhLcwxu4yW92RA,673
 brilliance_admin/docs.py,sha256=fKeJKuiCCi1jHRmNcmkuDD6_2di7bwc6-w8V1VCTu0s,1231
 brilliance_admin/exceptions.py,sha256=CJGvpo7EiaX3RVAEUDpwgH_Tuw8kY7tMy57pVcnBxak,947
-brilliance_admin/translations.py,sha256=I_iSfj05Qv5fbZqDvnnHZGUFsi1wk-J0EXSftKBLw5Q,3850
+brilliance_admin/translations.py,sha256=r5xy3Iara_7m2E7rgG8goPFDcKdPLUGAKIWIt6TdulA,3906
 brilliance_admin/utils.py,sha256=M_0WANlb-1NW4aOA33MxOgoRx0GIVJ6w6PCGKAwmflk,5971
 brilliance_admin/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-brilliance_admin/api/routers.py,sha256=GXz-GFXRH5VbDH1r5O9LLnnmaMhbQq4RctzVEubHnsk,810
+brilliance_admin/api/routers.py,sha256=S8IV7JxA1wLspYn3qxESMI3Qt6UhQK-Gy0PsZi8hcwQ,819
 brilliance_admin/api/utils.py,sha256=ezvHK49OlpCdT9fLB41Y1nswZDLdzC3zTcQtGtuTYUk,999
 brilliance_admin/api/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 brilliance_admin/api/views/auth.py,sha256=Qmd9KuFqCeNhQukYl0W62kcUYPMtgMekjkaTvz1AArM,1133
 brilliance_admin/api/views/autocomplete.py,sha256=lpFDq46OCuiPhkUedv4y6GmJQVy3iX4P-di_-GMzabY,1516
-brilliance_admin/api/views/graphs.py,sha256=nn91zoFRZ0FvSkFJoTy7ZQEr8B2cUj43nd8OxPsSmTQ,1351
+brilliance_admin/api/views/dashboard.py,sha256=tLFdbKrePH-A91HNCN4F_FXdlRQ1tA9D2tGLvzDOoFM,1389
 brilliance_admin/api/views/index.py,sha256=DkMshrs5zmqpbbF9G2RhqeLGFKMrkrAmQ6nnba7aLl8,1400
 brilliance_admin/api/views/schema.py,sha256=MS9v9Qy3cRO9gGs4uW2PNRBS6Uw48sLRGRe49jnJ2yM,1019
 brilliance_admin/api/views/settings.py,sha256=2A9suZQONEtW9LkFban29Fe5ipQaaGT0CzpxnbuotJQ,1166
@@ -30,11 +30,11 @@ brilliance_admin/integrations/sqlalchemy/table/retrieve.py,sha256=EKwGH8Mz3Jd-uR
 brilliance_admin/integrations/sqlalchemy/table/update.py,sha256=NxcYPqRZbm_BM-4QHzEbhgAhYSs3SXzYMMzKCalqahU,3800
 brilliance_admin/locales/en.yml,sha256=YBjkq2Tm0KjXKOMgnIM5etO42Pkm8mDdQlvmpITwsA4,1453
 brilliance_admin/locales/ru.yml,sha256=9MKJaJyx6dALP6CQkLQMJvgZdp8nwgnBxDsRZiYhlnc,2052
-brilliance_admin/schema/__init__.py,sha256=tZIRTSKFsNOmDqjoAgtYthYrT8ljPvLnYRzfupBLT00,290
-brilliance_admin/schema/admin_schema.py,sha256=cYfyYko5lDh1ysBhTTrxDjMDJ3r01yAd3_R1Lsy-7WU,6707
-brilliance_admin/schema/category.py,sha256=D2aIpDyL-2CibkpenNu8uyh4AzOdQ2ArTDltVYS7xZQ,6592
-brilliance_admin/schema/graphs/__init__.py,sha256=qvmZv9QWdiutPtN5VYQLYbsjY2SOg8p_XRaz2rUlIxY,44
-brilliance_admin/schema/graphs/category_graphs.py,sha256=iTjwjQoZocEfJWJEAdYcJTGCLXWexJVpOiKSfGzrRS8,1486
+brilliance_admin/schema/__init__.py,sha256=H5UFO5dub_k5id8WdGRVy9G8RnqZuBSjw9XgPafj1VQ,293
+brilliance_admin/schema/admin_schema.py,sha256=SGdNuYUKrwAc6SA4RYh8TgSrod5RuY7lpXKzmY1SHZ4,6812
+brilliance_admin/schema/category.py,sha256=UTnUexbCHe9vfwi3ygX34YkLAH2ixfMWqe4H6xos0fI,6604
+brilliance_admin/schema/dashboard/__init__.py,sha256=RxE5nNs5X3iWGXBOA518hFyJMSRLEcXr0PNb8HZrjxs,50
+brilliance_admin/schema/dashboard/category_dashboard.py,sha256=rsEuWLpcfcrnzMeKIQCMFDYNF9H7LEfqEKlm63Sh7PE,2650
 brilliance_admin/schema/table/__init__.py,sha256=vuRw8HBuak2LaTZi2dNn5YOrJPalQps-O3Ht-d0AZV4,378
 brilliance_admin/schema/table/admin_action.py,sha256=0ymRL9DKkBK-AF6wKy7K9R4hkmblh55eHuZA_rjO1Lk,2018
 brilliance_admin/schema/table/category_table.py,sha256=AHR6fatZTdRKvUnks7DzQm0V0OwID-59khTxosEXoHE,6817
@@ -66,8 +66,8 @@ brilliance_admin/static/tinymce/plugins/codesample/css/prism.css,sha256=exAdMtHb
 brilliance_admin/static/tinymce/plugins/customLink/plugin.js,sha256=illBNpnHDkBsLG6wo_jDPF6z7CGnO1MQWUoDwZKy6vQ,5589
 brilliance_admin/static/tinymce/plugins/customLink/css/link.css,sha256=gh5nvY8Z92hJfCEBPnIm4jIPCcKKbJnab-30oIfX7Hc,56
 brilliance_admin/templates/index.html,sha256=Grsp-PTotLZkMmph8PJjxpnVpRZNx7B7F5VVmOoSpfA,1294
-brilliance_admin-0.44.10.dist-info/licenses/LICENSE,sha256=rgWE5Cxk53W0PhTOVmcQedABEWN1QMG-PRz3fz531sE,1074
-brilliance_admin-0.44.10.dist-info/METADATA,sha256=k6P6yu_Tj26u157thb1YBlfDlgC7YigBQFc3QhtEtaY,7393
-brilliance_admin-0.44.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-brilliance_admin-0.44.10.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
-brilliance_admin-0.44.10.dist-info/RECORD,,
+brilliance_admin-0.44.11.dist-info/licenses/LICENSE,sha256=rgWE5Cxk53W0PhTOVmcQedABEWN1QMG-PRz3fz531sE,1074
+brilliance_admin-0.44.11.dist-info/METADATA,sha256=Rl2WPj1vJnkb3eHudwsUfjlT9lXfVHvlhRW4CTwChIQ,7393
+brilliance_admin-0.44.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+brilliance_admin-0.44.11.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
+brilliance_admin-0.44.11.dist-info/RECORD,,

brilliance_admin/schema/graphs/__init__.py

@@ -1 +0,0 @@
-from .category_graphs import CategoryGraphs

brilliance_admin/schema/graphs/category_graphs.py

@@ -1,50 +0,0 @@
-from typing import Any, Dict, List
-
-from pydantic import BaseModel, Field
-
-from brilliance_admin.schema.category import BaseCategory, GraphInfoSchemaData
-from brilliance_admin.schema.table.fields_schema import FieldsSchema
-from brilliance_admin.translations import LanguageContext
-from brilliance_admin.utils import SupportsStr
-
-
-class GraphData(BaseModel):
-    search: str | None = None
-    filters: Dict[str, Any] = Field(default_factory=dict)
-
-
-class ChartData(BaseModel):
-    data: dict
-    options: dict
-    width: int | None = None
-    height: int = 50
-    type: str = 'line'
-
-
-class GraphsDataResult(BaseModel):
-    charts: List[ChartData]
-
-
-class CategoryGraphs(BaseCategory):
-    _type_slug: str = 'graphs'
-
-    search_enabled: bool = False
-    search_help: SupportsStr | None = None
-
-    table_filters: FieldsSchema | None = None
-
-    def generate_schema(self, user, language_context: LanguageContext) -> GraphInfoSchemaData:
-        schema = super().generate_schema(user, language_context)
-        graph = GraphInfoSchemaData(
-            search_enabled=self.search_enabled,
-            search_help=language_context.get_text(self.search_help),
-        )
-
-        if self.table_filters:
-            graph.table_filters = self.table_filters.generate_schema(user, language_context)
-
-        schema.graph_info = graph
-        return schema
-
-    async def get_data(self, data: GraphData, user) -> GraphsDataResult:
-        raise NotImplementedError('get_data is not implemented')