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

openlit/instrumentation/groq/utils.py

@@ -1,6 +1,7 @@
 """
 Groq OpenTelemetry instrumentation utility functions
 """
+
 import time
 
 from opentelemetry.trace import Status, StatusCode
@@ -15,6 +16,7 @@ from openlit.__helpers import (
 )
 from openlit.semcov import SemanticConvention
 
+
 def format_content(messages):
     """
     Process a list of messages to extract content.
@@ -27,8 +29,9 @@ def format_content(messages):
 
         if isinstance(content, list):
             content_str = ", ".join(
-                f'{item["type"]}: {item["text"] if "text" in item else item["image_url"]}'
-                if "type" in item else f'text: {item["text"]}'
+                f"{item['type']}: {item['text'] if 'text' in item else item['image_url']}"
+                if "type" in item
+                else f"text: {item['text']}"
                 for item in content
             )
             formatted_messages.append(f"{role}: {content_str}")
@@ -37,6 +40,7 @@ def format_content(messages):
 
     return "\n".join(formatted_messages)
 
+
 def process_chunk(scope, chunk):
     """
     Process a chunk of response data and update state.
@@ -53,27 +57,41 @@ def process_chunk(scope, chunk):
     chunked = response_as_dict(chunk)
 
     # Collect message IDs and aggregated response from events
-    if (len(chunked.get("choices", [])) > 0 and
-        "delta" in chunked.get("choices")[0] and
-        "content" in chunked.get("choices")[0].get("delta", {})):
-
+    if (
+        len(chunked.get("choices", [])) > 0
+        and "delta" in chunked.get("choices")[0]
+        and "content" in chunked.get("choices")[0].get("delta", {})
+    ):
         content = chunked.get("choices")[0].get("delta").get("content")
         if content:
             scope._llmresponse += content
 
-    if chunked.get('x_groq') is not None:
-        if chunked.get('x_groq').get('usage') is not None:
-            scope._input_tokens = chunked.get('x_groq').get('usage').get('prompt_tokens')
-            scope._output_tokens = chunked.get('x_groq').get('usage').get('completion_tokens')
-            scope._response_id = chunked.get('x_groq').get('id')
-            scope._response_model = chunked.get('x_groq').get('model')
-            scope._finish_reason = chunked.get('choices', [{}])[0].get('finish_reason')
-            scope._system_fingerprint = chunked.get('x_groq').get('system_fingerprint')
+    if chunked.get("x_groq") is not None:
+        if chunked.get("x_groq").get("usage") is not None:
+            scope._input_tokens = (
+                chunked.get("x_groq").get("usage").get("prompt_tokens")
+            )
+            scope._output_tokens = (
+                chunked.get("x_groq").get("usage").get("completion_tokens")
+            )
+            scope._response_id = chunked.get("x_groq").get("id")
+            scope._response_model = chunked.get("x_groq").get("model")
+            scope._finish_reason = chunked.get("choices", [{}])[0].get("finish_reason")
+            scope._system_fingerprint = chunked.get("x_groq").get("system_fingerprint")
             scope._end_time = time.time()
 
 
-def common_chat_logic(scope, pricing_info, environment, application_name, metrics,
-    capture_message_content, disable_metrics, version, is_stream):
+def common_chat_logic(
+    scope,
+    pricing_info,
+    environment,
+    application_name,
+    metrics,
+    capture_message_content,
+    disable_metrics,
+    version,
+    is_stream,
+):
     """
     Process chat request and generate Telemetry
     """
