opentelemetry-instrumentation-openai 0.15.8__py3-none-any.whl → 0.15.9__py3-none-any.whl

opentelemetry/instrumentation/openai/__init__.py

@@ -13,9 +13,12 @@ _instruments = ("openai >= 0.27.0",)
 class OpenAIInstrumentor(BaseInstrumentor):
     """An instrumentor for OpenAI's client library."""
 
-    def __init__(self, enrich_assistant: bool = False):
+    def __init__(
+        self, enrich_assistant: bool = False, enrich_token_usage: bool = False
+    ):
         super().__init__()
         Config.enrich_assistant = enrich_assistant
+        Config.enrich_token_usage = enrich_token_usage
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments

opentelemetry/instrumentation/openai/shared/__init__.py

@@ -9,7 +9,10 @@ from importlib.metadata import version
 from opentelemetry import context as context_api
 
 from opentelemetry.semconv.ai import SpanAttributes
-from opentelemetry.instrumentation.openai.utils import is_openai_v1
+from opentelemetry.instrumentation.openai.utils import (
+    is_openai_v1,
+    should_record_stream_token_usage,
+)
 
 OPENAI_API_VERSION = "openai.api_version"
 OPENAI_API_BASE = "openai.api_base"
@@ -238,10 +241,6 @@ def model_as_dict(model):
         return model
 
 
-def should_record_stream_token_usage():
-    return (os.getenv("TRACELOOP_STREAM_TOKEN_USAGE") or "false").lower() == "true"
-
-
 def get_token_count_from_string(string: str, model_name: str):
     if not should_record_stream_token_usage():
         return None

opentelemetry/instrumentation/openai/shared/config.py

@@ -1,2 +1,3 @@
 class Config:
+    enrich_token_usage = False
     enrich_assistant = False

opentelemetry/instrumentation/openai/utils.py

@@ -2,6 +2,8 @@ from importlib.metadata import version
 from contextlib import asynccontextmanager
 import os
 
+from opentelemetry.instrumentation.openai.shared.config import Config
+
 
 def is_openai_v1():
     return version("openai") >= "1.0.0"
@@ -11,6 +13,10 @@ def is_metrics_enabled() -> bool:
     return (os.getenv("TRACELOOP_METRICS_ENABLED") or "true").lower() == "true"
 
 
+def should_record_stream_token_usage():
+    return Config.enrich_token_usage
+
+
 def _with_image_gen_metric_wrapper(func):
     def _with_metric(duration_histogram, exception_counter):
         def wrapper(wrapped, instance, args, kwargs):

opentelemetry/instrumentation/openai/version.py

@@ -1 +1 @@
-__version__ = "0.15.8"
+__version__ = "0.15.9"

{opentelemetry_instrumentation_openai-0.15.8.dist-info → opentelemetry_instrumentation_openai-0.15.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.15.8
+Version: 0.15.9
 Summary: OpenTelemetry OpenAI instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 License: Apache-2.0

{opentelemetry_instrumentation_openai-0.15.8.dist-info → opentelemetry_instrumentation_openai-0.15.9.dist-info}/RECORD

@@ -1,17 +1,17 @@
-opentelemetry/instrumentation/openai/__init__.py,sha256=RtjRSDcPG5QYh4wAuu_Szu3PgBSUewxQta5c5jrMEjY,1142
-opentelemetry/instrumentation/openai/shared/__init__.py,sha256=90IJchM1dSyANvSTSXbGQaL04mxLRQOTTZHhZP8CUko,8399
+opentelemetry/instrumentation/openai/__init__.py,sha256=VSQyN0asXvBQD4jAm46xnHRHjKU74Zqzo1UimaC0ws8,1245
+opentelemetry/instrumentation/openai/shared/__init__.py,sha256=o0QGgSMDC8aE2PmV3z6AMdH4nP-SiUQ0w3aKhXXBvzg,8320
 opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=LvoZNowNh7KhTWgvp528Ma-Wrd506yPYLveBvgeT8p4,13697
 opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=xg9qNqijT5ZJOk509l9Q7kVHLwo88DUH-Uv4tzSkeOQ,7045
-opentelemetry/instrumentation/openai/shared/config.py,sha256=Us6lUrKjNXPy8OLJ0Tk2VFsbOKSNTDYY-f8ByEL2LOA,43
+opentelemetry/instrumentation/openai/shared/config.py,sha256=hd2oUeASejh5bEKot76pvQNONpWKsrw2S3iH3j3XsVs,74
 opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=zr7qsH5bpnRMahErgstpphLI-XPN8y7Pxh2_39Oo4Ds,5573
 opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py,sha256=SnmhXnnO5pyc0x9wvbYb1S_OVM4TYr7qeJPZbs3YxJg,1899
-opentelemetry/instrumentation/openai/utils.py,sha256=aHudimT_OE170ip_AGq9BSiD62pu2_sKGAGyFrY9X9U,2404
+opentelemetry/instrumentation/openai/utils.py,sha256=l63pdGpBMEy8oLPlt4QrNL35qYW4nf5ItNsZYYZG7jU,2554
 opentelemetry/instrumentation/openai/v0/__init__.py,sha256=lwKZYa7zhYoEKw9hNQAQ68MZnaYA4-nqJrDUcm2I4ZA,5554
 opentelemetry/instrumentation/openai/v1/__init__.py,sha256=A9X07leoMeErJaBGMMXAD5nYPc6xaUj2Ng5mriOsZ8Q,8162
 opentelemetry/instrumentation/openai/v1/assistant_wrappers.py,sha256=T6Vtdp1fAZdcYjGiTMZwkn4F4DgsltD4p4xLEFW-GhI,5874
 opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py,sha256=SAzYoun2yyOloofyOWtxpm8E2M9TL3Nm8TgKdNyXHuY,2779
-opentelemetry/instrumentation/openai/version.py,sha256=GqK-8KWAo4vp6jaQ3n26VDgMQlCxjp7WFrJNanI0RCs,23
-opentelemetry_instrumentation_openai-0.15.8.dist-info/METADATA,sha256=AoX5FMe64Kwl0n3QrSAf9Zv_pDX4PtXOfxqkfbw5Ics,2218
-opentelemetry_instrumentation_openai-0.15.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-opentelemetry_instrumentation_openai-0.15.8.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
-opentelemetry_instrumentation_openai-0.15.8.dist-info/RECORD,,
+opentelemetry/instrumentation/openai/version.py,sha256=k-GJzgMV-c2ATHbR4wgw0IKwlkANiQ4VvTZ6xMxt9UA,23
+opentelemetry_instrumentation_openai-0.15.9.dist-info/METADATA,sha256=2J11zzA3JcGnRIIPvic3wWuBQJYIxHq1lIy7bMG7A8Q,2218
+opentelemetry_instrumentation_openai-0.15.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+opentelemetry_instrumentation_openai-0.15.9.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
+opentelemetry_instrumentation_openai-0.15.9.dist-info/RECORD,,