opentelemetry-instrumentation-openai 0.36.1__py3-none-any.whl → 0.38.0__py3-none-any.whl

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/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/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/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/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/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/version.py

@@ -1 +1 @@
-__version__ = "0.36.1"
+__version__ = "0.38.0"

{opentelemetry_instrumentation_openai-0.36.1.dist-info → opentelemetry_instrumentation_openai-0.38.0.dist-info}/METADATA

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

{opentelemetry_instrumentation_openai-0.36.1.dist-info → opentelemetry_instrumentation_openai-0.38.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
 opentelemetry/instrumentation/openai/__init__.py,sha256=ly0ZPoOTAVRo1f0EeKfyTWj8_HLna3kZfIo9GWgUJk4,1888
-opentelemetry/instrumentation/openai/shared/__init__.py,sha256=HQ2qOn8fiinyUbbN55EO3aP8c33cM5IaWJ886bGiJac,9291
-opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=FiVCibvVkU1f6602HOaHodU9N95EDFOAKxmND3zhC2s,28241
-opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=P066vEEjc3tKNrnIPXi7Inc56mVhmJl5xEz1fG_vW-I,7037
+opentelemetry/instrumentation/openai/shared/__init__.py,sha256=Ha5oEgK0VrdTu10wdxs-Dqwcv2fbqw1mqlXlsngH7kg,9493
+opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=YYEYBSyqcOSlb5VNORs3LL-J749sk9ZZbOpCn8JikIU,28306
+opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=de35aM1Bjsk3GsfNAdu009OF_mdeFB7H_jBsc4LOKY0,7101
 opentelemetry/instrumentation/openai/shared/config.py,sha256=dCQviJ1a5cpFlrP0HcKgE7lpiXB98ssnumLy_CIMibQ,355
 opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=ROnTujsXOrO3YVcXiV5Z-IifeuXbPOBrdqa3Ym6IDwI,7263
 opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py,sha256=A4qdJIeJdA45SfiLaFj3Vo0Ndcqqfuew1BDsGdnJU3E,2122
-opentelemetry/instrumentation/openai/utils.py,sha256=KCxCpos2-rmIucUdwzbqbJINhs65I4TKo1DGRN-3kGU,4051
+opentelemetry/instrumentation/openai/utils.py,sha256=B085XRVvCjigZlRewFRwEFTG2hdx5gv5qVakVxgYaVo,4086
 opentelemetry/instrumentation/openai/v0/__init__.py,sha256=02-bXv0aZbscMYO2W3jsHpjU521vkVK5RzdfSeGXBzg,5475
 opentelemetry/instrumentation/openai/v1/__init__.py,sha256=B2Ut0X14KQS5in_0jLBMCvXQK73SqBy2rBFIDk5ZRkc,8688
-opentelemetry/instrumentation/openai/v1/assistant_wrappers.py,sha256=PxMeM5ikB0iedev95nDA5PunNLVme8oFsFhoKu3ipQc,7115
-opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py,sha256=nEdavNRw5mY__PnarGoaszG24BjRC8BqDYNrtLFc6cs,3296
-opentelemetry/instrumentation/openai/version.py,sha256=dtFdL58o8_wXO3x70d8jtIt4WHZs03AumzHeW_aRNrI,23
-opentelemetry_instrumentation_openai-0.36.1.dist-info/METADATA,sha256=-Aw2kR2CAI7QpIMxhRpGulEFYHSK6gRrpjiCeMEm6W4,2186
-opentelemetry_instrumentation_openai-0.36.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-opentelemetry_instrumentation_openai-0.36.1.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
-opentelemetry_instrumentation_openai-0.36.1.dist-info/RECORD,,
+opentelemetry/instrumentation/openai/v1/assistant_wrappers.py,sha256=08ZB03chvpzF-v2dtpHKCToJmm5ztYSwKhBq3pbpPlI,7191
+opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py,sha256=4HsnPwR450NA5w-KDgMfQjK8U4do_M-sMMPU4LjXyiQ,3444
+opentelemetry/instrumentation/openai/version.py,sha256=GJwyrcH1eJOX_p_9H-LSIMO2ADxtxl7estBuQ7PgzCM,23
+opentelemetry_instrumentation_openai-0.38.0.dist-info/METADATA,sha256=qEvV3MsmEgcjTd9F4I4bk0dNRLrgYkeACMdUTxq9NBY,2186
+opentelemetry_instrumentation_openai-0.38.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+opentelemetry_instrumentation_openai-0.38.0.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
+opentelemetry_instrumentation_openai-0.38.0.dist-info/RECORD,,