Rebuild models if necessary

Author: Viicos

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

@@ -15,6 +15,7 @@
 from ..base import BaseModel
 from .display import Details, Display
 from .forms import (
+    BaseForm,
     Form,
     FormField,
     FormFieldBoolean,
@@ -103,7 +104,7 @@ class PageTitle(BaseModel, extra='forbid'):
     """The type of the component. Always 'PageTitle'."""
 
 
-class Div(BaseModel, extra='forbid'):
+class Div(BaseModel, defer_build=True, extra='forbid'):
     """A generic container component."""
 
     components: '_t.List[AnyComponent]'
@@ -116,7 +117,7 @@ class Div(BaseModel, extra='forbid'):
     """The type of the component. Always 'Div'."""
 
 
-class Page(BaseModel, 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]'
@@ -240,7 +241,7 @@ class Button(BaseModel, extra='forbid'):
     """The type of the component. Always 'Button'."""
 
 
-class Link(BaseModel, extra='forbid'):
+class Link(BaseModel, defer_build=True, extra='forbid'):
     """Link component."""
 
     components: '_t.List[AnyComponent]'
@@ -328,7 +329,7 @@ class Footer(BaseModel, extra='forbid'):
     """The type of the component. Always 'Footer'."""
 
 
-class Modal(BaseModel, extra='forbid'):
+class Modal(BaseModel, defer_build=True, extra='forbid'):
     """Modal component that displays a modal dialog."""
 
     title: str
@@ -353,7 +354,7 @@ class Modal(BaseModel, extra='forbid'):
     """The type of the component. Always 'Modal'."""
 
 
-class ServerLoad(BaseModel, extra='forbid'):
+class ServerLoad(BaseModel, defer_build=True, extra='forbid'):
     """A component that will be replaced by the server with the component returned by the given URL."""
 
     path: str
@@ -539,7 +540,7 @@ class Spinner(BaseModel, extra='forbid'):
     """The type of the component. Always 'Spinner'."""
 
 
-class Toast(BaseModel, extra='forbid'):
+class Toast(BaseModel, defer_build=True, extra='forbid'):
     """Toast component that displays a toast message (small temporary message)."""
 
     title: str
@@ -636,3 +637,14 @@ class Custom(BaseModel, extra='forbid'):
 """Union of all components.
 
 Pydantic discriminator field is set to 'type' to allow for efficient serialization and deserialization of the components."""
+
+# Rebuild models:
+BaseForm.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})
+Form.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})
+ModelForm.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})
+Div.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})
+Page.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})
+Link.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})
+Modal.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})
+ServerLoad.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})
+Toast.model_rebuild(_types_namespace={'AnyComponent': AnyComponent})

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

@@ -200,7 +200,7 @@ def default_footer(self) -> _te.Self:
         return self
 
 
-class Form(BaseForm):
+class Form(BaseForm, defer_build=True):
     """Form component."""
 
     form_fields: _t.List[FormField]
@@ -213,7 +213,7 @@ class Form(BaseForm):
 FormFieldsModel = _t.TypeVar('FormFieldsModel', bound=pydantic.BaseModel)
 
 
-class ModelForm(BaseForm):
+class ModelForm(BaseForm, defer_build=True):
     """Form component generated from a Pydantic model."""
 
     model: _t.Type[pydantic.BaseModel] = pydantic.Field(exclude=True)

src/python-fastui/fastui/events.py

@@ -8,7 +8,7 @@
 ContextType = TypeAliasType('ContextType', Dict[str, Union[str, int]])
 
 
-class PageEvent(BaseModel):
+class PageEvent(BaseModel, defer_build=True):
     name: str
     push_path: Union[str, None] = None
     context: Union[ContextType, None] = None
@@ -37,3 +37,5 @@ class AuthEvent(BaseModel):
 
 
 AnyEvent = Annotated[Union[PageEvent, GoToEvent, BackEvent, AuthEvent], Field(discriminator='type')]
+
+PageEvent.model_rebuild(_types_namespace={'AnyEvent': AnyEvent})