Refactor token usage constants and streamline assertions in async message tests

- Simplify the definition of cache read input tokens constant.
- Consolidate assertions in async message tests for better readability and maintainability.
- Ensure consistent formatting in token usage assertions across test cases.

Author: vasantteja

instrumentation-genai/opentelemetry-instrumentation-anthropic/src/opentelemetry/instrumentation/anthropic/utils.py

@@ -55,9 +55,7 @@ class MessageRequestParams:
 _GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS = (
     "gen_ai.usage.cache_creation.input_tokens"
 )
-_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS = (
-    "gen_ai.usage.cache_read.input_tokens"
-)
+_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS = "gen_ai.usage.cache_read.input_tokens"
 
 
 def _normalize_finish_reason(stop_reason: str | None) -> str | None:
@@ -474,9 +472,7 @@ async def _extract_telemetry_from_stream(self) -> None:
             if final_message.id:
                 self._invocation.response_id = final_message.id
 
-            finish_reason = _normalize_finish_reason(
-                final_message.stop_reason
-            )
+            finish_reason = _normalize_finish_reason(final_message.stop_reason)
             if finish_reason:
                 self._invocation.finish_reasons = [finish_reason]
 

instrumentation-genai/opentelemetry-instrumentation-anthropic/tests/test_async_messages.py

@@ -16,6 +16,7 @@
 
 import pytest
 from anthropic import APIConnectionError, AsyncAnthropic, NotFoundError
+
 from opentelemetry.semconv._incubating.attributes import (
     error_attributes as ErrorAttributes,
 )
@@ -189,21 +190,18 @@ async def test_async_messages_create_token_usage(
     span = spans[0]
     assert GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS in span.attributes
     assert GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS in span.attributes
-    assert (
-        span.attributes[GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS]
-        == expected_input_tokens(response.usage)
-    )
+    assert span.attributes[
+        GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS
+    ] == expected_input_tokens(response.usage)
     assert (
         span.attributes[GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS]
         == response.usage.output_tokens
     )
-    assert (
-        span.attributes["gen_ai.usage.cache_creation.input_tokens"]
-        == (response.usage.cache_creation_input_tokens or 0)
+    assert span.attributes["gen_ai.usage.cache_creation.input_tokens"] == (
+        response.usage.cache_creation_input_tokens or 0
     )
-    assert (
-        span.attributes["gen_ai.usage.cache_read.input_tokens"]
-        == (response.usage.cache_read_input_tokens or 0)
+    assert span.attributes["gen_ai.usage.cache_read.input_tokens"] == (
+        response.usage.cache_read_input_tokens or 0
     )
 
 
@@ -509,21 +507,18 @@ async def test_async_messages_stream_token_usage(
     span = spans[0]
     assert GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS in span.attributes
     assert GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS in span.attributes
-    assert (
-        span.attributes[GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS]
-        == expected_input_tokens(final_message.usage)
-    )
+    assert span.attributes[
+        GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS
+    ] == expected_input_tokens(final_message.usage)
     assert (
         span.attributes[GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS]
         == final_message.usage.output_tokens
     )
-    assert (
-        span.attributes["gen_ai.usage.cache_creation.input_tokens"]
-        == (final_message.usage.cache_creation_input_tokens or 0)
+    assert span.attributes["gen_ai.usage.cache_creation.input_tokens"] == (
+        final_message.usage.cache_creation_input_tokens or 0
     )
-    assert (
-        span.attributes["gen_ai.usage.cache_read.input_tokens"]
-        == (final_message.usage.cache_read_input_tokens or 0)
+    assert span.attributes["gen_ai.usage.cache_read.input_tokens"] == (
+        final_message.usage.cache_read_input_tokens or 0
     )