openlit 1.34.24__tar.gz → 1.34.25__tar.gz

{openlit-1.34.24 → openlit-1.34.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openlit
-Version: 1.34.24
+Version: 1.34.25
 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

{openlit-1.34.24 → openlit-1.34.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openlit"
-version = "1.34.24"
+version = "1.34.25"
 description = "OpenTelemetry-native Auto instrumentation library for monitoring LLM Applications and GPUs, facilitating the integration of observability into your GenAI-driven projects"
 authors = ["OpenLIT"]
 license = "Apache-2.0"

{openlit-1.34.24 → openlit-1.34.25}/src/openlit/instrumentation/chroma/__init__.py

@@ -1,5 +1,7 @@
-# pylint: disable=useless-return, bad-staticmethod-argument, disable=duplicate-code
-"""Initializer of Auto Instrumentation of Chromadb Functions"""
+"""
+OpenLIT ChromaDB Instrumentation
+"""
+
 from typing import Collection
 import importlib.metadata
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
@@ -10,77 +12,79 @@ from openlit.instrumentation.chroma.chroma import general_wrap
 _instruments = ("chromadb >= 0.4.0",)
 
 class ChromaInstrumentor(BaseInstrumentor):
-    """An instrumentor for Chromadb's client library."""
+    """
+    An instrumentor for ChromaDB's client library.
+    """
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
     def _instrument(self, **kwargs):
-        application_name = kwargs.get("application_name")
-        environment = kwargs.get("environment")
+        version = importlib.metadata.version("chromadb")
+        environment = kwargs.get("environment", "default")
+        application_name = kwargs.get("application_name", "default")
         tracer = kwargs.get("tracer")
+        pricing_info = kwargs.get("pricing_info", {})
+        capture_message_content = kwargs.get("capture_message_content", False)
         metrics = kwargs.get("metrics_dict")
-        pricing_info = kwargs.get("pricing_info")
-        capture_message_content = kwargs.get("capture_message_content")
         disable_metrics = kwargs.get("disable_metrics")
-        version = importlib.metadata.version("chromadb")
 
+        # Sync operations
         wrap_function_wrapper(
-            "chromadb.db",  
-            "DB.create_collection",  
+            "chromadb.db",
+            "DB.create_collection",
             general_wrap("chroma.create_collection", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "chromadb",  
-            "Collection.add",  
+            "chromadb",
+            "Collection.add",
             general_wrap("chroma.add", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "chromadb",  
-            "Collection.get",  
+            "chromadb",
+            "Collection.get",
             general_wrap("chroma.get", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "chromadb",  
-            "Collection.peek",  
+            "chromadb",
+            "Collection.peek",
             general_wrap("chroma.peek", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "chromadb",  
-            "Collection.query",  
+            "chromadb",
+            "Collection.query",
             general_wrap("chroma.query", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "chromadb",  
-            "Collection.update",  
+            "chromadb",
+            "Collection.update",
             general_wrap("chroma.update", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
         wrap_function_wrapper(
-            "chromadb",  
-            "Collection.upsert",  
+            "chromadb",
+            "Collection.upsert",
             general_wrap("chroma.upsert", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
+
         wrap_function_wrapper(
-            "chromadb",  
-            "Collection.delete",  
+            "chromadb",
+            "Collection.delete",
             general_wrap("chroma.delete", version, environment, application_name,
-                 tracer, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
-
-    @staticmethod
     def _uninstrument(self, **kwargs):
         pass

openlit-1.34.25/src/openlit/instrumentation/chroma/chroma.py

@@ -0,0 +1,59 @@
+"""
+Module for monitoring ChromaDB API calls.
+"""
+
+import time
+from opentelemetry.trace import SpanKind
+from opentelemetry import context as context_api
+from openlit.__helpers import (
+    handle_exception,
+    set_server_address_and_port,
+)
+from openlit.instrumentation.chroma.utils import (
+    process_vectordb_response,
+    DB_OPERATION_MAP,
+)
+
+def general_wrap(gen_ai_endpoint, version, environment, application_name,
+    tracer, pricing_info, capture_message_content, metrics, disable_metrics):
+    """
+    Generates a telemetry wrapper for ChromaDB function calls.
+    """
+
+    def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the ChromaDB function call.
+        """
+
+        if context_api.get_value(context_api._SUPPRESS_INSTRUMENTATION_KEY):
+            return wrapped(*args, **kwargs)
+
+        # Get server address and port using the standard helper
+        server_address, server_port = set_server_address_and_port(instance, "localhost", 8000)
+
+        db_operation = DB_OPERATION_MAP.get(gen_ai_endpoint, "unknown")
+        if db_operation == "create_collection":
+            namespace = kwargs.get("name") or (args[0] if args else "unknown")
+        else:
+            namespace = getattr(instance, "name", "unknown")
+        span_name = f"{db_operation} {namespace}"
+
+        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
+            try:
+                start_time = time.time()
+                response = wrapped(*args, **kwargs)
+
+                # Process response and generate telemetry
+                response = process_vectordb_response(
+                    response, db_operation, server_address, server_port,
+                    environment, application_name, metrics, start_time, span,
+                    capture_message_content, disable_metrics, version, instance, args, endpoint=gen_ai_endpoint, **kwargs
+                )
+
+            except Exception as e:
+                handle_exception(span, e)
+
+            return response
+
+
+    return wrapper

openlit-1.34.25/src/openlit/instrumentation/chroma/utils.py

@@ -0,0 +1,227 @@
+"""
+ChromaDB OpenTelemetry instrumentation utility functions
+"""
+import time
+
+from opentelemetry.trace import Status, StatusCode
+
+from openlit.__helpers import (
+    common_db_span_attributes,
+    record_db_metrics,
+)
+from openlit.semcov import SemanticConvention
+
+# Operation mapping for simple span naming
+DB_OPERATION_MAP = {
+    "chroma.create_collection": SemanticConvention.DB_OPERATION_CREATE_COLLECTION,
+    "chroma.add": SemanticConvention.DB_OPERATION_INSERT,
+    "chroma.get": SemanticConvention.DB_OPERATION_GET,
+    "chroma.peek": SemanticConvention.DB_OPERATION_PEEK,
+    "chroma.query": SemanticConvention.DB_OPERATION_GET,
+    "chroma.update": SemanticConvention.DB_OPERATION_UPDATE,
+    "chroma.upsert": SemanticConvention.DB_OPERATION_UPSERT,
+    "chroma.delete": SemanticConvention.DB_OPERATION_DELETE,
+}
+
+def object_count(obj):
+    """
+    Counts length of object if it exists, else returns 0.
+    """
+    return len(obj) if obj else 0
+
+def common_vectordb_logic(scope, environment, application_name,
+    metrics, capture_message_content, disable_metrics, version, instance=None, endpoint=None):
+    """
+    Process vector database request and generate telemetry.
+    """
+
+    scope._end_time = time.time()
+
+    # Set common database span attributes using helper
+    common_db_span_attributes(scope, SemanticConvention.DB_SYSTEM_CHROMA, scope._server_address, scope._server_port,
+        environment, application_name, version)
+
+    # Set DB operation specific attributes
+    scope._span.set_attribute(SemanticConvention.DB_OPERATION_NAME, scope._db_operation)
+    scope._span.set_attribute(SemanticConvention.DB_CLIENT_OPERATION_DURATION, scope._end_time - scope._start_time)
+
+    # Set collection name from instance
+    if hasattr(instance, "name"):
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, instance.name)
+
+    # Set Create Collection operation specific attributes
+    if scope._db_operation == SemanticConvention.DB_OPERATION_CREATE_COLLECTION:
+        # Standard database attributes
+        collection_name = scope._kwargs.get("name") or (scope._args[0] if scope._args else "unknown")
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, collection_name)
+
+        # Vector database specific attributes (extensions)
+        metadata = scope._kwargs.get("metadata", {})
+        if metadata:
+            scope._span.set_attribute(SemanticConvention.DB_COLLECTION_METADATA, str(metadata))
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_INSERT:
+        collection_name = getattr(instance, "name", "unknown")
+        query = scope._kwargs.get("ids", [])
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, collection_name)
+        scope._span.set_attribute(SemanticConvention.DB_VECTOR_COUNT, object_count(query))
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {collection_name} "
+            f"ids={query} "
+            f"documents={scope._kwargs.get('documents', [])}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_GET:
+        collection_name = getattr(instance, "name", "unknown")
+
+        # Handle different GET operations based on endpoint
+        if endpoint == "chroma.get":
+            # Collection.get() - retrieve documents by IDs
+            query = scope._kwargs.get("ids", [])
+
+            # Standard database attributes
+            scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+            scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, collection_name)
+            scope._span.set_attribute(SemanticConvention.DB_VECTOR_COUNT, object_count(query))
+
+            # Vector database specific attributes (extensions)
+            scope._span.set_attribute(SemanticConvention.DB_FILTER, str(scope._kwargs.get("where", "")))
+
+            scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+                f"{scope._db_operation} {collection_name} "
+                f"ids={query} "
+                f"limit={scope._kwargs.get('limit', 'None')} "
+                f"offset={scope._kwargs.get('offset', 'None')}")
+
+        elif endpoint == "chroma.query":
+            query_texts = scope._kwargs.get("query_texts", [])
+            query_embeddings = scope._kwargs.get("query_embeddings", [])
+
+            # Create comprehensive query text (can be either embeddings or texts)
+            if query_texts:
+                query_content = f"texts={query_texts}"
+            elif query_embeddings:
+                query_content = f"embeddings={len(query_embeddings) if query_embeddings else 0} vectors"
+            else:
+                query_content = "no query provided"
+
+            # Standard database attributes
+            scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, query_content)
+            scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, collection_name)
+
+            # Vector database specific attributes (extensions)
+            scope._span.set_attribute(SemanticConvention.DB_VECTOR_QUERY_TOP_K, scope._kwargs.get("n_results", 10))
+            scope._span.set_attribute(SemanticConvention.DB_FILTER, str(scope._kwargs.get("where", "")))
+
+            # Extract response metrics if available
+            if scope._response:
+                # Get number of results returned
+                if hasattr(scope._response, 'get') and scope._response.get('ids'):
+                    returned_rows = object_count(scope._response['ids'][0]) if scope._response['ids'] else 0
+                    scope._span.set_attribute(SemanticConvention.DB_RESPONSE_RETURNED_ROWS, returned_rows)
+
+            scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+                f"{scope._db_operation} {collection_name} "
+                f"n_results={scope._kwargs.get('n_results', 10)} "
+                f"{query_content} "
+                f"filter={scope._kwargs.get('where', 'None')}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_UPDATE:
+        collection_name = getattr(instance, "name", "unknown")
+        query = scope._kwargs.get("ids", [])
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, collection_name)
+        scope._span.set_attribute(SemanticConvention.DB_VECTOR_COUNT, object_count(query))
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {collection_name} "
+            f"ids={query} "
+            f"embeddings={scope._kwargs.get('embeddings', 'None')} "
+            f"metadatas={scope._kwargs.get('metadatas', 'None')} "
+            f"documents={scope._kwargs.get('documents', 'None')}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_UPSERT:
+        collection_name = getattr(instance, "name", "unknown")
+        query = scope._kwargs.get("ids", [])
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, collection_name)
+        scope._span.set_attribute(SemanticConvention.DB_VECTOR_COUNT, object_count(query))
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {collection_name} "
+            f"ids={query} "
+            f"embeddings={scope._kwargs.get('embeddings', 'None')} "
+            f"metadatas={scope._kwargs.get('metadatas', 'None')} "
+            f"documents={scope._kwargs.get('documents', 'None')}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_DELETE:
+        collection_name = getattr(instance, "name", "unknown")
+        query = scope._kwargs.get("ids", [])
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, str(query))
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, collection_name)
+        scope._span.set_attribute(SemanticConvention.DB_VECTOR_COUNT, object_count(query))
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_FILTER, str(scope._kwargs.get("where", "")))
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {collection_name} "
+            f"ids={query} "
+            f"filter={scope._kwargs.get('where', 'None')} "
+            f"delete_all={scope._kwargs.get('delete_all', False)}")
+
+    elif scope._db_operation == SemanticConvention.DB_OPERATION_PEEK:
+        collection_name = getattr(instance, "name", "unknown")
+        query = f"PEEK limit={scope._kwargs.get('limit', '')}"
+
+        # Standard database attributes
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_TEXT, query)
+        scope._span.set_attribute(SemanticConvention.DB_COLLECTION_NAME, collection_name)
+        scope._span.set_attribute(SemanticConvention.DB_VECTOR_COUNT, scope._kwargs.get("limit", ""))
+
+        # Vector database specific attributes (extensions)
+        scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
+            f"{scope._db_operation} {collection_name} "
+            f"limit={scope._kwargs.get('limit', 'None')}")
+
+    scope._span.set_status(Status(StatusCode.OK))
+
+    # Record metrics using helper
+    if not disable_metrics:
+        record_db_metrics(metrics, SemanticConvention.DB_SYSTEM_CHROMA, scope._server_address, scope._server_port,
+            environment, application_name, scope._start_time, scope._end_time)
+
+def process_vectordb_response(response, db_operation, server_address, server_port,
+    environment, application_name, metrics, start_time, span,
+    capture_message_content=False, disable_metrics=False,
+    version="1.0.0", instance=None, args=None, endpoint=None, **kwargs):
+    """
+    Process vector database response and generate telemetry following OpenTelemetry conventions.
+    """
+
+    scope = type("GenericScope", (), {})()
+
+    scope._start_time = start_time
+    scope._span = span
+    scope._kwargs = kwargs
+    scope._args = args or []
+    scope._db_operation = db_operation
+    scope._response = response
+    scope._server_address = server_address
+    scope._server_port = server_port
+
+    common_vectordb_logic(scope, environment, application_name,
+        metrics, capture_message_content, disable_metrics, version, instance, endpoint)
+
+    return response

{openlit-1.34.24 → openlit-1.34.25}/src/openlit/instrumentation/pinecone/async_pinecone.py

@@ -50,10 +50,9 @@ def async_general_wrap(gen_ai_endpoint, version, environment, application_name,
                     capture_message_content, disable_metrics, version, instance, args, **kwargs
                 )
 
-                return response
-
             except Exception as e:
                 handle_exception(span, e)
-                raise
+
+            return response
 
     return wrapper

{openlit-1.34.24 → openlit-1.34.25}/src/openlit/instrumentation/pinecone/pinecone.py

@@ -50,10 +50,9 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
                     capture_message_content, disable_metrics, version, instance, args, **kwargs
                 )
 
-                return response
-
             except Exception as e:
                 handle_exception(span, e)
-                raise
+
+            return response
 
     return wrapper

{openlit-1.34.24 → openlit-1.34.25}/src/openlit/instrumentation/pinecone/utils.py

@@ -72,7 +72,10 @@ def common_vectordb_logic(scope, environment, application_name,
         # Vector database specific attributes (extensions)
         scope._span.set_attribute(SemanticConvention.DB_VECTOR_QUERY_TOP_K, query.get("top_k", -1))
         scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
-            f"SEARCH {namespace} top_k={query.get('top_k', -1)} text={query_text} vector={query_vector}")
+            f"{scope._db_operation} {namespace} "
+            f"top_k={query.get('top_k', -1)} "
+            f"text={query_text} "
+            f"vector={query_vector}")
 
     elif scope._db_operation == SemanticConvention.DB_OPERATION_QUERY:
         namespace = scope._kwargs.get("namespace", "default") or (scope._args[0] if scope._args else "unknown")
@@ -101,7 +104,8 @@ def common_vectordb_logic(scope, environment, application_name,
 
         # Vector database specific attributes (extensions)
         scope._span.set_attribute(SemanticConvention.DB_QUERY_SUMMARY,
-            f"FETCH {namespace} ids={query}")
+            f"{scope._db_operation} {namespace} "
+            f"ids={query}")
         scope._span.set_attribute(SemanticConvention.DB_RESPONSE_RETURNED_ROWS, object_count(scope._response.vectors))
 
     elif scope._db_operation == SemanticConvention.DB_OPERATION_UPDATE: