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

openlit/__helpers.py

@@ -7,8 +7,8 @@ import json
 import logging
 from urllib.parse import urlparse
 from typing import Any, Dict, List, Tuple
+import math
 import requests
-import tiktoken
 from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
 from opentelemetry.trace import Status, StatusCode
 from opentelemetry._events import Event
@@ -45,28 +45,12 @@ def get_env_variable(name, arg_value, error_message):
         raise RuntimeError(error_message)
     return value
 
-def openai_tokens(text, model):
-    """
-    Calculate the number of tokens a given text would take up for a specified model.
-    """
-
-    try:
-        encoding = tiktoken.encoding_for_model(model)
-    except:
-        encoding = tiktoken.get_encoding("cl100k_base")
-
-    num_tokens = len(encoding.encode(text))
-    return num_tokens
-
 def general_tokens(text):
     """
     Calculate the number of tokens a given text would take up.
     """
 
-    encoding = tiktoken.get_encoding('gpt2')
-
-    num_tokens = len(encoding.encode(text))
-    return num_tokens
+    return math.ceil(len(text) / 2)
 
 def get_chat_model_cost(model, pricing_info, prompt_tokens, completion_tokens):
     """

openlit/instrumentation/assemblyai/__init__.py

@@ -1,4 +1,3 @@
-# pylint: disable=useless-return, bad-staticmethod-argument, disable=duplicate-code
 """Initializer of Auto Instrumentation of AssemblyAI Functions"""
 
 from typing import Collection
@@ -10,7 +9,7 @@ from openlit.instrumentation.assemblyai.assemblyai import (
     transcribe
 )
 
-_instruments = ("assemblyai >= 0.35.1",)
+_instruments = ('assemblyai >= 0.35.1',)
 
 class AssemblyAIInstrumentor(BaseInstrumentor):
     """
@@ -21,21 +20,22 @@ class AssemblyAIInstrumentor(BaseInstrumentor):
         return _instruments
 
     def _instrument(self, **kwargs):
