openadmin-dev 0.7.4__tar.gz → 0.7.6__tar.gz

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openadmin-dev
-Version: 0.7.4
+Version: 0.7.6
 Summary: Add your description here
 Project-URL: Homepage, https://github.com/openadmin-team/openadmin-py
 Project-URL: Issues, https://github.com/openadmin-team/openadmin-py/issues

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/examples/admin/genres.py

@@ -44,7 +44,12 @@ async def get_books_without_genre(session: AsyncSessionDep) -> int:
     return result.scalar_one()
 
 
-@page.table("All Genres", description="All genres sorted by book count")
+@page.table(
+    "All Genres",
+    description="All genres sorted by book count",
+    icon="flower",
+    color="green",
+)
 async def get_all_genres(session: AsyncSessionDep, pagination: PageDep):
     stmt = (
         select(models.Genre, func.count(models.BookToGenre.book_id).label("book_count"))
@@ -56,7 +61,13 @@ async def get_all_genres(session: AsyncSessionDep, pagination: PageDep):
     )
     result = await session.execute(stmt)
     return [
-        {"id": g.id, "name": g.name, "book_count": count} for g, count in result.all()
+        {
+            "id": g.id,
+            "name": g.name,
+            "book_count": count,
+            "__veiw__": f"{g.id} | {g.name}",
+        }
+        for g, count in result.all()
     ]
 
 

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/examples/admin/weekdays.py

