Update supported Python versions, add support for Pydantic 2.11 (#379)

Author: Viicos

.github/workflows/ci.yml

@@ -68,17 +68,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-13, macos-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         exclude:
-          # Python 3.8 and 3.9 are not available on macOS 14
+          # Python 3.9 is not available on macOS 14
           - os: macos-13
             python-version: '3.10'
           - os: macos-13
             python-version: '3.11'
           - os: macos-13
             python-version: '3.12'
           - os: macos-latest
-            python-version: '3.8'
+            python-version: '3.13'
           - os: macos-latest
             python-version: '3.9'
 

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v5.0.0
     hooks:
       - id: no-commit-to-branch
       - id: check-yaml

demo/sse.py

@@ -1,6 +1,6 @@
 import asyncio
+from collections.abc import AsyncIterable
 from itertools import chain
-from typing import AsyncIterable
 
 from fastapi import APIRouter
 from fastui import FastUI

pyproject.toml

@@ -6,7 +6,7 @@ line-length = 120
 extend-select = ["Q", "RUF100", "UP", "I"]
 flake8-quotes = {inline-quotes = "single", multiline-quotes = "double"}
 format.quote-style="single"
-target-version = "py38"
+target-version = "py39"
 
 [tool.pyright]
 include = ["src/python-fastui/fastui"]

src/python-fastui/fastui/__init__.py

@@ -13,7 +13,7 @@ class FastUI(pydantic.RootModel):
     The root component of a FastUI application.
     """
 
-    root: _t.List[AnyComponent]
+    root: list[AnyComponent]
 
     @pydantic.field_validator('root', mode='before')
     def coerce_to_list(cls, v):

src/python-fastui/fastui/auth/github.py

@@ -1,7 +1,8 @@
+from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
-from typing import TYPE_CHECKING, AsyncIterator, Dict, List, Tuple, Union, cast
+from typing import TYPE_CHECKING, Union, cast
 from urllib.parse import urlencode
 
 from pydantic import BaseModel, SecretStr, TypeAdapter, field_validator
@@ -25,10 +26,10 @@ class GitHubExchangeError:
 class GitHubExchange:
     access_token: str
     token_type: str
-    scope: List[str]
+    scope: list[str]
 
     @field_validator('scope', mode='before')
-    def check_scope(cls, v: str) -> List[str]:
+    def check_scope(cls, v: str) -> list[str]:
         return [s for s in v.split(',') if s]
 
 
@@ -61,7 +62,7 @@ class GitHubEmail(BaseModel):
     visibility: Union[str, None]
 
 
-github_emails_ta = TypeAdapter(List[GitHubEmail])
+github_emails_ta = TypeAdapter(list[GitHubEmail])
 
 
 class GitHubAuthProvider:
@@ -76,7 +77,7 @@ def __init__(
         github_client_secret: SecretStr,
         *,
         redirect_uri: Union[str, None] = None,
-        scopes: Union[List[str], None] = None,
+        scopes: Union[list[str], None] = None,
         state_provider: Union['StateProvider', bool] = True,
         exchange_cache_age: Union[timedelta, None] = timedelta(seconds=30),
     ):
@@ -202,7 +203,7 @@ async def get_github_user(self, exchange: GitHubExchange) -> GithubUser:
         user_response.raise_for_status()
         return GithubUser.model_validate_json(user_response.content)
 
-    async def get_github_user_emails(self, exchange: GitHubExchange) -> List[GitHubEmail]:
+    async def get_github_user_emails(self, exchange: GitHubExchange) -> list[GitHubEmail]:
         """
         See https://docs.github.com/en/rest/users/emails
         """
@@ -212,7 +213,7 @@ async def get_github_user_emails(self, exchange: GitHubExchange) -> List[GitHubE
         return github_emails_ta.validate_json(emails_response.content)
 
     @staticmethod
-    def _auth_headers(exchange: GitHubExchange) -> Dict[str, str]:
+    def _auth_headers(exchange: GitHubExchange) -> dict[str, str]:
         return {
             'Authorization': f'Bearer {exchange.access_token}',
             'Accept': 'application/vnd.github+json',
@@ -221,7 +222,7 @@ def _auth_headers(exchange: GitHubExchange) -> Dict[str, str]:
 
 class ExchangeCache:
     def __init__(self):
-        self._data: Dict[str, Tuple[datetime, GitHubExchange]] = {}
+        self._data: dict[str, tuple[datetime, GitHubExchange]] = {}
 
     def get(self, key: str, max_age: timedelta) -> Union[GitHubExchange, None]:
         self._purge(max_age)

src/python-fastui/fastui/auth/shared.py

@@ -1,6 +1,6 @@
 import json
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, List, Tuple, Union
+from typing import TYPE_CHECKING, Union
 
 from .. import AnyComponent, FastUI, events
 from .. import components as c
@@ -17,7 +17,7 @@ class AuthException(ABC, Exception):
     """
 
     @abstractmethod
-    def response_data(self) -> Tuple[int, str]:
+    def response_data(self) -> tuple[int, str]:
         raise NotImplementedError
 
 
@@ -26,7 +26,7 @@ def __init__(self, message: str, *, code: str):
         super().__init__(message)
         self.code = code
 
-    def response_data(self) -> Tuple[int, str]:
+    def response_data(self) -> tuple[int, str]:
         return 401, json.dumps({'detail': str(self)})
 
 
@@ -41,8 +41,8 @@ def __init__(self, path: str, message: Union[str, None] = None):
         self.path = path
         self.message = message
 
-    def response_data(self) -> Tuple[int, str]:
-        components: List[AnyComponent] = [c.FireEvent(event=events.GoToEvent(url=self.path), message=self.message)]
+    def response_data(self) -> tuple[int, str]:
+        components: list[AnyComponent] = [c.FireEvent(event=events.GoToEvent(url=self.path), message=self.message)]
         return 345, FastUI(root=components).model_dump_json(exclude_none=True)
 
 

src/python-fastui/fastui/class_name.py

@@ -1,10 +1,10 @@
 # could be renamed to something general if there's more to add
-from typing import Dict, List, Literal, Union
+from typing import Annotated, Literal, Union
 
 from pydantic import Field
-from typing_extensions import Annotated, TypeAliasType
+from typing_extensions import TypeAliasType
 
-ClassName = TypeAliasType('ClassName', Union[str, List['ClassName'], Dict[str, Union[bool, None]], None])
+ClassName = TypeAliasType('ClassName', Union[str, list['ClassName'], dict[str, Union[bool, None]], None])
 ClassNameField = Annotated[ClassName, Field(serialization_alias='className')]
 
 NamedStyle = TypeAliasType('NamedStyle', Union[Literal['primary', 'secondary', 'warning'], None])

src/python-fastui/fastui/components/__init__.py

@@ -107,7 +107,7 @@ class PageTitle(BaseModel, extra='forbid'):
 class Div(BaseModel, defer_build=True, extra='forbid'):
     """A generic container component."""
 
-    components: '_t.List[AnyComponent]'
+    components: 'list[AnyComponent]'
     """List of components to render inside the div."""
 
     class_name: _class_name.ClassNameField = None
@@ -120,7 +120,7 @@ class Div(BaseModel, defer_build=True, extra='forbid'):
 class Page(BaseModel, defer_build=True, extra='forbid'):
     """Similar to `container` in many UI frameworks, this acts as a root component for most pages."""
 
-    components: '_t.List[AnyComponent]'
+    components: 'list[AnyComponent]'
     """List of components to render on the page."""
 
     class_name: _class_name.ClassNameField = None
@@ -245,7 +245,7 @@ class Button(BaseModel, extra='forbid'):
 class Link(BaseModel, defer_build=True, extra='forbid'):
     """Link component."""
 
-    components: '_t.List[AnyComponent]'
+    components: 'list[AnyComponent]'
     """List of components to render attached to the link."""
 
     on_click: _t.Union[events.AnyEvent, None] = None
@@ -270,7 +270,7 @@ class Link(BaseModel, defer_build=True, extra='forbid'):
 class LinkList(BaseModel, extra='forbid'):
     """List of Link components."""
 
-    links: _t.List[Link]
+    links: list[Link]
     """List of links to render."""
 
     mode: _t.Union[_t.Literal['tabs', 'vertical', 'pagination'], None] = None
@@ -292,10 +292,10 @@ class Navbar(BaseModel, extra='forbid'):
     title_event: _t.Union[events.AnyEvent, None] = None
     """Optional event to trigger when the title is clicked. Often used to navigate to the home page."""
 
-    start_links: _t.List[Link] = []
+    start_links: list[Link] = []
     """List of links to render at the start of the navbar."""
 
-    end_links: _t.List[Link] = []
+    end_links: list[Link] = []
     """List of links to render at the end of the navbar."""
 
     class_name: _class_name.ClassNameField = None
@@ -318,7 +318,7 @@ def __get_pydantic_json_schema__(
 class Footer(BaseModel, extra='forbid'):
     """Footer component."""
 
-    links: _t.List[Link]
+    links: list[Link]
     """List of links to render in the footer."""
 
     extra_text: _t.Union[str, None] = None
@@ -337,10 +337,10 @@ class Modal(BaseModel, defer_build=True, extra='forbid'):
     title: str
     """The text displayed on the modal trigger button."""
 
-    body: '_t.List[AnyComponent]'
+    body: 'list[AnyComponent]'
     """List of components to render in the modal body."""
 
-    footer: '_t.Union[_t.List[AnyComponent], None]' = None
+    footer: '_t.Union[list[AnyComponent], None]' = None
     """Optional list of components to render in the modal footer."""
 
     open_trigger: _t.Union[events.PageEvent, None] = None
@@ -365,7 +365,7 @@ class ServerLoad(BaseModel, defer_build=True, extra='forbid'):
     load_trigger: _t.Union[events.PageEvent, None] = None
     """Optional event to trigger when the component is loaded."""
 
-    components: '_t.Union[_t.List[AnyComponent], None]' = None
+    components: '_t.Union[list[AnyComponent], None]' = None
     """Optional list of components to render while the server is loading the new component(s)."""
 
     sse: _t.Union[bool, None] = None
@@ -457,7 +457,7 @@ class Iframe(BaseModel, extra='forbid'):
 class Video(BaseModel, extra='forbid'):
     """Video component that displays a video or multiple videos."""
 
-    sources: _t.List[_p.AnyUrl]
+    sources: list[_p.AnyUrl]
     """List of URLs to the video sources."""
 
     autoplay: _t.Union[bool, None] = None
@@ -549,7 +549,7 @@ class Toast(BaseModel, defer_build=True, extra='forbid'):
     title: str
     """The title of the toast."""
 
-    body: '_t.List[AnyComponent]'
+    body: 'list[AnyComponent]'
     """List of components to render in the toast body."""
 
     # TODO: change these before the release (top left, center, end, etc). Can be done with the toast bug fix.

src/python-fastui/fastui/components/display.py

@@ -69,7 +69,7 @@ class Details(BaseModel, extra='forbid'):
     data: pydantic.SerializeAsAny[_types.DataModel]
     """Data model to display."""
 
-    fields: _t.Union[_t.List[_t.Union[DisplayLookup, Display]], None] = None
+    fields: _t.Union[list[_t.Union[DisplayLookup, Display]], None] = None
     """Fields to display."""
 
     class_name: _class_name.ClassNameField = None
@@ -80,15 +80,15 @@ class Details(BaseModel, extra='forbid'):
 
     @pydantic.model_validator(mode='after')
     def _fill_fields(self) -> _te.Self:
-        fields = {**self.data.model_fields, **self.data.model_computed_fields}
+        fields = {**type(self.data).model_fields, **type(self.data).model_computed_fields}
 
         if self.fields is None:
             self.fields = [DisplayLookup(field=name, title=field.title) for name, field in fields.items()]
         else:
             # add pydantic titles to fields that don't have them
             for field in (c for c in self.fields if c.title is None):
                 if isinstance(field, DisplayLookup):
-                    pydantic_field = self.data.model_fields.get(field.field)
+                    pydantic_field = type(self.data).model_fields.get(field.field)
                     if pydantic_field and pydantic_field.title:
                         field.title = pydantic_field.title
                 elif isinstance(field, Display):