Skip to content
Open
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 @@ -355,7 +355,9 @@ def _get_metadata_from_response(self, response: GenerationResponse) -> dict[str,
"prompt_feedback": response.prompt_feedback,
"usage": CompletionUsage(
prompt_tokens=response.usage_metadata.prompt_token_count,
completion_tokens=response.usage_metadata.candidates_token_count,
completion_tokens=(
response.usage_metadata.candidates_token_count + response.usage_metadata.thoughts_token_count
),
),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,9 @@ def _get_metadata_from_response(self, response: GenerationResponse) -> dict[str,
"prompt_feedback": response.prompt_feedback,
"usage": CompletionUsage(
prompt_tokens=response.usage_metadata.prompt_token_count,
completion_tokens=response.usage_metadata.candidates_token_count,
completion_tokens=(
response.usage_metadata.candidates_token_count + response.usage_metadata.thoughts_token_count
),
),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -543,3 +543,18 @@ def test_create_streaming_chat_message_content_without_thought_signature(vertex_


# endregion thought_signature deserialization tests


def test_vertex_ai_chat_completion_usage_counts_thinking_tokens(vertex_ai_unit_test_env) -> None:
from google.cloud.aiplatform_v1beta1.types.prediction_service import GenerateContentResponse
from vertexai.generative_models import GenerationResponse

response = GenerationResponse._from_gapic(
GenerateContentResponse(
usage_metadata=GenerateContentResponse.UsageMetadata(
prompt_token_count=5, candidates_token_count=10, thoughts_token_count=40, total_token_count=55
)
)
)
usage = VertexAIChatCompletion()._get_metadata_from_response(response)["usage"]
assert (usage.prompt_tokens, usage.completion_tokens) == (5, 50)
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,18 @@ async def test_vertex_ai_streaming_text_completion(


# endregion streaming text completion


def test_vertex_ai_text_completion_usage_counts_thinking_tokens(vertex_ai_unit_test_env) -> None:
from google.cloud.aiplatform_v1beta1.types.prediction_service import GenerateContentResponse
from vertexai.generative_models import GenerationResponse

response = GenerationResponse._from_gapic(
GenerateContentResponse(
usage_metadata=GenerateContentResponse.UsageMetadata(
prompt_token_count=5, candidates_token_count=10, thoughts_token_count=40, total_token_count=55
)
)
)
usage = VertexAITextCompletion()._get_metadata_from_response(response)["usage"]
assert (usage.prompt_tokens, usage.completion_tokens) == (5, 50)
Loading