openlit 1.33.9__py3-none-any.whl → 1.33.11__py3-none-any.whl

openlit/instrumentation/openai/openai.py

@@ -25,7 +25,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def chat_completions(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.
 
@@ -35,7 +35,7 @@ def chat_completions(version, environment, application_name,
         application_name: Name of the application using the OpenAI API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of OpenAI 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.
@@ -44,7 +44,7 @@ def chat_completions(version, environment, application_name,
     class TracedSyncStream:
         """
         Wrapper for streaming responses to collect metrics and trace data.
-        Wraps the 'openai.AsyncStream' response to collect message IDs and aggregated response.
+        Wraps the response to collect message IDs and aggregated response.
 
         This class implements the '__aiter__' and '__anext__' methods that
         handle asynchronous streaming responses.
@@ -197,11 +197,11 @@ def chat_completions(version, environment, application_name,
                                         output_tokens)
                     self._span.set_attribute(SemanticConvetion.SERVER_ADDRESS,
                                         self._server_address)
-                    self._span.set_attribute(SemanticConvetion.GEN_AI_OPENAI_REQUEST_SERVICE_TIER,
+                    self._span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_SERVICE_TIER,
                                         self._kwargs.get("service_tier", "auto"))
-                    self._span.set_attribute(SemanticConvetion.GEN_AI_OPENAI_RESPONSE_SERVICE_TIER,
+                    self._span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_SERVICE_TIER,
                                         self._openai_response_service_tier)
-                    self._span.set_attribute(SemanticConvetion.GEN_AI_OPENAI_RESPONSE_SYSTEM_FINGERPRINT,
+                    self._span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_SYSTEM_FINGERPRINT,
                                         self._openai_system_fingerprint)
                     if isinstance(self._llmresponse, str):
                         self._span.set_attribute(SemanticConvetion.GEN_AI_OUTPUT_TYPE,
@@ -229,7 +229,7 @@ def chat_completions(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={
@@ -382,12 +382,12 @@ def chat_completions(version, environment, application_name,
                                         output_tokens)
                     span.set_attribute(SemanticConvetion.SERVER_ADDRESS,
                                         server_address)
-                    span.set_attribute(SemanticConvetion.GEN_AI_OPENAI_REQUEST_SERVICE_TIER,
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_SERVICE_TIER,
                                         kwargs.get("service_tier", "auto"))
-                    span.set_attribute(SemanticConvetion.GEN_AI_OPENAI_RESPONSE_SERVICE_TIER,
+                    span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_SERVICE_TIER,
                                         response_dict.get('service_tier'))
-                    span.set_attribute(SemanticConvetion.GEN_AI_OPENAI_RESPONSE_SYSTEM_FINGERPRINT,
-                                        response_dict.get('system_fingerprint'))
+                    span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_SYSTEM_FINGERPRINT,
+                                        str(response_dict.get('system_fingerprint', '')))
 
                     # Set base span attribues (Extras)
                     span.set_attribute(DEPLOYMENT_ENVIRONMENT,
@@ -406,7 +406,7 @@ def chat_completions(version, environment, application_name,
                                         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={
@@ -417,7 +417,7 @@ def chat_completions(version, environment, application_name,
                     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={
@@ -477,7 +477,7 @@ def chat_completions(version, environment, application_name,
     return wrapper
 
 def embedding(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.
     
@@ -487,7 +487,7 @@ def embedding(version, environment, application_name,
         application_name: Name of the application using the OpenAI API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of OpenAI 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.
@@ -561,7 +561,7 @@ def embedding(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={
@@ -605,7 +605,7 @@ def embedding(version, environment, application_name,
     return wrapper
 
 def image_generate(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 image generation to collect metrics.
     
@@ -615,7 +615,7 @@ def image_generate(version, environment, application_name,
         application_name: Name of the application using the OpenAI API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of OpenAI image generation.
-        trace_content: Flag indicating whether to trace the input prompt and generated images.
+        capture_message_content: Flag indicating whether to trace the input prompt and generated images.
     
     Returns:
         A function that wraps the image generation method to add telemetry.
@@ -657,8 +657,6 @@ def image_generate(version, environment, application_name,
                 else:
                     image = "url"
 
-                request_model = kwargs.get("model", "dall-e-2")
-
                 # Calculate cost of the operation
                 cost = get_image_model_cost(request_model,
                                             pricing_info, kwargs.get("size", "1024x1024"),
@@ -702,7 +700,7 @@ def image_generate(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={
@@ -754,7 +752,7 @@ def image_generate(version, environment, application_name,
     return wrapper
 
 def image_variatons(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 creating image variations to collect metrics.
     
@@ -764,7 +762,7 @@ def image_variatons(version, environment, application_name,
         application_name: Name of the application using the OpenAI API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of generating image variations.
-        trace_content: Flag indicating whether to trace the input image and generated variations.
+        capture_message_content: Flag indicating whether to trace the input image and generated variations.
     
     Returns:
         A function that wraps the image variations creation method to add telemetry.
@@ -844,7 +842,7 @@ def image_variatons(version, environment, application_name,
                     span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
 
-                    if trace_content:
+                    if capture_message_content:
                         attribute_name = f"{SemanticConvetion.GEN_AI_RESPONSE_IMAGE}.{images_count}"
                         span.add_event(
                             name=attribute_name,
@@ -890,7 +888,7 @@ def image_variatons(version, environment, application_name,
     return wrapper
 
 def audio_create(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 creating speech audio to collect metrics.
     
@@ -900,7 +898,7 @@ def audio_create(version, environment, application_name,
         application_name: Name of the application using the OpenAI API.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of generating speech audio.
-        trace_content: Flag indicating whether to trace the input text and generated audio.
+        capture_message_content: Flag indicating whether to trace the input text and generated audio.
     
     Returns:
         A function that wraps the speech audio creation method to add telemetry.
@@ -969,7 +967,7 @@ def audio_create(version, environment, application_name,
                                     cost)
                 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/phidata/__init__.py

@@ -26,7 +26,7 @@ class PhidataInstrumentor(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("phidata")
 
@@ -34,7 +34,7 @@ class PhidataInstrumentor(BaseInstrumentor):
             "phi.agent",
             "Agent.print_response",
             phidata_wrap("phidata.print_response", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):

openlit/instrumentation/phidata/phidata.py

@@ -5,7 +5,7 @@ Module for monitoring Phidata calls.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import (
     handle_exception,
 )
@@ -15,7 +15,7 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def phidata_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 phidata_wrap(gen_ai_endpoint, version, environment, application_name,
         application_name: Name of the application using the Phidata Agent.
         tracer: OpenTelemetry tracer for creating spans.
         pricing_info: Information used for calculating the cost of Phidata 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.
@@ -62,8 +62,10 @@ def phidata_wrap(gen_ai_endpoint, version, environment, application_name,
                                     SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                     application_name)
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
+                                    environment)
                 span.set_attribute(SemanticConvetion.GEN_AI_AGENT_ID,
                                     getattr(instance, 'agent_id', '') or '')
                 span.set_attribute(SemanticConvetion.GEN_AI_AGENT_ROLE,

openlit/instrumentation/pinecone/__init__.py

@@ -21,7 +21,7 @@ class PineconeInstrumentor(BaseInstrumentor):
         tracer = kwargs.get("tracer")
         metrics = kwargs.get("metrics_dict")
         pricing_info = kwargs.get("pricing_info")
-        trace_content = kwargs.get("trace_content")
+        capture_message_content = kwargs.get("capture_message_content")
         disable_metrics = kwargs.get("disable_metrics")
         version = importlib.metadata.version("pinecone-client")
 
@@ -29,35 +29,35 @@ class PineconeInstrumentor(BaseInstrumentor):
             "pinecone.control.pinecone",  
             "Pinecone.create_index",
             general_wrap("pinecone.create_index", version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "pinecone.data.index",  
             "Index.upsert",
             general_wrap("pinecone.upsert", version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "pinecone.data.index",  
             "Index.query",
             general_wrap("pinecone.query", version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "pinecone.data.index",  
             "Index.update",
             general_wrap("pinecone.update", version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
             "pinecone.data.index",  
             "Index.delete",
             general_wrap("pinecone.delete", version, environment, application_name,
-                 tracer, pricing_info, trace_content, metrics, disable_metrics),
+                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
 

openlit/instrumentation/pinecone/pinecone.py

@@ -5,7 +5,7 @@ Module for monitoring Pinecone.
 
 import logging
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from openlit.__helpers import handle_exception
 from openlit.semcov import SemanticConvetion
 
@@ -23,7 +23,7 @@ def object_count(obj):
     return None
 
 def general_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):
     """
     Wraps a Pinecone operation to trace and log its execution metrics.
 
@@ -40,7 +40,7 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
     - application_name (str): The name of the application performing the Pinecone operation.
     - tracer (opentelemetry.trace.Tracer): An object used for OpenTelemetry tracing.
     - pricing_info (dict): Information about pricing, not used in current implementation.
-    - trace_content (bool): A flag indicating whether the content of responses should be traced.
+    - capture_message_content (bool): A flag indicating whether the content of responses should be traced.
 
     Returns:
     - function: A decorator function that, when applied, wraps the target function with
@@ -72,9 +72,9 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                    gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                span.set_attribute(DEPLOYMENT_ENVIRONMENT,
                                    environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                span.set_attribute(SERVICE_NAME,
                                    application_name)
                 span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_VECTORDB)
@@ -146,11 +146,11 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
                     attributes = {
                         TELEMETRY_SDK_NAME:
                             "openlit",
-                        SemanticConvetion.GEN_AI_APPLICATION_NAME:
+                        SERVICE_NAME:
                             application_name,
                         SemanticConvetion.DB_SYSTEM:
                             SemanticConvetion.DB_SYSTEM_PINECONE,
-                        SemanticConvetion.GEN_AI_ENVIRONMENT:
+                        DEPLOYMENT_ENVIRONMENT:
                             environment,
                         SemanticConvetion.GEN_AI_OPERATION:
                             SemanticConvetion.GEN_AI_OPERATION_TYPE_VECTORDB,

openlit/instrumentation/premai/__init__.py

@@ -26,7 +26,7 @@ class PremAIInstrumentor(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("premai")
 
@@ -34,16 +34,16 @@ class PremAIInstrumentor(BaseInstrumentor):
         wrap_function_wrapper(
             "premai.api",
             "ChatCompletionsModule.create",
-            chat("premai.chat.completions", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+            chat(version, environment, application_name,
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # sync embedding
         wrap_function_wrapper(
             "premai.api",
             "EmbeddingsModule.create",
-            embedding("premai.embeddings", version, environment, application_name,
-                  tracer, pricing_info, trace_content, metrics, disable_metrics),
+            embedding(version, environment, application_name,
+                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):