@@ -8,11 +8,11 @@ from typing import Any
 from openadmin import fastapi, spec
 
 WEEKDAYS: list[dict[str, Any]] = [
-    {"day": "Monday", "books": 5},
-    {"day": "Tuesday", "books": 3},
-    {"day": "Wednesday", "books": 7},
-    {"day": "Thursday", "books": 9},
-    {"day": "Friday", "books": 10},
+    {"day": "Monday", "books": 5, "coffe": 5},
+    {"day": "Tuesday", "books": 3, "coffe": 6},
+    {"day": "Wednesday", "books": 7, "coffe": 7},
+    {"day": "Thursday", "books": 9, "coffe": 8},
+    {"day": "Friday", "books": 10, "coffe": 9},
 ]
 
 page = fastapi.AdminPage(
@@ -29,7 +29,7 @@ page = fastapi.AdminPage(
     config={
         item["day"]: {
             "name": item["day"],
-            "color": spec.COLORS[num % len(spec.COLORS)],
+            "color": spec.COLORS[num + 10 % len(spec.COLORS)],
         }
         for num, item in enumerate(WEEKDAYS)
     },
@@ -60,7 +60,7 @@ def get_books_2() -> spec.PieChart:
         "config": {
             item["day"]: {
                 "name": item["day"],
-                "color": spec.COLORS[num % len(spec.COLORS)],
+                "color": spec.COLORS[num + 10 % len(spec.COLORS)],
             }
             for num, item in enumerate(WEEKDAYS)
         },
@@ -78,10 +78,54 @@ def get_books_2() -> spec.PieChart:
     config={
         item["day"]: {
             "name": item["day"],
-            "color": spec.COLORS[num % len(spec.COLORS)],
+            "color": spec.COLORS[num + 10 % len(spec.COLORS)],
         }
         for num, item in enumerate(WEEKDAYS)
     },
 )
 def get_books_3() -> spec.PieChart:
     return [{"name": day["day"], "value": day["value"]} for day in WEEKDAYS]
+
+
+@page.bar_chart(
+    "Books & Coffee 1",
+    description="Books read and coffee cups per weekday, week 1",
+    data_key="day",
+    config={
+        "books": {"name": "Books", "color": "violet", "icon": "book-open"},
+        "coffe": {"name": "Coffee", "color": "amber", "icon": "coffee"},
+    },
+    color="violet",
+    icon="book-open",
+    caption="5 day streak",
+    caption_description="Reading every day this work week",
+    caption_icon="flame",
+)
+def get_books_and_coffe_1() -> spec.BarChart:
+    return WEEKDAYS
+
+
+@page.bar_chart(
+    "Books & Coffee 2",
+    description="Books read and coffee cups per weekday, week 2",
+    data_key="day",
+    config={
+        "books": {"name": "Books", "color": "violet", "icon": "book-open"},
+        "coffe": {"name": "Coffee", "color": "amber", "icon": "coffee"},
+    },
+    color="amber",
+    icon="a-arrow-up",
+    caption="3 day streak",
+    caption_description="Reading every day this work week",
+    caption_icon="flame",
+)
+def get_books_and_coffe_2() -> spec.BarChart:
+    return {
+        "data": WEEKDAYS,
+        "color": "amber",
+        "icon": "a-arrow-up",
+        "config": {
+            "books": {"name": "Books", "color": "violet", "icon": "book-open"},
+            "coffe": {"name": "Coffee", "color": "amber", "icon": "coffee"},
+        },
+    }

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/openadmin/fastapi/admin_page.py

@@ -67,7 +67,7 @@ class AdminPage:
                 )
             elif isinstance(item, Table):
                 components.append(
-                    spec.Table(
+                    spec.TableComponent(
                         type="table",
                         id=item.id,
                         name=item.name,
@@ -77,6 +77,9 @@ class AdminPage:
                         query=query,
                         body=body,
                         form=form,
+                        is_hidden=item.is_hidden,
+                        icon=item.icon,
+                        color=item.color,
                     )
                 )
             elif isinstance(item, AreaChart):
@@ -93,7 +96,7 @@ class AdminPage:
                 )
             elif isinstance(item, BarChart):
                 components.append(
-                    spec.BarChart(
+                    spec.BarChartComponent(
                         type="bar-chart",
                         id=item.id,
                         name=item.name,
@@ -101,6 +104,13 @@ class AdminPage:
                         method=item.method,
                         url=url,
                         query=query,
+                        icon=item.icon,
+                        caption=item.caption,
+                        caption_icon=item.caption_icon,
+                        caption_description=item.caption_description,
+                        color=item.color,
+                        config=item.config,
+                        data_key=item.data_key,
                     )
                 )
             elif isinstance(item, LineChart):
@@ -167,10 +177,12 @@ class AdminPage:
                 )
             elif isinstance(item, Markdown):
                 components.append(
-                    spec.Markdown(
+                    spec.MarkdownComponent(
                         type="markdown",
                         id=item.id,
                         name=item.name,
+                        icon=item.icon,
+                        color=item.color,
                         description=item.description,
                         method=item.method,
                         url=url,
@@ -210,6 +222,9 @@ class AdminPage:
         name: str,
         *,
         description: str | None = None,
+        is_hidden: bool = False,
+        icon: spec.Icon | None = None,
+        color: spec.Color | None = None,
     ):
         kebab_name, unique_name = self.__get_kebab_and_unique_name(name)
 
@@ -219,6 +234,9 @@ class AdminPage:
             name=name,
             description=description,
             id=kebab_name,
+            is_hidden=is_hidden,
+            icon=icon,
+            color=color,
         )
         self.state.append(item)
         return self._wrap_user_handler(
@@ -260,6 +278,8 @@ class AdminPage:
         name: str,
         *,
         description: str | None = None,
+        color: spec.Color | None = None,
+        icon: spec.Icon | None = None,
     ):
         kebab_name, unique_name = self.__get_kebab_and_unique_name(name)
 
@@ -269,6 +289,8 @@ class AdminPage:
             name=name,
             description=description,
             id=kebab_name,
+            icon=icon,
+            color=color,
         )
         self.state.append(item)
 
@@ -534,6 +556,13 @@ class AdminPage:
         name: str,
         *,
         description: str | None = None,
+        icon: spec.Icon | None = None,
+        color: spec.Color | None = None,
+        caption: str | None = None,
+        caption_description: str | None = None,
+        caption_icon: spec.Icon | None = None,
+        config: dict[str, spec.BarChartConfigValue] | None = None,
+        data_key: str | None = None,
     ):
         kebab_name, unique_name = self.__get_kebab_and_unique_name(name)
 
@@ -543,6 +572,13 @@ class AdminPage:
             name=name,
             description=description,
             id=kebab_name,
+            icon=icon,
+            color=color,
+            caption_description=caption_description,
+            caption=caption,
+            caption_icon=caption_icon,
+            config=config,
+            data_key=data_key,
         )
         self.state.append(item)
         return self._wrap_user_handler(

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/openadmin/fastapi/bar_chart.py

@@ -14,5 +14,12 @@ class BarChart:
     id: str
     name: str
     description: str | None
+    config: dict[str, spec.BarChartConfigValue] | None
+    data_key: str | None
+    icon: spec.Icon | None
+    color: spec.Color | None
+    caption: str | None
+    caption_description: str | None
+    caption_icon: spec.Icon | None
     method: spec.HttpMethod
     func: Callable | None = field(default=None)

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/openadmin/fastapi/markdown.py

@@ -14,5 +14,7 @@ class Markdown:
     id: str
     name: str
     description: str | None
+    icon: spec.Icon | None
+    color: spec.Color | None
     method: spec.HttpMethod
     func: Callable | None = field(default=None)

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/openadmin/fastapi/table.py

@@ -14,5 +14,8 @@ class Table:
     method: spec.HttpMethod
     id: str
     name: str
+    color: spec.Color | None
+    icon: spec.Icon | None
     description: str | None
+    is_hidden: bool
     func: Callable | None = field(default=None)

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/openadmin/spec/__init__.py

@@ -4,14 +4,20 @@
 
 from .action import Action
 from .area_chart import AreaChart
-from .bar_chart import BarChart
+from .bar_chart import (
+    BarChart,
+    BarChartComponent,
+    BarChartConfigValue,
+    BarChartData,
+    BarChartResponce,
+)
 from .colors import COLORS, Color
 from .component import Component
 from .form import Form
 from .http_methods import HttpMethod
 from .icons import Icon
 from .line_chart import LineChart
-from .markdown import Markdown
+from .markdown import Markdown, MarkdownComponent, MarkdownContent, MarkdownResponse
 from .page import Page
 from .pie_chart import (
     PieChart,
@@ -25,13 +31,17 @@ from .property_type import PropertyType
 from .section import Section
 from .spec import Spec
 from .stat import Stat, StatComponent, StatResponse, StatValue
-from .table import Table
+from .table import Table, TableComponent, TableData, TableResponse
 
 __all__ = [
     "COLORS",
     "Action",
     "AreaChart",
     "BarChart",
+    "BarChartComponent",
+    "BarChartConfigValue",
+    "BarChartData",
+    "BarChartResponce",
     "Color",
     "Component",
     "Form",
@@ -39,6 +49,9 @@ __all__ = [
     "Icon",
     "LineChart",
     "Markdown",
+    "MarkdownComponent",
+    "MarkdownContent",
+    "MarkdownResponse",
     "Page",
     "PieChart",
     "PieChartComponent",
@@ -54,4 +67,7 @@ __all__ = [
     "StatResponse",
     "StatValue",
     "Table",
+    "TableComponent",
+    "TableData",
+    "TableResponse",
 ]

openadmin_dev-0.7.6/openadmin/spec/bar_chart.py

@@ -0,0 +1,52 @@
+# SPDX-FileCopyrightText: 2026 OpenAdmin
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from typing import Literal, NotRequired, TypedDict
+
+from pydantic import BaseModel, Field
+
+from .colors import Color
+from .http_methods import HttpMethod
+from .icons import Icon
+from .property import Property
+
+
+class BarChartConfigValue(TypedDict):
+    name: NotRequired[str]
+    color: NotRequired[Color]
+    icon: NotRequired[Icon]
+
+
+class BarChartComponent(BaseModel):
+    type: Literal["bar-chart"]
+    id: str
+    name: str
+    description: str | None
+    config: dict[str, BarChartConfigValue] | None
+    data_key: str | None
+    icon: Icon | None
+    color: Color | None
+    caption: str | None
+    caption_description: str | None
+    caption_icon: Icon | None
+    url: str
+    method: HttpMethod
+    query: list[Property] | None = Field(None)
+
+
+type BarChartData = (
+    list[dict[str, int | float | str]]
+    | list[dict[Literal["data", "value"], int | float | str]]
+    | object
+)
+
+
+class BarChartResponce(TypedDict):
+    config: NotRequired[dict[str, BarChartConfigValue]]
+    icon: NotRequired[Icon]
+    color: NotRequired[Color]
+    data: BarChartData
+
+
+type BarChart = BarChartData | BarChartResponce

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/openadmin/spec/component.py

@@ -5,22 +5,22 @@
 
 from .action import Action
 from .area_chart import AreaChart
-from .bar_chart import BarChart
+from .bar_chart import BarChartComponent
 from .form import Form
 from .line_chart import LineChart
-from .markdown import Markdown
+from .markdown import MarkdownComponent
 from .pie_chart import PieChartComponent
 from .stat import StatComponent
-from .table import Table
+from .table import TableComponent
 
 type Component = (
     StatComponent
-    | Table
+    | TableComponent
     | AreaChart
-    | BarChart
+    | BarChartComponent
     | LineChart
     | PieChartComponent
     | Action
     | Form
-    | Markdown
+    | MarkdownComponent
 )

openadmin_dev-0.7.6/openadmin/spec/markdown.py

@@ -0,0 +1,36 @@
+# SPDX-FileCopyrightText: 2026 OpenAdmin
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from typing import Literal, NotRequired, TypedDict
+
+from pydantic import BaseModel, Field
+
+from .colors import Color
+from .http_methods import HttpMethod
+from .icons import Icon
+from .property import Property
+
+
+class MarkdownComponent(BaseModel):
+    type: Literal["markdown"]
+    id: str
+    name: str
+    description: str | None
+    color: Color | None
+    icon: Icon | None
+    url: str
+    method: HttpMethod
+    query: list[Property] | None = Field(None)
+
+
+type MarkdownContent = str
+
+
+class MarkdownResponse(TypedDict):
+    icon: NotRequired[Icon]
+    color: NotRequired[Color]
+    content: MarkdownContent
+
+
+type Markdown = MarkdownContent | MarkdownResponse

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/openadmin/spec/table.py

@@ -2,21 +2,40 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-from typing import Literal
+from typing import Literal, NotRequired, TypedDict
 
 from pydantic import BaseModel, Field
 
+from .colors import Color
 from .http_methods import HttpMethod
+from .icons import Icon
 from .property import Property
 
 
-class Table(BaseModel):
+class TableComponent(BaseModel):
     type: Literal["table"]
     id: str
     name: str
     description: str | None
     url: str
+    icon: Icon | None
+    color: Color | None
     method: HttpMethod
+    is_hidden: bool
     form: list[Property] | None = Field(None)
     body: list[Property] | None = Field(None)
     query: list[Property] | None = Field(None)
+
+
+type TableData = (
+    list[dict[str | Literal["__view__"], str | int | float | bool]] | object
+)
+
+
+class TableResponse(TypedDict):
+    data: TableData
+    icon: NotRequired[Icon]
+    color: NotRequired[Color]
+
+
+type Table = TableData | TableResponse

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openadmin-dev"
-version = "0.7.4"
+version = "0.7.6"
 description = "Add your description here"
 authors = [
   { name="Mykyta Kasianenko", email="mykytakasianenko@gmail.com" },

{openadmin_dev-0.7.4 → openadmin_dev-0.7.6}/uv.lock

@@ -510,7 +510,7 @@ wheels = [
 
 [[package]]
 name = "openadmin"
-version = "0.7.3"
+version = "0.7.5"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi", extra = ["standard"] },

openadmin_dev-0.7.4/openadmin/spec/bar_chart.py

@@ -1,20 +0,0 @@
-# SPDX-FileCopyrightText: 2026 OpenAdmin
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from typing import Literal
-
-from pydantic import BaseModel, Field
-
-from .http_methods import HttpMethod
-from .property import Property
-
-
-class BarChart(BaseModel):
-    type: Literal["bar-chart"]
-    id: str
-    name: str
-    description: str | None
-    url: str
-    method: HttpMethod
-    query: list[Property] | None = Field(None)

openadmin_dev-0.7.4/openadmin/spec/markdown.py

@@ -1,20 +0,0 @@
-# SPDX-FileCopyrightText: 2026 OpenAdmin
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from typing import Literal
-
-from pydantic import BaseModel, Field
-
-from .http_methods import HttpMethod
-from .property import Property
-
-
-class Markdown(BaseModel):
-    type: Literal["markdown"]
-    id: str
-    name: str
-    description: str | None
-    url: str
-    method: HttpMethod
-    query: list[Property] | None = Field(None)