openlit 1.33.10__py3-none-any.whl → 1.33.12__py3-none-any.whl

openlit/instrumentation/mistral/async_mistral.py

@@ -22,7 +22,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def async_chat(version, environment, application_name, tracer,
-         pricing_info, trace_content, metrics, disable_metrics):
+         pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat to collect metrics.
 
@@ -32,7 +32,7 @@ def async_chat(version, environment, application_name, tracer,
         application_name: Name of the application using the Mistral API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Mistral usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
 
     Returns:
         A function that wraps the chat method to add telemetry.
@@ -144,7 +144,7 @@ def async_chat(version, environment, application_name, tracer,
                                     end_time - start_time)
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
-                if trace_content:
+                if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
@@ -155,7 +155,7 @@ def async_chat(version, environment, application_name, tracer,
                 for i in range(kwargs.get('n',1)):
                     span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_FINISH_REASON,
                                         [response_dict.get('choices')[i].get('finish_reason')])
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_COMPLETION_EVENT,
                             attributes={
@@ -215,7 +215,7 @@ def async_chat(version, environment, application_name, tracer,
     return wrapper
 
 def async_chat_stream(version, environment, application_name,
-                tracer, pricing_info, trace_content, metrics, disable_metrics):
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat_stream to collect metrics.
 
@@ -225,7 +225,7 @@ def async_chat_stream(version, environment, application_name,
         application_name: Name of the application using the Mistral API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Mistral usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
 
     Returns:
         A function that wraps the chat method to add telemetry.
@@ -422,7 +422,7 @@ def async_chat_stream(version, environment, application_name,
                                             self._ttft)
                         self._span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                             version)
-                        if trace_content:
+                        if capture_message_content:
                             self._span.add_event(
                                 name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                                 attributes={
@@ -485,7 +485,7 @@ def async_chat_stream(version, environment, application_name,
     return wrapper
 
 def async_embeddings(version, environment, application_name,
-              tracer, pricing_info, trace_content, metrics, disable_metrics):
+              tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for embeddings to collect metrics.
     
@@ -495,7 +495,7 @@ def async_embeddings(version, environment, application_name,
         application_name: Name of the application using the Mistral API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Mistral usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
     
     Returns:
         A function that wraps the embeddings method to add telemetry.
@@ -567,7 +567,7 @@ def async_embeddings(version, environment, application_name,
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
 
-                if trace_content:
+                if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={

openlit/instrumentation/mistral/mistral.py

@@ -22,7 +22,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def chat(version, environment, application_name, tracer,
-         pricing_info, trace_content, metrics, disable_metrics):
+         pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat to collect metrics.
 
@@ -32,7 +32,7 @@ def chat(version, environment, application_name, tracer,
         application_name: Name of the application using the Mistral API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Mistral usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
 
     Returns:
         A function that wraps the chat method to add telemetry.
@@ -144,7 +144,7 @@ def chat(version, environment, application_name, tracer,
                                     end_time - start_time)
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
-                if trace_content:
+                if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
@@ -155,7 +155,7 @@ def chat(version, environment, application_name, tracer,
                 for i in range(kwargs.get('n',1)):
                     span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_FINISH_REASON,
                                         [response_dict.get('choices')[i].get('finish_reason')])
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_COMPLETION_EVENT,
                             attributes={
@@ -215,7 +215,7 @@ def chat(version, environment, application_name, tracer,
     return wrapper
 
 def chat_stream(version, environment, application_name,
-                tracer, pricing_info, trace_content, metrics, disable_metrics):
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat_stream to collect metrics.
 
@@ -225,7 +225,7 @@ def chat_stream(version, environment, application_name,
         application_name: Name of the application using the Mistral API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Mistral usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
 
     Returns:
         A function that wraps the chat method to add telemetry.
@@ -422,7 +422,7 @@ def chat_stream(version, environment, application_name,
                                             self._ttft)
                         self._span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                             version)
-                        if trace_content:
+                        if capture_message_content:
                             self._span.add_event(
                                 name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                                 attributes={
@@ -485,7 +485,7 @@ def chat_stream(version, environment, application_name,
     return wrapper
 
 def embeddings(version, environment, application_name,
-              tracer, pricing_info, trace_content, metrics, disable_metrics):
+              tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for embeddings to collect metrics.
     
@@ -495,7 +495,7 @@ def embeddings(version, environment, application_name,
         application_name: Name of the application using the Mistral API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Mistral usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
     
     Returns:
         A function that wraps the embeddings method to add telemetry.
@@ -567,7 +567,7 @@ def embeddings(version, environment, application_name,
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
 
-                if trace_content:
+                if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={

openlit/instrumentation/multion/__init__.py

@@ -30,7 +30,7 @@ class MultiOnInstrumentor(BaseInstrumentor):
         tracer = kwargs.get("tracer")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info", {})
-        trace_content = kwargs.get("trace_content", False)
+        capture_message_content = kwargs.get("capture_message_content", False)
         disable_metrics = kwargs.get("disable_metrics")
         version = importlib.metadata.version("multion")
 
@@ -39,19 +39,19 @@ class MultiOnInstrumentor(BaseInstrumentor):
             "multion.client",
             "MultiOn.browse",
             multion_wrap("multion.browse", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "multion.client",
             "MultiOn.retrieve",
             multion_wrap("multion.retrieve", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "multion.sessions.client",
             "SessionsClient.create",
             multion_wrap("multion.sessions.create", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # Asynchronus
@@ -59,19 +59,19 @@ class MultiOnInstrumentor(BaseInstrumentor):
             "multion.client",
             "AsyncMultiOn.browse",
             async_multion_wrap("multion.browse", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "multion.client",
             "AsyncMultiOn.retrieve",
             async_multion_wrap("multion.retrieve", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "multion.sessions.client",
             "AsyncSessionsClient.create",
             async_multion_wrap("multion.sessions.create", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
 

openlit/instrumentation/multion/async_multion.py

@@ -15,7 +15,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
-                     tracer, pricing_info, trace_content, metrics, disable_metrics):
+                     tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat completions to collect metrics.
 
@@ -26,7 +26,7 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the multion Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of multion usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
 
     Returns:
         A function that wraps the chat completions method to add telemetry.
@@ -75,7 +75,7 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_RESPONSE_TIME,
                                     response.metadata.processing_time)
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
@@ -92,7 +92,7 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
                                     kwargs.get("url", ""))
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
@@ -110,7 +110,7 @@ def async_multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
                                     kwargs.get("url", ""))
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_COMPLETION_EVENT,
                             attributes={

openlit/instrumentation/multion/multion.py

@@ -15,7 +15,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def multion_wrap(gen_ai_endpoint, version, environment, application_name,
-                     tracer, pricing_info, trace_content, metrics, disable_metrics):
+                     tracer, pricing_info, capture_message_content, metrics, disable_metrics):
     """
     Generates a telemetry wrapper for chat completions to collect metrics.
 
@@ -26,7 +26,7 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the multion Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of multion usage.
-        trace_content: Flag indicating whether to trace the actual content.
+        capture_message_content: Flag indicating whether to trace the actual content.
 
     Returns:
         A function that wraps the chat completions method to add telemetry.
@@ -75,7 +75,7 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_RESPONSE_TIME,
                                     response.metadata.processing_time)
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
@@ -92,7 +92,7 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
                                     kwargs.get("url", ""))
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                             attributes={
@@ -110,7 +110,7 @@ def multion_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_BROWSE_URL,
                                     kwargs.get("url", ""))
 
-                    if trace_content:
+                    if capture_message_content:
                         span.add_event(
                             name=SemanticConvetion.GEN_AI_CONTENT_COMPLETION_EVENT,
                             attributes={

openlit/instrumentation/ollama/__init__.py

@@ -1,5 +1,6 @@
-# pylint: disable=useless-return, bad-staticmethod-argument, disable=duplicate-code
-"""Initializer of Auto Instrumentation of Ollama Functions"""
+"""
+Initializer of Auto Instrumentation of Ollama Functions
+"""
 
 from typing import Collection
 import importlib.metadata
@@ -27,9 +28,10 @@ class OllamaInstrumentor(BaseInstrumentor):
         application_name = kwargs.get("application_name", "default_application")
         environment = kwargs.get("environment", "default_environment")
         tracer = kwargs.get("tracer")
+        event_provider = kwargs.get("event_provider")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info", {})
-        trace_content = kwargs.get("trace_content", False)
+        capture_message_content = kwargs.get("capture_message_content", False)
         disable_metrics = kwargs.get("disable_metrics")
         version = importlib.metadata.version("ollama")
 
@@ -38,13 +40,13 @@ class OllamaInstrumentor(BaseInstrumentor):
             "ollama",
             "chat",
             chat(version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "ollama",
             "Client.chat",
             chat(version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # sync embeddings
@@ -52,13 +54,13 @@ class OllamaInstrumentor(BaseInstrumentor):
             "ollama",
             "embeddings",
             embeddings(version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
         wrap_function_wrapper(
             "ollama",
             "Client.embeddings",
             embeddings(version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # async chat
@@ -66,7 +68,7 @@ class OllamaInstrumentor(BaseInstrumentor):
             "ollama",
             "AsyncClient.chat",
             async_chat(version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # async embeddings
@@ -74,7 +76,7 @@ class OllamaInstrumentor(BaseInstrumentor):
             "ollama",
             "AsyncClient.embeddings",
             async_embeddings(version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):