Skip to content

fix: add usage_metadata None checks #429

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 1 commit into from
Dec 10, 2024
Merged

fix: add usage_metadata None checks #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/langtrace_python_sdk/instrumentation/gemini/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def set_response_attributes(
if hasattr(result, "text"):
set_event_completion(span, [{"role": "assistant", "content": result.text}])

if hasattr(result, "usage_metadata"):
if hasattr(result, "usage_metadata") and result.usage_metadata is not None:
usage = result.usage_metadata
input_tokens = usage.prompt_token_count
output_tokens = usage.candidates_token_count
Expand All @@ -152,7 +152,7 @@ def build_streaming_response(span, response):
item_to_yield = item
complete_response += str(item.text)
yield item_to_yield
if hasattr(item, "usage_metadata"):
if hasattr(item, "usage_metadata") and item.usage_metadata is not None:
usage = item.usage_metadata
input_tokens = usage.prompt_token_count
output_tokens = usage.candidates_token_count
Expand All @@ -171,7 +171,7 @@ async def abuild_streaming_response(span, response):
item_to_yield = item
complete_response += str(item.text)
yield item_to_yield
if hasattr(item, "usage_metadata"):
if hasattr(item, "usage_metadata") and item.usage_metadata is not None:
usage = item.usage_metadata
input_tokens = usage.prompt_token_count
output_tokens = usage.candidates_token_count
Expand Down
2 changes: 1 addition & 1 deletion src/langtrace_python_sdk/instrumentation/langchain_core/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def traced_method(wrapped, instance, args, kwargs):
result = wrapped(*args, **kwargs)
if trace_output:
span.set_attribute("langchain.outputs", to_json_string(result))
if hasattr(result, "usage_metadata"):
if hasattr(result, "usage_metadata") and result.usage_metadata is not None:
span.set_attribute(
SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
result.usage_metadata["input_tokens"],
Expand Down
2 changes: 1 addition & 1 deletion src/langtrace_python_sdk/instrumentation/vertexai/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def set_response_attributes(span: Span, result):
if hasattr(result, "text"):
set_event_completion(span, [{"role": "assistant", "content": result.text}])

if hasattr(result, "usage_metadata"):
if hasattr(result, "usage_metadata") and result.usage_metadata is not None:
usage = result.usage_metadata
input_tokens = usage.prompt_token_count
output_tokens = usage.candidates_token_count
Expand Down
2 changes: 1 addition & 1 deletion src/langtrace_python_sdk/utils/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ def set_usage_attributes(self, chunk):
self.completion_tokens = chunk.usage.completion_tokens

# VertexAI
if hasattr(chunk, "usage_metadata"):
if hasattr(chunk, "usage_metadata") and chunk.usage_metadata is not None:
self.completion_tokens = chunk.usage_metadata.candidates_token_count
self.prompt_tokens = chunk.usage_metadata.prompt_token_count

Expand Down
Loading