openlit 1.33.12__py3-none-any.whl → 1.33.13__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/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.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openlit
-Version: 1.33.12
+Version: 1.33.13
 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.13.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
@@ -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.13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openlit-1.33.13.dist-info/METADATA,sha256=qzSNDWBO7S4WOizt3IIR8LSzPDvmttzZggT7OfSqHpU,23471
+openlit-1.33.13.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+openlit-1.33.13.dist-info/RECORD,,