Refactor: Use response_type in decode_response

Co-authored-by: hello <hello@def-not-hacking-the.net>

Author: cursoragent

src/contiguity/_client.py

@@ -15,7 +15,7 @@ class ContiguityApiError(Exception):
 class BaseApiClient:
     def handle_error(self, response: Response, /, *, fail_message: str = "api request failed") -> None:
         if not HTTPStatus.OK <= response.status_code < HTTPStatus.MULTIPLE_CHOICES:
-            data = decode_response(response.content, type=ErrorResponse)
+            data = decode_response(response.content, response_type=ErrorResponse)
             msg = f"{fail_message}. {response.status_code} {data.error}"
             raise ContiguityApiError(msg)
 

src/contiguity/_instant_messaging.py

@@ -53,7 +53,7 @@ def send(  # noqa: PLR0913
         )
 
         self._client.handle_error(response, fail_message="failed to send instant message")
-        data = decode_response(response.content, type=IMSendResponse)
+        data = decode_response(response.content, response_type=IMSendResponse)
         logger.debug("successfully sent %s message to %r", self._api_path[1:], to)
         return data
 
@@ -70,7 +70,7 @@ def _typing(self, *, to: str, action: Literal["start", "stop"], from_: str | Non
         )
 
         self._client.handle_error(response, fail_message=f"failed to {action} {self._api_path[1:]} typing indicator")
-        data = decode_response(response.content, type=IMTypingResponse)
+        data = decode_response(response.content, response_type=IMTypingResponse)
         logger.debug("successfully %s %s typing indicator for %r", action, self._api_path[1:], to)
         return data
 
@@ -101,7 +101,7 @@ def _reactions(
         )
 
         self._client.handle_error(response, fail_message=f"failed to {action} {self._api_path[1:]} reaction")
-        data = decode_response(response.content, type=IMReactionResponse)
+        data = decode_response(response.content, response_type=IMReactionResponse)
         logger.debug("successfully %s %s reaction for %r", action, self._api_path[1:], to)
         return data
 

src/contiguity/_response.py

@@ -28,16 +28,22 @@ class ErrorResponse(BaseResponse):
     status: HTTPStatus
 
 
-def decode_response(content: bytes, /, *, type: type[T]) -> T:
-    raw = msgspec.json.decode(content, type=RawResponse[type])
+def decode_response(content: bytes, /, *, response_type: type[T]) -> T:
+    raw = msgspec.json.decode(content, type=RawResponse[response_type])
     metadata = ResponseMetadata(
         id=raw.id,
         timestamp=raw.timestamp,
         api_version=raw.api_version,
         object=raw.object,
     )
     data = msgspec.to_builtins(raw.data)
+    
+    # Handle sequence types (list of structs)
+    if isinstance(data, Sequence) and not isinstance(data, str):
+        return msgspec.convert(data, type=response_type)
+    
+    # Handle mapping types (single struct with metadata)
     if not isinstance(data, Mapping):
-        msg = f"expected Mapping instance for 'data' field, got {_type(data)}"
+        msg = f"expected Mapping or Sequence instance for 'data' field, got {_type(data)}"
         raise TypeError(msg)
-    return msgspec.convert({**data, "metadata": metadata}, type=type)
+    return msgspec.convert({**data, "metadata": metadata}, type=response_type)

src/contiguity/domains.py

@@ -59,23 +59,23 @@ def register(
         )
 
         self._client.handle_error(response, fail_message="failed to register domain")
-        data = decode_response(response.content, type=PartialDomain)
+        data = decode_response(response.content, response_type=PartialDomain)
         logger.debug("successfully registered domain %r", domain)
         return data
 
     def list(self) -> list[PartialDomain]:
         response = self._client.get("/domains")
         self._client.handle_error(response, fail_message="failed to list domains")
-        return decode_response(response.content, type=list[PartialDomain])
+        return decode_response(response.content, response_type=list[PartialDomain])
 
     def get(self, domain: str, /) -> Domain:
         response = self._client.get(f"/domains/{domain}")
         self._client.handle_error(response, fail_message="failed to get domain")
-        return decode_response(response.content, type=Domain)
+        return decode_response(response.content, response_type=Domain)
 
     def delete(self, domain: str, /) -> DeleteDomainResponse:
         response = self._client.delete(f"/domains/{domain}")
         self._client.handle_error(response, fail_message="failed to delete domain")
-        data = decode_response(response.content, type=DeleteDomainResponse)
+        data = decode_response(response.content, response_type=DeleteDomainResponse)
         logger.debug("successfully deleted domain %r", domain)
         return data