@@ -84,47 +102,107 @@ def common_chat_logic(scope, pricing_info, environment, application_name, metric
     prompt = format_content(scope._kwargs.get("messages", []))
     request_model = scope._kwargs.get("model", "mixtral-8x7b-32768")
 
-    cost = get_chat_model_cost(request_model, pricing_info, scope._input_tokens, scope._output_tokens)
+    cost = get_chat_model_cost(
+        request_model, pricing_info, scope._input_tokens, scope._output_tokens
+    )
 
     # Common Span Attributes
-    common_span_attributes(scope,
-        SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT, SemanticConvention.GEN_AI_SYSTEM_GROQ,
-        scope._server_address, scope._server_port, request_model, scope._response_model,
-        environment, application_name, is_stream, scope._tbt, scope._ttft, version)
+    common_span_attributes(
+        scope,
+        SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT,
+        SemanticConvention.GEN_AI_SYSTEM_GROQ,
+        scope._server_address,
+        scope._server_port,
+        request_model,
+        scope._response_model,
+        environment,
+        application_name,
+        is_stream,
+        scope._tbt,
+        scope._ttft,
+        version,
+    )
 
     # Span Attributes for Request parameters
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_SEED, scope._kwargs.get("seed", ""))
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_FREQUENCY_PENALTY, scope._kwargs.get("frequency_penalty", 0.0))
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_MAX_TOKENS, scope._kwargs.get("max_completion_tokens", -1))
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_PRESENCE_PENALTY, scope._kwargs.get("presence_penalty", 0.0))
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_STOP_SEQUENCES, scope._kwargs.get("stop", []))
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_TEMPERATURE, scope._kwargs.get("temperature", 1.0))
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_TOP_P, scope._kwargs.get("top_p", 1.0))
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_USER, scope._kwargs.get("user", ""))
-    scope._span.set_attribute(SemanticConvention.GEN_AI_REQUEST_SERVICE_TIER, scope._kwargs.get("service_tier", "on_demand"))
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_SEED, scope._kwargs.get("seed", "")
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_FREQUENCY_PENALTY,
+        scope._kwargs.get("frequency_penalty", 0.0),
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_MAX_TOKENS,
+        scope._kwargs.get("max_completion_tokens", -1),
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_PRESENCE_PENALTY,
+        scope._kwargs.get("presence_penalty", 0.0),
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_STOP_SEQUENCES, scope._kwargs.get("stop", [])
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_TEMPERATURE,
+        scope._kwargs.get("temperature", 1.0),
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_TOP_P, scope._kwargs.get("top_p", 1.0)
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_USER, scope._kwargs.get("user", "")
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_REQUEST_SERVICE_TIER,
+        scope._kwargs.get("service_tier", "on_demand"),
+    )
 
     # Span Attributes for Response parameters
     scope._span.set_attribute(SemanticConvention.GEN_AI_RESPONSE_ID, scope._response_id)
-    scope._span.set_attribute(SemanticConvention.GEN_AI_RESPONSE_FINISH_REASON, [scope._finish_reason])
-    scope._span.set_attribute(SemanticConvention.GEN_AI_RESPONSE_SYSTEM_FINGERPRINT, scope._system_fingerprint)
-    scope._span.set_attribute(SemanticConvention.GEN_AI_OUTPUT_TYPE, "text" if isinstance(scope._llmresponse, str) else "json")
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_RESPONSE_FINISH_REASON, [scope._finish_reason]
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_RESPONSE_SYSTEM_FINGERPRINT, scope._system_fingerprint
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_OUTPUT_TYPE,
+        "text" if isinstance(scope._llmresponse, str) else "json",
+    )
 
     # Span Attributes for Cost and Tokens
-    scope._span.set_attribute(SemanticConvention.GEN_AI_USAGE_INPUT_TOKENS, scope._input_tokens)
-    scope._span.set_attribute(SemanticConvention.GEN_AI_USAGE_OUTPUT_TOKENS, scope._output_tokens)
-    scope._span.set_attribute(SemanticConvention.GEN_AI_CLIENT_TOKEN_USAGE, scope._input_tokens + scope._output_tokens)
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_USAGE_INPUT_TOKENS, scope._input_tokens
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_USAGE_OUTPUT_TOKENS, scope._output_tokens
+    )
+    scope._span.set_attribute(
+        SemanticConvention.GEN_AI_CLIENT_TOKEN_USAGE,
+        scope._input_tokens + scope._output_tokens,
+    )
     scope._span.set_attribute(SemanticConvention.GEN_AI_USAGE_COST, cost)
 
     # Span Attributes for Tools
     if scope._tools:
