openlit 0.0.1__tar.gz → 0.0.2__tar.gz

{openlit-0.0.1 → openlit-0.0.2}/PKG-INFO

@@ -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 → openlit-0.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openlit"
-version = "0.0.1"
+version = "0.0.2"
 description = "OpenTelemetry-native Auto instrumentation library for monitoring LLM Applications, facilitating the integration of observability into your GenAI-driven projects"
 authors = ["OpenLIT"]
 repository = "https://github.com/open-lit/openlit/tree/main/openlit/python"

{openlit-0.0.1 → openlit-0.0.2}/src/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-0.0.1 → openlit-0.0.2}/src/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-0.0.1 → openlit-0.0.2}/src/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-0.0.1 → openlit-0.0.2}/src/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 = [
     {