opentelemetry-instrumentation-openai 0.26.0__py3-none-any.whl → 0.26.2__py3-none-any.whl

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

@@ -1 +1 @@
-__version__ = "0.26.0"
+__version__ = "0.26.2"

{opentelemetry_instrumentation_openai-0.26.0.dist-info → opentelemetry_instrumentation_openai-0.26.2.dist-info}/METADATA

@@ -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.2.dist-info/RECORD

@@ -0,0 +1,17 @@
+opentelemetry/instrumentation/openai/__init__.py,sha256=w0gjgORccQ3EsMiK2dzZg6V7J3pa6PcAuDvy1oofQ5A,1503
+opentelemetry/instrumentation/openai/shared/__init__.py,sha256=S6QoxypTSF1dMg4gfS3A3M0TzU2HVz9D6J6CleUXI54,8832
+opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=HEe0-vsCS8mDI585b6-Vybzy2EOpQ-FDpAz7LvVMWmQ,26776
+opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=DO4K0DU3xvCAmBMcp3pS3iDTKHLY6Pc_4Y7GnlnRo0g,6840
+opentelemetry/instrumentation/openai/shared/config.py,sha256=_4AkHau8C44uBc6-fNBl9EzCGPBuj9yDIngTuwSW6ZE,199
+opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=REcu_K8ogVIf8RR935w_UqS-ajGI0CNun73_P476i2o,6930
+opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py,sha256=A4qdJIeJdA45SfiLaFj3Vo0Ndcqqfuew1BDsGdnJU3E,2122
+opentelemetry/instrumentation/openai/utils.py,sha256=3ONjsia3xG4rRMOwjU91liOVpZxoRE39CxJ-C5HxIgQ,3464
+opentelemetry/instrumentation/openai/v0/__init__.py,sha256=02-bXv0aZbscMYO2W3jsHpjU521vkVK5RzdfSeGXBzg,5475
+opentelemetry/instrumentation/openai/v1/__init__.py,sha256=kqGsXkjyjIDNRfTSzJKjLdvvGUOViW2shZ73cM4PfS0,7693
+opentelemetry/instrumentation/openai/v1/assistant_wrappers.py,sha256=BMiZykQ3u2xrWpo2g3qZOxTJqy317JXRGO4zCVu4bZ8,6277
+opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py,sha256=kXOuDAt7If23EhWpH2r6L0eUVFvVWQBYrWGu3qJNKR0,2779
+opentelemetry/instrumentation/openai/version.py,sha256=Crq5hftgS1Lj7H-8uxyxs5fX6lta4LLNjycaIacOoKo,23
+opentelemetry_instrumentation_openai-0.26.2.dist-info/METADATA,sha256=0nknBiw_cPwIOv8lMbCZl2Gbfh47SB5Birqh8Fo1-Go,2255
+opentelemetry_instrumentation_openai-0.26.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+opentelemetry_instrumentation_openai-0.26.2.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
+opentelemetry_instrumentation_openai-0.26.2.dist-info/RECORD,,

opentelemetry_instrumentation_openai-0.26.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-opentelemetry/instrumentation/openai/__init__.py,sha256=w0gjgORccQ3EsMiK2dzZg6V7J3pa6PcAuDvy1oofQ5A,1503
-opentelemetry/instrumentation/openai/shared/__init__.py,sha256=U6_JB0RXrK6XK2Xhm450RtgHhZT1qMMSDSLtHjc57mY,8224
-opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=4P89ZEOuWPFzViG9xfawTMPcGUmGSO4K7CoHddyz6iA,26118
-opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=OuwS5vZwe_jTcWU7xnx8nVtqWCrGS1hcGbyKhQbf11g,6840
-opentelemetry/instrumentation/openai/shared/config.py,sha256=_4AkHau8C44uBc6-fNBl9EzCGPBuj9yDIngTuwSW6ZE,199
-opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=EUtQEl9MP56YVe5tPY1QXNR0yNXw1MvfCwrIzmGXTAg,6930
-opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py,sha256=GFgBqTiMcJFUmwKwkHDGpsnM3UXw_UJLBSVcxLbbr9Q,2122
-opentelemetry/instrumentation/openai/utils.py,sha256=3ONjsia3xG4rRMOwjU91liOVpZxoRE39CxJ-C5HxIgQ,3464
-opentelemetry/instrumentation/openai/v0/__init__.py,sha256=FYq3xhtaIdvy7mwCPzxaqNNGzfHEi0Q2JFQl51s6yNo,5475
-opentelemetry/instrumentation/openai/v1/__init__.py,sha256=wDO1rjgeZRNVXXA3IJUdqYVXRsvst7_JTtAjBK-m1Gc,7693
-opentelemetry/instrumentation/openai/v1/assistant_wrappers.py,sha256=4BDLcqOfwl0LFUdAjLE_PgRcWsQYKoCM_okWLCU8A9U,6277
-opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py,sha256=SAzYoun2yyOloofyOWtxpm8E2M9TL3Nm8TgKdNyXHuY,2779
-opentelemetry/instrumentation/openai/version.py,sha256=S1dNBNSmHJkAHkq1vL1Yg-dFpQk0fri_CstNlL1u5qw,23
-opentelemetry_instrumentation_openai-0.26.0.dist-info/METADATA,sha256=A8jCLOWpx4QuC0WTPMgSw3WHxWq1RpeeeJhZqceK1y8,2255
-opentelemetry_instrumentation_openai-0.26.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-opentelemetry_instrumentation_openai-0.26.0.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
-opentelemetry_instrumentation_openai-0.26.0.dist-info/RECORD,,