openlit 1.34.4__tar.gz → 1.34.5__tar.gz

{openlit-1.34.4 → openlit-1.34.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openlit
-Version: 1.34.4
+Version: 1.34.5
 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.34.4 → openlit-1.34.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openlit"
-version = "1.34.4"
+version = "1.34.5"
 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.34.4 → openlit-1.34.5}/src/openlit/instrumentation/google_ai_studio/__init__.py

@@ -1,4 +1,3 @@
-# pylint: disable=useless-return, bad-staticmethod-argument, disable=duplicate-code
 """Initializer of Auto Instrumentation of Google AI Studio Functions"""
 
 from typing import Collection
@@ -25,8 +24,8 @@ class GoogleAIStudioInstrumentor(BaseInstrumentor):
         return _instruments
 
     def _instrument(self, **kwargs):
-        application_name = kwargs.get("application_name", "default_application")
-        environment = kwargs.get("environment", "default_environment")
+        application_name = kwargs.get("application_name", "default")
+        environment = kwargs.get("environment", "default")
         tracer = kwargs.get("tracer")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info", {})
@@ -67,5 +66,4 @@ class GoogleAIStudioInstrumentor(BaseInstrumentor):
         )
 
     def _uninstrument(self, **kwargs):
-        # Proper uninstrumentation logic to revert patched methods
         pass

{openlit-1.34.4 → openlit-1.34.5}/src/openlit/instrumentation/google_ai_studio/async_google_ai_studio.py

@@ -2,7 +2,6 @@
 Module for monitoring Google AI Studio API calls.
 """
 
-import logging
 import time
 from opentelemetry.trace import SpanKind
 from openlit.__helpers import (
@@ -16,9 +15,6 @@ from openlit.instrumentation.google_ai_studio.utils import (
 )
 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):
     """
