opentelemetry-instrumentation-openai 0.21.5__tar.gz → 0.22.1__tar.gz

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.21.5
+Version: 0.22.1
 Summary: OpenTelemetry OpenAI instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 License: Apache-2.0
@@ -17,7 +17,7 @@ Provides-Extra: instruments
 Requires-Dist: opentelemetry-api (>=1.25.0,<2.0.0)
 Requires-Dist: opentelemetry-instrumentation (>=0.46b0,<0.47)
 Requires-Dist: opentelemetry-semantic-conventions (>=0.46b0,<0.47)
-Requires-Dist: opentelemetry-semantic-conventions-ai (==0.2.0)
+Requires-Dist: opentelemetry-semantic-conventions-ai (==0.3.1)
 Requires-Dist: tiktoken (>=0.6.0,<1)
 Project-URL: Repository, https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 Description-Content-Type: text/markdown

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -15,10 +15,6 @@ from opentelemetry.instrumentation.openai.utils import (
     should_record_stream_token_usage,
 )
 
-OPENAI_API_VERSION = "openai.api_version"
-OPENAI_API_BASE = "openai.api_base"
-OPENAI_API_TYPE = "openai.api_type"
-
 OPENAI_LLM_USAGE_TOKEN_TYPES = ["prompt_tokens", "completion_tokens"]
 
 # tiktoken encodings map for different model, key is model_name, value is tiktoken encoding
@@ -49,10 +45,12 @@ def _set_client_attributes(span, instance):
 
     client = instance._client  # pylint: disable=protected-access
     if isinstance(client, (openai.AsyncOpenAI, openai.OpenAI)):
-        _set_span_attribute(span, OPENAI_API_BASE, str(client.base_url))
+        _set_span_attribute(
+            span, SpanAttributes.LLM_OPENAI_API_BASE, str(client.base_url)
+        )
     if isinstance(client, (openai.AsyncAzureOpenAI, openai.AzureOpenAI)):
         _set_span_attribute(
-            span, OPENAI_API_VERSION, client._api_version
+            span, SpanAttributes.LLM_OPENAI_API_VERSION, client._api_version
         )  # pylint: disable=protected-access
 
 
@@ -65,9 +63,9 @@ def _set_api_attributes(span):
 
     base_url = openai.base_url if hasattr(openai, "base_url") else openai.api_base
 
-    _set_span_attribute(span, OPENAI_API_BASE, base_url)
-    _set_span_attribute(span, OPENAI_API_TYPE, openai.api_type)
-    _set_span_attribute(span, OPENAI_API_VERSION, openai.api_version)
+    _set_span_attribute(span, SpanAttributes.LLM_OPENAI_API_BASE, base_url)
+    _set_span_attribute(span, SpanAttributes.LLM_OPENAI_API_TYPE, openai.api_type)
+    _set_span_attribute(span, SpanAttributes.LLM_OPENAI_API_VERSION, openai.api_version)
 
     return
 
@@ -142,7 +140,9 @@ def _set_response_attributes(span, response):
     _set_span_attribute(span, SpanAttributes.LLM_RESPONSE_MODEL, response.get("model"))
 
     _set_span_attribute(
-        span, "gen_ai.openai.system_fingerprint", response.get("system_fingerprint")
+        span,
+        SpanAttributes.LLM_OPENAI_RESPONSE_SYSTEM_FINGERPRINT,
+        response.get("system_fingerprint"),
     )
 
     usage = response.get("usage")