-        application_name = kwargs.get("application_name", "default")
-        environment = kwargs.get("environment", "default")
-        tracer = kwargs.get("tracer")
-        metrics = kwargs.get("metrics_dict")
-        pricing_info = kwargs.get("pricing_info", {})
-        capture_message_content = kwargs.get("capture_message_content", False)
-        disable_metrics = kwargs.get("disable_metrics")
-        version = importlib.metadata.version("assemblyai")
+        application_name = kwargs.get('application_name', 'default')
+        environment = kwargs.get('environment', 'default')
+        tracer = kwargs.get('tracer')
+        event_provider = kwargs.get('event_provider')
+        metrics = kwargs.get('metrics_dict')
+        pricing_info = kwargs.get('pricing_info', {})
+        capture_message_content = kwargs.get('capture_message_content', False)
+        disable_metrics = kwargs.get('disable_metrics')
+        version = importlib.metadata.version('assemblyai')
 
         # sync transcribe
         wrap_function_wrapper(
-            "assemblyai.transcriber",
-            "Transcriber.transcribe",
+            'assemblyai.transcriber',
+            'Transcriber.transcribe',
             transcribe(version, environment, application_name,
-                  tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):

openlit/instrumentation/assemblyai/assemblyai.py

@@ -10,7 +10,8 @@ from openlit.__helpers import (
     get_audio_model_cost,
     handle_exception,
     create_metrics_attributes,
-    set_server_address_and_port
+    set_server_address_and_port,
+    otel_event
 )
 from openlit.semcov import SemanticConvetion
 
@@ -18,38 +19,15 @@ from openlit.semcov import SemanticConvetion
 logger = logging.getLogger(__name__)
 
 def transcribe(version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+                 tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics):
     """
-    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 Assembly AI API.
-        tracer: OpenTelemetry tracer for creating spans.
-        pricing_info: Information used for calculating the cost of generating speech 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.
+    Generates a telemetry wrapper for GenAI function call
     """
 
+
     def wrapper(wrapped, instance, args, kwargs):
         """
-        Wraps the 'generate' API call to add telemetry.
-
-        This collects metrics such as execution time, cost, and handles errors
-        gracefully, adding details to the trace for observability.
-
-        Args:
-            wrapped: The original 'generate' method to be wrapped.
-            instance: The instance of the class where the original method is defined.
-            args: Positional arguments for the 'generate' method.
-            kwargs: Keyword arguments for the 'generate' method.
-
-        Returns:
-            The response from the original 'transcribe' method.
+        Wraps the GenAI function call.
         """
 
         server_address, server_port = set_server_address_and_port(instance, 'api.assemblyai.com', 443)
@@ -96,6 +74,7 @@ def transcribe(version, environment, application_name,
                 span.set_attribute(SemanticConvetion.GEN_AI_SDK_VERSION,
                                     version)
 
+                # To be removed one the change to log events (from span events) is complete
                 if capture_message_content:
                     span.add_event(
                         name=SemanticConvetion.GEN_AI_CONTENT_PROMPT_EVENT,
@@ -110,6 +89,34 @@ def transcribe(version, environment, application_name,
                         },
                     )
 
+                input_event = otel_event(
+                    name=SemanticConvetion.GEN_AI_USER_MESSAGE,
+                    attributes={
+                        SemanticConvetion.GEN_AI_SYSTEM: SemanticConvetion.GEN_AI_SYSTEM_ASSEMBLYAI
+                    },
+                    body={
+                        **({'content': response.audio_url} if capture_message_content else {}),
+                        'role': 'user'
+                    }
+                )
+                event_provider.emit(input_event)
+
+                output_event = otel_event(
+                    name=SemanticConvetion.GEN_AI_CHOICE,
+                    attributes={
+                        SemanticConvetion.GEN_AI_SYSTEM: SemanticConvetion.GEN_AI_SYSTEM_ASSEMBLYAI
+                    },
+                    body={
+                        'finish_reason': 'stop',
+                        'index': 0,
+                        'message': {
+                            **({'content': response.text} if capture_message_content else {}),
+                            'role': 'assistant'
+                        }
+                    }
+                )
+                event_provider.emit(output_event)
+
                 span.set_status(Status(StatusCode.OK))
 
                 if disable_metrics is False:

openlit/instrumentation/azure_ai_inference/__init__.py

@@ -1,4 +1,3 @@
-# pylint: disable=useless-return, bad-staticmethod-argument, disable=duplicate-code
 """Initializer of Auto Instrumentation of Azure AI Inference Functions"""
 
 from typing import Collection
@@ -14,7 +13,7 @@ from openlit.instrumentation.azure_ai_inference.async_azure_ai_inference import
     async_complete, async_embedding
 )
 
-_instruments = ("azure-ai-inference >= 1.0.0b4",)
+_instruments = ('azure-ai-inference >= 1.0.0b4',)
 
 class AzureAIInferenceInstrumentor(BaseInstrumentor):
     """
@@ -25,43 +24,43 @@ class AzureAIInferenceInstrumentor(BaseInstrumentor):
         return _instruments
 
     def _instrument(self, **kwargs):
-        application_name = kwargs.get("application_name", "default_application")
-        environment = kwargs.get("environment", "default_environment")
-        tracer = kwargs.get("tracer")
-        metrics = kwargs.get("metrics_dict")
-        pricing_info = kwargs.get("pricing_info", {})
-        capture_message_content = kwargs.get("capture_message_content", False)
-        disable_metrics = kwargs.get("disable_metrics")
-        version = importlib.metadata.version("azure-ai-inference")
+        application_name = kwargs.get('application_name', 'default')
+        environment = kwargs.get('environment', 'default')
+        tracer = kwargs.get('tracer')
+        metrics = kwargs.get('metrics_dict')
+        pricing_info = kwargs.get('pricing_info', {})
+        capture_message_content = kwargs.get('capture_message_content', False)
+        disable_metrics = kwargs.get('disable_metrics')
+        version = importlib.metadata.version('azure-ai-inference')
 
         # sync generate
         wrap_function_wrapper(
-            "azure.ai.inference",
-            "ChatCompletionsClient.complete",
+            'azure.ai.inference',
+            'ChatCompletionsClient.complete',
             complete(version, environment, application_name,
                   tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # sync embedding
         wrap_function_wrapper(
-            "azure.ai.inference",
-            "EmbeddingsClient.embed",
+            'azure.ai.inference',
+            'EmbeddingsClient.embed',
             embedding(version, environment, application_name,
                   tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # async generate
         wrap_function_wrapper(
-            "azure.ai.inference.aio",
-            "ChatCompletionsClient.complete",
+            'azure.ai.inference.aio',
+            'ChatCompletionsClient.complete',
             async_complete(version, environment, application_name,
                   tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         # async embedding
         wrap_function_wrapper(
-            "azure.ai.inference.aio",
-            "EmbeddingsClient.embed",
+            'azure.ai.inference.aio',
+            'EmbeddingsClient.embed',
             async_embedding(version, environment, application_name,
                   tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )

openlit/instrumentation/openai/async_openai.py

@@ -11,7 +11,7 @@ from openlit.__helpers import (
     get_embed_model_cost,
     get_audio_model_cost,
     get_image_model_cost,
-    openai_tokens,
+    general_tokens,
     handle_exception,
     response_as_dict,
     calculate_ttft,
@@ -151,10 +151,8 @@ def async_chat_completions(version, environment, application_name,
                     request_model = self._kwargs.get("model", "gpt-4o")
 
                     # Calculate tokens using input prompt and aggregated response
-                    input_tokens = openai_tokens(prompt,
-                                                    request_model)
-                    output_tokens = openai_tokens(self._llmresponse,
-                                                        request_model)
+                    input_tokens = general_tokens(prompt)
+                    output_tokens = general_tokens(self._llmresponse)
 
                     # Calculate cost of the operation
                     cost = get_chat_model_cost(request_model,

openlit/instrumentation/openai/openai.py

@@ -11,7 +11,7 @@ from openlit.__helpers import (
     get_embed_model_cost,
     get_audio_model_cost,
     get_image_model_cost,
-    openai_tokens,
+    general_tokens,
     handle_exception,
     response_as_dict,
     calculate_ttft,
@@ -151,10 +151,8 @@ def chat_completions(version, environment, application_name,
                     request_model = self._kwargs.get("model", "gpt-4o")
 
                     # Calculate tokens using input prompt and aggregated response
-                    input_tokens = openai_tokens(prompt,
-                                                    request_model)
-                    output_tokens = openai_tokens(self._llmresponse,
-                                                        request_model)
+                    input_tokens = general_tokens(prompt)
+                    output_tokens = general_tokens(self._llmresponse)
 
                     # Calculate cost of the operation
                     cost = get_chat_model_cost(request_model,

{openlit-1.33.12.dist-info → openlit-1.33.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openlit
-Version: 1.33.12
+Version: 1.33.14
 Summary: OpenTelemetry-native Auto instrumentation library for monitoring LLM Applications and GPUs, facilitating the integration of observability into your GenAI-driven projects
 License: Apache-2.0
 Keywords: OpenTelemetry,otel,otlp,llm,tracing,openai,anthropic,claude,cohere,llm monitoring,observability,monitoring,gpt,Generative AI,chatGPT,gpu
@@ -25,7 +25,6 @@ Requires-Dist: opentelemetry-sdk (>=1.27.0,<2.0.0)
 Requires-Dist: pydantic (>=2.0.0,<3.0.0)
 Requires-Dist: requests (>=2.26.0,<3.0.0)
 Requires-Dist: schedule (>=1.2.2,<2.0.0)
-Requires-Dist: tiktoken (>=0.7.0,<0.8.0)
 Requires-Dist: xmltodict (>=0.13.0,<0.14.0)
 Project-URL: Homepage, https://github.com/openlit/openlit/tree/main/openlit/python
 Project-URL: Repository, https://github.com/openlit/openlit/tree/main/openlit/python

{openlit-1.33.12.dist-info → openlit-1.33.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-openlit/__helpers.py,sha256=TBFkzFFAOWLy2YjMOU--VMtQGb9kspSiJRwk4Twts3g,10675
+openlit/__helpers.py,sha256=9K9nz_RunwtnFeAk591uOJZiY3J88HsYv7T2H8elHWA,10262
 openlit/__init__.py,sha256=87uE_wi6YF2FKkmVy0VLmRKeNMuJ9e6XrycIbad9T6A,23755
 openlit/evals/__init__.py,sha256=nJe99nuLo1b5rf7pt9U9BCdSDedzbVi2Fj96cgl7msM,380
 openlit/evals/all.py,sha256=oWrue3PotE-rB5WePG3MRYSA-ro6WivkclSHjYlAqGs,7154
@@ -22,12 +22,12 @@ openlit/instrumentation/anthropic/__init__.py,sha256=QEsiwdxcQDzzlVYR4_x7KTdf0-U
 openlit/instrumentation/anthropic/anthropic.py,sha256=mZbNepBzOtQBCGJCDWaVTpXukii6jjt_fgSOY1RfMoU,5147
 openlit/instrumentation/anthropic/async_anthropic.py,sha256=DBHFdGKBhnI21Tuh_430kc-Zjaq54yUvfqmCmb1EQqg,5233
 openlit/instrumentation/anthropic/utils.py,sha256=nfIOV7eTtAReNN5QN0oG6NaqftulGjbgMrALOaDHQ8A,11897
-openlit/instrumentation/assemblyai/__init__.py,sha256=AS6tEzcyEG7RP6bNDW_Kf4_rN-u-O1BNjJ3khX3AEUs,1565
-openlit/instrumentation/assemblyai/assemblyai.py,sha256=18AQ7wrigCZd9RXwNZ36mn9fc3M3p2WkAHlT_sD5M3c,6292
+openlit/instrumentation/assemblyai/__init__.py,sha256=vW5ifDgwprOSsr2Xa94T8Us0Gm6ynimAPeB3a8VQKZw,1551
+openlit/instrumentation/assemblyai/assemblyai.py,sha256=TJvzWXtedpRvDybbfpvHURUxndtpVBlpy1AsQHdoiwY,6393
 openlit/instrumentation/astra/__init__.py,sha256=mEHT_p4q3bl9IiXAFqutGEvw37k6CCuWbmlI9Gx3xKY,8314
 openlit/instrumentation/astra/astra.py,sha256=BHU2iaM8ihDfdyXZQZ3Hdv0sfciSOS1QEsqrLPNGnAk,12081
 openlit/instrumentation/astra/async_astra.py,sha256=rlZeU5eIM_onR7rSxMRO0VSZL_p1eLpsU7nabTgBVlo,12093
-openlit/instrumentation/azure_ai_inference/__init__.py,sha256=H4x-9lyEwen2Bk_Dltpd7z8RGOk1hltjjbuJBXq35HQ,2681
+openlit/instrumentation/azure_ai_inference/__init__.py,sha256=T45ideMzIPWFzVhWIjalVGEBP562ESWfCA9diZAoTtw,2573
 openlit/instrumentation/azure_ai_inference/async_azure_ai_inference.py,sha256=xI0GDqKmsbSp58IHalpNvEapM_h65oGYDbe24UVyXqg,29974
 openlit/instrumentation/azure_ai_inference/azure_ai_inference.py,sha256=dgQ8GuSO-j0J6K77tcwK0mZSK3JnIdmT60kjwAV1dt8,29870
 openlit/instrumentation/bedrock/__init__.py,sha256=ZdCBjgwK92cclnbFfF90NC6AsRreom3nT3CklbM7EmM,1555
@@ -92,8 +92,8 @@ openlit/instrumentation/ollama/async_ollama.py,sha256=LhDQPy3wLyNO9JWksUEeCx-DK9
 openlit/instrumentation/ollama/ollama.py,sha256=wVyaX0quoiiCj1J3tyTiQx5Du5CmaWmt9e_lpCr7s6A,6434
 openlit/instrumentation/ollama/utils.py,sha256=zXsWNqfnZLssrcb-GNbWeZeqTKVzQb1bes8vzgl-gbQ,14549
 openlit/instrumentation/openai/__init__.py,sha256=dfgMBHd2wAT24uckVBBqTy7pzN34ESzeymKzkUy6t58,4893
-openlit/instrumentation/openai/async_openai.py,sha256=8-I6SMT1bFxNGLf2GW1Yfpny-lCvIcR5coKvytKL_yE,50635
-openlit/instrumentation/openai/openai.py,sha256=t1-9KY1CCqeRno2_gXd3PxFkWm1ySwFweno4st2T3bE,50469
+openlit/instrumentation/openai/async_openai.py,sha256=DtY26K-mNXqVAIGb_md3V3nVnGzNDn82anw9qzA3RKo,50500
+openlit/instrumentation/openai/openai.py,sha256=79ydZrzRDd_44_3WtZ7U68I3HMvTkKysKglyMhjPcNQ,50334
 openlit/instrumentation/phidata/__init__.py,sha256=tqls5-UI6FzbjxYgq_qqAfALhWJm8dHn2NtgqiQA4f8,1557
 openlit/instrumentation/phidata/phidata.py,sha256=-BU_g3FpGcttOt-W-QIER5qquCRORob2UFLdaOW3F_s,4819
 openlit/instrumentation/pinecone/__init__.py,sha256=0guSEPmObaZiOF8yHExpOGY-qW_egHXfZGog3rKGi8M,2596
@@ -120,7 +120,7 @@ openlit/otel/events.py,sha256=VrMjTpvnLtYRBHCiFwJojTQqqNpRCxoD4yJYeQrtPsk,3560
 openlit/otel/metrics.py,sha256=URL7gzQbnxaNQJSX7oHRa15v6xi1GFmANn-5uFNL-aY,6378
 openlit/otel/tracing.py,sha256=tjV2bEbEDPUB1Z46gE-UsJsb04sRdFrfbhIDkxViZc0,3103
 openlit/semcov/__init__.py,sha256=kUd-ZSmXkXBo-osVve4ce_XEgr0fgEN7nXxoNm7kfEQ,12798
-openlit-1.33.12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openlit-1.33.12.dist-info/METADATA,sha256=t2L1uO5RcNpbAuY5qKha7WQWoB6TCT6L0sc0jG1K5cY,23512
-openlit-1.33.12.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-openlit-1.33.12.dist-info/RECORD,,
+openlit-1.33.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openlit-1.33.14.dist-info/METADATA,sha256=AFPf0UID4LGiybK2NlcoSwKF2AFWx1ksMmDmbSH5uiM,23471
+openlit-1.33.14.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+openlit-1.33.14.dist-info/RECORD,,