@@ -61,7 +57,6 @@ def async_generate(version, environment, application_name,
 
             except Exception as e:
                 handle_exception(span, e)
-                logger.error("Error in trace creation: %s", e)
 
             # Return original response
             return response
@@ -144,7 +139,6 @@ def async_generate_stream(version, environment, application_name,
 
                 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):

{openlit-1.34.4 → openlit-1.34.5}/src/openlit/instrumentation/google_ai_studio/google_ai_studio.py

@@ -2,7 +2,6 @@
 Module for monitoring Google AI Studio API calls.
 """
 
-import logging
 import time
 from opentelemetry.trace import SpanKind
 from openlit.__helpers import (
@@ -16,9 +15,6 @@ from openlit.instrumentation.google_ai_studio.utils import (
 )
 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):
     """
@@ -61,7 +57,6 @@ def generate(version, environment, application_name,
 
             except Exception as e:
                 handle_exception(span, e)
-                logger.error("Error in trace creation: %s", e)
 
             # Return original response
             return response
@@ -144,7 +139,6 @@ def generate_stream(version, environment, application_name,
 
                 except Exception as e:
                     handle_exception(self._span, e)
-                    logger.error("Error in trace creation: %s", e)
                 raise
 
     def wrapper(wrapped, instance, args, kwargs):

{openlit-1.34.4 → openlit-1.34.5}/src/openlit/instrumentation/google_ai_studio/utils.py

@@ -15,8 +15,7 @@ from openlit.semcov import SemanticConvention
 
 def format_content(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.
+    Process a list of messages to extract content.
     """
 
     formatted_messages = []

{openlit-1.34.4 → openlit-1.34.5}/src/openlit/instrumentation/together/__init__.py

@@ -1,4 +1,3 @@
-# pylint: disable=useless-return, bad-staticmethod-argument, disable=duplicate-code
 """Initializer of Auto Instrumentation of Together AI Functions"""
 
 from typing import Collection
@@ -17,15 +16,15 @@ _instruments = ("together >= 1.3.5",)
 
 class TogetherInstrumentor(BaseInstrumentor):
     """
-    An instrumentor for Together's client library.
+    An instrumentor for Together client library.
     """
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
     def _instrument(self, **kwargs):
-        application_name = kwargs.get("application_name", "default_application")
-        environment = kwargs.get("environment", "default_environment")
+        application_name = kwargs.get("application_name", "default")
+        environment = kwargs.get("environment", "default")
         tracer = kwargs.get("tracer")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info", {})
@@ -66,5 +65,4 @@ class TogetherInstrumentor(BaseInstrumentor):
         )
 
     def _uninstrument(self, **kwargs):
-        # Proper uninstrumentation logic to revert patched methods
         pass

openlit-1.34.5/src/openlit/instrumentation/together/async_together.py

@@ -0,0 +1,194 @@
+"""
+Module for monitoring Together API calls.
+"""
+
+import time
+from opentelemetry.trace import SpanKind
+from openlit.__helpers import (
+    handle_exception,
+    set_server_address_and_port
+)
+from openlit.instrumentation.together.utils import (
+    process_chat_response,
+    process_chunk,
+    process_streaming_chat_response,
+    process_image_response
+)
+from openlit.semcov import SemanticConvention
+
+def async_completion(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._response_id = ""
+            self._response_model = ""
+            self._input_tokens = 0
+            self._output_tokens = 0
+            self._finish_reason = ""
+            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 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)
+
+                raise
+
+    async def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the GenAI function call.
+        """
+
+        # Check if streaming is enabled for the API call
+        streaming = kwargs.get("stream", False)
+
+        server_address, server_port = set_server_address_and_port(instance, "api.together.xyz", 443)
+        request_model = kwargs.get("model", "gpt-4o")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT} {request_model}"
+
+        if streaming:
+            # Special handling for streaming response to accommodate the nature of data flow
+            awaited_wrapped = await wrapped(*args, **kwargs)
+            span = tracer.start_span(span_name, kind=SpanKind.CLIENT)
+            return TracedAsyncStream(awaited_wrapped, span, span_name, kwargs, server_address, server_port)
+
+        # Handling for non-streaming responses
+        else:
+            with tracer.start_as_current_span(span_name, kind= SpanKind.CLIENT) as span:
+                start_time = time.time()
+                response = await wrapped(*args, **kwargs)
+
+                try:
+                    response = process_chat_response(
+                        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,
+                        capture_message_content=capture_message_content,
+                        disable_metrics=disable_metrics,
+                        version=version,
+                        **kwargs
+                    )
+
+                except Exception as e:
+                    handle_exception(span, e)
+
+                return response
+
+    return wrapper
+
+def async_image_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, "api.together.xyz", 443)
+        request_model = kwargs.get("model", "dall-e-2")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_IMAGE} {request_model}"
+
+        with tracer.start_as_current_span(span_name, kind= SpanKind.CLIENT) as span:
+            start_time = time.time()
+            response = await wrapped(*args, **kwargs)
+            end_time = time.time()
+
+            try:
+                response = process_image_response(
+                    response=response,
+                    request_model=request_model,
+                    pricing_info=pricing_info,
+                    server_address=server_address,
+                    server_port=server_port,
+                    environment=environment,
+                    application_name=application_name,
+                    metrics=metrics,
+                    start_time=start_time,
+                    end_time=end_time,
+                    span=span,
+                    capture_message_content=capture_message_content,
+                    disable_metrics=disable_metrics,
+                    version=version,
+                    **kwargs
+                )
+
+                return response
+
+            except Exception as e:
+                handle_exception(span, e)
+                return response
+
+    return wrapper

openlit-1.34.5/src/openlit/instrumentation/together/together.py

@@ -0,0 +1,194 @@
+"""
+Module for monitoring Together API calls.
+"""
+
+import time
+from opentelemetry.trace import SpanKind
+from openlit.__helpers import (
+    handle_exception,
+    set_server_address_and_port
+)
+from openlit.instrumentation.together.utils import (
+    process_chat_response,
+    process_chunk,
+    process_streaming_chat_response,
+    process_image_response
+)
+from openlit.semcov import SemanticConvention
+
+def completion(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._response_id = ""
+            self._response_model = ""
+            self._input_tokens = 0
+            self._output_tokens = 0
+            self._finish_reason = ""
+            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)
+
+                raise
+
+    def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the GenAI function call.
+        """
+
+        # Check if streaming is enabled for the API call
+        streaming = kwargs.get("stream", False)
+
+        server_address, server_port = set_server_address_and_port(instance, "api.together.xyz", 443)
+        request_model = kwargs.get("model", "gpt-4o")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT} {request_model}"
+
+        if streaming:
+            # Special handling for streaming response to accommodate the nature of data flow
+            awaited_wrapped = wrapped(*args, **kwargs)
+            span = tracer.start_span(span_name, kind=SpanKind.CLIENT)
+            return TracedSyncStream(awaited_wrapped, span, span_name, kwargs, server_address, server_port)
+
+        # Handling for non-streaming responses
+        else:
+            with tracer.start_as_current_span(span_name, kind= SpanKind.CLIENT) as span:
+                start_time = time.time()
+                response = wrapped(*args, **kwargs)
+
+                try:
+                    response = process_chat_response(
+                        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,
+                        capture_message_content=capture_message_content,
+                        disable_metrics=disable_metrics,
+                        version=version,
+                        **kwargs
+                    )
+
+                except Exception as e:
+                    handle_exception(span, e)
+
+                return response
+
+    return wrapper
+
+def image_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, "api.together.xyz", 443)
+        request_model = kwargs.get("model", "dall-e-2")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_IMAGE} {request_model}"
+
+        with tracer.start_as_current_span(span_name, kind= SpanKind.CLIENT) as span:
+            start_time = time.time()
+            response = wrapped(*args, **kwargs)
+            end_time = time.time()
+
+            try:
+                response = process_image_response(
+                    response=response,
+                    request_model=request_model,
+                    pricing_info=pricing_info,
+                    server_address=server_address,
+                    server_port=server_port,
+                    environment=environment,
+                    application_name=application_name,
+                    metrics=metrics,
+                    start_time=start_time,
+                    end_time=end_time,
+                    span=span,
+                    capture_message_content=capture_message_content,
+                    disable_metrics=disable_metrics,
+                    version=version,
+                    **kwargs
+                )
+
+                return response
+
+            except Exception as e:
+                handle_exception(span, e)
+                return response
+
+    return wrapper