opentelemetry-instrumentation-openai 0.31.2__py3-none-any.whl → 0.31.3__py3-none-any.whl

opentelemetry/instrumentation/openai/__init__.py

@@ -1,4 +1,5 @@
-from typing import Callable, Collection
+from typing import Callable, Collection, Optional
+from typing_extensions import Coroutine
 
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 
@@ -19,7 +20,9 @@ class OpenAIInstrumentor(BaseInstrumentor):
         enrich_token_usage: bool = False,
         exception_logger=None,
         get_common_metrics_attributes: Callable[[], dict] = lambda: {},
-        upload_base64_image: Callable[[str, str, str, str], str] = lambda *args: "",
+        upload_base64_image: Optional[
+            Callable[[str, str, str, str], Coroutine[None, None, str]]
+        ] = lambda *args: "",
     ):
         super().__init__()
         Config.enrich_assistant = enrich_assistant

opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -1,3 +1,4 @@
+import asyncio
 import copy
 import json
 import logging
@@ -69,15 +70,15 @@ def chat_wrapper(
         SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY
     ):
         return wrapped(*args, **kwargs)
-
     # span needs to be opened and closed manually because the response is a generator
+
     span = tracer.start_span(
         SPAN_NAME,
         kind=SpanKind.CLIENT,
         attributes={SpanAttributes.LLM_REQUEST_TYPE: LLM_REQUEST_TYPE.value},
     )
 
-    _handle_request(span, kwargs, instance)
+    asyncio.run(_handle_request(span, kwargs, instance))
 
     try:
         start_time = time.time()
@@ -167,7 +168,7 @@ async def achat_wrapper(
         kind=SpanKind.CLIENT,
         attributes={SpanAttributes.LLM_REQUEST_TYPE: LLM_REQUEST_TYPE.value},
     )
-    _handle_request(span, kwargs, instance)
+    await _handle_request(span, kwargs, instance)
 
     try:
         start_time = time.time()
@@ -236,11 +237,11 @@ async def achat_wrapper(
 
 
 @dont_throw
-def _handle_request(span, kwargs, instance):
+async def _handle_request(span, kwargs, instance):
     _set_request_attributes(span, kwargs)
     _set_client_attributes(span, instance)
     if should_send_prompts():
-        _set_prompts(span, kwargs.get("messages"))
+        await _set_prompts(span, kwargs.get("messages"))
         if kwargs.get("functions"):
             _set_functions_attributes(span, kwargs.get("functions"))
         elif kwargs.get("tools"):
@@ -331,33 +332,28 @@ def _is_base64_image(item):
     if not isinstance(item, dict):
         return False
 
-    if not isinstance(item.get('image_url'), dict):
+    if not isinstance(item.get("image_url"), dict):
         return False
 
-    if 'data:image/' not in item.get('image_url', {}).get('url', ''):
+    if "data:image/" not in item.get("image_url", {}).get("url", ""):
         return False
 
     return True
 
 
-def _process_image_item(item, trace_id, span_id, message_index, content_index):
+async def _process_image_item(item, trace_id, span_id, message_index, content_index):
     if not Config.upload_base64_image:
         return item
 
     image_format = item["image_url"]["url"].split(";")[0].split("/")[1]
     image_name = f"message_{message_index}_content_{content_index}.{image_format}"
     base64_string = item["image_url"]["url"].split(",")[1]
-    url = Config.upload_base64_image(trace_id, span_id, image_name, base64_string)
+    url = await Config.upload_base64_image(trace_id, span_id, image_name, base64_string)
 
-    return {
-        'type': 'image_url',
-        'image_url': {
-            'url': url
-        }
-    }
+    return {"type": "image_url", "image_url": {"url": url}}
 
 
-def _set_prompts(span, messages):
+async def _set_prompts(span, messages):
     if not span.is_recording() or messages is None:
         return
 
@@ -369,9 +365,13 @@ def _set_prompts(span, messages):
             content = copy.deepcopy(msg.get("content"))
             if isinstance(content, list):
                 content = [
-                    _process_image_item(item, span.context.trace_id, span.context.span_id, i, j)
-                    if _is_base64_image(item)
-                    else item
+                    (
+                        await _process_image_item(
+                            item, span.context.trace_id, span.context.span_id, i, j
+                        )
+                        if _is_base64_image(item)
+                        else item
+                    )
                     for j, item in enumerate(content)
                 ]
 

opentelemetry/instrumentation/openai/version.py

@@ -1 +1 @@
-__version__ = "0.31.2"
+__version__ = "0.31.3"

{opentelemetry_instrumentation_openai-0.31.2.dist-info → opentelemetry_instrumentation_openai-0.31.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.31.2
+Version: 0.31.3
 Summary: OpenTelemetry OpenAI instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 License: Apache-2.0

{opentelemetry_instrumentation_openai-0.31.2.dist-info → opentelemetry_instrumentation_openai-0.31.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
-opentelemetry/instrumentation/openai/__init__.py,sha256=Y_YgW1pgE7HKFz3LXAA4v-87IwW0aqcuXez1sV10RcY,1645
+opentelemetry/instrumentation/openai/__init__.py,sha256=ZNytfy9PeGr-O4qkyCQLtANukfPlnOEynsXJ_5L75oU,1750
 opentelemetry/instrumentation/openai/shared/__init__.py,sha256=HcS1Ar6WX9DPtlJuiPji3u7XV_SwYerTf5O32Kfe1FQ,8839
-opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=q6uLpnqrgoXcuEf-W5D20TxfqWfcctrJEE9q4aD74CM,27835
+opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=YS1MLJEKmp_PFTl0cGBiX8dHBDrSdVZl6cN3VRvdA8E,27971
 opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=CZngvHkGtLUh-Ne4uzM6VH8LiajZsKVOV1glhmSwij0,6843
 opentelemetry/instrumentation/openai/shared/config.py,sha256=86mItW37lxSAyD8LAx4RbYWTR_-XKLeGxQgMozD5eNY,305
 opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=YI0lFGulaE8N2F1hdTGHj52kHwUy6KQPIt7Lw9AWJHc,7069
@@ -10,8 +10,8 @@ opentelemetry/instrumentation/openai/v0/__init__.py,sha256=02-bXv0aZbscMYO2W3jsH
 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=Me03yXizCG2hXimVttvq6I-XoZSxSRE2J-NrK4My4cU,23
-opentelemetry_instrumentation_openai-0.31.2.dist-info/METADATA,sha256=ZAtlUbVjaf0TDCYnJlMh_VtpXwCxBBcdB04sPg5FOOg,2255
-opentelemetry_instrumentation_openai-0.31.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-opentelemetry_instrumentation_openai-0.31.2.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
-opentelemetry_instrumentation_openai-0.31.2.dist-info/RECORD,,
+opentelemetry/instrumentation/openai/version.py,sha256=KeJnUdf2sotD3eMjgcCRocii5SSlhH5-B6DNBS_0gO8,23
+opentelemetry_instrumentation_openai-0.31.3.dist-info/METADATA,sha256=9s0Qze0lONCb6d7SYl2ssk-RcWwlRA5mvhWZFPjGwKg,2255
+opentelemetry_instrumentation_openai-0.31.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+opentelemetry_instrumentation_openai-0.31.3.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
+opentelemetry_instrumentation_openai-0.31.3.dist-info/RECORD,,