[wip] Pydantic v2

integration/test_event_actions.py

@@ -25,7 +25,7 @@ def on_click2(self):
     class EventFiringComponent(rx.Component):
         """A component that fires onClick event without passing DOM event."""
 
-        tag = "EventFiringComponent"
+        tag: str = "EventFiringComponent"
 
         def _get_custom_code(self) -> str | None:
             return """

pyproject.toml

@@ -25,14 +25,19 @@ packages = [
     {include = "reflex"}
 ]
 
+[[tool.poetry.source]]
+name = "test"
+url = "https://test.pypi.org/simple/"
+priority = "explicit"
+
 [tool.poetry.dependencies]
 python = "^3.8"
 cloudpickle = "^2.2.1"
-fastapi = "^0.96.0"
+fastapi = "^0.110"
 gunicorn = "^20.1.0"
 jinja2 = "^3.1.2"
 psutil = "^5.9.4"
-pydantic = "^1.10.2"
+pydantic = "^2"
 python-multipart = "^0.0.5"
 python-socketio = "^5.7.0"
 redis = "^4.3.5"
@@ -55,7 +60,7 @@ wrapt = [
     {version = "^1.11.0", python = "<3.11"},
 ]
 packaging = "^23.1"
-reflex-hosting-cli = ">=0.1.2"
+reflex-hosting-cli = {version = "0.1.9dev0", source = "test"}
 charset-normalizer = "^3.3.2"
 wheel = "^0.42.0"
 build = "^1.0.3"

reflex/base.py

@@ -6,11 +6,12 @@
 
 import pydantic
 from pydantic import BaseModel
-from pydantic.fields import ModelField
+from pydantic.fields import FieldInfo
 
 from reflex import constants
 
 
+# TODO: migrate to pydantic v2
 def validate_field_name(bases: List[Type["BaseModel"]], field_name: str) -> None:
     """Ensure that the field's name does not shadow an existing attribute of the model.
 
@@ -35,7 +36,8 @@ def validate_field_name(bases: List[Type["BaseModel"]], field_name: str) -> None
 
 # monkeypatch pydantic validate_field_name method to skip validating
 # shadowed state vars when reloading app via utils.prerequisites.get_app(reload=True)
-pydantic.main.validate_field_name = validate_field_name  # type: ignore
+# TODO
+#  pydantic.main.validate_field_name = validate_field_name  # type: ignore
 
 
 class Base(pydantic.BaseModel):
@@ -48,12 +50,12 @@ class Base(pydantic.BaseModel):
     frontend and backend should subclass this class.
     """
 
-    class Config:
-        """Pydantic config."""
-
-        arbitrary_types_allowed = True
-        use_enum_values = True
-        extra = "allow"
+    # Pydantic config
+    model_config = pydantic.ConfigDict(
+        arbitrary_types_allowed=True,
+        use_enum_values=True,
+        extra="allow",
+    )
 
     def json(self) -> str:
         """Convert the object to a json string.
@@ -63,7 +65,9 @@ def json(self) -> str:
         """
         from reflex.utils.serializers import serialize
 
-        return self.__config__.json_dumps(self.dict(), default=serialize)
+        return self.__pydantic_serializer__.to_json(
+            value=self, fallback=serialize
+        ).decode()
 
     def set(self, **kwargs):
         """Set multiple fields and return the object.
@@ -85,7 +89,7 @@ def get_fields(cls) -> dict[str, Any]:
         Returns:
             The fields of the object.
         """
-        return cls.__fields__
+        return cls.model_fields
 
     @classmethod
     def add_field(cls, var: Any, default_value: Any):
@@ -97,14 +101,9 @@ def add_field(cls, var: Any, default_value: Any):
             var: The variable to add a pydantic field for.
             default_value: The default value of the field
         """
