wip: fixing the literals.

Author: eternalcuriouslearner

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/response_extractors.py

@@ -15,7 +15,10 @@
     openai_attributes as OpenAIAttributes,
 )
 
-from .utils import get_server_address_and_port
+from .utils import (
+    _openai_response_format_to_output_type,
+    get_server_address_and_port,
+)
 
 if TYPE_CHECKING:
     from openai.types.responses.response import Response
@@ -122,12 +125,8 @@ def _extract_output_type_from_value(text_config: object) -> str | None:
         return None
 
     format_type = _get_field(format_config, "type")
-    if format_type == "json_schema":
-        return GenAIAttributes.GenAiOutputTypeValues.JSON.value
-    if format_type == "text":
-        return GenAIAttributes.GenAiOutputTypeValues.TEXT.value
     if isinstance(format_type, str):
-        return format_type
+        return _openai_response_format_to_output_type(format_type)
     return None
 
 

instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/test_utils.py

@@ -19,16 +19,10 @@
 
 DEFAULT_MODEL = "gpt-4o-mini"
 DEFAULT_EMBEDDING_MODEL = "text-embedding-3-small"
-GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS = getattr(
-    GenAIAttributes,
-    "GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS",
-    "gen_ai.usage.cache_creation.input_tokens",
-)
-GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS = getattr(
-    GenAIAttributes,
-    "GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS",
-    "gen_ai.usage.cache_read.input_tokens",
+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"
 USER_ONLY_PROMPT = [{"role": "user", "content": "Say this is a test"}]
 USER_ONLY_EXPECTED_INPUT_MESSAGES = [
     {