brilliance-admin 0.43.6__tar.gz → 0.44.0__tar.gz

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/.github/workflows/certbot.yml

@@ -7,20 +7,29 @@ jobs:
   setup-https:
     runs-on: ubuntu-latest
     steps:
-      - name: Setup HTTPS with certbot
+      - name: Setup HTTPS with certbot (snap)
         uses: appleboy/ssh-action@master
         with:
           host: ${{ vars.SERVER_HOST }}
           username: deploy
           key: ${{ secrets.SERVER_SSH_KEY }}
           script: |
-            if ! command -v certbot >/dev/null 2>&1; then
+            sudo apt remove -y certbot python3-certbot-nginx || true
+
+            if ! command -v snap >/dev/null 2>&1; then
               sudo apt update
-              sudo apt install -y certbot python3-certbot-nginx
+              sudo apt install -y snapd
             fi
+
+            sudo snap install core || sudo snap refresh core
+            sudo snap install --classic certbot || true
+            sudo ln -sf /snap/bin/certbot /usr/bin/certbot
+
             sudo certbot --nginx \
               -d brilliance-admin.com \
               -d www.brilliance-admin.com \
+              -d docs.brilliance-admin.com \
+              --expand \
               --non-interactive \
               --agree-tos \
               -m admin@brilliance-admin.com \

brilliance_admin-0.44.0/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Brilliance Admin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

brilliance_admin-0.44.0/PKG-INFO