-        new_field = ModelField.infer(
-            name=var._var_name,
-            value=default_value,
-            annotation=var._var_type,
-            class_validators=None,
-            config=cls.__config__,
-        )
-        cls.__fields__.update({var._var_name: new_field})
+        field_info = FieldInfo(default=default_value, annotation=var._var_type)
+        cls.model_fields.update({var._var_name: field_info})
+        cls.model_rebuild(force=True)
 
     def get_value(self, key: str) -> Any:
         """Get the value of a field.
@@ -115,7 +114,7 @@ def get_value(self, key: str) -> Any:
         Returns:
             The value of the field.
         """
-        if isinstance(key, str) and key in self.__fields__:
+        if isinstance(key, str) and key in self.get_fields():
             # Seems like this function signature was wrong all along?
             # If the user wants a field that we know of, get it and pass it off to _get_value
             key = getattr(self, key)

reflex/compiler/utils.py

@@ -4,8 +4,7 @@
 import os
 from typing import Any, Callable, Dict, Optional, Type, Union
 from urllib.parse import urlparse
-
-from pydantic.fields import ModelField
+from pydantic.fields import FieldInfo
 
 from reflex import constants
 from reflex.components.base import (
@@ -149,7 +148,7 @@ def compile_state(state: Type[BaseState]) -> dict:
 
 
 def _compile_client_storage_field(
-    field: ModelField,
+    field: FieldInfo,
 ) -> tuple[Type[Cookie] | Type[LocalStorage] | None, dict[str, Any] | None]:
     """Compile the given cookie or local_storage field.
 
@@ -162,8 +161,10 @@ def _compile_client_storage_field(
     for field_type in (Cookie, LocalStorage):
         if isinstance(field.default, field_type):
             cs_obj = field.default
-        elif isinstance(field.type_, type) and issubclass(field.type_, field_type):
-            cs_obj = field.type_()
+        elif isinstance(field.annotation, type) and issubclass(
+            field.annotation, field_type
+        ):
+            cs_obj = field.annotation()
         else:
             continue
         return field_type, cs_obj.options()
@@ -188,7 +189,7 @@ def _compile_client_storage_recursive(
     cookies = {}
     local_storage = {}
     state_name = state.get_full_name()
-    for name, field in state.__fields__.items():
+    for name, field in state.model_fields.items():
         if name in state.inherited_vars:
             # only include vars defined in this state
             continue

reflex/components/base/bare.py

@@ -1,7 +1,7 @@
 """A bare component."""
 from __future__ import annotations
 
-from typing import Any, Iterator
+from typing import Any, Iterator, Optional
 
 from reflex.components.component import Component
 from reflex.components.tags import Tag
@@ -12,7 +12,7 @@
 class Bare(Component):
     """A component with no tag."""
 
-    contents: Var[str]
+    contents: Optional[Var[str]] = None
 
     @classmethod
     def create(cls, contents: Any) -> Component:
@@ -27,7 +27,7 @@ def create(cls, contents: Any) -> Component:
         if isinstance(contents, Var) and contents._var_data:
             contents = contents.to(str)
         else:
-            contents = str(contents)
+            contents = Var.create(str(contents))
         return cls(contents=contents)  # type: ignore
 
     def _render(self) -> Tag:

reflex/components/base/body.py

@@ -6,4 +6,4 @@
 class Body(Component):
     """A body component."""
 
-    tag = "body"
+    tag: str = "body"

reflex/components/base/document.py

@@ -8,30 +8,30 @@
 class NextDocumentLib(Component):
     """Root document components."""
 
-    library = "next/document"
+    library: str = "next/document"
 
 
 class Html(NextDocumentLib):
     """The document html."""
 
-    tag = "Html"
+    tag: str = "Html"
 
-    lang: Optional[str]
+    lang: Optional[str] = None
 
 
 class DocumentHead(NextDocumentLib):
     """The document head."""
 
-    tag = "Head"
+    tag: str = "Head"
 
 
 class Main(NextDocumentLib):
     """The document main section."""
 
-    tag = "Main"
+    tag: str = "Main"
 
 
 class NextScript(NextDocumentLib):
     """The document main scripts."""
 
-    tag = "NextScript"
+    tag: str = "NextScript"

reflex/components/base/fragment.py

@@ -5,5 +5,5 @@
 class Fragment(Component):
     """A React fragment to return multiple components from a function without wrapping it in a container."""
 
-    library = "react"
-    tag = "Fragment"
+    library: str = "react"
+    tag: str = "Fragment"

reflex/components/base/head.py

@@ -6,12 +6,12 @@
 class NextHeadLib(Component):
     """Header components."""
 
-    library = "next/head"
+    library: str = "next/head"
 
 
 class Head(NextHeadLib, MemoizationLeaf):
     """Head Component."""
 
-    tag = "NextHead"
+    tag: str = "NextHead"
 
-    is_default = True
+    is_default: bool = True

reflex/components/base/link.py

@@ -1,5 +1,5 @@
 """Display the title of the current page."""
-
+from typing import Optional
 
 from reflex.components.component import Component
 from reflex.vars import Var
@@ -8,37 +8,37 @@
 class RawLink(Component):
     """A component that displays the title of the current page."""
 
-    tag = "link"
+    tag: str = "link"
 
     # The href.
-    href: Var[str]
+    href: Optional[Var[str]] = None
 
     # The type of link.
-    rel: Var[str]
+    rel: Optional[Var[str]] = None
 
 
 class ScriptTag(Component):
     """A script tag with the specified type and source."""
 
-    tag = "script"
+    tag: str = "script"
 
     # The type of script represented.
-    type_: Var[str]
+    type_: Optional[Var[str]] = None
 
     # The URI of an external script.
-    source: Var[str]
+    source: Optional[Var[str]] = None
 
     # Metadata to verify the content of the script.
-    integrity: Var[str]
+    integrity: Optional[Var[str]] = None
 
     # Whether to allow cross-origin requests.
-    crossorigin: Var[str]
+    crossorigin: Optional[Var[str]] = None
 
     # Indicates which referrer to send when fetching the script.
-    referrer_policy: Var[str]
+    referrer_policy: Optional[Var[str]] = None
 
     # Whether to asynchronously load the script.
-    is_async: Var[bool]
+    is_async: Optional[Var[bool]] = None
 
     # Whether to defer loading the script.
-    defer: Var[bool]
+    defer: Optional[Var[bool]] = None

reflex/components/base/meta.py

@@ -11,7 +11,7 @@
 class Title(Component):
     """A component that displays the title of the current page."""
 
-    tag = "title"
+    tag: str = "title"
 
     def render(self) -> dict:
         """Render the title component.
@@ -29,7 +29,7 @@ def render(self) -> dict:
 class Meta(Component):
     """A component that displays metadata for the current page."""
 
-    tag = "meta"
+    tag: str = "meta"
 
     # The description of character encoding.
     char_set: Optional[str] = None

reflex/components/base/script.py

@@ -1,10 +1,9 @@
 """Next.js script wrappers and inline script functionality.
-
-https://nextjs.org/docs/app/api-reference/components/script
+https://nextjs.org/docs/app/api-reference/components/script.
 """
 from __future__ import annotations
 
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 from reflex.components.component import Component
 from reflex.vars import Var
@@ -20,12 +19,12 @@ class Script(Component):
     HTML <script> tag which does not work when rendering a component.
     """
 
-    library = "next/script"
-    tag = "Script"
-    is_default = True
+    library: str = "next/script"
+    tag: str = "Script"
+    is_default: bool = True
 
     # Required unless inline script is used
-    src: Var[str]
+    src: Optional[Var[str]] = None
 
     # When the script will execute: afterInteractive | beforeInteractive | lazyOnload
     strategy: Var[str] = "afterInteractive"  # type: ignore