Evaluate ForwardRef before type params substiturion

Fatal1ty · Nov 14, 2023 · e054a06 · e054a06
1 parent 7a1d012
commit e054a06
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/mashumaro/core/meta/types/pack.py b/mashumaro/core/meta/types/pack.py
@@ -96,6 +96,10 @@ def _pack_with_annotated_serialization_strategy(
         )
     except (KeyError, ValueError):
         value_type = Any
+    if isinstance(value_type, ForwardRef):
+        value_type = spec.builder.evaluate_forward_ref(
+            value_type, spec.origin_type
+        )
     value_type = substitute_type_params(
         value_type,
         resolve_type_params(strategy_type, get_args(spec.type))[strategy_type],
@@ -176,6 +180,10 @@ def _pack_annotated_serializable_type(
         ) from None
     if is_self(value_type):
         return f"{spec.expression}._serialize()"
+    if isinstance(value_type, ForwardRef):
+        value_type = spec.builder.evaluate_forward_ref(
+            value_type, spec.origin_type
+        )
     value_type = substitute_type_params(
         value_type,
         resolve_type_params(spec.origin_type, get_args(spec.type))[

diff --git a/mashumaro/core/meta/types/unpack.py b/mashumaro/core/meta/types/unpack.py
@@ -467,6 +467,10 @@ def _unpack_with_annotated_serialization_strategy(
         )
     except (KeyError, ValueError):
         value_type = Any
+    if isinstance(value_type, ForwardRef):
+        value_type = spec.builder.evaluate_forward_ref(
+            value_type, spec.origin_type
+        )
     value_type = substitute_type_params(
         value_type,
         resolve_type_params(strategy_type, get_args(spec.type))[strategy_type],
@@ -540,6 +544,10 @@ def _unpack_annotated_serializable_type(
         ) from None
     if is_self(value_type):
         return f"{type_name(spec.type)}._deserialize({spec.expression})"
+    if isinstance(value_type, ForwardRef):
+        value_type = spec.builder.evaluate_forward_ref(
+            value_type, spec.origin_type
+        )
     value_type = substitute_type_params(
         value_type,
         resolve_type_params(spec.origin_type, get_args(spec.type))[