Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ def _init_request(self, inputs: TextGenerationInput) -> dict[str, Any]:

def _parse_usage(self, response_data: dict[str, Any]) -> TextGenerationUsage:
"""Parse usage from response."""
meta = response_data.get("meta", {})
usage_data = response_data.get("usage", {})

billed_units = meta.get("billed_units", {})
tokens = meta.get("tokens", {})
billed_units = usage_data.get("billed_units", {})
tokens = usage_data.get("tokens", {})

input_tokens = billed_units.get("input_tokens")
output_tokens = billed_units.get("output_tokens")
Expand All @@ -54,7 +54,7 @@ def _parse_usage(self, response_data: dict[str, Any]) -> TextGenerationUsage:
input_tokens=input_tokens,
output_tokens=output_tokens,
total_tokens=tokens.get("total_tokens") if tokens else None,
cached_tokens=meta.get("cached_tokens"),
cached_tokens=usage_data.get("cached_tokens"),
)

return TextGenerationUsage()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,6 @@
# thinking_budget: Not confirmed for this model, omit constraint
},
),
Model(
id="command-r-plus",
provider=Provider.COHERE,
display_name="Command R+",
streaming=True,
parameter_constraints={
Parameter.TEMPERATURE: Range(min=0.0, max=1.0, step=0.01),
Parameter.MAX_TOKENS: Range(min=1, max=4096, step=1),
TextGenerationParameter.OUTPUT_SCHEMA: Schema(),
# command-r-plus supports reasoning (optimized for complex reasoning)
TextGenerationParameter.THINKING_BUDGET: Range(min=-1, max=31000, step=1),
},
),
Model(
id="command-r",
provider=Provider.COHERE,
display_name="Command R",
streaming=True,
parameter_constraints={
Parameter.TEMPERATURE: Range(min=0.0, max=1.0, step=0.01),
Parameter.MAX_TOKENS: Range(min=1, max=4096, step=1),
TextGenerationParameter.OUTPUT_SCHEMA: Schema(),
# thinking_budget: Support unclear, omit constraint for now
},
),
Model(
id="command-r7b-12-2024",
provider=Provider.COHERE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ def _parse_chunk(self, event: dict[str, Any]) -> TextGenerationChunk | None:
else None
)

meta = event.get("meta", {})
usage_data = event.get("usage", {})
usage = None
if isinstance(meta, dict):
billed_units = meta.get("billed_units", {})
tokens = meta.get("tokens", {})
if isinstance(usage_data, dict):
billed_units = usage_data.get("billed_units", {})
tokens = usage_data.get("tokens", {})

input_tokens = billed_units.get("input_tokens")
output_tokens = billed_units.get("output_tokens")
Expand All @@ -108,7 +108,7 @@ def _parse_chunk(self, event: dict[str, Any]) -> TextGenerationChunk | None:
input_tokens=input_tokens,
output_tokens=output_tokens,
total_tokens=tokens.get("total_tokens") if tokens else None,
cached_tokens=meta.get("cached_tokens"),
cached_tokens=usage_data.get("cached_tokens"),
)

return TextGenerationChunk(
Expand Down
Loading