opentelemetry-instrumentation-openai 0.26.0__tar.gz → 0.26.2__tar.gz

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.26.0
+Version: 0.26.2
 Summary: OpenTelemetry OpenAI instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 License: Apache-2.0
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 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.3.6)
+Requires-Dist: opentelemetry-api (>=1.26.0,<2.0.0)
+Requires-Dist: opentelemetry-instrumentation (>=0.47b0,<0.48)
+Requires-Dist: opentelemetry-semantic-conventions (>=0.47b0,<0.48)
+Requires-Dist: opentelemetry-semantic-conventions-ai (==0.4.0)
 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.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -9,7 +9,7 @@ from importlib.metadata import version
 from opentelemetry import context as context_api
 
 from opentelemetry.instrumentation.openai.shared.config import Config
-from opentelemetry.semconv.ai import SpanAttributes
+from opentelemetry.semconv_ai import SpanAttributes
 from opentelemetry.instrumentation.openai.utils import (
     dont_throw,
     is_openai_v1,
@@ -17,6 +17,8 @@ from opentelemetry.instrumentation.openai.utils import (
 )
 
 OPENAI_LLM_USAGE_TOKEN_TYPES = ["prompt_tokens", "completion_tokens"]
+PROMPT_FILTER_KEY = "prompt_filter_results"
+PROMPT_ERROR = "prompt_error"
 
 # tiktoken encodings map for different model, key is model_name, value is tiktoken encoding
 tiktoken_encodings = {}
@@ -138,6 +140,14 @@ def _set_response_attributes(span, response):
     if not span.is_recording():
         return
 
+    if "error" in response:
+        _set_span_attribute(
+            span,
+            f"{SpanAttributes.LLM_PROMPTS}.{PROMPT_ERROR}",
+            json.dumps(response.get("error")),
+        )
+        return
+
     _set_span_attribute(span, SpanAttributes.LLM_RESPONSE_MODEL, response.get("model"))
 
     _set_span_attribute(
@@ -145,6 +155,7 @@ def _set_response_attributes(span, response):
         SpanAttributes.LLM_OPENAI_RESPONSE_SYSTEM_FINGERPRINT,
         response.get("system_fingerprint"),
     )
+    _log_prompt_filter(span, response)
 
     usage = response.get("usage")
     if not usage:
@@ -164,10 +175,18 @@ def _set_response_attributes(span, response):
     _set_span_attribute(
         span, SpanAttributes.LLM_USAGE_PROMPT_TOKENS, usage.get("prompt_tokens")
     )
-
     return
 
 
+def _log_prompt_filter(span, response_dict):
+    if response_dict.get("prompt_filter_results"):
+        _set_span_attribute(
+            span,
+            f"{SpanAttributes.LLM_PROMPTS}.{PROMPT_FILTER_KEY}",
+            json.dumps(response_dict.get("prompt_filter_results")),
+        )
+
+
 @dont_throw
 def _set_span_stream_usage(span, prompt_tokens, completion_tokens):
     if not span.is_recording():

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -7,7 +7,7 @@ from wrapt import ObjectProxy
 
 from opentelemetry import context as context_api
 from opentelemetry.metrics import Counter, Histogram
-from opentelemetry.semconv.ai import (
+from opentelemetry.semconv_ai import (
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
     SpanAttributes,
     LLMRequestTypeValues,
@@ -42,6 +42,9 @@ from opentelemetry.trace.status import Status, StatusCode
 from opentelemetry.instrumentation.openai.utils import is_openai_v1, is_azure_openai
 
 SPAN_NAME = "openai.chat"
+PROMPT_FILTER_KEY = "prompt_filter_results"
+CONTENT_FILTER_KEY = "content_filter_results"
+
 LLM_REQUEST_TYPE = LLMRequestTypeValues.CHAT
 
 logger = logging.getLogger(__name__)
@@ -373,9 +376,17 @@ def _set_completions(span, choices):
             span, f"{prefix}.finish_reason", choice.get("finish_reason")
         )
 
+        if choice.get("content_filter_results"):
+            _set_span_attribute(
+                span,
+                f"{prefix}.{CONTENT_FILTER_KEY}",
+                json.dumps(choice.get("content_filter_results")),
+            )
+
         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")
@@ -770,6 +781,10 @@ def _accumulate_stream_items(item, complete_response):
 
     complete_response["model"] = item.get("model")
 
+    # prompt filter results
+    if item.get("prompt_filter_results"):
+        complete_response["prompt_filter_results"] = item.get("prompt_filter_results")
+
     for choice in item.get("choices"):
         index = choice.get("index")
         if len(complete_response.get("choices")) <= index:
@@ -779,11 +794,16 @@ def _accumulate_stream_items(item, complete_response):
         complete_choice = complete_response.get("choices")[index]
         if choice.get("finish_reason"):
             complete_choice["finish_reason"] = choice.get("finish_reason")
+        if choice.get("content_filter_results"):
+            complete_choice["content_filter_results"] = choice.get(
+                "content_filter_results"
+            )
 
         delta = choice.get("delta")
 
         if delta and delta.get("content"):
             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"):

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/shared/completion_wrappers.py

@@ -2,7 +2,7 @@ import logging
 
 from opentelemetry import context as context_api
 
-from opentelemetry.semconv.ai import (
+from opentelemetry.semconv_ai import (
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
     SpanAttributes,
     LLMRequestTypeValues,

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py

@@ -3,7 +3,7 @@ import time
 
 from opentelemetry import context as context_api
 from opentelemetry.metrics import Counter, Histogram
-from opentelemetry.semconv.ai import (
+from opentelemetry.semconv_ai import (
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
     SpanAttributes,
     LLMRequestTypeValues,

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py

@@ -12,7 +12,7 @@ from opentelemetry.instrumentation.openai.utils import (
 )
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 from opentelemetry.metrics import Counter, Histogram
-from opentelemetry.semconv.ai import SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY
+from opentelemetry.semconv_ai import SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY
 
 
 @_with_image_gen_metric_wrapper

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/v0/__init__.py

@@ -19,7 +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
+from opentelemetry.semconv_ai import Meters
 
 _instruments = ("openai >= 0.27.0", "openai < 1.0.0")
 

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/v1/__init__.py

@@ -33,7 +33,7 @@ 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
+from opentelemetry.semconv_ai import Meters
 
 _instruments = ("openai >= 1.0.0",)
 

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/v1/assistant_wrappers.py

@@ -8,7 +8,7 @@ from opentelemetry.instrumentation.openai.shared import (
 from opentelemetry.trace import SpanKind
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 
-from opentelemetry.semconv.ai import SpanAttributes, LLMRequestTypeValues
+from opentelemetry.semconv_ai import SpanAttributes, LLMRequestTypeValues
 
 from opentelemetry.instrumentation.openai.utils import _with_tracer_wrapper, dont_throw
 from opentelemetry.instrumentation.openai.shared.config import Config

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py

@@ -1,7 +1,7 @@
 from opentelemetry.instrumentation.openai.shared import (
     _set_span_attribute,
 )
-from opentelemetry.semconv.ai import SpanAttributes
+from opentelemetry.semconv_ai import SpanAttributes
 from openai import AssistantEventHandler
 from typing_extensions import override
 

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

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

{opentelemetry_instrumentation_openai-0.26.0 → opentelemetry_instrumentation_openai-0.26.2}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.26.0"
+version = "0.26.2"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -24,10 +24,10 @@ include = "opentelemetry/instrumentation/openai"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4"
-opentelemetry-api = "^1.25.0"
-opentelemetry-instrumentation = "^0.46b0"
-opentelemetry-semantic-conventions = "^0.46b0"
-opentelemetry-semantic-conventions-ai = "0.3.6"
+opentelemetry-api = "^1.26.0"
+opentelemetry-instrumentation = "^0.47b0"
+opentelemetry-semantic-conventions = "^0.47b0"
+opentelemetry-semantic-conventions-ai = "0.4.0"
 tiktoken = ">=0.6.0, <1"
 
 [tool.poetry.group.dev.dependencies]

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

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