opentelemetry-instrumentation-openai 0.5.2__py3-none-any.whl → 0.5.3__py3-none-any.whl

opentelemetry/instrumentation/openai/shared/__init__.py

@@ -131,6 +131,7 @@ def _set_response_attributes(span, response):
 
 
 def is_streaming_response(response):
-    return isinstance(response, types.GeneratorType) or (
-        is_openai_v1() and isinstance(response, openai.Stream)
-    )
+    if is_openai_v1():
+        return isinstance(response, openai.Stream)
+
+    return isinstance(response, types.GeneratorType) or isinstance(response, types.AsyncGeneratorType)

opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -7,8 +7,7 @@ from opentelemetry.semconv.ai import SpanAttributes, LLMRequestTypeValues
 
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 from opentelemetry.instrumentation.openai.utils import (
-    _with_tracer_wrapper,
-    start_as_current_span_async,
+    _with_tracer_wrapper
 )
 from opentelemetry.instrumentation.openai.shared import (
     _set_request_attributes,
@@ -43,9 +42,8 @@ def chat_wrapper(tracer, wrapped, instance, args, kwargs):
     if is_streaming_response(response):
         # span will be closed after the generator is done
         return _build_from_streaming_response(span, response)
-    else:
-        _handle_response(response, span)
 
+    _handle_response(response, span)
     span.end()
 
     return response
@@ -56,14 +54,18 @@ async def achat_wrapper(tracer, wrapped, instance, args, kwargs):
     if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY):
         return wrapped(*args, **kwargs)
 
-    async with start_as_current_span_async(
-        tracer=tracer, name=SPAN_NAME, kind=SpanKind.CLIENT
-    ) as span:
-        _handle_request(span, kwargs)
-        response = await wrapped(*args, **kwargs)
-        _handle_response(response, span)
+    span = tracer.start_span(SPAN_NAME, kind=SpanKind.CLIENT)
+    _handle_request(span, kwargs)
+    response = await wrapped(*args, **kwargs)
+
+    if is_streaming_response(response):
+        # span will be closed after the generator is done
+        return _abuild_from_streaming_response(span, response)
+
+    _handle_response(response, span)
+    span.end()
 
-        return response
+    return response
 
 
 def _handle_request(span, kwargs):
@@ -139,25 +141,24 @@ def _build_from_streaming_response(span, response):
     complete_response = {"choices": [], "model": ""}
     for item in response:
         item_to_yield = item
-        if is_openai_v1():
-            item = item.model_dump()
-
-        for choice in item.get("choices"):
-            index = choice.get("index")
-            if len(complete_response.get("choices")) <= index:
-                complete_response["choices"].append(
-                    {"index": index, "message": {"content": "", "role": ""}}
-                )
-            complete_choice = complete_response.get("choices")[index]
-            if choice.get("finish_reason"):
-                complete_choice["finish_reason"] = choice.get("finish_reason")
-
-            delta = choice.get("delta")
-
-            if delta.get("content"):
-                complete_choice["message"]["content"] += delta.get("content")
-            if delta.get("role"):
-                complete_choice["message"]["role"] = delta.get("role")
+        _accumulate_stream_items(item, complete_response)
+
+        yield item_to_yield
+
+    _set_response_attributes(span, complete_response)
+
+    if should_send_prompts():
+        _set_completions(span, complete_response.get("choices"))
+
+    span.set_status(Status(StatusCode.OK))
+    span.end()
+
+
+async def _abuild_from_streaming_response(span, response):
+    complete_response = {"choices": [], "model": ""}
+    async for item in response:
+        item_to_yield = item
+        _accumulate_stream_items(item, complete_response)
 
         yield item_to_yield
 
@@ -168,3 +169,25 @@ def _build_from_streaming_response(span, response):
 
     span.set_status(Status(StatusCode.OK))
     span.end()
+
+
+def _accumulate_stream_items(item, complete_response):
+    if is_openai_v1():
+        item = item.model_dump()
+
+    for choice in item.get("choices"):
+        index = choice.get("index")
+        if len(complete_response.get("choices")) <= index:
+            complete_response["choices"].append(
+                {"index": index, "message": {"content": "", "role": ""}}
+            )
+        complete_choice = complete_response.get("choices")[index]
+        if choice.get("finish_reason"):
+            complete_choice["finish_reason"] = choice.get("finish_reason")
+
+        delta = choice.get("delta")
+
+        if delta.get("content"):
+            complete_choice["message"]["content"] += delta.get("content")
+        if delta.get("role"):
+            complete_choice["message"]["role"] = delta.get("role")

opentelemetry/instrumentation/openai/version.py

@@ -1 +1 @@
-__version__ = "0.5.2"
+__version__ = "0.5.3"

{opentelemetry_instrumentation_openai-0.5.2.dist-info → opentelemetry_instrumentation_openai-0.5.3.dist-info}/METADATA

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

{opentelemetry_instrumentation_openai-0.5.2.dist-info → opentelemetry_instrumentation_openai-0.5.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 opentelemetry/instrumentation/openai/__init__.py,sha256=iiuJICVwzv0K2OeskonjZIYpPnxooSEsIkXOS7uZEf8,937
-opentelemetry/instrumentation/openai/shared/__init__.py,sha256=I3mHPmUPjb22ZsbgmbPVtuIxo8_FM6F87dyqBxfxTnA,4285
-opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=EcER4tO6Zwu4eC-Z-L2dmYbgTnsKmZG8hmVIhpEOURA,5354
+opentelemetry/instrumentation/openai/shared/__init__.py,sha256=eZ-baHO8ocPb-vmfBG-20ilrffBtfBa6kyut0dDnua4,4336
+opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=3l9TMZ6FC7eWb8gSFk7Y9Be5a7hjB_YARJazs_YBuqM,5934
 opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=M3K4IkQOS2bnBehLI_Mh_ApvD1trSMX2_PjSxbZO0yc,4449
 opentelemetry/instrumentation/openai/utils.py,sha256=m405jldmW6dsgQz_qF75WNM0fMTJUMD_IVMluu7s-nY,546
 opentelemetry/instrumentation/openai/v0/__init__.py,sha256=0olHqFUCAfVtD-TnOzIVDwK5YaieZU36RewZPLX8Cos,1236
 opentelemetry/instrumentation/openai/v1/__init__.py,sha256=FnDPr5UQcKnTBLt1dAbr_GYtE8pOCtR7U2PtY0thnFo,1320
-opentelemetry/instrumentation/openai/version.py,sha256=isJrmDBLRag7Zc2UK9ZovWGOv7ji1Oh-zJtJMNJFkXw,22
-opentelemetry_instrumentation_openai-0.5.2.dist-info/METADATA,sha256=opGgiUtt2VrL-aYLXG5LdOZZIeglC6LT437-lgRh2Sw,1767
-opentelemetry_instrumentation_openai-0.5.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-opentelemetry_instrumentation_openai-0.5.2.dist-info/RECORD,,
+opentelemetry/instrumentation/openai/version.py,sha256=tgzuqHKcEdKBaP57F5oXxq4XlW2n9J4Fj8ZGu7nGOZg,22
+opentelemetry_instrumentation_openai-0.5.3.dist-info/METADATA,sha256=_xfm3o1qSjz5ZRI0wxolsW6R3d7MolQC6kaUe8l7-TQ,1767
+opentelemetry_instrumentation_openai-0.5.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+opentelemetry_instrumentation_openai-0.5.3.dist-info/RECORD,,