@@ -0,0 +1,155 @@
+Metadata-Version: 2.4
+Name: brilliance-admin
+Version: 0.44.0
+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
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: asgiref>=3.11
+Requires-Dist: fastapi>=0.115
+Requires-Dist: jinja2>=3.1
+Requires-Dist: PyYAML>=6.0
+Provides-Extra: example
+Requires-Dist: uvicorn>=0.34.0; extra == "example"
+Requires-Dist: faker>=38.2.0; extra == "example"
+Requires-Dist: pyjwt>=2.10.1; extra == "example"
+Requires-Dist: structlog>=25.5.0; extra == "example"
+Requires-Dist: rich>=14.2.0; extra == "example"
+Provides-Extra: tests
+Requires-Dist: pytest>=8.4.2; extra == "tests"
+Requires-Dist: pytest-asyncio>=1.2.0; extra == "tests"
+Requires-Dist: httpx>=0.28.1; extra == "tests"
+Requires-Dist: pytest-mock>=3.15.1; extra == "tests"
+Requires-Dist: sqlalchemy>=2.0.41; extra == "tests"
+Requires-Dist: aiosqlite>=0.22.1; extra == "tests"
+Requires-Dist: factory-boy>=3.3.3; extra == "tests"
+Requires-Dist: pyjwt>=2.10.1; extra == "tests"
+Provides-Extra: scalar
+Requires-Dist: scalar-fastapi>=1.5.0; extra == "scalar"
+Dynamic: license-file
+
+<div align="center">
+  <img src="https://github.com/brilliance-admin/backend-python/blob/main/example/static/logo-outline.png?raw=true"
+       alt="Brilliance Admin"
+       width="600">
+
+[![PyPI](https://img.shields.io/pypi/v/brilliance-admin)](https://pypi.org/project/brilliance-admin/)
+[![CI](https://github.com/brilliance-admin/backend-python/actions/workflows/deploy.yml/badge.svg)](https://github.com/brilliance-admin/backend-python/actions)
+
+Simple and lightweight data managment framework powered by `FastAPI` and `Vue3` `Vuetify` all-in-one. \
+Integrated with `SQLAlchemy`. Inspaired by Django Admin and DRF.\
+_Some call it heavenly in its brilliance._
+
+### [Live Demo](https://brilliance-admin.com/) | [Demo Sources](https://github.com/brilliance-admin/backend-python/tree/main/example) | [Documentation](https://docs.brilliance-admin.com/)
+
+  <img src="https://github.com/brilliance-admin/backend-python/blob/main/screenshots/websitemockupgenerator.png?raw=true"
+       alt="Preview">
+
+</div>
+
+### Brilliance Admin provides
+
+A quick way to create a data management interface using:
+
+- Admin page - endpoint with a prebuilt SPA [frontend Vue3 + Vuetify](https://github.com/brilliance-admin/frontend) <br>
+This endpoint can be added to any ASGI compatable backend. For existing project or standalone admin app.
+- API to fetch the UI JSON schema
+- API methods for that UI to work with (to read and modify data)
+
+## Key ideas
+
+- **API Oriented** <br>
+Data generation/updating API separated from rendering fontend with zero hardcode, this makes it possible to have a single frontend with multiple backend implementations in different languages and makes test coverage easier.
+- **Rich visualization**  <br>
+Providing rich and convenient ways to display and manage data (tables, charts, etc) from any data source.
+- **UI JSON Schema** <br>
+Represents the data describing the structure of entire admin panel UI. <br>
+You only need to specify what should be rendered. The frontend will display it and automatically request data from the backend for rendering or updates.
+- **ORM** <br>
+Automatic generation from ORM for schema UI frontend and backend methods for CRUD operations.
+- **Minimal boilerplate** <br>
+Focused on simplified, but rich configuration.
+
+## Features
+
+* Tables with full CRUD support, including filtering, sorting, and pagination.
+* Ability to define custom table actions with forms, response messages, and file downloads.
+* Graphs via ChartJS
+* Localization support
+* Adapted for different screen sizes and mobile devices
+* Auth via any account data source
+
+**Integrations:**
+
+* **SQLAlchemy** - schema autogeneration for tables + CRUD operations + authorization
+
+**Planned:**
+
+* Dashboard features
+* Role-based access permissions system via interface
+* Backend interface for storing and viewing action history in the admin interface
+* Nested data support for creation and detail views (inline editing), nested CRUD workflows
+* Django ORM integration
+* Support for Oauth providers
+
+## Installation:
+``` shell
+pip install brilliance-admin
+```
+
+## Usage example
+
+You need to generate `AdminSchema` instance:
+``` python
+from brilliance_admin import schema
+
+
+class CategoryExample(schema.CategoryTable):
+    "Implementation of get_list and retrieve; update and create are optional"
+
+
+admin_schema = schema.AdminSchema(
+    title='Admin Panel',
+    auth=YourAdminAuthentication(),
+    categories=[
+        schema.Category(
+            slug='example',
+            categories=[
+                CategoryExample(),
+            ]
+        ),
+    ],
+)
+
+admin_app = admin_schema.generate_app()
+
+# Your FastAPI app (Any ASGI framework can be used)
+app = FastAPI()
+app.mount('/admin', admin_app)
+```
+
+For more details, check out our [how-to-start documentation](https://docs.brilliance-admin.com/how-to-start/)
+
+## Comparison of Similar Projects
+
+The project closest in concept is [React Admin](https://github.com/marmelab/react-admin). <br>
+It is an SPA frontend that store the schema UI inside and works with separate API backend providers.
+
+The key difference of Brilliance Admin is that its all-in-one. <br>
+It is more focused on rapid setup for data management, without the need to work with frontend configuration, while it still available.
+
+## Comparison of Similar Python Projects
+
+| Criterion | Brilliance Admin | Django Admin | FastAPI Admin | Starlette Admin | SQLAdmin |
+|---------|------------------|--------------|---------------|-----------------|----------|
+| Base framework | FastAPI | Django | FastAPI | Starlette | FastAPI |
+| ASGI compatible | Yes | Partial | Yes | Yes | Yes |
+| Rendering model | Prebuilt Vue 3 + Vuetify SPA + Jinja2 | Server-side Django templates | Server-side Jinja2 templates + Tabler UI | Server-side Jinja2 templates + Tabler UI | Server-side Jinja2 templates + Bootstrap |
+| Frontend architecture | Separate frontend (SPA) | Classic server-rendered UI | Server-rendered UI with JS interactivity | Server-rendered UI with JS interactivity | Server-rendered UI |
+| Data source | Any source + SQLAlchemy | Django ORM | Tortoise ORM | Any source + SQLAlchemy, MongoDB | SQLAlchemy |
+| Multiple databases per model | Yes | Database routers | No (global engine) | Yes (session per ModelView) | No (single engine per Admin) |
+| Schema generation | User-defined format | From Django models | From ORM models | User-defined format | From SQLAlchemy models |
+| Async support | Yes | No | Yes | Yes | Yes |
+| API-first approach | Yes | No | Partially | Partially | No |
+| Built-in Localization | Yes | Yes | No | No | No |

brilliance_admin-0.44.0/README.md

@@ -0,0 +1,124 @@
+<div align="center">
+  <img src="https://github.com/brilliance-admin/backend-python/blob/main/example/static/logo-outline.png?raw=true"
+       alt="Brilliance Admin"
+       width="600">
+
+[![PyPI](https://img.shields.io/pypi/v/brilliance-admin)](https://pypi.org/project/brilliance-admin/)
+[![CI](https://github.com/brilliance-admin/backend-python/actions/workflows/deploy.yml/badge.svg)](https://github.com/brilliance-admin/backend-python/actions)
+
+Simple and lightweight data managment framework powered by `FastAPI` and `Vue3` `Vuetify` all-in-one. \
+Integrated with `SQLAlchemy`. Inspaired by Django Admin and DRF.\
+_Some call it heavenly in its brilliance._
+
+### [Live Demo](https://brilliance-admin.com/) | [Demo Sources](https://github.com/brilliance-admin/backend-python/tree/main/example) | [Documentation](https://docs.brilliance-admin.com/)
+
+  <img src="https://github.com/brilliance-admin/backend-python/blob/main/screenshots/websitemockupgenerator.png?raw=true"
+       alt="Preview">
+
+</div>
+
+### Brilliance Admin provides
+
+A quick way to create a data management interface using:
+
+- Admin page - endpoint with a prebuilt SPA [frontend Vue3 + Vuetify](https://github.com/brilliance-admin/frontend) <br>
+This endpoint can be added to any ASGI compatable backend. For existing project or standalone admin app.
+- API to fetch the UI JSON schema
+- API methods for that UI to work with (to read and modify data)
+
+## Key ideas
+
+- **API Oriented** <br>
+Data generation/updating API separated from rendering fontend with zero hardcode, this makes it possible to have a single frontend with multiple backend implementations in different languages and makes test coverage easier.
+- **Rich visualization**  <br>
+Providing rich and convenient ways to display and manage data (tables, charts, etc) from any data source.
+- **UI JSON Schema** <br>
+Represents the data describing the structure of entire admin panel UI. <br>
+You only need to specify what should be rendered. The frontend will display it and automatically request data from the backend for rendering or updates.
+- **ORM** <br>
+Automatic generation from ORM for schema UI frontend and backend methods for CRUD operations.
+- **Minimal boilerplate** <br>
+Focused on simplified, but rich configuration.
+
+## Features
+
+* Tables with full CRUD support, including filtering, sorting, and pagination.
+* Ability to define custom table actions with forms, response messages, and file downloads.
+* Graphs via ChartJS
+* Localization support
+* Adapted for different screen sizes and mobile devices
+* Auth via any account data source
+
+**Integrations:**
+
+* **SQLAlchemy** - schema autogeneration for tables + CRUD operations + authorization
+
+**Planned:**
+
+* Dashboard features
+* Role-based access permissions system via interface
+* Backend interface for storing and viewing action history in the admin interface
+* Nested data support for creation and detail views (inline editing), nested CRUD workflows
+* Django ORM integration
+* Support for Oauth providers
+
+## Installation:
+``` shell
+pip install brilliance-admin
+```
+
+## Usage example
+
+You need to generate `AdminSchema` instance:
+``` python
+from brilliance_admin import schema
+
+
+class CategoryExample(schema.CategoryTable):
+    "Implementation of get_list and retrieve; update and create are optional"
+
+
+admin_schema = schema.AdminSchema(
+    title='Admin Panel',
+    auth=YourAdminAuthentication(),
+    categories=[
+        schema.Category(
+            slug='example',
+            categories=[
+                CategoryExample(),
+            ]
+        ),
+    ],
+)
+
+admin_app = admin_schema.generate_app()
+
+# Your FastAPI app (Any ASGI framework can be used)
+app = FastAPI()
+app.mount('/admin', admin_app)
+```
+
+For more details, check out our [how-to-start documentation](https://docs.brilliance-admin.com/how-to-start/)
+
+## Comparison of Similar Projects
+
+The project closest in concept is [React Admin](https://github.com/marmelab/react-admin). <br>
+It is an SPA frontend that store the schema UI inside and works with separate API backend providers.
+
+The key difference of Brilliance Admin is that its all-in-one. <br>
+It is more focused on rapid setup for data management, without the need to work with frontend configuration, while it still available.
+
+## Comparison of Similar Python Projects
+
+| Criterion | Brilliance Admin | Django Admin | FastAPI Admin | Starlette Admin | SQLAdmin |
+|---------|------------------|--------------|---------------|-----------------|----------|
+| Base framework | FastAPI | Django | FastAPI | Starlette | FastAPI |
+| ASGI compatible | Yes | Partial | Yes | Yes | Yes |
+| Rendering model | Prebuilt Vue 3 + Vuetify SPA + Jinja2 | Server-side Django templates | Server-side Jinja2 templates + Tabler UI | Server-side Jinja2 templates + Tabler UI | Server-side Jinja2 templates + Bootstrap |
+| Frontend architecture | Separate frontend (SPA) | Classic server-rendered UI | Server-rendered UI with JS interactivity | Server-rendered UI with JS interactivity | Server-rendered UI |
+| Data source | Any source + SQLAlchemy | Django ORM | Tortoise ORM | Any source + SQLAlchemy, MongoDB | SQLAlchemy |
+| Multiple databases per model | Yes | Database routers | No (global engine) | Yes (session per ModelView) | No (single engine per Admin) |
+| Schema generation | User-defined format | From Django models | From ORM models | User-defined format | From SQLAlchemy models |
+| Async support | Yes | No | Yes | Yes | Yes |
+| API-first approach | Yes | No | Partially | Partially | No |
+| Built-in Localization | Yes | Yes | No | No | No |

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/brilliance_admin/integrations/sqlalchemy/__init__.py

@@ -1,5 +1,6 @@
 # pylint: disable=wildcard-import, unused-wildcard-import, unused-import
 # flake8: noqa: F405
+from .fields import SQLAlchemyRelatedField
 from .auth import SQLAlchemyJWTAdminAuthentication
 from .autocomplete import SQLAlchemyAdminAutocompleteMixin
 from .fields_schema import SQLAlchemyFieldsSchema

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/brilliance_admin/integrations/sqlalchemy/autocomplete.py

@@ -32,7 +32,11 @@ class SQLAlchemyAdminAutocompleteMixin:
         if not field:
             raise Exception(f'Field "{data.field_slug}" is not found')
 
-        async with self.db_async_session() as session:
-            results = await field.autocomplete(self.model, data, user, extra={'db_session': session})
+        results = await field.autocomplete(
+            self.model,
+            data,
+            user,
+            extra={'db_async_session': self.db_async_session},
+        )
 
         return AutocompleteResult(results=results)

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/brilliance_admin/integrations/sqlalchemy/fields.py

@@ -43,7 +43,7 @@ class SQLAlchemyRelatedField(TableField):
     # - для доступа к связи через ORM
     #   getattr(record, rel_name)
     # - для записи и чтения связанных объектов
-    rel_name: str | None = None
+    rel_name: str | None
 
     # Класс связанной SQLAlchemy-модели.
     # Откуда берётся:
@@ -101,11 +101,11 @@ class SQLAlchemyRelatedField(TableField):
         from sqlalchemy import select
         from sqlalchemy.sql import expression
 
-        if extra is None or extra.get('db_session') is None:
-            msg = f'SQLAlchemyRelatedField.autocomplete {type(self).__name__} requires extra["db_session"] (AsyncSession)'
+        if extra is None or extra.get('db_async_session') is None:
+            msg = f'SQLAlchemyRelatedField.autocomplete {type(self).__name__} requires extra["db_async_session"] (AsyncSession)'
             raise AttributeError(msg)
 
-        session = extra['db_session']
+        db_async_session = extra['db_async_session']
 
         results = []
 
@@ -125,7 +125,9 @@ class SQLAlchemyRelatedField(TableField):
         if existed_choices and hasattr(target_model, 'id'):
             stmt = stmt.where(getattr(target_model, 'id').in_(existed_choices) | expression.true())
 
-        records = (await session.execute(stmt)).scalars().all()
+        async with db_async_session() as session:
+            records = (await session.execute(stmt)).scalars().all()
+
         for record in records:
             results.append(Record(key=getattr(record, 'id'), title=str(record)))
 

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/brilliance_admin/schema/__init__.py

@@ -1,7 +1,7 @@
 # pylint: disable=wildcard-import, unused-wildcard-import, unused-import
 # flake8: noqa: F405
 from .admin_schema import AdminSchema, AdminSchemaData
-from .category import Category
+from .category import CategoryGroup, CategoryLink
 from .graphs import *
-from .group import Group
 from .table import *
+from .table.category_table import CategoryTable

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/brilliance_admin/schema/admin_schema.py

@@ -7,11 +7,12 @@ from urllib.parse import urljoin
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
+from pydantic import Field
 from pydantic.dataclasses import dataclass
 
 from brilliance_admin.auth import UserABC
 from brilliance_admin.docs import build_redoc_docs, build_scalar_docs
-from brilliance_admin.schema.group import Group, GroupSchemaData
+from brilliance_admin.schema.category import BaseCategory, CategorySchemaData
 from brilliance_admin.translations import LanguageContext, LanguageManager
 from brilliance_admin.utils import DataclassBase, SupportsStr
 
@@ -23,8 +24,8 @@ DEFAULT_LANGUAGES = {
 
 @dataclass
 class AdminSchemaData(DataclassBase):
-    groups: Dict[str, GroupSchemaData]
     profile: UserABC | Any
+    categories: Dict[str, CategorySchemaData] = Field(default_factory=dict)
 
     def __post_init__(self):
         if not isinstance(self.profile, UserABC):
@@ -50,7 +51,7 @@ class AdminIndexContextData(DataclassBase):
 
 @dataclass
 class AdminSchema:
-    groups: List[Group]
+    categories: List[BaseCategory]
     auth: Any
 
     title: SupportsStr | None = 'Admin'
@@ -68,9 +69,9 @@ class AdminSchema:
     language_manager: LanguageManager | None = None
 
     def __post_init__(self):
-        for group in self.groups:
-            if not issubclass(group.__class__, Group):
-                raise TypeError(f'Group "{group}" is not instance of Group subclass')
+        for category in self.categories:
+            if not issubclass(category.__class__, BaseCategory):
+                raise TypeError(f'Root category "{category}" is not instance of BaseCategory subclass')
 
         if not self.language_manager:
             self.language_manager = LanguageManager(DEFAULT_LANGUAGES)
@@ -81,24 +82,25 @@ class AdminSchema:
     def generate_schema(self, user: UserABC, language_slug: str | None) -> AdminSchemaData:
         language_context: LanguageContext = self.get_language_context(language_slug)
 
-        groups = {}
+        result = AdminSchemaData(profile=user)
 
-        for group in self.groups:
-            if not group.slug:
-                msg = f'Category group {type(group).__name__}.slug is empty'
+        for category in self.categories:
+            if not category.slug:
+                msg = f'Category {type(category).__name__}.slug is empty'
                 raise AttributeError(msg)
 
-            groups[group.slug] = group.generate_schema(user, language_context)
+            try:
+                result.categories[category.slug] = category.generate_schema(user, language_context).to_dict(keep_none=False)
+            except Exception as e:
+                msg = f'Root category "{category.slug}" generate_schema error: {e}'
+                raise Exception(msg) from e
 
-        return AdminSchemaData(
-            groups=groups,
-            profile=user,
-        )
+        return result
 
-    def get_group(self, group_slug: str) -> Optional[Group]:
-        for group in self.groups:
-            if group.slug == group_slug:
-                return group
+    def get_group(self, group_slug: str) -> Optional[BaseCategory]:
+        for category in self.categories:
+            if category.slug == group_slug:
+                return category
 
         return None
 

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/brilliance_admin/schema/category.py

@@ -4,10 +4,13 @@ from typing import Any, ClassVar, Dict, List
 from pydantic import Field
 from pydantic.dataclasses import dataclass
 from pydantic_core import core_schema
+from structlog import get_logger
 
 from brilliance_admin.auth import UserABC
 from brilliance_admin.translations import LanguageContext
-from brilliance_admin.utils import DataclassBase, SupportsStr
+from brilliance_admin.utils import DataclassBase, KwargsInitMixin, SupportsStr, humanize_field_name
+
+logger = get_logger()
 
 
 # pylint: disable=too-many-instance-attributes
@@ -106,37 +109,56 @@ class CategorySchemaData(DataclassBase):
     icon: str | None
     type: str
 
+    categories: dict = Field(default_factory=dict)
+
     table_info: TableInfoSchemaData | None = None
     graph_info: GraphInfoSchemaData | None = None
 
+    link: str | None = None
+
     def __repr__(self):
         return f'<CategorySchemaData type={self.type} "{self.title}">'
 
 
-class Category(abc.ABC):
-    slug: ClassVar[str]
-    title: ClassVar[SupportsStr | None] = None
-    description: ClassVar[SupportsStr | None] = None
+class BaseCategory(KwargsInitMixin, abc.ABC):
+    slug: str
+    title: SupportsStr | None = None
+    description: SupportsStr | None = None
 
     # https://pictogrammers.com/library/mdi/
-    icon: ClassVar[str | None] = None
+    icon: str | None = None
 
     _type_slug: ClassVar[str]
 
     def generate_schema(self, user: UserABC, language_context: LanguageContext) -> CategorySchemaData:
-        return CategorySchemaData(
-            title=language_context.get_text(self.title) or self.slug,
+        type_slug = getattr(type(self), '_type_slug', None)
+        if not type_slug:
+            msg = f'{type(self).__name__}._type_slug must be set!'
+            raise AttributeError(msg)
+
+        result = CategorySchemaData(
+            title=language_context.get_text(self.title) or humanize_field_name(self.slug),
             description=language_context.get_text(self.description),
             icon=self.icon,
-            type=self._type_slug,
+            type=type_slug,
         )
+        return result
+
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+
+        if cls is BaseCategory:
+            return
+
+        if not issubclass(cls, BaseCategory):
+            raise TypeError(f'{cls.__name__} must inherit from Category')
 
     @classmethod
     def __get_pydantic_core_schema__(cls, source_type: Any, handler: Any) -> core_schema.CoreSchema:
-        def validate(v: Any) -> "Category":
+        def validate(v: Any) -> "BaseCategory":
             if isinstance(v, cls):
                 return v
-            raise TypeError(f"Expected {cls.__name__} instance")
+            raise TypeError(f"Expected {cls.__name__} instance, recieved: {type(v)} {v}")
 
         return core_schema.no_info_plain_validator_function(
             validate,
@@ -146,3 +168,56 @@ class Category(abc.ABC):
                 return_schema=core_schema.str_schema(),
             ),
         )
+
+
+class CategoryLink(BaseCategory):
+    _type_slug: str = 'link'
+
+    link: str
+
+    def generate_schema(self, user: UserABC, language_context: LanguageContext) -> CategorySchemaData:
+        result = super().generate_schema(user, language_context)
+        result.link = self.link
+        return result
+
+
+class CategoryGroup(BaseCategory):
+    _type_slug: str = 'group'
+
+    subcategories: list = Field(default_factory=list)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        for category in self.subcategories:
+            if not isinstance(category, BaseCategory):
+                raise TypeError(f'Category "{category}" is not instance of BaseCategory subclass')
+
+    def generate_schema(self, user: UserABC, language_context: LanguageContext) -> CategorySchemaData:
+        result = super().generate_schema(user, language_context)
+
+        for category in self.subcategories:
+
+            if not category.slug:
+                msg = f'Category {type(category).__name__}.slug is empty'
+                raise AttributeError(msg)
+
+            if category.slug in result.categories:
+                exists = result.categories[category.slug]
+                msg = f'Category {type(category).__name__}.slug "{self.slug}" already registered by "{exists.title}"'
+                raise KeyError(msg)
+
+            try:
+                result.categories[category.slug] = category.generate_schema(user, language_context)
+            except Exception as e:
+                msg = f'Category "{category.slug}" {type(category)} generate_schema error: {e}'
+                raise Exception(msg) from e
+
+        return result
+
+    def get_category(self, category_slug: str):
+        for category in self.subcategories:
+            if category.slug == category_slug:
+                return category
+
+        return None

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/brilliance_admin/schema/graphs/category_graphs.py

@@ -2,8 +2,7 @@ from typing import Any, Dict, List
 
 from pydantic import BaseModel, Field
 
-from brilliance_admin.schema import Category
-from brilliance_admin.schema.category import GraphInfoSchemaData
+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
@@ -26,7 +25,7 @@ class GraphsDataResult(BaseModel):
     charts: List[ChartData]
 
 
-class CategoryGraphs(Category):
+class CategoryGraphs(BaseCategory):
     _type_slug: str = 'graphs'
 
     search_enabled: bool = False

{brilliance_admin-0.43.6 → brilliance_admin-0.44.0}/brilliance_admin/schema/table/category_table.py

@@ -8,7 +8,7 @@ from pydantic import Field
 
 from brilliance_admin.auth import UserABC
 from brilliance_admin.exceptions import AdminAPIException, APIError
-from brilliance_admin.schema import Category
+from brilliance_admin.schema.category import BaseCategory
 from brilliance_admin.schema.category import TableInfoSchemaData
 from brilliance_admin.schema.table.admin_action import ActionData, ActionResult
 from brilliance_admin.schema.table.fields_schema import FieldsSchema
@@ -17,7 +17,7 @@ from brilliance_admin.translations import LanguageContext
 from brilliance_admin.utils import DeserializeAction, SupportsStr
 
 
-class CategoryTable(Category):
+class CategoryTable(BaseCategory):
     _type_slug: str = 'table'
 
     search_enabled: bool = False
@@ -32,6 +32,8 @@ class CategoryTable(Category):
     pk_name: str | None = None
 
     def __init__(self, *args, table_schema=None, table_filters=None, **kwargs):
+        super().__init__(*args, **kwargs)
+
         if table_schema:
             self.table_schema = table_schema