PyPI - openlit - Versions diffs - 1.33.7__py3-none-any.whl → 1.33.9__py3-none-any.whl - Mend

openlit 1.33.7py3-none-any.whl → 1.33.9py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (78) hide show

openlit/__helpers.py +83 -0
openlit/__init__.py +1 -1
openlit/instrumentation/ag2/ag2.py +2 -2
openlit/instrumentation/ai21/__init__.py +4 -4
openlit/instrumentation/ai21/ai21.py +370 -319
openlit/instrumentation/ai21/async_ai21.py +371 -319
openlit/instrumentation/anthropic/__init__.py +4 -4
openlit/instrumentation/anthropic/anthropic.py +321 -189
openlit/instrumentation/anthropic/async_anthropic.py +323 -190
openlit/instrumentation/assemblyai/__init__.py +1 -1
openlit/instrumentation/assemblyai/assemblyai.py +59 -43
openlit/instrumentation/astra/astra.py +4 -4
openlit/instrumentation/astra/async_astra.py +4 -4
openlit/instrumentation/azure_ai_inference/__init__.py +4 -4
openlit/instrumentation/azure_ai_inference/async_azure_ai_inference.py +406 -252
openlit/instrumentation/azure_ai_inference/azure_ai_inference.py +406 -252
openlit/instrumentation/bedrock/__init__.py +1 -1
openlit/instrumentation/bedrock/bedrock.py +115 -58
openlit/instrumentation/chroma/chroma.py +4 -4
openlit/instrumentation/cohere/__init__.py +33 -10
openlit/instrumentation/cohere/async_cohere.py +610 -0
openlit/instrumentation/cohere/cohere.py +410 -219
openlit/instrumentation/controlflow/controlflow.py +2 -2
openlit/instrumentation/crawl4ai/async_crawl4ai.py +2 -2
openlit/instrumentation/crawl4ai/crawl4ai.py +2 -2
openlit/instrumentation/crewai/crewai.py +2 -2
openlit/instrumentation/dynamiq/dynamiq.py +2 -2
openlit/instrumentation/elevenlabs/async_elevenlabs.py +73 -47
openlit/instrumentation/elevenlabs/elevenlabs.py +73 -52
openlit/instrumentation/embedchain/embedchain.py +4 -4
openlit/instrumentation/firecrawl/firecrawl.py +2 -2
openlit/instrumentation/google_ai_studio/__init__.py +9 -9
openlit/instrumentation/google_ai_studio/async_google_ai_studio.py +183 -219
openlit/instrumentation/google_ai_studio/google_ai_studio.py +183 -220
openlit/instrumentation/gpt4all/gpt4all.py +17 -17
openlit/instrumentation/groq/async_groq.py +14 -14
openlit/instrumentation/groq/groq.py +14 -14
openlit/instrumentation/haystack/haystack.py +2 -2
openlit/instrumentation/julep/async_julep.py +2 -2
openlit/instrumentation/julep/julep.py +2 -2
openlit/instrumentation/langchain/langchain.py +36 -31
openlit/instrumentation/letta/letta.py +6 -6
openlit/instrumentation/litellm/async_litellm.py +20 -20
openlit/instrumentation/litellm/litellm.py +20 -20
openlit/instrumentation/llamaindex/llamaindex.py +2 -2
openlit/instrumentation/mem0/mem0.py +2 -2
openlit/instrumentation/milvus/milvus.py +4 -4
openlit/instrumentation/mistral/async_mistral.py +18 -18
openlit/instrumentation/mistral/mistral.py +18 -18
openlit/instrumentation/multion/async_multion.py +2 -2
openlit/instrumentation/multion/multion.py +2 -2
openlit/instrumentation/ollama/async_ollama.py +29 -29
openlit/instrumentation/ollama/ollama.py +29 -29
openlit/instrumentation/openai/__init__.py +11 -230
openlit/instrumentation/openai/async_openai.py +434 -409
openlit/instrumentation/openai/openai.py +415 -393
openlit/instrumentation/phidata/phidata.py +2 -2
openlit/instrumentation/pinecone/pinecone.py +4 -4
openlit/instrumentation/premai/premai.py +20 -20
openlit/instrumentation/qdrant/async_qdrant.py +4 -4
openlit/instrumentation/qdrant/qdrant.py +4 -4
openlit/instrumentation/reka/async_reka.py +6 -6
openlit/instrumentation/reka/reka.py +6 -6
openlit/instrumentation/together/async_together.py +18 -18
openlit/instrumentation/together/together.py +18 -18
openlit/instrumentation/transformers/transformers.py +6 -6
openlit/instrumentation/vertexai/async_vertexai.py +53 -53
openlit/instrumentation/vertexai/vertexai.py +53 -53
openlit/instrumentation/vllm/vllm.py +6 -6
openlit/otel/metrics.py +98 -7
openlit/semcov/__init__.py +113 -80
{openlit-1.33.7.dist-info → openlit-1.33.9.dist-info}/METADATA +2 -1
openlit-1.33.9.dist-info/RECORD +121 -0
{openlit-1.33.7.dist-info → openlit-1.33.9.dist-info}/WHEEL +1 -1
openlit/instrumentation/openai/async_azure_openai.py +0 -900
openlit/instrumentation/openai/azure_openai.py +0 -898
openlit-1.33.7.dist-info/RECORD +0 -122
{openlit-1.33.7.dist-info → openlit-1.33.9.dist-info}/LICENSE +0 -0

