opentelemetry-instrumentation-openai 0.37.1__tar.gz → 0.38.1__tar.gz

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-openai
-Version: 0.37.1
+Version: 0.38.1
 Summary: OpenTelemetry OpenAI instrumentation
 License: Apache-2.0
 Author: Gal Kleinman

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/opentelemetry/instrumentation/openai/__init__.py

@@ -5,8 +5,6 @@ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 
 from opentelemetry.instrumentation.openai.shared.config import Config
 from opentelemetry.instrumentation.openai.utils import is_openai_v1
-from opentelemetry.instrumentation.openai.v0 import OpenAIV0Instrumentor
-from opentelemetry.instrumentation.openai.v1 import OpenAIV1Instrumentor
 
 _instruments = ("openai >= 0.27.0",)
 
@@ -38,12 +36,20 @@ class OpenAIInstrumentor(BaseInstrumentor):
 
     def _instrument(self, **kwargs):
         if is_openai_v1():
+            from opentelemetry.instrumentation.openai.v1 import OpenAIV1Instrumentor
+
             OpenAIV1Instrumentor().instrument(**kwargs)
         else:
+            from opentelemetry.instrumentation.openai.v0 import OpenAIV0Instrumentor
+
             OpenAIV0Instrumentor().instrument(**kwargs)
 
     def _uninstrument(self, **kwargs):
         if is_openai_v1():
+            from opentelemetry.instrumentation.openai.v1 import OpenAIV1Instrumentor
+
             OpenAIV1Instrumentor().uninstrument(**kwargs)
         else:
+            from opentelemetry.instrumentation.openai.v0 import OpenAIV0Instrumentor
+
             OpenAIV0Instrumentor().uninstrument(**kwargs)

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -11,6 +11,7 @@ from opentelemetry.trace.propagation import set_span_in_context
 from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
 
 from opentelemetry.instrumentation.openai.shared.config import Config
