Clean up from_payload

Author: dandavison

temporalio/contrib/pydantic/converter.py

@@ -44,13 +44,19 @@ def from_payload(self, payload: Payload, type_hint: Optional[Type] = None) -> An
         data = json.loads(payload.data.decode())
         if type_hint and typing.get_origin(type_hint) is list:
             assert isinstance(data, list), "Expected list"
-            [type_hint] = typing.get_args(type_hint)
-            assert type_hint is not None, "Expected type hint"
-            assert issubclass(type_hint, BaseModel), "Expected BaseModel"
+            [model] = typing.get_args(type_hint)
+            assert model is not None, "Expected type hint"
+            assert issubclass(model, BaseModel), "Expected BaseModel"
             if temporalio.workflow.unsafe.in_sandbox():
-                type_hint = _unwrap_restricted_fields(type_hint)
-
-            return [self._from_dict(d, type_hint) for d in data]
+                model = create_model(
+                    model.__name__,
+                    **{  # type: ignore
+                        name: (RestrictionContext.unwrap_if_proxied(f.annotation), f)
+                        for name, f in model.model_fields.items()
+                    },
+                )
+
+            return [self._from_dict(d, model) for d in data]
         return self._from_dict(data, type_hint)
 
     def _from_dict(self, data: dict, type_hint: Optional[Type]) -> Any:
@@ -81,13 +87,3 @@ def __init__(self) -> None:
     payload_converter_class=PydanticPayloadConverter
 )
 """Data converter using Pydantic JSON conversion."""
-
-
-def _unwrap_restricted_fields(
-    model: Type[BaseModel],
-) -> Type[BaseModel]:
-    fields = {
-        name: (RestrictionContext.unwrap_if_proxied(f.annotation), f)
-        for name, f in model.model_fields.items()
-    }
-    return create_model(model.__name__, **fields)  # type: ignore