openlit/instrumentation/controlflow/controlflow.py CHANGED Viewed

@@ -68,8 +68,8 @@ def wrap_controlflow(gen_ai_endpoint, version, environment, application_name,
                                    environment)
                 span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
                                    application_name)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                   SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                   SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 if gen_ai_endpoint == "controlflow.create_agent":
                     span.set_attribute(SemanticConvetion.GEN_AI_AGENT_ROLE,

openlit/instrumentation/crawl4ai/async_crawl4ai.py CHANGED Viewed

@@ -58,8 +58,8 @@ def async_wrap_crawl(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_CRAWL4AI)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
                 span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,

openlit/instrumentation/crawl4ai/crawl4ai.py CHANGED Viewed

@@ -58,8 +58,8 @@ def wrap_crawl(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_CRAWL4AI)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
                 span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,

openlit/instrumentation/crewai/crewai.py CHANGED Viewed

@@ -71,8 +71,8 @@ def crew_wrap(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_CREWAI)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
                 span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,

openlit/instrumentation/dynamiq/dynamiq.py CHANGED Viewed

@@ -58,8 +58,8 @@ def dynamiq_wrap(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_DYNAMIQ)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
                 span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,

openlit/instrumentation/elevenlabs/async_elevenlabs.py CHANGED Viewed

@@ -1,13 +1,17 @@
-# pylint: disable=duplicate-code, broad-exception-caught, too-many-statements, unused-argument, possibly-used-before-assignment
 """
 Module for monitoring Ollama API calls.
 """
 import logging
+import time
+from urllib.parse import urlparse
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
-from openlit.__helpers import get_audio_model_cost
-from openlit.__helpers import handle_exception
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
+from openlit.__helpers import (
+    get_audio_model_cost,
+    handle_exception,
+    create_metrics_attributes,
+)
 from openlit.semcov import SemanticConvetion
 # Initialize logger for logging potential issues and operations
@@ -19,7 +23,6 @@ def async_generate(gen_ai_endpoint, version, environment, application_name,
     Generates a telemetry wrapper for creating speech audio to collect metrics.
     Args:
-        gen_ai_endpoint: Endpoint identifier for logging and tracing.
         version: Version of the monitoring package.
         environment: Deployment environment (e.g., production, staging).
         application_name: Name of the application using the ElevenLabs API.
@@ -47,73 +50,96 @@ def async_generate(gen_ai_endpoint, version, environment, application_name,
         Returns:
             The response from the original 'generate' method.
         """
+        url = urlparse(instance._client_wrapper._base_url)
+        server_address, server_port = url.hostname, url.port or 443
+        request_model = kwargs.get('model', kwargs.get('model_id', 'eleven_multilingual_v2'))
-        with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
-            response = await wrapped(*args, **kwargs)
+        span_name = f'{SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO} {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()
+            for key, value in instance.__dict__.items():
+                print(f'{key}: {value}')
             try:
                 # Calculate cost of the operation
-                cost = get_audio_model_cost(kwargs.get("model", "eleven_multilingual_v2"),
-                                            pricing_info, kwargs.get("text", ""))
+                cost = get_audio_model_cost(request_model,
+                                            pricing_info, kwargs.get('text', ''))
                 # Set Span attributes
-                span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
+                span.set_attribute(TELEMETRY_SDK_NAME, 'openlit')
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO)
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
-                                    SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AUDIO)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
-                                    gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
-                                    environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
-                                    application_name)
+                                    SemanticConvetion.GEN_AI_SYSTEM_ASSEMBLYAI)
+                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
+                                    request_model)
+                span.set_attribute(SemanticConvetion.SERVER_ADDRESS,
+                                    server_address)
+                span.set_attribute(SemanticConvetion.SERVER_PORT,
+                                    server_port)
+                span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_MODEL,
+                                    request_model)
                 span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
-                                    kwargs.get("model", "eleven_multilingual_v2"))
-                if isinstance(kwargs.get("voice", "Rachel"), str):
+                                    request_model)
+                span.set_attribute(SemanticConvetion.GEN_AI_OUTPUT_TYPE,
+                                    'audio')
+                # Set Span attributes (Extras)
+                if gen_ai_endpoint == 'elevenlabs.generate':
+                    if isinstance(kwargs.get('voice', 'Rachel'), str):
+                        span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_VOICE,
+                                        kwargs.get('voice', 'Rachel'))
+                else:
                     span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_VOICE,
-                                    kwargs.get("voice", "Rachel"))
-                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_RESPONSE_FORMAT,
-                                    kwargs.get("output_format", "mp3"))
-                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_SETTINGS,
-                                    str(kwargs.get("voice_settings", "")))
-                span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
-                                    cost)
+                                        kwargs.get('voice_id', ''))
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_RESPONSE_FORMAT,
+                                        kwargs.get('output_format', 'mp3'))
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_SETTINGS,
+                                        str(kwargs.get('voice_settings', '')))
+                    span.set_attribute(DEPLOYMENT_ENVIRONMENT,
+                                        environment)
+                    span.set_attribute(SERVICE_NAME,
+                                        application_name)
+                    span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
+                                        cost)
+                    span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
+                                        version)
                 if trace_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
-                            SemanticConvetion.GEN_AI_CONTENT_PROMPT: str(kwargs.get("text", "")),
+                            SemanticConvetion.GEN_AI_CONTENT_PROMPT: str(kwargs.get('text', '')),
                         },
                     )
                 span.set_status(Status(StatusCode.OK))
                 if disable_metrics is False:
-                    attributes = {
-                        TELEMETRY_SDK_NAME:
-                            "openlit",
-                        SemanticConvetion.GEN_AI_APPLICATION_NAME:
-                            application_name,
-                        SemanticConvetion.GEN_AI_SYSTEM:
-                            SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS,
-                        SemanticConvetion.GEN_AI_ENVIRONMENT:
-                            environment,
-                        SemanticConvetion.GEN_AI_TYPE:
-                            SemanticConvetion.GEN_AI_TYPE_AUDIO,
-                        SemanticConvetion.GEN_AI_REQUEST_MODEL:
-                            kwargs.get("model", "eleven_multilingual_v2")
-                    }
-                    metrics["genai_requests"].add(1, attributes)
-                    metrics["genai_cost"].record(cost, attributes)
+                    attributes = create_metrics_attributes(
+                        service_name=application_name,
+                        deployment_environment=environment,
+                        operation=SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO,
+                        system=SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS,
+                        request_model=request_model,
+                        server_address=server_address,
+                        server_port=server_port,
+                        response_model=request_model,
+                    )
+                    metrics['genai_client_operation_duration'].record(
+                        end_time - start_time, attributes
+                    )
+                    metrics['genai_requests'].add(1, attributes)
+                    metrics['genai_cost'].record(cost, attributes)
                 # Return original response
                 return response
             except Exception as e:
                 handle_exception(span, e)
-                logger.error("Error in trace creation: %s", e)
+                logger.error('Error in trace creation: %s', e)
                 # Return original response
                 return response

openlit/instrumentation/elevenlabs/elevenlabs.py CHANGED Viewed

@@ -1,13 +1,17 @@
-# pylint: disable=duplicate-code, broad-exception-caught, too-many-statements, unused-argument, possibly-used-before-assignment
 """
 Module for monitoring Ollama API calls.
 """
 import logging
+import time
+from urllib.parse import urlparse
 from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
-from openlit.__helpers import get_audio_model_cost
-from openlit.__helpers import handle_exception
+from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
+from openlit.__helpers import (
+    get_audio_model_cost,
+    handle_exception,
+    create_metrics_attributes,
+)
 from openlit.semcov import SemanticConvetion
 # Initialize logger for logging potential issues and operations
@@ -19,7 +23,6 @@ def generate(gen_ai_endpoint, version, environment, application_name,
     Generates a telemetry wrapper for creating speech audio to collect metrics.
     Args:
-        gen_ai_endpoint: Endpoint identifier for logging and tracing.
         version: Version of the monitoring package.
         environment: Deployment environment (e.g., production, staging).
         application_name: Name of the application using the ElevenLabs API.
@@ -48,78 +51,96 @@ def generate(gen_ai_endpoint, version, environment, application_name,
             The response from the original 'generate' method.
         """
-        with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
-            response = wrapped(*args, **kwargs)
+        url = urlparse(instance._client_wrapper._base_url)
+        server_address, server_port = url.hostname, url.port or 443
+        request_model = kwargs.get('model', kwargs.get('model_id', 'eleven_multilingual_v2'))
+        span_name = f'{SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO} {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()
+            for key, value in instance.__dict__.items():
+                print(f'{key}: {value}')
             try:
                 # Calculate cost of the operation
-                cost = get_audio_model_cost(kwargs.get("model", "eleven_multilingual_v2"),
-                                            pricing_info, kwargs.get("text", ""))
+                cost = get_audio_model_cost(request_model,
+                                            pricing_info, kwargs.get('text', ''))
                 # Set Span attributes
-                span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
+                span.set_attribute(TELEMETRY_SDK_NAME, 'openlit')
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO)
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
-                                    SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AUDIO)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
-                                    gen_ai_endpoint)
-                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
-                                    environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
-                                    application_name)
-                if gen_ai_endpoint == "elevenlabs.generate":
-                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
-                                    kwargs.get("model", "eleven_multilingual_v2"))
-                    if isinstance(kwargs.get("voice", "Rachel"), str):
+                                    SemanticConvetion.GEN_AI_SYSTEM_ASSEMBLYAI)
+                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
+                                    request_model)
+                span.set_attribute(SemanticConvetion.SERVER_ADDRESS,
+                                    server_address)
+                span.set_attribute(SemanticConvetion.SERVER_PORT,
+                                    server_port)
+                span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_MODEL,
+                                    request_model)
+                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
+                                    request_model)
+                span.set_attribute(SemanticConvetion.GEN_AI_OUTPUT_TYPE,
+                                    'audio')
+                # Set Span attributes (Extras)
+                if gen_ai_endpoint == 'elevenlabs.generate':
+                    if isinstance(kwargs.get('voice', 'Rachel'), str):
                         span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_VOICE,
-                                        kwargs.get("voice", "Rachel"))
+                                        kwargs.get('voice', 'Rachel'))
                 else:
-                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_MODEL,
-                                    kwargs.get("model_id", "eleven_multilingual_v2"))
                     span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_VOICE,
-                                        kwargs.get("voice_id", ""))
-                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_RESPONSE_FORMAT,
-                                    kwargs.get("output_format", "mp3"))
-                span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_SETTINGS,
-                                    str(kwargs.get("voice_settings", "")))
-                span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
-                                    cost)
+                                        kwargs.get('voice_id', ''))
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_RESPONSE_FORMAT,
+                                        kwargs.get('output_format', 'mp3'))
+                    span.set_attribute(SemanticConvetion.GEN_AI_REQUEST_AUDIO_SETTINGS,
+                                        str(kwargs.get('voice_settings', '')))
+                    span.set_attribute(DEPLOYMENT_ENVIRONMENT,
+                                        environment)
+                    span.set_attribute(SERVICE_NAME,
+                                        application_name)
+                    span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
+                                        cost)
+                    span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
+                                        version)
                 if trace_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
                         attributes={
-                            SemanticConvetion.GEN_AI_CONTENT_PROMPT: str(kwargs.get("text", "")),
+                            SemanticConvetion.GEN_AI_CONTENT_PROMPT: str(kwargs.get('text', '')),
                         },
                     )
                 span.set_status(Status(StatusCode.OK))
                 if disable_metrics is False:
-                    attributes = {
-                        TELEMETRY_SDK_NAME:
-                            "openlit",
-                        SemanticConvetion.GEN_AI_APPLICATION_NAME:
-                            application_name,
-                        SemanticConvetion.GEN_AI_SYSTEM:
-                            SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS,
-                        SemanticConvetion.GEN_AI_ENVIRONMENT:
-                            environment,
-                        SemanticConvetion.GEN_AI_TYPE:
-                            SemanticConvetion.GEN_AI_TYPE_AUDIO,
-                        SemanticConvetion.GEN_AI_REQUEST_MODEL:
-                            kwargs.get("model", "eleven_multilingual_v2")
-                    }
-                    metrics["genai_requests"].add(1, attributes)
-                    metrics["genai_cost"].record(cost, attributes)
+                    attributes = create_metrics_attributes(
+                        service_name=application_name,
+                        deployment_environment=environment,
+                        operation=SemanticConvetion.GEN_AI_OPERATION_TYPE_AUDIO,
+                        system=SemanticConvetion.GEN_AI_SYSTEM_ELEVENLABS,
+                        request_model=request_model,
+                        server_address=server_address,
+                        server_port=server_port,
+                        response_model=request_model,
+                    )
+                    metrics['genai_client_operation_duration'].record(
+                        end_time - start_time, attributes
+                    )
+                    metrics['genai_requests'].add(1, attributes)
+                    metrics['genai_cost'].record(cost, attributes)
                 # Return original response
                 return response
             except Exception as e:
                 handle_exception(span, e)
