openlit 1.33.17__py3-none-any.whl → 1.33.19__py3-none-any.whl

openlit/__helpers.py

@@ -237,27 +237,21 @@ def extract_and_format_input(messages):
     them into fixed roles like 'user', 'assistant', 'system', 'tool'.
     """
 
-    fixed_roles = ['user', 'assistant', 'system', 'tool']  # Ensure these are your fixed keys
-    # Initialize the dictionary with fixed keys and empty structures
+    fixed_roles = ['user', 'assistant', 'system', 'tool', 'developer']
     formatted_messages = {role_key: {'role': '', 'content': ''} for role_key in fixed_roles}
 
     for message in messages:
-        # Normalize the message structure
         message = response_as_dict(message)
 
-        # Extract role and content
         role = message.get('role')
         if role not in fixed_roles:
-            continue  # Skip any role not in our predefined roles
+            continue
 
         content = message.get('content', '')
 
-        # Prepare content as a string
+        # Prepare content as a string, handling both list and str
         if isinstance(content, list):
-            content_str = ", ".join(
-                f'{item.get("type", "text")}: {extract_text_from_item(item)}'
-                for item in content
-            )
+            content_str = ", ".join(str(item) for item in content)
         else:
             content_str = content
 
@@ -272,30 +266,6 @@ def extract_and_format_input(messages):
 
     return formatted_messages
 
-def extract_text_from_item(item):
-    """
-    Extract text from inpit message
-    """
-
-    #pylint: disable=no-else-return
-    if item.get('type') == 'text':
-        return item.get('text', '')
-    elif item.get('type') == 'image':
-        # Handle image content specifically checking for 'url' or 'base64'
-        source = item.get('source', {})
-        if isinstance(source, dict):
-            if source.get('type') == 'base64':
-                # Return the actual base64 data if present
-                return source.get('data', '[Missing base64 data]')
-            elif source.get('type') == 'url':
-                return source.get('url', '[Missing URL]')
-    elif item.get('type') == 'image_url':
-        # New format: Handle the 'image_url' type
-        image_url = item.get('image_url', {})
-        if isinstance(image_url, dict):
-            return image_url.get('url', '[Missing image URL]')
-    return ''
-
 # To be removed one the change to log events (from span events) is complete
 def concatenate_all_contents(formatted_messages):
     """

openlit/instrumentation/azure_ai_inference/__init__.py

@@ -4,13 +4,11 @@ from typing import Collection
 import importlib.metadata
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from wrapt import wrap_function_wrapper
-
 from openlit.instrumentation.azure_ai_inference.azure_ai_inference import (
-    complete, embedding
+    complete
 )
-
 from openlit.instrumentation.azure_ai_inference.async_azure_ai_inference import (
-    async_complete, async_embedding
+    async_complete
 )
 
 _instruments = ('azure-ai-inference >= 1.0.0b4',)
@@ -27,6 +25,7 @@ class AzureAIInferenceInstrumentor(BaseInstrumentor):
         application_name = kwargs.get('application_name', 'default')
         environment = kwargs.get('environment', 'default')
         tracer = kwargs.get('tracer')
+        event_provider = kwargs.get('event_provider')
         metrics = kwargs.get('metrics_dict')
         pricing_info = kwargs.get('pricing_info', {})
         capture_message_content = kwargs.get('capture_message_content', False)
@@ -38,15 +37,7 @@ class AzureAIInferenceInstrumentor(BaseInstrumentor):
             'azure.ai.inference',
             'ChatCompletionsClient.complete',
             complete(version, environment, application_name,
-                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
-        )
-
-        # sync embedding
-        wrap_function_wrapper(
-            'azure.ai.inference',
-            'EmbeddingsClient.embed',
-            embedding(version, environment, application_name,
-                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # async generate
@@ -54,15 +45,7 @@ class AzureAIInferenceInstrumentor(BaseInstrumentor):
             'azure.ai.inference.aio',
             'ChatCompletionsClient.complete',
             async_complete(version, environment, application_name,
-                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
-        )
-
-        # async embedding
-        wrap_function_wrapper(
-            'azure.ai.inference.aio',
-            'EmbeddingsClient.embed',
-            async_embedding(version, environment, application_name,
-                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):