src/contiguity/email.py

@@ -95,6 +95,6 @@ def email(  # noqa: PLR0913
         )
 
         self._client.handle_error(response, fail_message="failed to send email")
-        data = decode_response(response.content, type=EmailResponse)
+        data = decode_response(response.content, response_type=EmailResponse)
         logger.debug("successfully sent email to %r", to)
         return data

src/contiguity/imessage.py

@@ -92,7 +92,7 @@ def mark_read(self, *, to: str, from_: str) -> ReadResponse:
         )
 
         self._client.handle_error(response, fail_message="failed to send instant message")
-        data = decode_response(response.content, type=ReadResponse)
+        data = decode_response(response.content, response_type=ReadResponse)
         logger.debug("successfully sent %s read receipt to %r", self._api_path[1:], to)
         return data
 
@@ -102,4 +102,4 @@ def get_history(self, *, to: str, from_: str, limit: int = 20) -> History:
         )
 
         self._client.handle_error(response, fail_message="failed to get message history")
-        return decode_response(response.content, type=History)
+        return decode_response(response.content, response_type=History)

src/contiguity/leases.py

@@ -81,17 +81,17 @@ class Leases(BaseProduct):
     def get_available_numbers(self) -> list[NumberDetails]:
         response = self._client.get("/leases")
         self._client.handle_error(response, fail_message="failed to get available numbers")
-        return decode_response(response.content, type=list[NumberDetails])
+        return decode_response(response.content, response_type=list[NumberDetails])
 
     def get_leased_numbers(self) -> list[NumberDetails]:
         response = self._client.get("/leased")
         self._client.handle_error(response, fail_message="failed to get leased numbers")
-        return decode_response(response.content, type=list[NumberDetails])
+        return decode_response(response.content, response_type=list[NumberDetails])
 
     def get_number_details(self, number: str, /) -> NumberDetails:
         response = self._client.get(f"/lease/{number}")
         self._client.handle_error(response, fail_message="failed to get number details")
-        return decode_response(response.content, type=NumberDetails)
+        return decode_response(response.content, response_type=NumberDetails)
 
     def lease_number(
         self,
@@ -106,10 +106,10 @@ def lease_number(
             json={"billing_method": billing_method},
         )
         self._client.handle_error(response, fail_message="failed to lease number")
-        return decode_response(response.content, type=NumberDetails)
+        return decode_response(response.content, response_type=NumberDetails)
 
     def terminate_lease(self, number: NumberDetails | str, /) -> TerminateLeaseResponse:
         number = number.id if isinstance(number, NumberDetails) else number
         response = self._client.delete(f"/leased/{number}")
         self._client.handle_error(response, fail_message="failed to terminate lease")
-        return decode_response(response.content, type=TerminateLeaseResponse)
+        return decode_response(response.content, response_type=TerminateLeaseResponse)

src/contiguity/otp.py

@@ -81,7 +81,7 @@ def send(
         )
 
         self._client.handle_error(response, fail_message="failed to send OTP")
-        data = decode_response(response.content, type=OTPSendResponse)
+        data = decode_response(response.content, response_type=OTPSendResponse)
         logger.debug("successfully sent OTP %r to %r", data.otp_id, to)
         return data
 
@@ -94,7 +94,7 @@ def resend(self, otp_id: str, /) -> OTPResendResponse:
         )
 
         self._client.handle_error(response, fail_message="failed to resend OTP")
-        data = decode_response(response.content, type=OTPResendResponse)
+        data = decode_response(response.content, response_type=OTPResendResponse)
         logger.debug("successfully resent OTP %r with status: %r", otp_id, data.resent)
         return data
 
@@ -108,6 +108,6 @@ def verify(self, otp: int | str, /, *, otp_id: str) -> OTPVerifyResponse:
         )
 
         self._client.handle_error(response, fail_message="failed to verify OTP")
-        data = decode_response(response.content, type=OTPVerifyResponse)
+        data = decode_response(response.content, response_type=OTPVerifyResponse)
         logger.debug("successfully verified OTP %r with status: %r", otp_id, data.verified)
         return data

src/contiguity/text.py

@@ -44,6 +44,6 @@ def send(
         )
 
         self._client.handle_error(response, fail_message="failed to send text message")
-        data = decode_response(response.content, type=TextResponse)
+        data = decode_response(response.content, response_type=TextResponse)
         logger.debug("successfully sent text to %r", to)
         return data