openlit 1.34.30__py3-none-any.whl → 1.34.31__py3-none-any.whl

openlit/instrumentation/multion/async_multion.py

@@ -5,7 +5,11 @@ Module for monitoring multion calls.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
+from opentelemetry.sdk.resources import (
+    SERVICE_NAME,
+    TELEMETRY_SDK_NAME,
+    DEPLOYMENT_ENVIRONMENT,
+)
 from openlit.__helpers import (
     handle_exception,
 )
@@ -14,8 +18,18 @@ from openlit.semcov import SemanticConvention
 # Initialize logger for logging potential issues and operations
 logger = logging.getLogger(__name__)
 
-def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
-                     tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+
+def async_multion_wrap(
+    gen_ai_endpoint,
+    version,
+    environment,
+    application_name,
+    tracer,
+    pricing_info,
+    capture_message_content,
+    metrics,
+    disable_metrics,
+):
     """
     Generates a telemetry wrapper for chat completions to collect metrics.
 
@@ -50,36 +64,47 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
         """
 
         # pylint: disable=line-too-long
-        with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
+        with tracer.start_as_current_span(
+            gen_ai_endpoint, kind=SpanKind.CLIENT
+        ) as span:
             response = await wrapped(*args, **kwargs)
 
             try:
                 # Set base span attribues
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
-                span.set_attribute(SemanticConvention.GEN_AI_SYSTEM,
-                                    SemanticConvention.GEN_AI_SYSTEM_MULTION)
-                span.set_attribute(SemanticConvention.GEN_AI_OPERATION,
-                                    SemanticConvention.GEN_AI_OPERATION_TYPE_AGENT)
-                span.set_attribute(SemanticConvention.GEN_AI_ENDPOINT,
-                                    gen_ai_endpoint)
-                span.set_attribute(SERVICE_NAME,
-                                    application_name)
-                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
-                                    environment)
+                span.set_attribute(
+                    SemanticConvention.GEN_AI_SYSTEM,
+                    SemanticConvention.GEN_AI_SYSTEM_MULTION,
+                )
+                span.set_attribute(
+                    SemanticConvention.GEN_AI_OPERATION,
+                    SemanticConvention.GEN_AI_OPERATION_TYPE_AGENT,
+                )
+                span.set_attribute(SemanticConvention.GEN_AI_ENDPOINT, gen_ai_endpoint)
+                span.set_attribute(SERVICE_NAME, application_name)
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT, environment)
 
                 if gen_ai_endpoint == "multion.browse":
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
-                                    kwargs.get("url", ""))
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_STEP_COUNT,
-                                    response.metadata.step_count)
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_RESPONSE_TIME,
-                                    response.metadata.processing_time)
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
+                        kwargs.get("url", ""),
+                    )
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_STEP_COUNT,
+                        response.metadata.step_count,
+                    )
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_RESPONSE_TIME,
+                        response.metadata.processing_time,
+                    )
 
                     if capture_message_content:
                         span.add_event(
                             name=SemanticConvention.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
-                                SemanticConvention.GEN_AI_CONTENT_PROMPT: kwargs.get("cmd", ""),
+                                SemanticConvention.GEN_AI_CONTENT_PROMPT: kwargs.get(
+                                    "cmd", ""
+                                ),
                             },
                         )
                         span.add_event(
@@ -89,14 +114,18 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                             },
                         )
                 elif gen_ai_endpoint == "multion.retrieve":
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
-                                    kwargs.get("url", ""))
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
+                        kwargs.get("url", ""),
+                    )
 
                     if capture_message_content:
                         span.add_event(
                             name=SemanticConvention.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
-                                SemanticConvention.GEN_AI_CONTENT_PROMPT: kwargs.get("cmd", ""),
+                                SemanticConvention.GEN_AI_CONTENT_PROMPT: kwargs.get(
+                                    "cmd", ""
+                                ),
                             },
                         )
                         span.add_event(
@@ -107,8 +136,10 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                         )
 
                 elif gen_ai_endpoint == "multion.sessions.create":
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
-                                    kwargs.get("url", ""))
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
+                        kwargs.get("url", ""),
+                    )
 
                     if capture_message_content:
                         span.add_event(

openlit/instrumentation/multion/multion.py

@@ -5,7 +5,11 @@ Module for monitoring multion calls.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
+from opentelemetry.sdk.resources import (
+    SERVICE_NAME,
+    TELEMETRY_SDK_NAME,
+    DEPLOYMENT_ENVIRONMENT,
+)
 from openlit.__helpers import (
     handle_exception,
 )
@@ -14,8 +18,18 @@ from openlit.semcov import SemanticConvention
 # Initialize logger for logging potential issues and operations
 logger = logging.getLogger(__name__)
 
-def multion_wrap(gen_ai_endpoint, version, environment, application_name,
-                     tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+
+def multion_wrap(
+    gen_ai_endpoint,
+    version,
+    environment,
+    application_name,
+    tracer,
+    pricing_info,
+    capture_message_content,
+    metrics,
+    disable_metrics,
+):
     """
     Generates a telemetry wrapper for chat completions to collect metrics.
 
@@ -50,36 +64,47 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
         """
 
         # pylint: disable=line-too-long
-        with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
+        with tracer.start_as_current_span(
+            gen_ai_endpoint, kind=SpanKind.CLIENT
+        ) as span:
             response = wrapped(*args, **kwargs)
 
             try:
                 # Set base span attribues
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
-                span.set_attribute(SemanticConvention.GEN_AI_SYSTEM,
-                                    SemanticConvention.GEN_AI_SYSTEM_MULTION)
-                span.set_attribute(SemanticConvention.GEN_AI_OPERATION,
-                                    SemanticConvention.GEN_AI_OPERATION_TYPE_AGENT)
-                span.set_attribute(SemanticConvention.GEN_AI_ENDPOINT,
-                                    gen_ai_endpoint)
-                span.set_attribute(SERVICE_NAME,
-                                    application_name)
-                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
-                                    environment)
+                span.set_attribute(
+                    SemanticConvention.GEN_AI_SYSTEM,
+                    SemanticConvention.GEN_AI_SYSTEM_MULTION,
+                )
+                span.set_attribute(
+                    SemanticConvention.GEN_AI_OPERATION,
+                    SemanticConvention.GEN_AI_OPERATION_TYPE_AGENT,
+                )
+                span.set_attribute(SemanticConvention.GEN_AI_ENDPOINT, gen_ai_endpoint)
+                span.set_attribute(SERVICE_NAME, application_name)
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT, environment)
 
                 if gen_ai_endpoint == "multion.browse":
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
-                                    kwargs.get("url", ""))
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_STEP_COUNT,
-                                    response.metadata.step_count)
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_RESPONSE_TIME,
-                                    response.metadata.processing_time)
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
+                        kwargs.get("url", ""),
+                    )
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_STEP_COUNT,
+                        response.metadata.step_count,
+                    )
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_RESPONSE_TIME,
+                        response.metadata.processing_time,
+                    )
 
                     if capture_message_content:
                         span.add_event(
                             name=SemanticConvention.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
-                                SemanticConvention.GEN_AI_CONTENT_PROMPT: kwargs.get("cmd", ""),
+                                SemanticConvention.GEN_AI_CONTENT_PROMPT: kwargs.get(
+                                    "cmd", ""
+                                ),
                             },
                         )
                         span.add_event(
@@ -89,14 +114,18 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                             },
                         )
                 elif gen_ai_endpoint == "multion.retrieve":
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
-                                    kwargs.get("url", ""))
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
+                        kwargs.get("url", ""),
+                    )
 
                     if capture_message_content:
                         span.add_event(
                             name=SemanticConvention.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
-                                SemanticConvention.GEN_AI_CONTENT_PROMPT: kwargs.get("cmd", ""),
+                                SemanticConvention.GEN_AI_CONTENT_PROMPT: kwargs.get(
+                                    "cmd", ""
+                                ),
                             },
                         )
                         span.add_event(
@@ -107,8 +136,10 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                         )
 
                 elif gen_ai_endpoint == "multion.sessions.create":
