opentelemetry-instrumentation-openai 0.5.3__tar.gz → 0.7.0__tar.gz

{opentelemetry_instrumentation_openai-0.5.3 → opentelemetry_instrumentation_openai-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.5.3
+Version: 0.7.0
 Summary: OpenTelemetry OpenAI instrumentation
 License: Apache-2.0
 Author: Gal Kleinman

{opentelemetry_instrumentation_openai-0.5.3 → opentelemetry_instrumentation_openai-0.7.0}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -4,6 +4,8 @@ import json
 import types
 import logging
 
+from importlib.metadata import version
+
 from opentelemetry import context as context_api
 
 from opentelemetry.semconv.ai import SpanAttributes
@@ -135,3 +137,10 @@ def is_streaming_response(response):
         return isinstance(response, openai.Stream)
 
     return isinstance(response, types.GeneratorType) or isinstance(response, types.AsyncGeneratorType)
+
+
+def model_as_dict(model):
+    if version("pydantic") < "2.0.0":
+        return model.dict()
+
+    return model.model_dump()

{opentelemetry_instrumentation_openai-0.5.3 → opentelemetry_instrumentation_openai-0.7.0}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -16,6 +16,7 @@ from opentelemetry.instrumentation.openai.shared import (
     _set_response_attributes,
     is_streaming_response,
     should_send_prompts,
+    model_as_dict,
 )
 from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
@@ -77,7 +78,7 @@ def _handle_request(span, kwargs):
 
 def _handle_response(response, span):
     if is_openai_v1():
-        response_dict = response.model_dump()
+        response_dict = model_as_dict(response)
     else:
         response_dict = response
 
@@ -173,7 +174,7 @@ async def _abuild_from_streaming_response(span, response):
 
 def _accumulate_stream_items(item, complete_response):
     if is_openai_v1():
-        item = item.model_dump()
+        item = model_as_dict(item)
 
     for choice in item.get("choices"):
         index = choice.get("index")

{opentelemetry_instrumentation_openai-0.5.3 → opentelemetry_instrumentation_openai-0.7.0}/opentelemetry/instrumentation/openai/shared/completion_wrappers.py

@@ -16,6 +16,7 @@ from opentelemetry.instrumentation.openai.shared import (
     _set_response_attributes,
     is_streaming_response,
     should_send_prompts,
+    model_as_dict,
 )
 
 from opentelemetry.instrumentation.openai.utils import is_openai_v1
@@ -74,7 +75,7 @@ def _handle_request(span, kwargs):
 
 def _handle_response(response, span):
     if is_openai_v1():
-        response_dict = response.model_dump()
+        response_dict = model_as_dict(response)
     else:
         response_dict = response
 
@@ -119,7 +120,7 @@ def _build_from_streaming_response(span, response):
     for item in response:
         item_to_yield = item
         if is_openai_v1():
-            item = item.model_dump()
+            item = model_as_dict(item)
 
         for choice in item.get("choices"):
             index = choice.get("index")

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

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

{opentelemetry_instrumentation_openai-0.5.3 → opentelemetry_instrumentation_openai-0.7.0}/pyproject.toml

@@ -11,7 +11,7 @@ addopts = "--cov --cov-report html:'../../coverage/packages/opentelemetry-instru
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.5.3"
+version = "0.7.0"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",

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

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