Skip to content

Obinna/s3 en 1111 fix cohere instrumentation #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2025
Merged

Obinna/s3 en 1111 fix cohere instrumentation #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae3598b
cast token count to int
obinnaokafor Apr 2, 2025
f83afda
bump version
obinnaokafor Apr 2, 2025
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
121 changes: 62 additions & 59 deletions src/langtrace_python_sdk/instrumentation/cohere/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,25 @@ def traced_method(wrapped, instance, args, kwargs):
and result.meta.billed_units is not None
):
usage = result.meta.billed_units
if usage is not None:
span.set_attribute(
SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
usage.input_tokens or 0,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
usage.output_tokens or 0,
)

span.set_attribute(
SpanAttributes.LLM_USAGE_TOTAL_TOKENS,
(usage.input_tokens or 0) + (usage.output_tokens or 0),
)

span.set_attribute(
"search_units",
usage.search_units or 0,
)
input_tokens = int(usage.input_tokens) if usage.input_tokens else 0
output_tokens = int(usage.output_tokens) if usage.output_tokens else 0
span.set_attribute(
SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
input_tokens,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
output_tokens,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_TOTAL_TOKENS,
input_tokens + output_tokens,
)
span.set_attribute(
"search_units",
int(usage.search_units) if usage.search_units else 0,
)


span.set_status(StatusCode.OK)
span.end()
Expand Down Expand Up @@ -309,25 +309,25 @@ def traced_method(wrapped, instance, args, kwargs):
and result.meta.billed_units is not None
):
usage = result.meta.billed_units
if usage is not None:
span.set_attribute(
SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
usage.input_tokens or 0,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
usage.output_tokens or 0,
)

span.set_attribute(
SpanAttributes.LLM_USAGE_TOTAL_TOKENS,
(usage.input_tokens or 0) + (usage.output_tokens or 0),
)

span.set_attribute(
"search_units",
usage.search_units or 0,
)
input_tokens = int(usage.input_tokens) if usage.input_tokens else 0
output_tokens = int(usage.output_tokens) if usage.output_tokens else 0
span.set_attribute(
SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
input_tokens,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
output_tokens,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_TOTAL_TOKENS,
input_tokens + output_tokens,
)
span.set_attribute(
"search_units",
int(usage.search_units) if usage.search_units else 0,
)

span.set_status(StatusCode.OK)
span.end()
return result
Expand Down Expand Up @@ -419,10 +419,12 @@ def traced_method(wrapped, instance, args, kwargs):
if (hasattr(result.usage, "billed_units") and
result.usage.billed_units is not None):
usage = result.usage.billed_units
input_tokens = int(usage.input_tokens) if usage.input_tokens else 0
output_tokens = int(usage.output_tokens) if usage.output_tokens else 0
for metric, value in {
"input": usage.input_tokens or 0,
"output": usage.output_tokens or 0,
"total": (usage.input_tokens or 0) + (usage.output_tokens or 0),
"input": input_tokens,
"output": output_tokens,
"total": input_tokens + output_tokens,
}.items():
span.set_attribute(
f"gen_ai.usage.{metric}_tokens",
Expand Down Expand Up @@ -571,26 +573,27 @@ def traced_method(wrapped, instance, args, kwargs):
and response.meta.billed_units is not None
):
usage = response.meta.billed_units
if usage is not None:
span.set_attribute(
SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
usage.input_tokens or 0,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
usage.output_tokens or 0,
)

input_tokens = int(usage.input_tokens) if usage.input_tokens else 0
output_tokens = int(usage.output_tokens) if usage.output_tokens else 0
span.set_attribute(
SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
input_tokens,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
output_tokens,
)
span.set_attribute(
SpanAttributes.LLM_USAGE_TOTAL_TOKENS,
input_tokens + output_tokens,
)

if usage.search_units is not None:
span.set_attribute(
SpanAttributes.LLM_USAGE_TOTAL_TOKENS,
(usage.input_tokens or 0)
+ (usage.output_tokens or 0),
"search_units",
int(usage.search_units) if usage.search_units else 0,
)
if usage.search_units is not None:
span.set_attribute(
"search_units",
usage.search_units or 0,
)


yield event
finally:
Expand Down
6 changes: 3 additions & 3 deletions src/langtrace_python_sdk/utils/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,19 +347,19 @@ def set_usage_attributes(span, usage):
set_span_attribute(
span,
SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
input_tokens,
int(input_tokens),
)

set_span_attribute(
span,
SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
output_tokens,
int(output_tokens),
)

set_span_attribute(
span,
SpanAttributes.LLM_USAGE_TOTAL_TOKENS,
input_tokens + output_tokens,
int(input_tokens) + int(output_tokens),
Copy link
Collaborator

@alizenhom alizenhom Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will probably break with other vendors did , can you test it with other vendors first?

)

if "search_units" in usage:
Expand Down
2 changes: 1 addition & 1 deletion src/langtrace_python_sdk/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.8.10"
__version__ = "3.8.11"