-        scope._span.set_attribute(SemanticConvention.GEN_AI_TOOL_NAME, scope._tools.get("function", {}).get("name", ""))
-        scope._span.set_attribute(SemanticConvention.GEN_AI_TOOL_CALL_ID, str(scope._tools.get("id", "")))
-        scope._span.set_attribute(SemanticConvention.GEN_AI_TOOL_ARGS, str(scope._tools.get("function", {}).get("arguments", "")))
+        scope._span.set_attribute(
+            SemanticConvention.GEN_AI_TOOL_NAME,
+            scope._tools.get("function", {}).get("name", ""),
+        )
+        scope._span.set_attribute(
+            SemanticConvention.GEN_AI_TOOL_CALL_ID, str(scope._tools.get("id", ""))
+        )
+        scope._span.set_attribute(
+            SemanticConvention.GEN_AI_TOOL_ARGS,
+            str(scope._tools.get("function", {}).get("arguments", "")),
+        )
 
     # Span Attributes for Content
     if capture_message_content:
         scope._span.set_attribute(SemanticConvention.GEN_AI_CONTENT_PROMPT, prompt)
-        scope._span.set_attribute(SemanticConvention.GEN_AI_CONTENT_COMPLETION, scope._llmresponse)
+        scope._span.set_attribute(
+            SemanticConvention.GEN_AI_CONTENT_COMPLETION, scope._llmresponse
+        )
 
         # To be removed one the change to span_attributes (from span events) is complete
         scope._span.add_event(
@@ -144,23 +222,69 @@ def common_chat_logic(scope, pricing_info, environment, application_name, metric
 
     # Metrics
     if not disable_metrics:
-        record_completion_metrics(metrics, SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT, SemanticConvention.GEN_AI_SYSTEM_GROQ,
-            scope._server_address, scope._server_port, request_model, scope._response_model, environment,
-            application_name, scope._start_time, scope._end_time, scope._input_tokens, scope._output_tokens,
-            cost, scope._tbt, scope._ttft)
+        record_completion_metrics(
+            metrics,
+            SemanticConvention.GEN_AI_OPERATION_TYPE_CHAT,
+            SemanticConvention.GEN_AI_SYSTEM_GROQ,
+            scope._server_address,
+            scope._server_port,
+            request_model,
+            scope._response_model,
+            environment,
+            application_name,
+            scope._start_time,
+            scope._end_time,
+            scope._input_tokens,
+            scope._output_tokens,
+            cost,
+            scope._tbt,
+            scope._ttft,
+        )
 
-def process_streaming_chat_response(scope, pricing_info, environment, application_name, metrics,
-    capture_message_content=False, disable_metrics=False, version=""):
+
+def process_streaming_chat_response(
+    scope,
+    pricing_info,
+    environment,
+    application_name,
+    metrics,
+    capture_message_content=False,
+    disable_metrics=False,
+    version="",
+):
     """
     Process chat request and generate Telemetry
     """
 
-    common_chat_logic(scope, pricing_info, environment, application_name, metrics,
-        capture_message_content, disable_metrics, version, is_stream=True)
+    common_chat_logic(
+        scope,
+        pricing_info,
+        environment,
+        application_name,
+        metrics,
+        capture_message_content,
+        disable_metrics,
+        version,
+        is_stream=True,
+    )
+
 
-def process_chat_response(response, request_model, pricing_info, server_port, server_address,
-    environment, application_name, metrics, start_time, span, capture_message_content=False,
-    disable_metrics=False, version="1.0.0", **kwargs):
+def process_chat_response(
+    response,
+    request_model,
+    pricing_info,
+    server_port,
+    server_address,
+    environment,
+    application_name,
+    metrics,
+    start_time,
+    span,
+    capture_message_content=False,
+    disable_metrics=False,
+    version="1.0.0",
+    **kwargs,
+):
     """
     Process chat request and generate Telemetry
     """
@@ -185,15 +309,28 @@ def process_chat_response(response, request_model, pricing_info, server_port, se
     scope._server_address, scope._server_port = server_address, server_port
     scope._kwargs = kwargs
     scope._system_fingerprint = response_dict.get("system_fingerprint")
-    scope._finish_reason = str(response_dict.get("choices", [])[0].get("finish_reason", ""))
+    scope._finish_reason = str(
+        response_dict.get("choices", [])[0].get("finish_reason", "")
+    )
 
     # Handle tool calls
     if scope._kwargs.get("tools"):
-        scope._tools = response_dict.get("choices", [{}])[0].get("message", {}).get("tool_calls")
+        scope._tools = (
+            response_dict.get("choices", [{}])[0].get("message", {}).get("tool_calls")
+        )
     else:
         scope._tools = None
 
-    common_chat_logic(scope, pricing_info, environment, application_name, metrics,
-        capture_message_content, disable_metrics, version, is_stream=False)
+    common_chat_logic(
+        scope,
+        pricing_info,
+        environment,
+        application_name,
+        metrics,
+        capture_message_content,
+        disable_metrics,
+        version,
+        is_stream=False,
+    )
 
     return response

openlit/instrumentation/haystack/__init__.py

@@ -12,6 +12,7 @@ from openlit.instrumentation.haystack.async_haystack import async_general_wrap
 
 _instruments = ("haystack-ai >= 2.0.0",)
 
+
 class HaystackInstrumentor(BaseInstrumentor):
     """Optimized instrumentor for Haystack with minimal overhead"""
 
@@ -32,16 +33,34 @@ class HaystackInstrumentor(BaseInstrumentor):
         # Pipeline operations (always enabled)
         try:
             wrap_function_wrapper(
-                "haystack", "Pipeline.run",
-                general_wrap("pipeline", version, environment, application_name,
-                           tracer, pricing_info, capture_message_content,
-                           metrics, disable_metrics)
+                "haystack",
+                "Pipeline.run",
+                general_wrap(
+                    "pipeline",
+                    version,
+                    environment,
+                    application_name,
+                    tracer,
+                    pricing_info,
+                    capture_message_content,
+                    metrics,
+                    disable_metrics,
+                ),
             )
             wrap_function_wrapper(
-                "haystack", "AsyncPipeline.run_async",
-                async_general_wrap("pipeline", version, environment,
-                                 application_name, tracer, pricing_info,
-                                 capture_message_content, metrics, disable_metrics)
+                "haystack",
+                "AsyncPipeline.run_async",
+                async_general_wrap(
+                    "pipeline",
+                    version,
+                    environment,
+                    application_name,
+                    tracer,
+                    pricing_info,
+                    capture_message_content,
+                    metrics,
+                    disable_metrics,
+                ),
             )
         except Exception:
             pass
@@ -49,27 +68,54 @@ class HaystackInstrumentor(BaseInstrumentor):
         # Component operations (only if detailed_tracing enabled)
         if detailed_tracing:
             components = [
-                ("haystack.components.retrievers.in_memory",
-                 "InMemoryBM25Retriever.run", "bm25_retriever"),
-                ("haystack.components.builders.prompt_builder",
-                 "PromptBuilder.run", "prompt_builder"),
-                ("haystack.components.generators.openai",
-                 "OpenAIGenerator.run", "openai_generator"),
-                ("haystack.components.generators.chat.openai",
-                 "OpenAIChatGenerator.run", "openai_chat_generator"),
-                ("haystack.components.embedders.openai_text_embedder",
-                 "OpenAITextEmbedder.run", "text_embedder"),
-                ("haystack.components.embedders.openai_document_embedder",
-                 "OpenAIDocumentEmbedder.run", "document_embedder"),
+                (
+                    "haystack.components.retrievers.in_memory",
+                    "InMemoryBM25Retriever.run",
+                    "bm25_retriever",
+                ),
+                (
+                    "haystack.components.builders.prompt_builder",
+                    "PromptBuilder.run",
+                    "prompt_builder",
+                ),
+                (
+                    "haystack.components.generators.openai",
+                    "OpenAIGenerator.run",
+                    "openai_generator",
+                ),
+                (
+                    "haystack.components.generators.chat.openai",
+                    "OpenAIChatGenerator.run",
+                    "openai_chat_generator",
+                ),
+                (
+                    "haystack.components.embedders.openai_text_embedder",
+                    "OpenAITextEmbedder.run",
+                    "text_embedder",
+                ),
+                (
+                    "haystack.components.embedders.openai_document_embedder",
+                    "OpenAIDocumentEmbedder.run",
+                    "document_embedder",
+                ),
             ]
 
             for module, method, component_type in components:
                 try:
                     wrap_function_wrapper(
-                        module, method,
-                        general_wrap(component_type, version, environment,
-                                   application_name, tracer, pricing_info,
-                                   capture_message_content, metrics, disable_metrics)
+                        module,
+                        method,
+                        general_wrap(
+                            component_type,
+                            version,
+                            environment,
+                            application_name,
+                            tracer,
+                            pricing_info,
+                            capture_message_content,
+                            metrics,
+                            disable_metrics,
+                        ),
                     )
                 except Exception:
                     pass

openlit/instrumentation/haystack/async_haystack.py

@@ -12,8 +12,18 @@ from openlit.instrumentation.haystack.utils import (
     set_server_address_and_port,
 )
 
-def async_general_wrap(endpoint, version, environment, application_name,
-    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+
+def async_general_wrap(
+    endpoint,
+    version,
+    environment,
+    application_name,
+    tracer,
+    pricing_info,
+    capture_message_content,
+    metrics,
+    disable_metrics,
+):
     """Optimized async wrapper for Haystack operations"""
 
     async def wrapper(wrapped, instance, args, kwargs):
@@ -41,10 +51,22 @@ def async_general_wrap(endpoint, version, environment, application_name,
 
             try:
                 response = process_haystack_response(
-                    response, operation_type, server_address, server_port,
-                    environment, application_name, metrics, start_time, span,
-                    capture_message_content, disable_metrics, version,
-                    instance, args, endpoint=endpoint, **kwargs
+                    response,
+                    operation_type,
+                    server_address,
+                    server_port,
+                    environment,
+                    application_name,
+                    metrics,
+                    start_time,
+                    span,
+                    capture_message_content,
+                    disable_metrics,
+                    version,
+                    instance,
+                    args,
+                    endpoint=endpoint,
+                    **kwargs,
                 )
             except Exception as e:
                 handle_exception(span, e)

openlit/instrumentation/haystack/haystack.py

@@ -12,8 +12,18 @@ from openlit.instrumentation.haystack.utils import (
     set_server_address_and_port,
 )
 
-def general_wrap(endpoint, version, environment, application_name,
-    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+
+def general_wrap(
+    endpoint,
+    version,
+    environment,
+    application_name,
+    tracer,
+    pricing_info,
+    capture_message_content,
+    metrics,
+    disable_metrics,
+):
     """Optimized wrapper for Haystack operations"""
 
     def wrapper(wrapped, instance, args, kwargs):
@@ -41,10 +51,22 @@ def general_wrap(endpoint, version, environment, application_name,
 
             try:
                 response = process_haystack_response(
-                    response, operation_type, server_address, server_port,
-                    environment, application_name, metrics, start_time, span,
-                    capture_message_content, disable_metrics, version,
-                    instance, args, endpoint=endpoint, **kwargs
+                    response,
+                    operation_type,
+                    server_address,
+                    server_port,
+                    environment,
+                    application_name,
+                    metrics,
+                    start_time,
+                    span,
+                    capture_message_content,
+                    disable_metrics,
+                    version,
+                    instance,
+                    args,
+                    endpoint=endpoint,
+                    **kwargs,
                 )
             except Exception as e:
                 handle_exception(span, e)