returned custom TurnkeyNetworkError

Author: moeodeh3

codegen/http/generate_http.py

@@ -104,7 +104,7 @@ def _request(self, url: str, body: Dict[str, Any], response_type: type) -> Any:
             Parsed response as Pydantic model
             
         Raises:
-            Exception: If request fails
+            TurnkeyNetworkError: If request fails
         \"\"\"
         full_url = self.base_url + url
         body_str = self._serialize_body(body)
@@ -116,19 +116,34 @@ def _request(self, url: str, body: Dict[str, Any], response_type: type) -> Any:
             "X-Client-Version": VERSION
         }
         
-        response = requests.post(
-            full_url,
-            headers=headers,
-            data=body_str,
-            timeout=self.default_timeout
-        )
+        try:
+            response = requests.post(
+                full_url,
+                headers=headers,
+                data=body_str,
+                timeout=self.default_timeout
+            )
+        except requests.RequestException as exc:
+            raise TurnkeyNetworkError(
+                "Request failed",
+                None,
+                TurnkeyErrorCodes.NETWORK_ERROR,
+                str(exc)
+            ) from exc
         
         if not response.ok:
             try:
                 error_data = response.json()
-                raise Exception(f"Turnkey API error: {error_data}")
+                error_message = error_data.get("message", str(error_data))
             except ValueError:
-                raise Exception(f"{response.status_code} {response.reason}")
+                error_message = response.text or f"{response.status_code} {response.reason}"
+            
+            raise TurnkeyNetworkError(
+                error_message,
+                response.status_code,
+                TurnkeyErrorCodes.BAD_RESPONSE,
+                response.text
+            )
         
         response_data = response.json()
         return response_type(**response_data)

packages/http/src/turnkey_http/generated/client.py

@@ -91,7 +91,7 @@ def _request(self, url: str, body: Dict[str, Any], response_type: type) -> Any:
             Parsed response as Pydantic model
 
         Raises:
-            Exception: If request fails
+            TurnkeyNetworkError: If request fails
         """
         full_url = self.base_url + url
         body_str = self._serialize_body(body)
@@ -103,16 +103,30 @@ def _request(self, url: str, body: Dict[str, Any], response_type: type) -> Any:
             "X-Client-Version": VERSION,
         }
 
-        response = requests.post(
-            full_url, headers=headers, data=body_str, timeout=self.default_timeout
-        )
+        try:
+            response = requests.post(
+                full_url, headers=headers, data=body_str, timeout=self.default_timeout
+            )
+        except requests.RequestException as exc:
+            raise TurnkeyNetworkError(
+                "Request failed", None, TurnkeyErrorCodes.NETWORK_ERROR, str(exc)
+            ) from exc
 
         if not response.ok:
             try:
                 error_data = response.json()
-                raise Exception(f"Turnkey API error: {error_data}")
+                error_message = error_data.get("message", str(error_data))
             except ValueError:
-                raise Exception(f"{response.status_code} {response.reason}")
+                error_message = (
+                    response.text or f"{response.status_code} {response.reason}"
+                )
+
+            raise TurnkeyNetworkError(
+                error_message,
+                response.status_code,
+                TurnkeyErrorCodes.BAD_RESPONSE,
+                response.text,
+            )
 
         response_data = response.json()
         return response_type(**response_data)

packages/http/tests/test_activities.py

@@ -7,6 +7,7 @@
     v1ApiKeyCurve,
     TCreateApiKeysBody,
     TGetActivityResponse,
+    TurnkeyNetworkError,
 )
 from turnkey_http.utils import send_signed_request
 
@@ -80,16 +81,18 @@ def test_organization_id_override(client, user_id):
     )
 
     # This should fail because we're using a wrong organization ID
-    with pytest.raises(Exception) as exc_info:
+    with pytest.raises(TurnkeyNetworkError) as exc_info:
         client.create_api_keys(request)
 
     # Verify the error is related to the wrong organization
-    error_msg = str(exc_info.value)
+    error = exc_info.value
+    error_msg = str(error)
     print(f"\n❌ Error message: {error_msg}")
+    print(f"   Status code: {error.status_code}")
     print(f"✅ Request failed as expected with wrong organization ID")
 
     # Assert that we got the expected error for organization not found
-    assert "ORGANIZATION_NOT_FOUND" in error_msg
+    assert "no organization found" in error_msg.lower()
     assert wrong_org_id in error_msg
 
 

packages/http/tests/test_queries.py

@@ -1,7 +1,11 @@
 """Test Turnkey HTTP client query methods"""
 
 from turnkey_http.utils import send_signed_request
-from turnkey_sdk_types import TGetOrganizationResponse, TGetOrganizationBody
+from turnkey_sdk_types import (
+    TGetOrganizationResponse,
+    TGetOrganizationBody,
+    TurnkeyNetworkError,
+)
 
 import pytest
 
@@ -106,12 +110,14 @@ def test_organization_id_override_query(client):
     request = TGetOrganizationBody(organizationId=wrong_org_id)
 
     # This should fail because we're using a wrong organization ID
-    with pytest.raises(Exception) as exc_info:
+    with pytest.raises(TurnkeyNetworkError) as exc_info:
         client.get_organization(request)
 
     # Verify the error is related to the wrong organization
-    error_msg = str(exc_info.value)
+    error = exc_info.value
+    error_msg = str(error)
     print(f"\n❌ Error message: {error_msg}")
+    print(f"   Status code: {error.status_code}")
     print(f"✅ Request failed as expected with wrong organization ID")
 
     # Assert that we got an error for invalid organization (different error than activities)

packages/sdk-types/tests/test_pydantic_aliases.py

@@ -4,6 +4,7 @@
     TEthSendTransactionBody,
 )
 
+
 def test_pydantic_aliases():
     """Test Pydantic field aliasing for Python keywords and special characters.