@@ -260,8 +260,8 @@ def _metric_shared_attributes(
     response_model: str, operation: str, server_address: str, is_streaming: bool = False
 ):
     return {
-        "gen_ai.system": "openai",
-        "gen_ai.response.model": response_model,
+        SpanAttributes.LLM_SYSTEM: "openai",
+        SpanAttributes.LLM_RESPONSE_MODEL: response_model,
         "gen_ai.operation.name": operation,
         "server.address": server_address,
         "stream": is_streaming,

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -296,8 +296,8 @@ def _set_choice_counter_metrics(choice_counter, choices, shared_attributes):
     for choice in choices:
         attributes_with_reason = {**shared_attributes}
         if choice.get("finish_reason"):
-            attributes_with_reason["llm.response.finish_reason"] = choice.get(
-                "finish_reason"
+            attributes_with_reason[SpanAttributes.LLM_RESPONSE_FINISH_REASON] = (
+                choice.get("finish_reason")
             )
         choice_counter.add(1, attributes=attributes_with_reason)
 
@@ -307,7 +307,7 @@ def _set_token_counter_metrics(token_counter, usage, shared_attributes):
         if name in OPENAI_LLM_USAGE_TOKEN_TYPES:
             attributes_with_token_type = {
                 **shared_attributes,
-                "gen_ai.token.type": _token_type(name),
+                SpanAttributes.LLM_TOKEN_TYPE: _token_type(name),
             }
             token_counter.record(val, attributes=attributes_with_token_type)
 
@@ -424,14 +424,14 @@ def _set_streaming_token_metrics(
         if type(prompt_usage) is int and prompt_usage >= 0:
             attributes_with_token_type = {
                 **shared_attributes,
-                "gen_ai.token.type": "input",
+                SpanAttributes.LLM_TOKEN_TYPE: "input",
             }
             token_counter.record(prompt_usage, attributes=attributes_with_token_type)
 
         if type(completion_usage) is int and completion_usage >= 0:
             attributes_with_token_type = {
                 **shared_attributes,
-                "gen_ai.token.type": "output",
+                SpanAttributes.LLM_TOKEN_TYPE: "output",
             }
             token_counter.record(
                 completion_usage, attributes=attributes_with_token_type
@@ -520,7 +520,7 @@ class ChatStream(ObjectProxy):
             return chunk
 
     def _process_item(self, item):
-        self._span.add_event(name="llm.content.completion.chunk")
+        self._span.add_event(name=f"{SpanAttributes.LLM_CONTENT_COMPLETION_CHUNK}")
 
         if self._first_token and self._streaming_time_to_first_token:
             self._time_of_first_token = time.time()
@@ -551,6 +551,23 @@ class ChatStream(ObjectProxy):
                 complete_choice["message"]["content"] += delta.get("content")
             if delta and delta.get("role"):
                 complete_choice["message"]["role"] = delta.get("role")
+            if delta and delta.get("tool_calls"):
+                tool_calls = delta.get("tool_calls")
+                if not isinstance(tool_calls, list) or len(tool_calls) == 0:
+                    continue
+
+                if not complete_choice["message"].get("tool_calls"):
+                    complete_choice["message"]["tool_calls"] = [
+                        {"function": {"name": "", "arguments": ""}}
+                    ]
+
+                tool_call = tool_calls[0]
+                function = complete_choice["message"]["tool_calls"][0]["function"]
+
+                if tool_call.get("function") and tool_call["function"].get("name"):
+                    function["name"] += tool_call["function"]["name"]
+                if tool_call.get("function") and tool_call["function"].get("arguments"):
+                    function["arguments"] += tool_call["function"]["arguments"]
 
     def _shared_attributes(self):
         return _metric_shared_attributes(
@@ -564,14 +581,13 @@ class ChatStream(ObjectProxy):
 
     @dont_throw
     def _close_span(self):
-        if not is_azure_openai(self._instance):
-            _set_streaming_token_metrics(
-                self._request_kwargs,
-                self._complete_response,
-                self._span,
-                self._token_counter,
-                self._shared_attributes(),
-            )
+        _set_streaming_token_metrics(
+            self._request_kwargs,
+            self._complete_response,
+            self._span,
+            self._token_counter,
+            self._shared_attributes(),
+        )
 
         # choice metrics
         if self._choice_counter and self._complete_response.get("choices"):
@@ -627,7 +643,7 @@ def _build_from_streaming_response(
     time_of_first_token = start_time  # will be updated when first token is received
 
     for item in response:
-        span.add_event(name="llm.content.completion.chunk")
+        span.add_event(name=f"{SpanAttributes.LLM_CONTENT_COMPLETION_CHUNK}")
 
         item_to_yield = item
 
@@ -641,15 +657,14 @@ def _build_from_streaming_response(
         yield item_to_yield
 
     shared_attributes = {
-        "gen_ai.response.model": complete_response.get("model") or None,
+        SpanAttributes.LLM_RESPONSE_MODEL: complete_response.get("model") or None,
         "server.address": _get_openai_base_url(instance),
         "stream": True,
     }
 
-    if not is_azure_openai(instance):
-        _set_streaming_token_metrics(
-            request_kwargs, complete_response, span, token_counter, shared_attributes
-        )
+    _set_streaming_token_metrics(
+        request_kwargs, complete_response, span, token_counter, shared_attributes
+    )
 
     # choice metrics
     if choice_counter and complete_response.get("choices"):
@@ -695,7 +710,7 @@ async def _abuild_from_streaming_response(
     time_of_first_token = start_time  # will be updated when first token is received
 
     async for item in response:
-        span.add_event(name="llm.content.completion.chunk")
+        span.add_event(name=f"{SpanAttributes.LLM_CONTENT_COMPLETION_CHUNK}")
 
         item_to_yield = item
 
@@ -709,7 +724,7 @@ async def _abuild_from_streaming_response(
         yield item_to_yield
 
     shared_attributes = {
-        "gen_ai.response.model": complete_response.get("model") or None,
+        SpanAttributes.LLM_RESPONSE_MODEL: complete_response.get("model") or None,
         "server.address": _get_openai_base_url(instance),
         "stream": True,
     }

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py

@@ -203,7 +203,7 @@ def _set_embeddings_metrics(
             if name in OPENAI_LLM_USAGE_TOKEN_TYPES:
                 attributes_with_token_type = {
                     **shared_attributes,
-                    "gen_ai.token.type": _token_type(name),
+                    SpanAttributes.LLM_TOKEN_TYPE: _token_type(name),
                 }
                 token_counter.record(val, attributes=attributes_with_token_type)
 

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py

@@ -1,10 +1,6 @@
 import time
 
 from opentelemetry import context as context_api
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
-
-from opentelemetry.metrics import Counter, Histogram
-
 from opentelemetry.instrumentation.openai import is_openai_v1
 from opentelemetry.instrumentation.openai.shared import (
     _get_openai_base_url,
@@ -14,6 +10,8 @@ from opentelemetry.instrumentation.openai.shared import (
 from opentelemetry.instrumentation.openai.utils import (
     _with_image_gen_metric_wrapper,
 )
+from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.metrics import Counter, Histogram
 
 
 @_with_image_gen_metric_wrapper

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/opentelemetry/instrumentation/openai/utils.py

@@ -2,6 +2,7 @@ from importlib.metadata import version
 from contextlib import asynccontextmanager
 import logging
 import os
+import traceback
 
 import openai
 from opentelemetry.instrumentation.openai.shared.config import Config
@@ -124,7 +125,9 @@ def dont_throw(func):
             return func(*args, **kwargs)
         except Exception as e:
             logger.debug(
-                "OpenLLMetry failed to trace in %s, error: %s", func.__name__, str(e)
+                "OpenLLMetry failed to trace in %s, error: %s",
+                func.__name__,
+                traceback.format_exc(),
             )
             if Config.exception_logger:
                 Config.exception_logger(e)

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/opentelemetry/instrumentation/openai/v0/__init__.py

@@ -19,6 +19,7 @@ from opentelemetry.instrumentation.openai.shared.embeddings_wrappers import (
 )
 from opentelemetry.instrumentation.openai.utils import is_metrics_enabled
 from opentelemetry.instrumentation.openai.version import __version__
+from opentelemetry.semconv.ai import Meters
 
 _instruments = ("openai >= 0.27.0", "openai < 1.0.0")
 
@@ -36,36 +37,36 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
 
         if is_metrics_enabled():
             tokens_histogram = meter.create_histogram(
-                name="gen_ai.client.token.usage",
+                name=Meters.LLM_TOKEN_USAGE,
                 unit="token",
                 description="Measures number of input and output tokens used",
             )
 
             chat_choice_counter = meter.create_counter(
-                name="gen_ai.client.generation.choices",
+                name=Meters.LLM_GENERATION_CHOICES,
                 unit="choice",
                 description="Number of choices returned by chat completions call",
             )
 
-            chat_duration_histogram = meter.create_histogram(
-                name="gen_ai.client.operation.duration",
+            duration_histogram = meter.create_histogram(
+                name=Meters.LLM_OPERATION_DURATION,
                 unit="s",
                 description="GenAI operation duration",
             )
 
             chat_exception_counter = meter.create_counter(
-                name="llm.openai.chat_completions.exceptions",
+                name=Meters.LLM_COMPLETIONS_EXCEPTIONS,
                 unit="time",
                 description="Number of exceptions occurred during chat completions",
             )
 
             streaming_time_to_first_token = meter.create_histogram(
-                name="llm.openai.chat_completions.streaming_time_to_first_token",
+                name=Meters.LLM_STREAMING_TIME_TO_FIRST_TOKEN,
                 unit="s",
                 description="Time to first token in streaming chat completions",
             )
             streaming_time_to_generate = meter.create_histogram(
-                name="llm.openai.chat_completions.streaming_time_to_generate",
+                name=Meters.LLM_STREAMING_TIME_TO_GENERATE,
                 unit="s",
                 description="Time between first token and completion in streaming chat completions",
             )
@@ -73,7 +74,7 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
             (
                 tokens_histogram,
                 chat_choice_counter,
-                chat_duration_histogram,
+                duration_histogram,
                 chat_exception_counter,
                 streaming_time_to_first_token,
                 streaming_time_to_generate,
@@ -81,19 +82,12 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
 
         if is_metrics_enabled():
             embeddings_vector_size_counter = meter.create_counter(
-                name="llm.openai.embeddings.vector_size",
+                name=Meters.LLM_EMBEDDINGS_VECTOR_SIZE,
                 unit="element",
                 description="he size of returned vector",
             )
-
-            embeddings_duration_histogram = meter.create_histogram(
-                name="llm.openai.embeddings.duration",
-                unit="s",
-                description="Duration of embeddings operation",
-            )
-
             embeddings_exception_counter = meter.create_counter(
-                name="llm.openai.embeddings.exceptions",
+                name=Meters.LLM_EMBEDDINGS_EXCEPTIONS,
                 unit="time",
                 description="Number of exceptions occurred during embeddings operation",
             )
@@ -101,9 +95,8 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
             (
                 tokens_histogram,
                 embeddings_vector_size_counter,
-                embeddings_duration_histogram,
                 embeddings_exception_counter,
-            ) = (None, None, None, None)
+            ) = (None, None, None)
 
         wrap_function_wrapper("openai", "Completion.create", completion_wrapper(tracer))
         wrap_function_wrapper(
@@ -116,7 +109,7 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
                 tracer,
                 tokens_histogram,
                 chat_choice_counter,
-                chat_duration_histogram,
+                duration_histogram,
                 chat_exception_counter,
                 streaming_time_to_first_token,
                 streaming_time_to_generate,
@@ -129,7 +122,7 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
                 tracer,
                 tokens_histogram,
                 chat_choice_counter,
-                chat_duration_histogram,
+                duration_histogram,
                 chat_exception_counter,
                 streaming_time_to_first_token,
                 streaming_time_to_generate,
@@ -142,7 +135,7 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
                 tracer,
                 tokens_histogram,
                 embeddings_vector_size_counter,
-                embeddings_duration_histogram,
+                duration_histogram,
                 embeddings_exception_counter,
             ),
         )
@@ -153,7 +146,7 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
                 tracer,
                 tokens_histogram,
                 embeddings_vector_size_counter,
-                embeddings_duration_histogram,
+                duration_histogram,
                 embeddings_exception_counter,
             ),
         )

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/opentelemetry/instrumentation/openai/v1/__init__.py

@@ -33,6 +33,8 @@ from opentelemetry.instrumentation.openai.v1.assistant_wrappers import (
 from opentelemetry.instrumentation.openai.utils import is_metrics_enabled
 from opentelemetry.instrumentation.openai.version import __version__
 
+from opentelemetry.semconv.ai import Meters
+
 _instruments = ("openai >= 1.0.0",)
 
 
@@ -50,36 +52,36 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
 
         if is_metrics_enabled():
             tokens_histogram = meter.create_histogram(
-                name="gen_ai.client.token.usage",
+                name=Meters.LLM_TOKEN_USAGE,
                 unit="token",
                 description="Measures number of input and output tokens used",
             )
 
             chat_choice_counter = meter.create_counter(
-                name="gen_ai.client.generation.choices",
+                name=Meters.LLM_GENERATION_CHOICES,
                 unit="choice",
                 description="Number of choices returned by chat completions call",
             )
 
-            chat_duration_histogram = meter.create_histogram(
-                name="gen_ai.client.operation.duration",
+            duration_histogram = meter.create_histogram(
+                name=Meters.LLM_OPERATION_DURATION,
                 unit="s",
                 description="GenAI operation duration",
             )
 
             chat_exception_counter = meter.create_counter(
-                name="llm.openai.chat_completions.exceptions",
+                name=Meters.LLM_COMPLETIONS_EXCEPTIONS,
                 unit="time",
                 description="Number of exceptions occurred during chat completions",
             )
 
             streaming_time_to_first_token = meter.create_histogram(
-                name="llm.openai.chat_completions.streaming_time_to_first_token",
+                name=Meters.LLM_STREAMING_TIME_TO_FIRST_TOKEN,
                 unit="s",
                 description="Time to first token in streaming chat completions",
             )
             streaming_time_to_generate = meter.create_histogram(
-                name="llm.openai.chat_completions.streaming_time_to_generate",
+                name=Meters.LLM_STREAMING_TIME_TO_GENERATE,
                 unit="s",
                 description="Time between first token and completion in streaming chat completions",
             )
@@ -87,7 +89,7 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
             (
                 tokens_histogram,
                 chat_choice_counter,
-                chat_duration_histogram,
+                duration_histogram,
                 chat_exception_counter,
                 streaming_time_to_first_token,
                 streaming_time_to_generate,
@@ -100,7 +102,7 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
                 tracer,
                 tokens_histogram,
                 chat_choice_counter,
-                chat_duration_histogram,
+                duration_histogram,
                 chat_exception_counter,
                 streaming_time_to_first_token,
                 streaming_time_to_generate,
@@ -115,19 +117,12 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
 
         if is_metrics_enabled():
             embeddings_vector_size_counter = meter.create_counter(
-                name="llm.openai.embeddings.vector_size",
+                name=Meters.LLM_EMBEDDINGS_VECTOR_SIZE,
                 unit="element",
                 description="he size of returned vector",
             )
-
-            embeddings_duration_histogram = meter.create_histogram(
-                name="llm.openai.embeddings.duration",
-                unit="s",
-                description="Duration of embeddings operation",
-            )
-
             embeddings_exception_counter = meter.create_counter(
-                name="llm.openai.embeddings.exceptions",
+                name=Meters.LLM_EMBEDDINGS_EXCEPTIONS,
                 unit="time",
                 description="Number of exceptions occurred during embeddings operation",
             )
@@ -135,9 +130,8 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
             (
                 tokens_histogram,
                 embeddings_vector_size_counter,
-                embeddings_duration_histogram,
                 embeddings_exception_counter,
-            ) = (None, None, None, None)
+            ) = (None, None, None)
 
         wrap_function_wrapper(
             "openai.resources.embeddings",
@@ -146,7 +140,7 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
                 tracer,
                 tokens_histogram,
                 embeddings_vector_size_counter,
-                embeddings_duration_histogram,
+                duration_histogram,
                 embeddings_exception_counter,
             ),
         )
@@ -158,7 +152,7 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
                 tracer,
                 tokens_histogram,
                 chat_choice_counter,
-                chat_duration_histogram,
+                duration_histogram,
                 chat_exception_counter,
                 streaming_time_to_first_token,
                 streaming_time_to_generate,
@@ -176,32 +170,24 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
                 tracer,
                 tokens_histogram,
                 embeddings_vector_size_counter,
-                embeddings_duration_histogram,
+                duration_histogram,
                 embeddings_exception_counter,
             ),
         )
 
         if is_metrics_enabled():
-            image_gen_duration_histogram = meter.create_histogram(
-                name="llm.openai.image_generations.duration",
-                unit="s",
-                description="Duration of image generations operation",
-            )
-
             image_gen_exception_counter = meter.create_counter(
-                name="llm.openai.image_generations.exceptions",
+                name=Meters.LLM_IMAGE_GENERATIONS_EXCEPTIONS,
                 unit="time",
                 description="Number of exceptions occurred during image generations operation",
             )
         else:
-            image_gen_duration_histogram, image_gen_exception_counter = None, None
+            image_gen_exception_counter = None
 
         wrap_function_wrapper(
             "openai.resources.images",
             "Images.generate",
-            image_gen_metrics_wrapper(
-                image_gen_duration_histogram, image_gen_exception_counter
-            ),
+            image_gen_metrics_wrapper(duration_histogram, image_gen_exception_counter),
         )
 
         # Beta APIs may not be available consistently in all versions

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/opentelemetry/instrumentation/openai/v1/assistant_wrappers.py

@@ -10,9 +10,12 @@ from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 
 from opentelemetry.semconv.ai import SpanAttributes, LLMRequestTypeValues
 
-from opentelemetry.instrumentation.openai.utils import _with_tracer_wrapper
+from opentelemetry.instrumentation.openai.utils import _with_tracer_wrapper, dont_throw
 from opentelemetry.instrumentation.openai.shared.config import Config
 
+from openai._legacy_response import LegacyAPIResponse
+from openai.types.beta.threads.run import Run
+
 logger = logging.getLogger(__name__)
 
 assistants = {}
@@ -55,15 +58,23 @@ def runs_create_wrapper(tracer, wrapped, instance, args, kwargs):
 
 @_with_tracer_wrapper
 def runs_retrieve_wrapper(tracer, wrapped, instance, args, kwargs):
+    @dont_throw
+    def process_response(response):
+        if type(response) is LegacyAPIResponse:
+            parsed_response = response.parse()
+        else:
+            parsed_response = response
+        assert type(parsed_response) is Run
+
+        if parsed_response.id in runs:
+            runs[thread_id]["end_time"] = time.time_ns()
+
     if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY):
         return wrapped(*args, **kwargs)
 
     thread_id = kwargs.get("thread_id")
-
     response = wrapped(*args, **kwargs)
-
-    if response.id in runs:
-        runs[thread_id]["end_time"] = time.time_ns()
+    process_response(response)
 
     return response
 

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

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

{opentelemetry_instrumentation_openai-0.21.5 → opentelemetry_instrumentation_openai-0.22.1}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.21.5"
+version = "0.22.1"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -27,21 +27,21 @@ python = ">=3.9,<4"
 opentelemetry-api = "^1.25.0"
 opentelemetry-instrumentation = "^0.46b0"
 opentelemetry-semantic-conventions = "^0.46b0"
-opentelemetry-semantic-conventions-ai = "0.2.0"
+opentelemetry-semantic-conventions-ai = "0.3.1"
 tiktoken = ">=0.6.0, <1"
 
 [tool.poetry.group.dev.dependencies]
-autopep8 = "2.1.1"
+autopep8 = "^2.2.0"
 flake8 = "7.0.0"
 
 [tool.poetry.group.test.dependencies]
-pytest = "8.1.1"
+pytest = "^8.2.2"
 pytest-sugar = "1.0.0"
 vcrpy = "^6.0.1"
 pytest-recording = "^0.13.1"
-openai = {extras = ["datalib"], version = "^1.14.2"}
+openai = {extras = ["datalib"], version = "^1.31.1"}
 opentelemetry-sdk = "^1.23.0"
-pytest-asyncio = "^0.23.5"
+pytest-asyncio = "^0.23.7"
 
 [build-system]
 requires = [ "poetry-core" ]

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

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