opentelemetry-instrumentation-openai 0.14.1__tar.gz → 0.14.3__tar.gz

{opentelemetry_instrumentation_openai-0.14.1 → opentelemetry_instrumentation_openai-0.14.3}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.14.1
+Version: 0.14.3
 Summary: OpenTelemetry OpenAI instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 License: Apache-2.0
 Author: Gal Kleinman
 Author-email: gal@traceloop.com
-Requires-Python: >=3.8.1,<4
+Requires-Python: >=3.9,<4
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9

{opentelemetry_instrumentation_openai-0.14.1 → opentelemetry_instrumentation_openai-0.14.3}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -90,6 +90,23 @@ def _set_functions_attributes(span, functions):
         )
 
 
+def set_tools_attributes(span, tools):
+    if not tools:
+        return
+
+    for i, tool in enumerate(tools):
+        function = tool.get("function")
+        if not function:
+            continue
+
+        prefix = f"{SpanAttributes.LLM_REQUEST_FUNCTIONS}.{i}"
+        _set_span_attribute(span, f"{prefix}.name", function.get("name"))
+        _set_span_attribute(span, f"{prefix}.description", function.get("description"))
+        _set_span_attribute(
+            span, f"{prefix}.parameters", json.dumps(function.get("parameters"))
+        )
+
+
 def _set_request_attributes(span, kwargs):
     if not span.is_recording():
         return

{opentelemetry_instrumentation_openai-0.14.1 → opentelemetry_instrumentation_openai-0.14.3}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -16,6 +16,7 @@ from opentelemetry.instrumentation.openai.shared import (
     _set_request_attributes,
     _set_span_attribute,
     _set_functions_attributes,
+    set_tools_attributes,
     _set_response_attributes,
     is_streaming_response,
     should_send_prompts,
@@ -137,7 +138,10 @@ def _handle_request(span, kwargs, instance):
     _set_client_attributes(span, instance)
     if should_send_prompts():
         _set_prompts(span, kwargs.get("messages"))
-        _set_functions_attributes(span, kwargs.get("functions"))
+        if kwargs.get("functions"):
+            _set_functions_attributes(span, kwargs.get("functions"))
+        elif kwargs.get("tools"):
+            set_tools_attributes(span, kwargs.get("tools"))
 
 
 def _handle_response(
@@ -253,15 +257,28 @@ def _set_completions(span, choices):
         _set_span_attribute(span, f"{prefix}.content", message.get("content"))
 
         function_call = message.get("function_call")
-        if not function_call:
-            return
+        if function_call:
+            _set_span_attribute(
+                span, f"{prefix}.function_call.name", function_call.get("name")
+            )
+            _set_span_attribute(
+                span,
+                f"{prefix}.function_call.arguments",
+                function_call.get("arguments"),
+            )
 
-        _set_span_attribute(
-            span, f"{prefix}.function_call.name", function_call.get("name")
-        )
-        _set_span_attribute(
-            span, f"{prefix}.function_call.arguments", function_call.get("arguments")
-        )
+        tool_calls = message.get("tool_calls")
+        if tool_calls:
+            _set_span_attribute(
+                span,
+                f"{prefix}.function_call.name",
+                tool_calls[0].get("function").get("name"),
+            )
+            _set_span_attribute(
+                span,
+                f"{prefix}.function_call.arguments",
+                tool_calls[0].get("function").get("arguments"),
+            )
 
 
 def _build_from_streaming_response(

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

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

{opentelemetry_instrumentation_openai-0.14.1 → opentelemetry_instrumentation_openai-0.14.3}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.14.1"
+version = "0.14.3"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -23,7 +23,7 @@ readme = "README.md"
 include = "opentelemetry/instrumentation/openai"
 
 [tool.poetry.dependencies]
-python = ">=3.8.1,<4"
+python = ">=3.9,<4"
 opentelemetry-api = "^1.23.0"
 opentelemetry-instrumentation = "0.44b0"
 opentelemetry-semantic-conventions-ai = "^0.0.23"

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

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