+from opentelemetry.semconv._incubating.attributes.gen_ai_attributes import GEN_AI_RESPONSE_ID
 from opentelemetry.semconv_ai import SpanAttributes
 from opentelemetry.instrumentation.openai.utils import (
     dont_throw,
@@ -22,6 +23,8 @@ OPENAI_LLM_USAGE_TOKEN_TYPES = ["prompt_tokens", "completion_tokens"]
 PROMPT_FILTER_KEY = "prompt_filter_results"
 PROMPT_ERROR = "prompt_error"
 
+_PYDANTIC_VERSION = version("pydantic")
+
 # tiktoken encodings map for different model, key is model_name, value is tiktoken encoding
 tiktoken_encodings = {}
 
@@ -149,6 +152,7 @@ def _set_response_attributes(span, response):
         return
 
     _set_span_attribute(span, SpanAttributes.LLM_RESPONSE_MODEL, response.get("model"))
+    _set_span_attribute(span, GEN_AI_RESPONSE_ID, response.get("id"))
 
     _set_span_attribute(
         span,
@@ -156,7 +160,6 @@ def _set_response_attributes(span, response):
         response.get("system_fingerprint"),
     )
     _log_prompt_filter(span, response)
-
     usage = response.get("usage")
     if not usage:
         return
@@ -235,7 +238,7 @@ def is_streaming_response(response):
 def model_as_dict(model):
     if isinstance(model, dict):
         return model
-    if version("pydantic") < "2.0.0":
+    if _PYDANTIC_VERSION < "2.0.0":
         return model.dict()
     if hasattr(model, "model_dump"):
         return model.model_dump()

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -700,7 +700,7 @@ def _build_from_streaming_response(
     start_time=None,
     request_kwargs=None,
 ):
-    complete_response = {"choices": [], "model": ""}
+    complete_response = {"choices": [], "model": "", "id": ""}
 
     first_token = True
     time_of_first_token = start_time  # will be updated when first token is received
@@ -767,7 +767,7 @@ async def _abuild_from_streaming_response(
     start_time=None,
     request_kwargs=None,
 ):
-    complete_response = {"choices": [], "model": ""}
+    complete_response = {"choices": [], "model": "", "id": ""}
 
     first_token = True
     time_of_first_token = start_time  # will be updated when first token is received
@@ -826,6 +826,7 @@ def _accumulate_stream_items(item, complete_response):
         item = model_as_dict(item)
 
     complete_response["model"] = item.get("model")
+    complete_response["id"] = item.get("id")
 
     # prompt filter results
     if item.get("prompt_filter_results"):

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/opentelemetry/instrumentation/openai/shared/completion_wrappers.py

@@ -142,7 +142,7 @@ def _set_completions(span, choices):
 
 @dont_throw
 def _build_from_streaming_response(span, request_kwargs, response):
-    complete_response = {"choices": [], "model": ""}
+    complete_response = {"choices": [], "model": "", "id": ""}
     for item in response:
         yield item
         _accumulate_streaming_response(complete_response, item)
@@ -160,7 +160,7 @@ def _build_from_streaming_response(span, request_kwargs, response):
 
 @dont_throw
 async def _abuild_from_streaming_response(span, request_kwargs, response):
-    complete_response = {"choices": [], "model": ""}
+    complete_response = {"choices": [], "model": "", "id": ""}
     async for item in response:
         yield item
         _accumulate_streaming_response(complete_response, item)
@@ -215,7 +215,7 @@ def _accumulate_streaming_response(complete_response, item):
         item = model_as_dict(item)
 
     complete_response["model"] = item.get("model")
-
+    complete_response["id"] = item.get("id")
     for choice in item.get("choices"):
         index = choice.get("index")
         if len(complete_response.get("choices")) <= index:

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/opentelemetry/instrumentation/openai/utils.py

@@ -9,9 +9,11 @@ import traceback
 import openai
 from opentelemetry.instrumentation.openai.shared.config import Config
 
+_OPENAI_VERSION = version("openai")
+
 
 def is_openai_v1():
-    return version("openai") >= "1.0.0"
+    return _OPENAI_VERSION >= "1.0.0"
 
 
 def is_azure_openai(instance):

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/opentelemetry/instrumentation/openai/v1/assistant_wrappers.py

@@ -151,6 +151,7 @@ def messages_list_wrapper(tracer, wrapped, instance, args, kwargs):
         _set_span_attribute(
             span, f"{prefix}.content", content[0].get("text").get("value")
         )
+        _set_span_attribute(span, f"gen_ai.response.{i}.id", msg.get("id"))
 
     if run.get("usage"):
         usage_dict = model_as_dict(run.get("usage"))

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py

@@ -81,7 +81,13 @@ class EventHandleWrapper(AssistantEventHandler):
 
     @override
     def on_message_done(self, message):
+        _set_span_attribute(
+            self._span,
+            f"gen_ai.response.{self._current_text_index}.id",
+            message.id,
+        )
         self._original_handler.on_message_done(message)
+        self._current_text_index += 1
 
     @override
     def on_text_created(self, text):
@@ -105,8 +111,6 @@ class EventHandleWrapper(AssistantEventHandler):
             text.value,
         )
 
-        self._current_text_index += 1
-
     @override
     def on_image_file_done(self, image_file):
         self._original_handler.on_image_file_done(image_file)

opentelemetry_instrumentation_openai-0.38.1/opentelemetry/instrumentation/openai/version.py

@@ -0,0 +1 @@
+__version__ = "0.38.1"

{opentelemetry_instrumentation_openai-0.37.1 → opentelemetry_instrumentation_openai-0.38.1}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.37.1"
+version = "0.38.1"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",

opentelemetry_instrumentation_openai-0.37.1/opentelemetry/instrumentation/openai/version.py

@@ -1 +0,0 @@
-__version__ = "0.37.1"