openlit 1.33.20__tar.gz → 1.33.22__tar.gz

{openlit-1.33.20 → openlit-1.33.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openlit
-Version: 1.33.20
+Version: 1.33.22
 Summary: OpenTelemetry-native Auto instrumentation library for monitoring LLM Applications and GPUs, facilitating the integration of observability into your GenAI-driven projects
 License: Apache-2.0
 Keywords: OpenTelemetry,otel,otlp,llm,tracing,openai,anthropic,claude,cohere,llm monitoring,observability,monitoring,gpt,Generative AI,chatGPT,gpu

{openlit-1.33.20 → openlit-1.33.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openlit"
-version = "1.33.20"
+version = "1.33.22"
 description = "OpenTelemetry-native Auto instrumentation library for monitoring LLM Applications and GPUs, facilitating the integration of observability into your GenAI-driven projects"
 authors = ["OpenLIT"]
 license = "Apache-2.0"

{openlit-1.33.20 → openlit-1.33.22}/src/openlit/__helpers.py

@@ -240,6 +240,11 @@ def extract_and_format_input(messages):
     fixed_roles = ['user', 'assistant', 'system', 'tool', 'developer']
     formatted_messages = {role_key: {'role': '', 'content': ''} for role_key in fixed_roles}
 
+    # Check if input is a simple string
+    if isinstance(messages, str):
+        formatted_messages['user'] = {'role': 'user', 'content': messages}
+        return formatted_messages
+
     for message in messages:
         message = response_as_dict(message)
 
@@ -276,3 +281,55 @@ def concatenate_all_contents(formatted_messages):
         for message_data in formatted_messages.values()
         if message_data['content']
     )
+
+def format_and_concatenate(messages):
+    """
+    Process a list of messages to extract content, categorize them by role,
+    and concatenate all 'content' fields into a single string with role: content format.
+    """
+
+    formatted_messages = {}
+
+    # Check if input is a simple string
+    if isinstance(messages, str):
+        formatted_messages['user'] = {'role': 'user', 'content': messages}
+    elif isinstance(messages, list) and all(isinstance(m, str) for m in messages):
+        # If it's a list of strings, each string is 'user' input
+        user_content = ' '.join(messages)
+        formatted_messages['user'] = {'role': 'user', 'content': user_content}
+    else:
+        for message in messages:
+            message = response_as_dict(message)
+            role = message.get('role', 'unknown')  # Default to 'unknown' if no role is specified
+            content = message.get('content', '')
+
+            # Initialize role in formatted messages if not present
+            if role not in formatted_messages:
+                formatted_messages[role] = {'role': role, 'content': ''}
+
+            # Handle list of dictionaries in content
+            if isinstance(content, list):
+                content_str = []
+                for item in content:
+                    if isinstance(item, dict):
+                        # Collect text or other attributes as needed
+                        text = item.get('text', '')
+                        image_url = item.get('image_url', '')
+                        content_str.append(text)
+                        content_str.append(image_url)
+                content_str = ", ".join(filter(None, content_str))
+            else:
+                content_str = content
+
+            # Concatenate content
+            if formatted_messages[role]['content']:
+                formatted_messages[role]['content'] += ' ' + content_str
+            else:
+                formatted_messages[role]['content'] = content_str
+
+    # Concatenate role and content for all messages
+    return ' '.join(
+        f"{message_data['role']}: {message_data['content']}"
+        for message_data in formatted_messages.values()
+        if message_data['content']
+    )

{openlit-1.33.20 → openlit-1.33.22}/src/openlit/instrumentation/google_ai_studio/__init__.py

@@ -7,11 +7,11 @@ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from wrapt import wrap_function_wrapper
 
 from openlit.instrumentation.google_ai_studio.google_ai_studio import (
-    generate
+    generate, generate_stream
 )
 
 from openlit.instrumentation.google_ai_studio.async_google_ai_studio import (
-    async_generate
+    async_generate, async_generate_stream
 )
 
 _instruments = ("google-genai >= 1.3.0",)
@@ -39,16 +39,31 @@ class GoogleAIStudioInstrumentor(BaseInstrumentor):
             "google.genai.models",
             "Models.generate_content",
             generate(version, environment, application_name,
-                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        # sync stream generate
+        wrap_function_wrapper(
+            "google.genai.models",
+            "Models.generate_content_stream",
+            generate_stream(version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # async generate
         wrap_function_wrapper(
             "google.genai.models",
             "AsyncModels.generate_content",
-            async_generate(version, environment,
-                           application_name, tracer, pricing_info, capture_message_content, metrics,
-                           disable_metrics),
+            async_generate(version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+        )
+
+        # async stream generate
+        wrap_function_wrapper(
+            "google.genai.models",
+            "AsyncModels.generate_content_stream",
+            async_generate_stream(version, environment, application_name,
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):

openlit-1.33.22/src/openlit/instrumentation/google_ai_studio/async_google_ai_studio.py

@@ -0,0 +1,159 @@
+"""
+Module for monitoring Google AI Studio API calls.
+"""
+
+import logging
+import time
+from opentelemetry.trace import SpanKind
+from openlit.__helpers import (
+    handle_exception,
+    set_server_address_and_port
+)
+from openlit.instrumentation.google_ai_studio.utils import (
+    process_chat_response,
+    process_chunk,
+    process_streaming_chat_response
+)
+from openlit.semcov import SemanticConvention
+
+# Initialize logger for logging potential issues and operations
+logger = logging.getLogger(__name__)
+
+def async_generate(version, environment, application_name,
+    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+    """
+    Generates a telemetry wrapper for GenAI function call
+    """
+
+    async def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the GenAI function call.
+        """
+
+        server_address, server_port = set_server_address_and_port(instance, "generativelanguage.googleapis.com", 443)
+        request_model = kwargs.get("model", "gemini-2.0-flash")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT} {request_model}"
+
+        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
+            start_time = time.time()
+            response = await wrapped(*args, **kwargs)
+
+            response = process_chat_response(
+                    instance = instance,
+                    response=response,
+                    request_model=request_model,
+                    pricing_info=pricing_info,
+                    server_port=server_port,
+                    server_address=server_address,
+                    environment=environment,
+                    application_name=application_name,
+                    metrics=metrics,
+                    start_time=start_time,
+                    span=span,
+                    args=args,
+                    kwargs=kwargs,
+                    capture_message_content=capture_message_content,
+                    disable_metrics=disable_metrics,
+                    version=version,
+            )
+
+        return response
+
+    return wrapper
+
+def async_generate_stream(version, environment, application_name,
+    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+    """
+    Generates a telemetry wrapper for GenAI function call
+    """
+
+    class TracedAsyncStream:
+        """
+        Wrapper for streaming responses to collect telemetry.
+        """
+
+        def __init__(
+                self,
+                wrapped,
+                span,
+                span_name,
+                kwargs,
+                server_address,
+                server_port,
+                **args,
+            ):
+            self.__wrapped__ = wrapped
+            self._span = span
+            self._span_name = span_name
+            self._llmresponse = ''
+            self._finish_reason = ''
+            self._output_tokens = ''
+            self._input_tokens = ''
+            self._response_model = ''
+            self._tools = None
+
+            self._args = args
+            self._kwargs = kwargs
+            self._start_time = time.time()
+            self._end_time = None
+            self._timestamps = []
+            self._ttft = 0
+            self._tbt = 0
+            self._server_address = server_address
+            self._server_port = server_port
+
+        async def __aenter__(self):
+            await self.__wrapped__.__aenter__()
+            return self
+
+        async def __aexit__(self, exc_type, exc_value, traceback):
+            await self.__wrapped__.__aexit__(exc_type, exc_value, traceback)
+
+        def __aiter__(self):
+            return self
+
+        async def __getattr__(self, name):
+            """Delegate attribute access to the wrapped object."""
+            return getattr(await self.__wrapped__, name)
+
+        async def __anext__(self):
+            try:
+                chunk = await self.__wrapped__.__anext__()
+                process_chunk(self, chunk)
+                return chunk
+            except StopAsyncIteration:
+                try:
+                    with tracer.start_as_current_span(self._span_name, kind= SpanKind.CLIENT) as self._span:
+                        process_streaming_chat_response(
+                            self,
+                            pricing_info=pricing_info,
+                            environment=environment,
+                            application_name=application_name,
+                            metrics=metrics,
+                            capture_message_content=capture_message_content,
+                            disable_metrics=disable_metrics,
+                            version=version
+                        )
+
+                except Exception as e:
+                    handle_exception(self._span, e)
+                    logger.error("Error in trace creation: %s", e)
+                raise
+
+    async def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the GenAI function call.
+        """
+
+        server_address, server_port = set_server_address_and_port(instance, "generativelanguage.googleapis.com", 443)
+        request_model = kwargs.get("model", "gemini-2.0-flash")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT} {request_model}"
+
+        awaited_wrapped = await wrapped(*args, **kwargs)
+        span = tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT)
+
+        return TracedAsyncStream(awaited_wrapped, span, span_name, kwargs, server_address, server_port)
+
+    return wrapper

openlit-1.33.22/src/openlit/instrumentation/google_ai_studio/google_ai_studio.py

@@ -0,0 +1,159 @@
+"""
+Module for monitoring Google AI Studio API calls.
+"""
+
+import logging
+import time
+from opentelemetry.trace import SpanKind
+from openlit.__helpers import (
+    handle_exception,
+    set_server_address_and_port
+)
+from openlit.instrumentation.google_ai_studio.utils import (
+    process_chat_response,
+    process_chunk,
+    process_streaming_chat_response
+)
+from openlit.semcov import SemanticConvention
+
+# Initialize logger for logging potential issues and operations
+logger = logging.getLogger(__name__)
+
+def generate(version, environment, application_name,
+    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+    """
+    Generates a telemetry wrapper for GenAI function call
+    """
+
+    def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the GenAI function call.
+        """
+
+        server_address, server_port = set_server_address_and_port(instance, "generativelanguage.googleapis.com", 443)
+        request_model = kwargs.get("model", "gemini-2.0-flash")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT} {request_model}"
+
+        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
+            start_time = time.time()
+            response = wrapped(*args, **kwargs)
+
+            response = process_chat_response(
+                    instance = instance,
+                    response=response,
+                    request_model=request_model,
+                    pricing_info=pricing_info,
+                    server_port=server_port,
+                    server_address=server_address,
+                    environment=environment,
+                    application_name=application_name,
+                    metrics=metrics,
+                    start_time=start_time,
+                    span=span,
+                    args=args,
+                    kwargs=kwargs,
+                    capture_message_content=capture_message_content,
+                    disable_metrics=disable_metrics,
+                    version=version,
+            )
+
+        return response
+
+    return wrapper
+
+def generate_stream(version, environment, application_name,
+    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+    """
+    Generates a telemetry wrapper for GenAI function call
+    """
+
+    class TracedSyncStream:
+        """
+        Wrapper for streaming responses to collect telemetry.
+        """
+
+        def __init__(
+                self,
+                wrapped,
+                span,
+                span_name,
+                kwargs,
+                server_address,
+                server_port,
+                **args,
+            ):
+            self.__wrapped__ = wrapped
+            self._span = span
+            self._span_name = span_name
+            self._llmresponse = ''
+            self._finish_reason = ''
+            self._output_tokens = ''
+            self._input_tokens = ''
+            self._response_model = ''
+            self._tools = None
+
+            self._args = args
+            self._kwargs = kwargs
+            self._start_time = time.time()
+            self._end_time = None
+            self._timestamps = []
+            self._ttft = 0
+            self._tbt = 0
+            self._server_address = server_address
+            self._server_port = server_port
+
+        def __enter__(self):
+            self.__wrapped__.__enter__()
+            return self
+
+        def __exit__(self, exc_type, exc_value, traceback):
+            self.__wrapped__.__exit__(exc_type, exc_value, traceback)
+
+        def __iter__(self):
+            return self
+
+        def __getattr__(self, name):
+            """Delegate attribute access to the wrapped object."""
+            return getattr(self.__wrapped__, name)
+
+        def __next__(self):
+            try:
+                chunk = self.__wrapped__.__next__()
+                process_chunk(self, chunk)
+                return chunk
+            except StopIteration:
+                try:
+                    with tracer.start_as_current_span(self._span_name, kind= SpanKind.CLIENT) as self._span:
+                        process_streaming_chat_response(
+                            self,
+                            pricing_info=pricing_info,
+                            environment=environment,
+                            application_name=application_name,
+                            metrics=metrics,
+                            capture_message_content=capture_message_content,
+                            disable_metrics=disable_metrics,
+                            version=version
+                        )
+
+                except Exception as e:
+                    handle_exception(self._span, e)
+                    logger.error("Error in trace creation: %s", e)
+                raise
+
+    def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the GenAI function call.
+        """
+
+        server_address, server_port = set_server_address_and_port(instance, "generativelanguage.googleapis.com", 443)
+        request_model = kwargs.get("model", "gemini-2.0-flash")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT} {request_model}"
+
+        awaited_wrapped = wrapped(*args, **kwargs)
+        span = tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT)
+
+        return TracedSyncStream(awaited_wrapped, span, span_name, kwargs, server_address, server_port)
+
+    return wrapper