-                    span.set_attribute(SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
-                                    kwargs.get("url", ""))
+                    span.set_attribute(
+                        SemanticConvention.GEN_AI_AGENT_BROWSE_URL,
+                        kwargs.get("url", ""),
+                    )
 
                     if capture_message_content:
                         span.add_event(

openlit/instrumentation/ollama/__init__.py

@@ -7,15 +7,12 @@ import importlib.metadata
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from wrapt import wrap_function_wrapper
 
-from openlit.instrumentation.ollama.ollama import (
-    chat, embeddings
-)
-from openlit.instrumentation.ollama.async_ollama import (
-    async_chat, async_embeddings
-)
+from openlit.instrumentation.ollama.ollama import chat, embeddings
+from openlit.instrumentation.ollama.async_ollama import async_chat, async_embeddings
 
 _instruments = ("ollama >= 0.2.0",)
 
+
 # Dispatch wrapper to route instrumentation to chat or embeddings based on path
 def _dispatch(sync_chat_wrap, sync_emb_wrap):
     def wrapper(wrapped, instance, args, kwargs):
@@ -26,8 +23,10 @@ def _dispatch(sync_chat_wrap, sync_emb_wrap):
             if op == "embeddings":
                 return sync_emb_wrap(wrapped, instance, args, kwargs)
         return wrapped(*args, **kwargs)
+
     return wrapper
 
+
 def _dispatch_async(async_chat_wrap, async_emb_wrap):
     async def wrapper(wrapped, instance, args, kwargs):
         if len(args) > 2 and isinstance(args[2], str):
@@ -37,8 +36,10 @@ def _dispatch_async(async_chat_wrap, async_emb_wrap):
             if op == "embeddings":
                 return await async_emb_wrap(wrapped, instance, args, kwargs)
         return await wrapped(*args, **kwargs)
+
     return wrapper
 
+
 class OllamaInstrumentor(BaseInstrumentor):
     """
     An instrumentor for Ollama client library.
@@ -59,24 +60,44 @@ class OllamaInstrumentor(BaseInstrumentor):
 
         # Build wrapper factories for chat and embeddings
         sync_chat_wrap = chat(
-            version, environment, application_name,
-            tracer, pricing_info,
-            capture_message_content, metrics, disable_metrics
+            version,
+            environment,
+            application_name,
+            tracer,
+            pricing_info,
+            capture_message_content,
+            metrics,
+            disable_metrics,
         )
         sync_emb_wrap = embeddings(
-            version, environment, application_name,
-            tracer, pricing_info,
-            capture_message_content, metrics, disable_metrics
+            version,
+            environment,
+            application_name,
+            tracer,
+            pricing_info,
+            capture_message_content,
+            metrics,
+            disable_metrics,
         )
         async_chat_wrap = async_chat(
-            version, environment, application_name,
-            tracer, pricing_info,
-            capture_message_content, metrics, disable_metrics
+            version,
+            environment,
+            application_name,
+            tracer,
+            pricing_info,
+            capture_message_content,
+            metrics,
+            disable_metrics,
         )
         async_emb_wrap = async_embeddings(
-            version, environment, application_name,
-            tracer, pricing_info,
-            capture_message_content, metrics, disable_metrics
+            version,
+            environment,
+            application_name,
+            tracer,
+            pricing_info,
+            capture_message_content,
+            metrics,
+            disable_metrics,
         )
 
         # Patch underlying request methods to ensure instrumentation regardless of import order

openlit/instrumentation/ollama/async_ollama.py

@@ -4,20 +4,26 @@ Module for monitoring Ollama API calls.
 
 import time
 from opentelemetry.trace import SpanKind
-from openlit.__helpers import (
-    handle_exception,
-    set_server_address_and_port
-)
+from openlit.__helpers import handle_exception, set_server_address_and_port
 from openlit.instrumentation.ollama.utils import (
     process_chunk,
     process_chat_response,
     process_streaming_chat_response,
-    process_embedding_response
+    process_embedding_response,
 )
 from openlit.semcov import SemanticConvention
 
-def async_chat(version, environment, application_name,
-            tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+
+def async_chat(
+    version,
+    environment,
+    application_name,
+    tracer,
+    pricing_info,
+    capture_message_content,
+    metrics,
+    disable_metrics,
+):
     """
     Generates a telemetry wrapper for Ollama async chat function call
     """
@@ -28,15 +34,15 @@ def async_chat(version, environment, application_name,
         """
 
         def __init__(
-                self,
-                wrapped,
-                span,
-                span_name,
-                kwargs,
-                server_address,
-                server_port,
-                args,
-            ):
+            self,
+            wrapped,
+            span,
+            span_name,
+            kwargs,
+            server_address,
+            server_port,
+            args,
+        ):
             self.__wrapped__ = wrapped
             self._span = span
             self._llmresponse = ""
