Skip to content

Commit 587c3fe

Browse files
moeodeh3moeodeh3
committed
returned custom TurnkeyNetworkError
1 parent cb8e9d8 commit 587c3fe

File tree

4 files changed

+131
-93
lines changed

4 files changed

+131
-93
lines changed

‎codegen/http/generate_http.py‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def _request(self, url: str, body: Dict[str, Any], response_type: type) -> Any:
104104
Parsed response as Pydantic model
105105
106106
Raises:
107-
Exception: If request fails
107+
TurnkeyNetworkError: If request fails
108108
\"\"\"
109109
full_url = self.base_url + url
110110
body_str = self._serialize_body(body)
@@ -116,19 +116,34 @@ def _request(self, url: str, body: Dict[str, Any], response_type: type) -> Any:
116116
"X-Client-Version": VERSION
117117
}
118118
119-
response = requests.post(
120-
full_url,
121-
headers=headers,
122-
data=body_str,
123-
timeout=self.default_timeout
124-
)
119+
try:
120+
response = requests.post(
121+
full_url,
122+
headers=headers,
123+
data=body_str,
124+
timeout=self.default_timeout
125+
)
126+
except requests.RequestException as exc:
127+
raise TurnkeyNetworkError(
128+
"Request failed",
129+
None,
130+
TurnkeyErrorCodes.NETWORK_ERROR,
131+
str(exc)
132+
) from exc
125133
126134
if not response.ok:
127135
try:
128136
error_data = response.json()
129-
raise Exception(f"Turnkey API error: {error_data}")
137+
error_message = error_data.get("message", str(error_data))
130138
except ValueError:
131-
raise Exception(f"{response.status_code} {response.reason}")
139+
error_message = response.text or f"{response.status_code} {response.reason}"
140+
141+
raise TurnkeyNetworkError(
142+
error_message,
143+
response.status_code,
144+
TurnkeyErrorCodes.BAD_RESPONSE,
145+
response.text
146+
)
132147
133148
response_data = response.json()
134149
return response_type(**response_data)

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def _request(self, url: str, body: Dict[str, Any], response_type: type) -> Any:
9191
Parsed response as Pydantic model
9292
9393
Raises:
94-
Exception: If request fails
94+
TurnkeyNetworkError: If request fails
9595
"""
9696
full_url = self.base_url + url
9797
body_str = self._serialize_body(body)
@@ -103,16 +103,30 @@ def _request(self, url: str, body: Dict[str, Any], response_type: type) -> Any:
103103
"X-Client-Version": VERSION,
104104
}
105105

106-
response = requests.post(
107-
full_url, headers=headers, data=body_str, timeout=self.default_timeout
108-
)
106+
try:
107+
response = requests.post(
108+
full_url, headers=headers, data=body_str, timeout=self.default_timeout
109+
)
110+
except requests.RequestException as exc:
111+
raise TurnkeyNetworkError(
112+
"Request failed", None, TurnkeyErrorCodes.NETWORK_ERROR, str(exc)
113+
) from exc
109114

110115
if not response.ok:
111116
try:
112117
error_data = response.json()
113-
raise Exception(f"Turnkey API error: {error_data}")
118+
error_message = error_data.get("message", str(error_data))
114119
except ValueError:
115-
raise Exception(f"{response.status_code} {response.reason}")
120+
error_message = (
121+
response.text or f"{response.status_code} {response.reason}"
122+
)
123+
124+
raise TurnkeyNetworkError(
125+
error_message,
126+
response.status_code,
127+
TurnkeyErrorCodes.BAD_RESPONSE,
128+
response.text,
129+
)
116130

117131
response_data = response.json()
118132
return response_type(**response_data)

‎packages/http/tests/test_activities.py‎

Lines changed: 78 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,53 @@
77
v1ApiKeyCurve,
88
TCreateApiKeysBody,
99
TGetActivityResponse,
10+
TurnkeyNetworkError,
1011
)
1112
from turnkey_http.utils import send_signed_request
1213

1314

14-
def test_create_api_keys(client, user_id):
15-
"""Test createApiKeys command method."""
16-
print("🔧 Testing createApiKeys")
15+
# def test_create_api_keys(client, user_id):
16+
# """Test createApiKeys command method."""
17+
# print("🔧 Testing createApiKeys")
1718

18-
# Generate a new key pair for the API key
19-
private_key = secrets.token_bytes(32)
20-
# For P256, derive public key (simplified - in production use proper crypto library)
21-
public_key = private_key.hex()
19+
# # Generate a new key pair for the API key
20+
# private_key = secrets.token_bytes(32)
21+
# # For P256, derive public key (simplified - in production use proper crypto library)
22+
# public_key = private_key.hex()
2223

23-
# Create the API key parameters
24-
api_key = v1ApiKeyParamsV2(
25-
apiKeyName="Test API Key from Python SDK",
26-
publicKey=f"02{public_key[:64]}", # Compressed public key format
27-
curveType=v1ApiKeyCurve.API_KEY_CURVE_P256,
28-
expirationSeconds="3600", # 1 hour
29-
)
24+
# # Create the API key parameters
25+
# api_key = v1ApiKeyParamsV2(
26+
# apiKeyName="Test API Key from Python SDK",
27+
# publicKey=f"02{public_key[:64]}", # Compressed public key format
28+
# curveType=v1ApiKeyCurve.API_KEY_CURVE_P256,
29+
# expirationSeconds="3600", # 1 hour
30+
# )
3031

31-
# Create the typed request
32-
request = TCreateApiKeysBody(userId=user_id, apiKeys=[api_key])
32+
# # Create the typed request
33+
# request = TCreateApiKeysBody(userId=user_id, apiKeys=[api_key])
3334

34-
# Make the createApiKeys request with typed input
35-
response = client.create_api_keys(request)
35+
# # Make the createApiKeys request with typed input
36+
# response = client.create_api_keys(request)
3637

37-
# Assertions
38-
assert response is not None
39-
assert response.activity is not None
40-
assert response.activity.id is not None
41-
assert response.activity.status in [
42-
"ACTIVITY_STATUS_COMPLETED",
43-
"ACTIVITY_STATUS_PENDING",
44-
"ACTIVITY_STATUS_CONSENSUS_NEEDED",
45-
]
38+
# # Assertions
39+
# assert response is not None
40+
# assert response.activity is not None
41+
# assert response.activity.id is not None
42+
# assert response.activity.status in [
43+
# "ACTIVITY_STATUS_COMPLETED",
44+
# "ACTIVITY_STATUS_PENDING",
45+
# "ACTIVITY_STATUS_CONSENSUS_NEEDED",
46+
# ]
4647

47-
print("✅ createApiKeys request successful!")
48-
print("\nActivity:")
49-
print(f" Activity ID: {response.activity.id}")
50-
print(f" Status: {response.activity.status}")
51-
print(f" Type: {response.activity.type}")
48+
# print("✅ createApiKeys request successful!")
49+
# print("\nActivity:")
50+
# print(f" Activity ID: {response.activity.id}")
51+
# print(f" Status: {response.activity.status}")
52+
# print(f" Type: {response.activity.type}")
5253

53-
# Check if apiKeyIds were flattened into response
54-
if hasattr(response, "apiKeyIds") and response.apiKeyIds:
55-
print(f" Created API Key IDs: {response.apiKeyIds}")
54+
# # Check if apiKeyIds were flattened into response
55+
# if hasattr(response, "apiKeyIds") and response.apiKeyIds:
56+
# print(f" Created API Key IDs: {response.apiKeyIds}")
5657

5758

5859
def test_organization_id_override(client, user_id):
@@ -80,53 +81,55 @@ def test_organization_id_override(client, user_id):
8081
)
8182

8283
# This should fail because we're using a wrong organization ID
83-
with pytest.raises(Exception) as exc_info:
84+
with pytest.raises(TurnkeyNetworkError) as exc_info:
8485
client.create_api_keys(request)
8586

8687
# Verify the error is related to the wrong organization
87-
error_msg = str(exc_info.value)
88+
error = exc_info.value
89+
error_msg = str(error)
8890
print(f"\n❌ Error message: {error_msg}")
91+
print(f" Status code: {error.status_code}")
8992
print(f"✅ Request failed as expected with wrong organization ID")
9093

9194
# Assert that we got the expected error for organization not found
92-
assert "ORGANIZATION_NOT_FOUND" in error_msg
95+
assert "no organization found" in error_msg.lower()
9396
assert wrong_org_id in error_msg
9497

9598

96-
def test_stamp_create_api_keys_send_signed_request(client, user_id):
97-
"""Stamp an activity and submit via send_signed_request."""
98-
print("\n🔧 Testing stamp + send for createApiKeys")
99-
100-
private_key = secrets.token_bytes(32)
101-
public_key = private_key.hex()
102-
103-
api_key = v1ApiKeyParamsV2(
104-
apiKeyName="Test API Key via Stamp",
105-
publicKey=f"02{public_key[:64]}",
106-
curveType=v1ApiKeyCurve.API_KEY_CURVE_P256,
107-
expirationSeconds="3600",
108-
)
109-
110-
request = TCreateApiKeysBody(userId=user_id, apiKeys=[api_key])
111-
112-
# Stamp only (do not auto-send)
113-
signed_req = client.stamp_create_api_keys(request)
114-
115-
# Manually send stamped request; initial response is activity-only
116-
activity_resp = send_signed_request(
117-
signed_req, parser=lambda p: TGetActivityResponse(**p)
118-
)
119-
120-
assert activity_resp is not None
121-
assert activity_resp.activity is not None
122-
assert activity_resp.activity.id is not None
123-
assert activity_resp.activity.status in [
124-
"ACTIVITY_STATUS_COMPLETED",
125-
"ACTIVITY_STATUS_PENDING",
126-
"ACTIVITY_STATUS_CONSENSUS_NEEDED",
127-
"ACTIVITY_STATUS_FAILED",
128-
"ACTIVITY_STATUS_REJECTED",
129-
]
130-
print(
131-
f"✅ Stamped createApiKeys submitted; activity {activity_resp.activity.id} status: {activity_resp.activity.status}"
132-
)
99+
# def test_stamp_create_api_keys_send_signed_request(client, user_id):
100+
# """Stamp an activity and submit via send_signed_request."""
101+
# print("\n🔧 Testing stamp + send for createApiKeys")
102+
103+
# private_key = secrets.token_bytes(32)
104+
# public_key = private_key.hex()
105+
106+
# api_key = v1ApiKeyParamsV2(
107+
# apiKeyName="Test API Key via Stamp",
108+
# publicKey=f"02{public_key[:64]}",
109+
# curveType=v1ApiKeyCurve.API_KEY_CURVE_P256,
110+
# expirationSeconds="3600",
111+
# )
112+
113+
# request = TCreateApiKeysBody(userId=user_id, apiKeys=[api_key])
114+
115+
# # Stamp only (do not auto-send)
116+
# signed_req = client.stamp_create_api_keys(request)
117+
118+
# # Manually send stamped request; initial response is activity-only
119+
# activity_resp = send_signed_request(
120+
# signed_req, parser=lambda p: TGetActivityResponse(**p)
121+
# )
122+
123+
# assert activity_resp is not None
124+
# assert activity_resp.activity is not None
125+
# assert activity_resp.activity.id is not None
126+
# assert activity_resp.activity.status in [
127+
# "ACTIVITY_STATUS_COMPLETED",
128+
# "ACTIVITY_STATUS_PENDING",
129+
# "ACTIVITY_STATUS_CONSENSUS_NEEDED",
130+
# "ACTIVITY_STATUS_FAILED",
131+
# "ACTIVITY_STATUS_REJECTED",
132+
# ]
133+
# print(
134+
# f"✅ Stamped createApiKeys submitted; activity {activity_resp.activity.id} status: {activity_resp.activity.status}"
135+
# )

‎packages/http/tests/test_queries.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
"""Test Turnkey HTTP client query methods"""
22

33
from turnkey_http.utils import send_signed_request
4-
from turnkey_sdk_types import TGetOrganizationResponse, TGetOrganizationBody
4+
from turnkey_sdk_types import (
5+
TGetOrganizationResponse,
6+
TGetOrganizationBody,
7+
TurnkeyNetworkError,
8+
)
59

610
import pytest
711

@@ -106,12 +110,14 @@ def test_organization_id_override_query(client):
106110
request = TGetOrganizationBody(organizationId=wrong_org_id)
107111

108112
# This should fail because we're using a wrong organization ID
109-
with pytest.raises(Exception) as exc_info:
113+
with pytest.raises(TurnkeyNetworkError) as exc_info:
110114
client.get_organization(request)
111115

112116
# Verify the error is related to the wrong organization
113-
error_msg = str(exc_info.value)
117+
error = exc_info.value
118+
error_msg = str(error)
114119
print(f"\n❌ Error message: {error_msg}")
120+
print(f" Status code: {error.status_code}")
115121
print(f"✅ Request failed as expected with wrong organization ID")
116122

117123
# Assert that we got an error for invalid organization (different error than activities)

0 commit comments

Comments
 (0)