opentelemetry-instrumentation-openai 0.10.3__tar.gz → 0.11.2__tar.gz

{opentelemetry_instrumentation_openai-0.10.3 → opentelemetry_instrumentation_openai-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.10.3
+Version: 0.11.2
 Summary: OpenTelemetry OpenAI instrumentation
 License: Apache-2.0
 Author: Gal Kleinman
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: opentelemetry-api (>=1.22.0,<2.0.0)
 Requires-Dist: opentelemetry-instrumentation (==0.43b0)
-Requires-Dist: opentelemetry-semantic-conventions-ai (>=0.0.19,<0.0.20)
+Requires-Dist: opentelemetry-semantic-conventions-ai (>=0.0.20,<0.0.21)
 Description-Content-Type: text/markdown
 
 # OpenTelemetry OpenAI Instrumentation

{opentelemetry_instrumentation_openai-0.10.3 → opentelemetry_instrumentation_openai-0.11.2}/opentelemetry/instrumentation/openai/shared/__init__.py

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

{opentelemetry_instrumentation_openai-0.10.3 → opentelemetry_instrumentation_openai-0.11.2}/opentelemetry/instrumentation/openai/shared/completion_wrappers.py

@@ -5,10 +5,7 @@ from opentelemetry import context as context_api
 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,
-)
+from opentelemetry.instrumentation.openai.utils import _with_tracer_wrapper
 from opentelemetry.instrumentation.openai.shared import (
     _set_request_attributes,
     _set_span_attribute,
@@ -60,17 +57,23 @@ async def acompletion_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,
+    span = tracer.start_span(
         name=SPAN_NAME,
         kind=SpanKind.CLIENT,
         attributes={SpanAttributes.LLM_REQUEST_TYPE: LLM_REQUEST_TYPE.value},
-    ) as span:
-        _handle_request(span, kwargs)
-        response = await wrapped(*args, **kwargs)
+    )
+
+    _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)
+    else:
         _handle_response(response, span)
 
-        return response
+    span.end()
+    return response
 
 
 def _handle_request(span, kwargs):
@@ -148,3 +151,31 @@ def _build_from_streaming_response(span, response):
 
     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
+        if is_openai_v1():
+            item = model_as_dict(item)
+
+        for choice in item.get("choices"):
+            index = choice.get("index")
+            if len(complete_response.get("choices")) <= index:
+                complete_response["choices"].append({"index": index, "text": ""})
+            complete_choice = complete_response.get("choices")[index]
+            if choice.get("finish_reason"):
+                complete_choice["finish_reason"] = choice.get("finish_reason")
+
+            complete_choice["text"] += choice.get("text")
+
+        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()

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

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

{opentelemetry_instrumentation_openai-0.10.3 → opentelemetry_instrumentation_openai-0.11.2}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.10.3"
+version = "0.11.2"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -25,13 +25,20 @@ include = "opentelemetry/instrumentation/openai"
 python = ">=3.8.1,<4"
 opentelemetry-api = "^1.22.0"
 opentelemetry-instrumentation = "0.43b0"
-opentelemetry-semantic-conventions-ai = "^0.0.19"
+opentelemetry-semantic-conventions-ai = "^0.0.20"
 
 [tool.poetry.group.dev.dependencies]
 autopep8 = "2.0.4"
 flake8 = "7.0.0"
+
+[tool.poetry.group.test.dependencies]
 pytest = "7.4.4"
 pytest-sugar = "0.9.7"
+vcrpy = "^6.0.1"
+pytest-recording = "^0.13.1"
+openai = "^1.12.0"
+opentelemetry-sdk = "^1.22.0"
+pytest-asyncio = "^0.23.5"
 
 [build-system]
 requires = [ "poetry-core" ]

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

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