@@ -78,7 +84,9 @@ def async_chat(version, environment, application_name,
                 return chunk
             except StopAsyncIteration:
                 try:
-                    with tracer.start_as_current_span(self._span_name, kind=SpanKind.CLIENT) as self._span:
+                    with tracer.start_as_current_span(
+                        self._span_name, kind=SpanKind.CLIENT
+                    ) as self._span:
                         process_streaming_chat_response(
                             self,
                             pricing_info=pricing_info,
@@ -87,7 +95,7 @@ def async_chat(version, environment, application_name,
                             metrics=metrics,
                             capture_message_content=capture_message_content,
                             disable_metrics=disable_metrics,
-                            version=version
+                            version=version,
                         )
                 except Exception as e:
                     handle_exception(self._span, e)
@@ -101,7 +109,9 @@ def async_chat(version, environment, application_name,
 
         streaming = kwargs.get("stream", False)
 
-        server_address, server_port = set_server_address_and_port(instance, "127.0.0.1", 11434)
+        server_address, server_port = set_server_address_and_port(
+            instance, "127.0.0.1", 11434
+        )
         json_body = kwargs.get("json", {}) or {}
         request_model = json_body.get("model") or kwargs.get("model")
 
@@ -110,7 +120,15 @@ def async_chat(version, environment, application_name,
         if streaming:
             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, args)
+            return TracedAsyncStream(
+                awaited_wrapped,
+                span,
+                span_name,
+                kwargs,
+                server_address,
+                server_port,
+                args,
+            )
 
         else:
             with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
@@ -133,7 +151,7 @@ def async_chat(version, environment, application_name,
                         capture_message_content=capture_message_content,
                         disable_metrics=disable_metrics,
                         version=version,
-                        **kwargs
+                        **kwargs,
                     )
 
                 except Exception as e:
@@ -143,8 +161,17 @@ def async_chat(version, environment, application_name,
 
     return wrapper
 
-def async_embeddings(version, environment, application_name,
-              tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+
+def async_embeddings(
+    version,
+    environment,
+    application_name,
+    tracer,
+    pricing_info,
+    capture_message_content,
+    metrics,
+    disable_metrics,
+):
     """
     Generates a telemetry wrapper for Ollama async embeddings function call
     """
@@ -154,10 +181,14 @@ def async_embeddings(version, environment, application_name,
         Wraps the Ollama async embeddings function call.
         """
 
-        server_address, server_port = set_server_address_and_port(instance, "127.0.0.1", 11434)
+        server_address, server_port = set_server_address_and_port(
+            instance, "127.0.0.1", 11434
+        )
         request_model = kwargs.get("model")
 
-        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_EMBEDDING} {request_model}"
+        span_name = (
+            f"{SemanticConvention.GEN_AI_OPERATION_TYPE_EMBEDDING} {request_model}"
+        )
 
         with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
             start_time = time.monotonic()
@@ -179,7 +210,7 @@ def async_embeddings(version, environment, application_name,
                     capture_message_content=capture_message_content,
                     disable_metrics=disable_metrics,
                     version=version,
-                    **kwargs
+                    **kwargs,
                 )
 
             except Exception as e: