openlit 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

openlit/__init__.py

@@ -3,8 +3,9 @@ The __init__.py module for the openLIT package.
 This module sets up the openLIT configuration and instrumentation for various
 large language models (LLMs).
 """
-from typing import Optional, Dict, Any
+from typing import Dict
 import logging
+from importlib.util import find_spec
 
 # Import internal modules for setting up tracing and fetching pricing info.
 from openlit.otel.tracing import setup_tracing
@@ -91,6 +92,30 @@ class OpenlitConfig:
         cls.trace_content = trace_content
         cls.disable_metrics = disable_metrics
 
+def instrument_if_available(instrumentor_name, instrumentor_instance, config,
+                            disabled_instrumentors, module_name_map):
+    """Instruments the specified instrumentor if its library is available."""
+    if instrumentor_name in disabled_instrumentors:
+        return
+
+    module_name = module_name_map.get(instrumentor_name)
+
+    if not module_name or find_spec(module_name) is not None:
+        try:
+            instrumentor_instance.instrument(
+                environment=config.environment,
+                application_name=config.application_name,
+                tracer=config.tracer,
+                pricing_info=config.pricing_info,
+                trace_content=config.trace_content,
+                metrics_dict=config.metrics_dict,
+                disable_metrics=config.disable_metrics
+            )
+
+        # pylint: disable=broad-exception-caught
+        except Exception as e:
+            logger.error("Failed to instrument %s: %s", instrumentor_name, e)
+
 def init(environment="default", application_name="default", tracer=None, otlp_endpoint=None,
          otlp_headers=None, disable_batch=False, trace_content=True, disabled_instrumentors=None,
          meter=None, disable_metrics=False):
@@ -115,12 +140,19 @@ def init(environment="default", application_name="default", tracer=None, otlp_en
     disabled_instrumentors = disabled_instrumentors if disabled_instrumentors else []
 
     # Check for invalid instrumentor names
-    valid_instruments = {
-        "openai", "anthropic", "langchain",
-        "cohere", "mistral", "chroma",
-        "pinecone", "transformers"
+
+    module_name_map = {
+        "openai": "openai",
+        "anthropic": "anthropic",  
+        "cohere": "cohere",  
+        "mistral": "mistralai",  
+        "langchain": "langchain",
+        "chroma": "chromadb",
+        "pinecone": "pincone",
+        "transformers": "transformers"
     }
-    invalid_instrumentors = set(disabled_instrumentors) - valid_instruments
+
+    invalid_instrumentors = [name for name in disabled_instrumentors if name not in module_name_map]
     for invalid_name in invalid_instrumentors:
         logger.warning("Invalid instrumentor name detected and ignored: '%s'", invalid_name)
 
@@ -168,16 +200,8 @@ def init(environment="default", application_name="default", tracer=None, otlp_en
 
         # Initialize and instrument only the enabled instrumentors
         for name, instrumentor in instrumentor_instances.items():
-            if name not in disabled_instrumentors:
-                instrumentor.instrument(
-                    environment=config.environment,
-                    application_name=config.application_name,
-                    tracer=config.tracer,
-                    pricing_info=config.pricing_info,
-                    trace_content=config.trace_content,
-                    metrics_dict=config.metrics_dict,
-                    disable_metrics=config.disable_metrics
-                )
+            instrument_if_available(name, instrumentor, config,
+                                    disabled_instrumentors, module_name_map)
 
     # pylint: disable=broad-exception-caught
     except Exception as e:

openlit/instrumentation/cohere/__init__.py

@@ -7,7 +7,7 @@ from wrapt import wrap_function_wrapper
 
 from openlit.instrumentation.cohere.cohere import chat, chat_stream, embed
 
-_instruments = ("cohere >= 5.0.0",)
+_instruments = ("cohere >= 5.3.2",)
 
 class CohereInstrumentor(BaseInstrumentor):
     """An instrumentor for Cohere's client library."""

openlit/instrumentation/cohere/cohere.py

@@ -173,8 +173,8 @@ def chat(gen_ai_endpoint, version, environment, application_name, tracer,
                 # Calculate cost of the operation
                 cost = get_chat_model_cost(kwargs.get("model", "command"),
                                             pricing_info,
-                                            response.meta["billed_units"]["input_tokens"],
-                                            response.meta["billed_units"]["output_tokens"])
+                                            response.meta.billed_units.input_tokens,
+                                            response.meta.billed_units.output_tokens)
 
                 # Set Span attributes
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
@@ -207,12 +207,12 @@ def chat(gen_ai_endpoint, version, environment, application_name, tracer,
                 span.set_attribute(SemanticConvetion.GEN_AI_RESPONSE_FINISH_REASON,
                                     response.response_id)
                 span.set_attribute(SemanticConvetion.GEN_AI_USAGE_PROMPT_TOKENS,
-                                    response.meta["billed_units"]["input_tokens"])
+                                    response.meta.billed_units.input_tokens)
                 span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COMPLETION_TOKENS,
-                                    response.meta["billed_units"]["output_tokens"])
+                                    response.meta.billed_units.output_tokens)
                 span.set_attribute(SemanticConvetion.GEN_AI_USAGE_TOTAL_TOKENS,
-                                    response.meta["billed_units"]["input_tokens"] +
-                                    response.meta["billed_units"]["output_tokens"])
+                                    response.meta.billed_units.input_tokens +
+                                    response.meta.billed_units.output_tokens)
                 span.set_attribute(SemanticConvetion.GEN_AI_USAGE_COST,
                                     cost)
                 if trace_content:
@@ -241,12 +241,12 @@ def chat(gen_ai_endpoint, version, environment, application_name, tracer,
 
                     metrics["genai_requests"].add(1, attributes)
                     metrics["genai_total_tokens"].add(
-                        response.meta["billed_units"]["input_tokens"] +
-                        response.meta["billed_units"]["output_tokens"], attributes)
+                        response.meta.billed_units.input_tokens +
+                        response.meta.billed_units.output_tokens, attributes)
                     metrics["genai_completion_tokens"].add(
-                        response.meta["billed_units"]["output_tokens"], attributes)
+                        response.meta.billed_units.output_tokens, attributes)
                     metrics["genai_prompt_tokens"].add(
-                        response.meta["billed_units"]["input_tokens"], attributes)
+                        response.meta.billed_units.input_tokens, attributes)
                     metrics["genai_cost"].record(cost, attributes)
 
                 # Return original response
@@ -307,8 +307,8 @@ def chat_stream(gen_ai_endpoint, version, environment, application_name,
                     if event.event_type == "stream-end":
                         llmresponse = event.response.text
                         response_id = event.response.response_id
-                        prompt_tokens = event.response.meta["billed_units"]["input_tokens"]
-                        completion_tokens = event.response.meta["billed_units"]["output_tokens"]
+                        prompt_tokens = event.response.meta.billed_units.input_tokens
+                        completion_tokens = event.response.meta.billed_units.output_tokens
                         finish_reason = event.finish_reason
                     yield event
 

openlit/instrumentation/langchain/__init__.py

@@ -7,8 +7,7 @@ from wrapt import wrap_function_wrapper
 
 from openlit.instrumentation.langchain.langchain import general_wrap, hub
 
-_instruments = ("langchain >= 0.1.1", "langchain-openai >= 0.1.1",
-                "langchain-core > 0.1.1", "langchain-community >= 0.0.31")
+_instruments = ("langchain >= 0.1.1",)
 
 WRAPPED_METHODS = [
     {

{openlit-0.0.1.dist-info → openlit-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openlit
-Version: 0.0.1
+Version: 0.0.2
 Summary: OpenTelemetry-native Auto instrumentation library for monitoring LLM Applications, facilitating the integration of observability into your GenAI-driven projects
 Home-page: https://github.com/open-lit/openlit/tree/main/openlit/python
 Keywords: OpenTelemetry,otel,otlp,llm,tracing,openai,anthropic,claude,cohere,llm monitoring,observability,monitoring,gpt,Generative AI,chatGPT

{openlit-0.0.1.dist-info → openlit-0.0.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 openlit/__helpers.py,sha256=G-QikEhscZIKxV372EQwW8oEqXKy11okykmvQ6VO_Ys,4649
-openlit/__init__.py,sha256=rQcQ8Oej01MpGaWFj0fxAJQux0-L0Bdyo-l5XHx9uTw,7954
+openlit/__init__.py,sha256=E1J6QPM0BiQAbOSetZ32yaw-Ikx4ZgvPemMP9XTdxFA,8795
 openlit/instrumentation/anthropic/__init__.py,sha256=oaU53BOPyfUKbEzYvLr1DPymDluurSnwo4Hernf2XdU,1955
 openlit/instrumentation/anthropic/anthropic.py,sha256=gLN7LrgbTTOxgO8TEn-mX7WCYVGExrIGB-_ueCLPMEY,15993
 openlit/instrumentation/anthropic/async_anthropic.py,sha256=wb5U9aF3FtgPZ_1EZudsuKaB6wmOrEVwDIlfcEWnQqU,16035
 openlit/instrumentation/chroma/__init__.py,sha256=61lFpHlUEQUobsUJZHXdvOViKwsOH8AOvSfc4VgCmiM,3253
 openlit/instrumentation/chroma/chroma.py,sha256=wcY5sN-Lfdr4P56FDy8O_ft20gfxTDP12c2vIUF7Qno,10374
-openlit/instrumentation/cohere/__init__.py,sha256=Q83kFr1FA4vyUcfZlUb7DjkSsbcuxvKcsFZG8www5Xw,1920
-openlit/instrumentation/cohere/cohere.py,sha256=Ygx4BFeTA5Eop60ZjwmbVTOCLQx-rK4ooHIY3SHRs8w,20420
-openlit/instrumentation/langchain/__init__.py,sha256=zmge92WPSFisoIBL0kbUrijbPNsBlPECz6ERe9cQrP0,2634
+openlit/instrumentation/cohere/__init__.py,sha256=PC5T1qIg9pwLNocBP_WjG5B_6p_z019s8quk_fNLAMs,1920
+openlit/instrumentation/cohere/cohere.py,sha256=LdRMStLs-UTxDsGsTObEv-unC8g1tRFaU2EFCUBFGHI,20348
+openlit/instrumentation/langchain/__init__.py,sha256=TW1ZR7I1i9Oig-wDWp3j1gmtQFO76jNBXQRBGGKzoOo,2531
 openlit/instrumentation/langchain/langchain.py,sha256=D-PiYlmUW5SuE4rvKRMOsMGtW5wI6aA3ldig1JhXUok,7609
 openlit/instrumentation/mistral/__init__.py,sha256=zJCIpFWRbsYrvooOJYuqwyuKeSOQLWbyXWCObL-Snks,3156
 openlit/instrumentation/mistral/async_mistral.py,sha256=nD1ns326mclIUjd4PEfrSa8mufpoZqjYF1meK9oohkA,21328
@@ -24,7 +24,7 @@ openlit/instrumentation/transformers/transformers.py,sha256=peT0BGskYt7AZ0b93TZ7
 openlit/otel/metrics.py,sha256=GdlQB1PpNvFAVbCqSTh7A87k6VVb1raHrW0y7xGSuQA,4293
 openlit/otel/tracing.py,sha256=peismkno0YPoRezHPbF5Ycz15_oOBErn_coW1CPspHg,3612
 openlit/semcov/__init__.py,sha256=n7lrz6xOwATtKF8cOWvhjr3JIrZ16sy3DXAW4Li2Q24,5686
-openlit-0.0.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openlit-0.0.1.dist-info/METADATA,sha256=wi-sQz8QHV7LTiV7q_aJb_NGJV1TZq_Gteqvx6kAlto,6515
-openlit-0.0.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-openlit-0.0.1.dist-info/RECORD,,
+openlit-0.0.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openlit-0.0.2.dist-info/METADATA,sha256=qNG41ZQC_-n7j1C5HqT7F-eQ7KTf1bUoZZm6CHxlH1U,6515
+openlit-0.0.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+openlit-0.0.2.dist-info/RECORD,,