opentelemetry-instrumentation-openai 0.16.6__tar.gz → 0.16.8__tar.gz

{opentelemetry_instrumentation_openai-0.16.6 → opentelemetry_instrumentation_openai-0.16.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.16.6
+Version: 0.16.8
 Summary: OpenTelemetry OpenAI instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 License: Apache-2.0

{opentelemetry_instrumentation_openai-0.16.6 → opentelemetry_instrumentation_openai-0.16.8}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -30,7 +30,7 @@ from opentelemetry.instrumentation.openai.shared import (
 from opentelemetry.trace import SpanKind, Tracer
 from opentelemetry.trace.status import Status, StatusCode
 
-from opentelemetry.instrumentation.openai.utils import is_openai_v1
+from opentelemetry.instrumentation.openai.utils import is_openai_v1, is_azure_openai
 
 SPAN_NAME = "openai.chat"
 LLM_REQUEST_TYPE = LLMRequestTypeValues.CHAT
@@ -303,6 +303,11 @@ def _set_completions(span, choices):
             span, f"{prefix}.finish_reason", choice.get("finish_reason")
         )
 
+        if choice.get("finish_reason") == "content_filter":
+            _set_span_attribute(span, f"{prefix}.role", "assistant")
+            _set_span_attribute(span, f"{prefix}.content", "FILTERED")
+            return
+
         message = choice.get("message")
         if not message:
             return
@@ -428,9 +433,10 @@ def _build_from_streaming_response(
         "stream": True,
     }
 
-    _set_streaming_token_metrics(
-        request_kwargs, complete_response, span, token_counter, shared_attributes
-    )
+    if not is_azure_openai(instance):
+        _set_streaming_token_metrics(
+            request_kwargs, complete_response, span, token_counter, shared_attributes
+        )
 
     # choice metrics
     if choice_counter and complete_response.get("choices"):
@@ -495,9 +501,10 @@ async def _abuild_from_streaming_response(
         "stream": True,
     }
 
-    _set_streaming_token_metrics(
-        request_kwargs, complete_response, span, token_counter, shared_attributes
-    )
+    if not is_azure_openai(instance):
+        _set_streaming_token_metrics(
+            request_kwargs, complete_response, span, token_counter, shared_attributes
+        )
 
     # choice metrics
     if choice_counter and complete_response.get("choices"):
@@ -546,6 +553,3 @@ def _accumulate_stream_items(item, complete_response):
             complete_choice["message"]["content"] += delta.get("content")
         if delta and delta.get("role"):
             complete_choice["message"]["role"] = delta.get("role")
-
-        if choice.get("content_filter_results"):
-            complete_choice["message"]["content"] = "FILTERED"

{opentelemetry_instrumentation_openai-0.16.6 → opentelemetry_instrumentation_openai-0.16.8}/opentelemetry/instrumentation/openai/utils.py

@@ -3,6 +3,7 @@ from contextlib import asynccontextmanager
 import logging
 import os
 
+import openai
 from opentelemetry.instrumentation.openai.shared.config import Config
 
 
@@ -10,6 +11,12 @@ def is_openai_v1():
     return version("openai") >= "1.0.0"
 
 
+def is_azure_openai(instance):
+    return is_openai_v1() and isinstance(
+        instance._client, (openai.AsyncAzureOpenAI, openai.AzureOpenAI)
+    )
+
+
 def is_metrics_enabled() -> bool:
     return (os.getenv("TRACELOOP_METRICS_ENABLED") or "true").lower() == "true"
 

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

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

{opentelemetry_instrumentation_openai-0.16.6 → opentelemetry_instrumentation_openai-0.16.8}/pyproject.toml

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

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

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