🚨 Fix mypy issues.

Author: Raphael Krupinski

src/lapidary/runtime/model/op.py

@@ -4,7 +4,6 @@
 from typing import Union
 
 import httpx
-import pydantic.fields
 import typing_extensions as typing
 
 from ..response import find_type
@@ -46,20 +45,19 @@ def handle_response(self, response: httpx.Response) -> typing.Any:
         if typ is None:
             return None
 
-        fields = {}
+        fields: typing.MutableMapping[str, typing.Any] = {}
         for field_name, field_info in typ.model_fields.items():
-            field_info: pydantic.fields.FieldInfo
             handlers: Sequence[Union[ResponsePartHandler, type[ResponsePartHandler]]] = [
                 anno
                 for anno in field_info.metadata
                 if isinstance(anno, ResponsePartHandler) or (inspect.isclass(anno) and issubclass(anno, ResponsePartHandler))
             ]
             assert len(handlers) == 1
             handler = handlers[0]
-            if inspect.isclass(handler):
-                handler = handler()
             if isinstance(handler, PropertyAnnotation):
-                handler.supply_formal(field_name, field_info.annotation)
+                field_type = field_info.annotation
+                assert field_type
+                handler.supply_formal(field_name, field_type)
             handler.apply(fields, response)
         obj = typ.parse_obj(fields)
         # obj: typing.Any = parse_model(response, typ)
@@ -81,7 +79,7 @@ def get_response_map(return_anno: type) -> ResponseMap:
     for media_type_map in responses.values():
         for media_type, typ in media_type_map.items():
             if not issubclass(typ, ResponseEnvelope):
-                media_type_map[media_type] = DefaultEnvelope[typ]
+                media_type_map[media_type] = DefaultEnvelope[typ]  # type: ignore[valid-type]
     return responses
 
 

src/lapidary/runtime/model/response.py

@@ -1,7 +1,6 @@
 import abc
 import dataclasses as dc
 from collections.abc import Callable
-from typing import Any
 
 import httpx
 import pydantic
@@ -23,9 +22,9 @@ class Responses:
 class ResponseEnvelopeBuilder:
     def __init__(self, typ: type[pydantic.BaseModel]) -> None:
         self._type = typ
-        self.fields = {}
+        self.fields: typing.MutableMapping[str, typing.Any] = {}
 
-    def build(self) -> Any:
+    def build(self) -> typing.Any:
         return self._type.model_construct(**self.fields)
 
 
@@ -45,14 +44,14 @@ def supply_formal(self, name: str, type_: type) -> None:
 
 
 class Body(ResponsePartHandler, PropertyAnnotation):
-    _parse: Callable[[...], Any]
+    _parse: Callable[[bytes], typing.Any]
 
     def supply_formal(self, name: str, type_: type) -> None:
         super().supply_formal(name, type_)
         self._parse = pydantic.TypeAdapter(type_).validate_json
 
     def apply(self, fields: typing.MutableMapping, response: httpx.Response) -> None:
-        fields[self._name] = self._parse(response.text)
+        fields[self._name] = self._parse(response.content)
 
 
 class Header(ResponsePartHandler, PropertyAnnotation):
@@ -71,4 +70,4 @@ class ResponseEnvelope(abc.ABC, pydantic.BaseModel):
 
 
 class DefaultEnvelope(ResponseEnvelope, typing.Generic[BodyT]):
-    body: typing.Annotated[BodyT, Body]
+    body: typing.Annotated[BodyT, Body()]