-                logger.error("Error in trace creation: %s", e)
+                logger.error('Error in trace creation: %s', e)
                 # Return original response
                 return response

openlit/instrumentation/embedchain/embedchain.py CHANGED Viewed

@@ -65,8 +65,8 @@ def evaluate(gen_ai_endpoint, version, environment, application_name,
                                     gen_ai_endpoint)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
                                     environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_FRAMEWORK)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_FRAMEWORK)
                 span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
                                     application_name)
                 span.set_attribute(SemanticConvetion.GEN_AI_EVAL_CONTEXT_RELEVANCY,
@@ -143,8 +143,8 @@ def get_data_sources(gen_ai_endpoint, version, environment, application_name,
                                     gen_ai_endpoint)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
                                     environment)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_FRAMEWORK)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_FRAMEWORK)
                 span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
                                     application_name)
                 span.set_attribute(SemanticConvetion.GEN_AI_DATA_SOURCES,

openlit/instrumentation/firecrawl/firecrawl.py CHANGED Viewed

@@ -58,8 +58,8 @@ def wrap_crawl(gen_ai_endpoint, version, environment, application_name,
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
                 span.set_attribute(SemanticConvetion.GEN_AI_SYSTEM,
                                     SemanticConvetion.GEN_AI_SYSTEM_FIRECRAWL)
-                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
-                                    SemanticConvetion.GEN_AI_TYPE_AGENT)
+                span.set_attribute(SemanticConvetion.GEN_AI_OPERATION,
+                                    SemanticConvetion.GEN_AI_OPERATION_TYPE_AGENT)
                 span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
                                     gen_ai_endpoint)
                 span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,

openlit/instrumentation/google_ai_studio/__init__.py CHANGED Viewed

@@ -14,11 +14,11 @@ from openlit.instrumentation.google_ai_studio.async_google_ai_studio import (
     async_generate
 )
-_instruments = ("google-generativeai >= 0.2.0",)
+_instruments = ("google-genai >= 1.3.0",)
 class GoogleAIStudioInstrumentor(BaseInstrumentor):
     """
-    An instrumentor for google-generativeai's client library.
+    An instrumentor for google-genai's client library.
     """
     def instrumentation_dependencies(self) -> Collection[str]:
@@ -32,21 +32,21 @@ class GoogleAIStudioInstrumentor(BaseInstrumentor):
         pricing_info = kwargs.get("pricing_info", {})
         trace_content = kwargs.get("trace_content", False)
         disable_metrics = kwargs.get("disable_metrics")
-        version = importlib.metadata.version("google-generativeai")
+        version = importlib.metadata.version("google-genai")
         # sync generate
         wrap_function_wrapper(
-            "google.generativeai.generative_models",
-            "GenerativeModel.generate_content",
-            generate("google_ai_studio.generate_content", version, environment, application_name,
+            "google.genai.models",
+            "Models.generate_content",
+            generate(version, environment, application_name,
                   tracer, pricing_info, trace_content, metrics, disable_metrics),
         )
         # async generate
         wrap_function_wrapper(
-            "google.generativeai.generative_models",
-            "GenerativeModel.generate_content_async",
-            async_generate("google_ai_studio.generate_content", version, environment,
+            "google.genai.models",
+            "AsyncModels.generate_content",
+            async_generate(version, environment,
                            application_name, tracer, pricing_info, trace_content, metrics,
                            disable_metrics),
         )

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

openlit 1.33.7py3-none-any.whl → 1.33.9py3-none-any.whl