mirror of
https://github.com/anthropics/claude-code-sdk-python.git
synced 2025-07-07 22:55:01 +00:00
Fix: Remove cost_usd field and handle GeneratorExit
The CLI only sends total_cost_usd, not cost_usd. This PR: - Removes the non-existent cost_usd field from ResultMessage - Makes total_cost_usd optional since it may be missing - Handles GeneratorExit gracefully in subprocess transport - Removes unnecessary cancel scope call Fixes the error users were experiencing: - KeyError: 'cost_usd' - Field required [type=missing, input_value=...] The anyio cancel scope error still appears in logs but doesn't affect functionality. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
54bff2e85d
commit
6cc5b34d54
3 changed files with 8 additions and 11 deletions
|
@ -47,11 +47,9 @@ class InternalClient:
|
||||||
|
|
||||||
match data["type"]:
|
match data["type"]:
|
||||||
case "user":
|
case "user":
|
||||||
# Extract just the content from the nested structure
|
|
||||||
return UserMessage(content=data["message"]["content"])
|
return UserMessage(content=data["message"]["content"])
|
||||||
|
|
||||||
case "assistant":
|
case "assistant":
|
||||||
# Parse content blocks
|
|
||||||
content_blocks: list[ContentBlock] = []
|
content_blocks: list[ContentBlock] = []
|
||||||
for block in data["message"]["content"]:
|
for block in data["message"]["content"]:
|
||||||
match block["type"]:
|
match block["type"]:
|
||||||
|
@ -79,20 +77,18 @@ class InternalClient:
|
||||||
case "system":
|
case "system":
|
||||||
return SystemMessage(
|
return SystemMessage(
|
||||||
subtype=data["subtype"],
|
subtype=data["subtype"],
|
||||||
data=data, # Pass through all data
|
data=data,
|
||||||
)
|
)
|
||||||
|
|
||||||
case "result":
|
case "result":
|
||||||
# Map total_cost to total_cost_usd for consistency
|
|
||||||
return ResultMessage(
|
return ResultMessage(
|
||||||
subtype=data["subtype"],
|
subtype=data["subtype"],
|
||||||
cost_usd=data["cost_usd"],
|
|
||||||
duration_ms=data["duration_ms"],
|
duration_ms=data["duration_ms"],
|
||||||
duration_api_ms=data["duration_api_ms"],
|
duration_api_ms=data["duration_api_ms"],
|
||||||
is_error=data["is_error"],
|
is_error=data["is_error"],
|
||||||
num_turns=data["num_turns"],
|
num_turns=data["num_turns"],
|
||||||
session_id=data["session_id"],
|
session_id=data["session_id"],
|
||||||
total_cost_usd=data["total_cost"],
|
total_cost_usd=data.get("total_cost_usd"),
|
||||||
usage=data.get("usage"),
|
usage=data.get("usage"),
|
||||||
result=data.get("result"),
|
result=data.get("result"),
|
||||||
)
|
)
|
||||||
|
|
|
@ -190,7 +190,11 @@ class SubprocessCLITransport(Transport):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
data = json.loads(line_str)
|
data = json.loads(line_str)
|
||||||
yield data
|
try:
|
||||||
|
yield data
|
||||||
|
except GeneratorExit:
|
||||||
|
# Handle generator cleanup gracefully
|
||||||
|
return
|
||||||
except json.JSONDecodeError as e:
|
except json.JSONDecodeError as e:
|
||||||
if line_str.startswith("{") or line_str.startswith("["):
|
if line_str.startswith("{") or line_str.startswith("["):
|
||||||
raise SDKJSONDecodeError(line_str, e) from e
|
raise SDKJSONDecodeError(line_str, e) from e
|
||||||
|
@ -198,8 +202,6 @@ class SubprocessCLITransport(Transport):
|
||||||
|
|
||||||
except anyio.ClosedResourceError:
|
except anyio.ClosedResourceError:
|
||||||
pass
|
pass
|
||||||
finally:
|
|
||||||
tg.cancel_scope.cancel()
|
|
||||||
|
|
||||||
await self._process.wait()
|
await self._process.wait()
|
||||||
if self._process.returncode is not None and self._process.returncode != 0:
|
if self._process.returncode is not None and self._process.returncode != 0:
|
||||||
|
|
|
@ -75,13 +75,12 @@ class ResultMessage:
|
||||||
"""Result message with cost and usage information."""
|
"""Result message with cost and usage information."""
|
||||||
|
|
||||||
subtype: str
|
subtype: str
|
||||||
cost_usd: float
|
|
||||||
duration_ms: int
|
duration_ms: int
|
||||||
duration_api_ms: int
|
duration_api_ms: int
|
||||||
is_error: bool
|
is_error: bool
|
||||||
num_turns: int
|
num_turns: int
|
||||||
session_id: str
|
session_id: str
|
||||||
total_cost_usd: float
|
total_cost_usd: float | None = None
|
||||||
usage: dict[str, Any] | None = None
|
usage: dict[str, Any] | None = None
|
||||||
result: str | None = None
|
result: str | None = None
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue