Consolidate implementation around annotationlib

Author: masenf

reflex/components/field.py

@@ -7,6 +7,7 @@
 from typing import Annotated, Any, Generic, TypeVar, get_origin
 
 from reflex.utils import types
+from reflex.utils.compat import annotations_from_namespace
 
 FIELD_TYPE = TypeVar("FIELD_TYPE")
 
@@ -116,12 +117,10 @@ def _collect_inherited_fields(cls, bases: tuple[type]) -> dict[str, Any]:
     def _resolve_annotations(
         cls, namespace: dict[str, Any], name: str
     ) -> dict[str, Any]:
-        if (_annotate := namespace.get("__annotate_func__")) is not None:
-            # python3.14 style
-            raw_annotations = _annotate(0)
-        else:
-            raw_annotations = namespace.get("__annotations__", {})
-        return types.resolve_annotations(raw_annotations, namespace["__module__"])
+        return types.resolve_annotations(
+            annotations_from_namespace(namespace),
+            namespace["__module__"],
+        )
 
     @classmethod
     def _process_field_overrides(

reflex/utils/compat.py

@@ -1,5 +1,7 @@
 """Compatibility hacks and helpers."""
 
+import sys
+from collections.abc import Mapping
 from importlib.util import find_spec
 from typing import TYPE_CHECKING, Any
 
@@ -31,6 +33,27 @@ async def windows_hot_reload_lifespan_hack():
         pass
 
 
+def annotations_from_namespace(namespace: Mapping[str, Any]) -> dict[str, Any]:
+    """Get the annotations from a class namespace.
+
+    Args:
+        namespace: The class namespace.
+
+    Returns:
+        The (forward-ref) annotations from the class namespace.
+    """
+    if sys.version_info >= (3, 14) and "__annotations__" not in namespace:
+        from annotationlib import (
+            Format,
+            call_annotate_function,
+            get_annotate_from_class_namespace,
+        )
+
+        if annotate := get_annotate_from_class_namespace(namespace):
+            return call_annotate_function(annotate, format=Format.FORWARDREF)
+    return namespace.get("__annotations__", {})
+
+
 if find_spec("pydantic") and find_spec("pydantic.v1"):
     from pydantic.v1.main import ModelMetaclass
 
@@ -49,8 +72,7 @@ def __new__(mcs, name: str, bases: tuple, namespace: dict, **kwargs):
             Returns:
                 The created class.
             """
-            if (_anotate := namespace.get("__annotate_func__")) is not None:
-                namespace["__annotations__"] = _anotate(0)
+            namespace["__annotations__"] = annotations_from_namespace(namespace)
             return super().__new__(mcs, name, bases, namespace, **kwargs)
 else:
     ModelMetaclassLazyAnnotations = type  # type: ignore[assignment]
@@ -85,12 +107,8 @@ def sqlmodel_get_annotations(class_dict: dict[str, Any]) -> dict[str, Any]:
     """
     from reflex.utils.types import resolve_annotations
 
-    if (_annotate := class_dict.get("__annotate_func__")) is not None:
-        annotations = _annotate(0)
-    else:
-        annotations = class_dict.get("__annotations__", {})
     return resolve_annotations(  # type: ignore[no-any-return]
-        annotations,
+        annotations_from_namespace(class_dict),
         class_dict.get("__module__"),
     )
 

reflex/utils/types.py

@@ -1187,6 +1187,27 @@ def resolve_annotations(
     return annotations
 
 
+def annotations_from_namespace(namespace: Mapping[str, Any]) -> dict[str, Any]:
+    """Get the annotations from a class namespace.
+
+    Args:
+        namespace: The class namespace.
+
+    Returns:
+        The (forward-ref) annotations from the class namespace.
+    """
+    if sys.version_info >= (3, 14) and "__annotations__" not in namespace:
+        from annotationlib import (
+            Format,
+            call_annotate_function,
+            get_annotate_from_class_namespace,
+        )
+
+        if annotate := get_annotate_from_class_namespace(namespace):
+            return call_annotate_function(annotate, format=Format.FORWARDREF)
+    return namespace.get("__annotations__", {})
+
+
 TYPES_THAT_HAS_DEFAULT_VALUE = (int, float, tuple, list, set, dict, str)
 
 

reflex/vars/base.py

@@ -43,6 +43,7 @@
 from reflex.constants.compiler import Hooks
 from reflex.constants.state import FIELD_MARKER
 from reflex.utils import console, exceptions, imports, serializers, types
+from reflex.utils.compat import annotations_from_namespace
 from reflex.utils.decorator import once
 from reflex.utils.exceptions import (
     ComputedVarSignatureError,
@@ -3477,12 +3478,8 @@ def __new__(
         # Add the field to the class
         inherited_fields: dict[str, Field] = {}
         own_fields: dict[str, Field] = {}
-        if (_annotate := namespace.get("__annotate_func__")) is not None:
-            raw_annotations = _annotate(0)
-        else:
-            raw_annotations = namespace.get("__annotations__", {})
         resolved_annotations = types.resolve_annotations(
-            raw_annotations, namespace["__module__"]
+            annotations_from_namespace(namespace), namespace["__module__"]
         )
 
         for base in bases[::-1]: