Unify manager model parsing with shared response utility

Co-authored-by: Shri Sukhani <shrisukhani@users.noreply.github.com>

Author: cursoragent

hyperbrowser/client/managers/async_manager/computer_action.py

@@ -1,6 +1,7 @@
 from pydantic import BaseModel
 from typing import Union, List, Optional
 from hyperbrowser.exceptions import HyperbrowserError
+from ..response_utils import parse_response_model
 from hyperbrowser.models import (
     SessionDetail,
     ComputerActionParams,
@@ -46,7 +47,11 @@ async def _execute_request(
             session.computer_action_endpoint,
             data=payload,
         )
-        return ComputerActionResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=ComputerActionResponse,
+            operation_name="computer action",
+        )
 
     async def click(
         self,

hyperbrowser/client/managers/async_manager/profile.py

@@ -8,6 +8,7 @@
     ProfileResponse,
 )
 from hyperbrowser.models.session import BasicResponse
+from ..response_utils import parse_response_model
 
 
 class ProfileManager:
@@ -25,19 +26,31 @@ async def create(
                 else params.model_dump(exclude_none=True, by_alias=True)
             ),
         )
-        return CreateProfileResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=CreateProfileResponse,
+            operation_name="create profile",
+        )
 
     async def get(self, id: str) -> ProfileResponse:
         response = await self._client.transport.get(
             self._client._build_url(f"/profile/{id}"),
         )
-        return ProfileResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=ProfileResponse,
+            operation_name="get profile",
+        )
 
     async def delete(self, id: str) -> BasicResponse:
         response = await self._client.transport.delete(
             self._client._build_url(f"/profile/{id}"),
         )
-        return BasicResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=BasicResponse,
+            operation_name="delete profile",
+        )
 
     async def list(
         self, params: Optional[ProfileListParams] = None
@@ -47,4 +60,8 @@ async def list(
             self._client._build_url("/profiles"),
             params=params_obj.model_dump(exclude_none=True, by_alias=True),
         )
-        return ProfileListResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=ProfileListResponse,
+            operation_name="list profiles",
+        )

hyperbrowser/client/managers/async_manager/team.py

@@ -1,4 +1,5 @@
 from hyperbrowser.models import TeamCreditInfo
+from ..response_utils import parse_response_model
 
 
 class TeamManager:
@@ -9,4 +10,8 @@ async def get_credit_info(self) -> TeamCreditInfo:
         response = await self._client.transport.get(
             self._client._build_url("/team/credit-info")
         )
-        return TeamCreditInfo(**response.data)
+        return parse_response_model(
+            response.data,
+            model=TeamCreditInfo,
+            operation_name="team credit info",
+        )

hyperbrowser/client/managers/async_manager/web/__init__.py

@@ -7,6 +7,7 @@
     WebSearchResponse,
 )
 from ....schema_utils import inject_web_output_schemas
+from ...response_utils import parse_response_model
 
 
 class WebManager:
@@ -25,11 +26,19 @@ async def fetch(self, params: FetchParams) -> FetchResponse:
             self._client._build_url("/web/fetch"),
             data=payload,
         )
-        return FetchResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=FetchResponse,
+            operation_name="web fetch",
+        )
 
     async def search(self, params: WebSearchParams) -> WebSearchResponse:
         response = await self._client.transport.post(
             self._client._build_url("/web/search"),
             data=params.model_dump(exclude_none=True, by_alias=True),
         )
-        return WebSearchResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=WebSearchResponse,
+            operation_name="web search",
+        )

hyperbrowser/client/managers/response_utils.py

@@ -0,0 +1,36 @@
+from collections.abc import Mapping
+from typing import Any, Type, TypeVar
+
+from hyperbrowser.exceptions import HyperbrowserError
+
+T = TypeVar("T")
+
+
+def parse_response_model(
+    response_data: Any,
+    *,
+    model: Type[T],
+    operation_name: str,
+) -> T:
+    if not isinstance(operation_name, str) or not operation_name.strip():
+        raise HyperbrowserError("operation_name must be a non-empty string")
+    if not isinstance(response_data, Mapping):
+        raise HyperbrowserError(f"Expected {operation_name} response to be an object")
+    try:
+        response_payload = dict(response_data)
+    except HyperbrowserError:
+        raise
+    except Exception as exc:
+        raise HyperbrowserError(
+            f"Failed to read {operation_name} response data",
+            original_error=exc,
+        ) from exc
+    try:
+        return model(**response_payload)
+    except HyperbrowserError:
+        raise
+    except Exception as exc:
+        raise HyperbrowserError(
+            f"Failed to parse {operation_name} response",
+            original_error=exc,
+        ) from exc

hyperbrowser/client/managers/session_utils.py

@@ -3,6 +3,7 @@
 
 from hyperbrowser.exceptions import HyperbrowserError
 from hyperbrowser.models.session import SessionRecording
+from .response_utils import parse_response_model
 
 T = TypeVar("T")
 
@@ -13,28 +14,11 @@ def parse_session_response_model(
     model: Type[T],
     operation_name: str,
 ) -> T:
-    if not isinstance(operation_name, str) or not operation_name.strip():
-        raise HyperbrowserError("operation_name must be a non-empty string")
-    if not isinstance(response_data, Mapping):
-        raise HyperbrowserError(f"Expected {operation_name} response to be an object")
-    try:
-        response_payload = dict(response_data)
-    except HyperbrowserError:
-        raise
-    except Exception as exc:
-        raise HyperbrowserError(
-            f"Failed to read {operation_name} response data",
-            original_error=exc,
-        ) from exc
-    try:
-        return model(**response_payload)
-    except HyperbrowserError:
-        raise
-    except Exception as exc:
-        raise HyperbrowserError(
-            f"Failed to parse {operation_name} response",
-            original_error=exc,
-        ) from exc
+    return parse_response_model(
+        response_data,
+        model=model,
+        operation_name=operation_name,
+    )
 
 
 def parse_session_recordings_response_data(response_data: Any) -> List[SessionRecording]:

hyperbrowser/client/managers/sync_manager/computer_action.py

@@ -1,6 +1,7 @@
 from pydantic import BaseModel
 from typing import Union, List, Optional
 from hyperbrowser.exceptions import HyperbrowserError
+from ..response_utils import parse_response_model
 from hyperbrowser.models import (
     SessionDetail,
     ComputerActionParams,
@@ -46,7 +47,11 @@ def _execute_request(
             session.computer_action_endpoint,
             data=payload,
         )
-        return ComputerActionResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=ComputerActionResponse,
+            operation_name="computer action",
+        )
 
     def click(
         self,

hyperbrowser/client/managers/sync_manager/profile.py

@@ -8,6 +8,7 @@
     ProfileResponse,
 )
 from hyperbrowser.models.session import BasicResponse
+from ..response_utils import parse_response_model
 
 
 class ProfileManager:
@@ -25,24 +26,40 @@ def create(
                 else params.model_dump(exclude_none=True, by_alias=True)
             ),
         )
-        return CreateProfileResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=CreateProfileResponse,
+            operation_name="create profile",
+        )
 
     def get(self, id: str) -> ProfileResponse:
         response = self._client.transport.get(
             self._client._build_url(f"/profile/{id}"),
         )
-        return ProfileResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=ProfileResponse,
+            operation_name="get profile",
+        )
 
     def delete(self, id: str) -> BasicResponse:
         response = self._client.transport.delete(
             self._client._build_url(f"/profile/{id}"),
         )
-        return BasicResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=BasicResponse,
+            operation_name="delete profile",
+        )
 
     def list(self, params: Optional[ProfileListParams] = None) -> ProfileListResponse:
         params_obj = params or ProfileListParams()
         response = self._client.transport.get(
             self._client._build_url("/profiles"),
             params=params_obj.model_dump(exclude_none=True, by_alias=True),
         )
-        return ProfileListResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=ProfileListResponse,
+            operation_name="list profiles",
+        )

hyperbrowser/client/managers/sync_manager/team.py

@@ -1,4 +1,5 @@
 from hyperbrowser.models import TeamCreditInfo
+from ..response_utils import parse_response_model
 
 
 class TeamManager:
@@ -9,4 +10,8 @@ def get_credit_info(self) -> TeamCreditInfo:
         response = self._client.transport.get(
             self._client._build_url("/team/credit-info")
         )
-        return TeamCreditInfo(**response.data)
+        return parse_response_model(
+            response.data,
+            model=TeamCreditInfo,
+            operation_name="team credit info",
+        )

hyperbrowser/client/managers/sync_manager/web/__init__.py

@@ -7,6 +7,7 @@
     WebSearchResponse,
 )
 from ....schema_utils import inject_web_output_schemas
+from ...response_utils import parse_response_model
 
 
 class WebManager:
@@ -25,11 +26,19 @@ def fetch(self, params: FetchParams) -> FetchResponse:
             self._client._build_url("/web/fetch"),
             data=payload,
         )
-        return FetchResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=FetchResponse,
+            operation_name="web fetch",
+        )
 
     def search(self, params: WebSearchParams) -> WebSearchResponse:
         response = self._client.transport.post(
             self._client._build_url("/web/search"),
             data=params.model_dump(exclude_none=True, by_alias=True),
         )
-        return WebSearchResponse(**response.data)
+        return parse_response_model(
+            response.data,
+            model=WebSearchResponse,
+            operation_name="web search",
+        )