openlit 1.28.0__tar.gz → 1.29.1__tar.gz

{openlit-1.28.0 → openlit-1.29.1}/PKG-INFO

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

{openlit-1.28.0 → openlit-1.29.1}/pyproject.toml

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

{openlit-1.28.0 → openlit-1.29.1}/src/openlit/instrumentation/gpu/__init__.py

@@ -132,13 +132,18 @@ class GPUInstrumentor(BaseInstrumentor):
                                                                                   gpu_index, e)
                     return 0
 
+                def safe_decode(byte_string):
+                    if isinstance(byte_string, bytes):
+                        return byte_string.decode('utf-8')
+                    return byte_string
+
                 attributes = {
                     TELEMETRY_SDK_NAME: "openlit",
                     SemanticConvetion.GEN_AI_APPLICATION_NAME: application_name,
                     SemanticConvetion.GEN_AI_ENVIRONMENT: environment,
                     SemanticConvetion.GPU_INDEX: str(gpu_index),
-                    SemanticConvetion.GPU_UUID: pynvml.nvmlDeviceGetUUID(handle).decode('utf-8'),
-                    SemanticConvetion.GPU_NAME: pynvml.nvmlDeviceGetName(handle).decode('utf-8')
+                    SemanticConvetion.GPU_UUID: safe_decode(pynvml.nvmlDeviceGetUUID(handle)),
+                    SemanticConvetion.GPU_NAME: safe_decode(pynvml.nvmlDeviceGetName(handle))
                 }
                 yield Observation(get_metric_value(handle, metric_name), attributes)
 

{openlit-1.28.0 → openlit-1.29.1}/src/openlit/instrumentation/qdrant/__init__.py

@@ -6,6 +6,7 @@ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from wrapt import wrap_function_wrapper
 
 from openlit.instrumentation.qdrant.qdrant import general_wrap
+from openlit.instrumentation.qdrant.async_qdrant import async_general_wrap
 
 _instruments = ("qdrant-client >= 1.9.0",)
 
@@ -118,7 +119,146 @@ WRAPPED_METHODS = [
         "object": "QdrantClient.recommend",
         "endpoint": "qdrant.recommend",
         "wrapper": general_wrap,
-    }
+    },
+    {
+
+        "package": "qdrant_client",
+        "object": "QdrantClient.create_payload_index",
+        "endpoint": "qdrant.create_payload_index",
+        "wrapper": general_wrap,
+    },
+    {
+
+        "package": "qdrant_client",
+        "object": "QdrantClient.query_points",
+        "endpoint": "qdrant.query_points",
+        "wrapper": general_wrap,
+    },
+
+    # Async Client
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.create_collection",
+        "endpoint": "qdrant.create_collection",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.delete_collection",
+        "endpoint": "qdrant.delete_collection",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.update_collection",
+        "endpoint": "qdrant.update_collection",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.upload_collection",
+        "endpoint": "qdrant.upload_collection",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.upsert",
+        "endpoint": "qdrant.upsert",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.set_payload",
+        "endpoint": "qdrant.set_payload",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.overwrite_payload",
+        "endpoint": "qdrant.overwrite_payload",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.clear_payload",
+        "endpoint": "qdrant.clear_payload",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.delete_payload",
+        "endpoint": "qdrant.delete_payload",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.upload_points",
+        "endpoint": "qdrant.upload_points",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.update_vectors",
+        "endpoint": "qdrant.update_vectors",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.delete_vectors",
+        "endpoint": "qdrant.delete_vectors",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.delete",
+        "endpoint": "qdrant.delete",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.retrieve",
+        "endpoint": "qdrant.retrieve",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.scroll",
+        "endpoint": "qdrant.scroll",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.search",
+        "endpoint": "qdrant.search",
+        "wrapper": async_general_wrap,
+    },
+    {
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.search_groups",
+        "endpoint": "qdrant.search_groups",
+        "wrapper": async_general_wrap,
+    },
+    {
+
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.recommend",
+        "endpoint": "qdrant.recommend",
+        "wrapper": async_general_wrap,
+    },
+    {
+
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.create_payload_index",
+        "endpoint": "qdrant.create_payload_index",
+        "wrapper": async_general_wrap,
+    },
+    {
+
+        "package": "qdrant_client",
+        "object": "AsyncQdrantClient.query_points",
+        "endpoint": "qdrant.query_points",
+        "wrapper": async_general_wrap,
+    },
 ]
 
 class QdrantInstrumentor(BaseInstrumentor):

openlit-1.28.0/src/openlit/instrumentation/qdrant/qdrant.py → openlit-1.29.1/src/openlit/instrumentation/qdrant/async_qdrant.py

@@ -24,7 +24,7 @@ def object_count(obj):
 
     return cnt
 
-def general_wrap(gen_ai_endpoint, version, environment, application_name,
+def async_general_wrap(gen_ai_endpoint, version, environment, application_name,
                  tracer, pricing_info, trace_content, metrics, disable_metrics):
     """
     Creates a wrapper around a function call to trace and log its execution metrics.
@@ -46,7 +46,7 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
                 a new function that wraps 'wrapped' with additional tracing and logging.
     """
 
-    def wrapper(wrapped, instance, args, kwargs):
+    async def wrapper(wrapped, instance, args, kwargs):
         """
         An inner wrapper function that executes the wrapped function, measures execution
         time, and records trace data using OpenTelemetry.
@@ -67,7 +67,7 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
         errors are handled and logged appropriately.
         """
         with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
-            response = wrapped(*args, **kwargs)
+            response = await wrapped(*args, **kwargs)
 
             try:
                 span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
@@ -226,6 +226,15 @@ def general_wrap(gen_ai_endpoint, version, environment, application_name,
                     span.set_attribute(SemanticConvetion.DB_VECTOR_COUNT,
                                        object_count(kwargs.get("points_selector")))
 
+                elif gen_ai_endpoint == "qdrant.create_payload_index":
+                    db_operation = SemanticConvetion.DB_OPERATION_CREATE_INDEX
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_CREATE_INDEX)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_STATEMENT,
+                                       str(kwargs.get("query", "")))
+
                 span.set_status(Status(StatusCode.OK))
 
                 if disable_metrics is False:

openlit-1.29.1/src/openlit/instrumentation/qdrant/qdrant.py

@@ -0,0 +1,274 @@
+# pylint: disable=duplicate-code, broad-exception-caught, too-many-statements, unused-argument, possibly-used-before-assignment, too-many-branches
+"""
+Module for monitoring Qdrant.
+"""
+
+import logging
+from opentelemetry.trace import SpanKind, Status, StatusCode
+from opentelemetry.sdk.resources import TELEMETRY_SDK_NAME
+from openlit.__helpers import handle_exception
+from openlit.semcov import SemanticConvetion
+
+# Initialize logger for logging potential issues and operations
+logger = logging.getLogger(__name__)
+
+def object_count(obj):
+    """
+    Counts Length of object if it exists, Else returns None
+    """
+    try:
+        cnt = len(obj)
+    # pylint: disable=bare-except
+    except:
+        cnt = 0
+
+    return cnt
+
+def general_wrap(gen_ai_endpoint, version, environment, application_name,
+                 tracer, pricing_info, trace_content, metrics, disable_metrics):
+    """
+    Creates a wrapper around a function call to trace and log its execution metrics.
+
+    This function wraps any given function to measure its execution time,
+    log its operation, and trace its execution using OpenTelemetry.
+    
+    Parameters:
+    - gen_ai_endpoint (str): A descriptor or name for the endpoint being traced.
+    - version (str): The version of the Langchain application.
+    - environment (str): The deployment environment (e.g., 'production', 'development').
+    - application_name (str): Name of the Langchain application.
+    - tracer (opentelemetry.trace.Tracer): The tracer object used for OpenTelemetry tracing.
+    - pricing_info (dict): Information about the pricing for internal metrics (currently not used).
+    - trace_content (bool): Flag indicating whether to trace the content of the response.
+
+    Returns:
+    - function: A higher-order function that takes a function 'wrapped' and returns
+                a new function that wraps 'wrapped' with additional tracing and logging.
+    """
+
+    def wrapper(wrapped, instance, args, kwargs):
+        """
+        An inner wrapper function that executes the wrapped function, measures execution
+        time, and records trace data using OpenTelemetry.
+
+        Parameters:
+        - wrapped (Callable): The original function that this wrapper will execute.
+        - instance (object): The instance to which the wrapped function belongs. This
+                             is used for instance methods. For static and classmethods,
+                             this may be None.
+        - args (tuple): Positional arguments passed to the wrapped function.
+        - kwargs (dict): Keyword arguments passed to the wrapped function.
+
+        Returns:
+        - The result of the wrapped function call.
+        
+        The wrapper initiates a span with the provided tracer, sets various attributes
+        on the span based on the function's execution and response, and ensures
+        errors are handled and logged appropriately.
+        """
+        with tracer.start_as_current_span(gen_ai_endpoint, kind= SpanKind.CLIENT) as span:
+            response = wrapped(*args, **kwargs)
+
+            try:
+                span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
+                span.set_attribute(SemanticConvetion.GEN_AI_ENDPOINT,
+                                   gen_ai_endpoint)
+                span.set_attribute(SemanticConvetion.GEN_AI_ENVIRONMENT,
+                                   environment)
+                span.set_attribute(SemanticConvetion.GEN_AI_APPLICATION_NAME,
+                                   application_name)
+                span.set_attribute(SemanticConvetion.GEN_AI_TYPE,
+                                   SemanticConvetion.GEN_AI_TYPE_VECTORDB)
+                span.set_attribute(SemanticConvetion.DB_SYSTEM,
+                                   SemanticConvetion.DB_SYSTEM_QDRANT)
+
+                if gen_ai_endpoint == "qdrant.create_collection":
+                    db_operation = SemanticConvetion.DB_OPERATION_CREATE_COLLECTION
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_CREATE_COLLECTION)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+
+                elif gen_ai_endpoint == "qdrant.upload_collection":
+                    db_operation = SemanticConvetion.DB_OPERATION_CREATE_COLLECTION
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_CREATE_COLLECTION)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+
+                elif gen_ai_endpoint == "qdrant.delete_collection":
+                    db_operation = SemanticConvetion.DB_OPERATION_DELETE_COLLECTION
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_DELETE_COLLECTION)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+
+                elif gen_ai_endpoint == "qdrant.update_collection":
+                    db_operation = SemanticConvetion.DB_OPERATION_UPDATE_COLLECTION
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_UPDATE_COLLECTION)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+
+                elif gen_ai_endpoint == "qdrant.set_payload":
+                    db_operation = SemanticConvetion.DB_OPERATION_ADD
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_ADD)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_OPERATION_STATUS,
+                                       response.status)
+                    span.set_attribute(SemanticConvetion.DB_VECTOR_COUNT,
+                                       object_count(kwargs.get("points", [])))
+                    span.set_attribute(SemanticConvetion.DB_PAYLOAD_COUNT,
+                                       object_count(kwargs.get("payload", [])))
+
+                elif gen_ai_endpoint == "qdrant.retrieve":
+                    db_operation = SemanticConvetion.DB_OPERATION_QUERY
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_QUERY)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_STATEMENT,
+                                       str(kwargs.get("ids", "")))
+
+                elif gen_ai_endpoint == "qdrant.scroll":
+                    db_operation = SemanticConvetion.DB_OPERATION_QUERY
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_QUERY)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_STATEMENT,
+                                       str(kwargs.get("scroll_filter", "")))
+
+                elif gen_ai_endpoint in ["qdrant.search", "qdrant.search_groups"]:
+                    db_operation = SemanticConvetion.DB_OPERATION_QUERY
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_QUERY)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_STATEMENT,
+                                       str(kwargs.get("query_vector", "")))
+
+                elif gen_ai_endpoint == "qdrant.recommend":
+                    db_operation = SemanticConvetion.DB_OPERATION_QUERY
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_QUERY)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_STATEMENT,
+                                       "positive:" + str(kwargs.get("positive", "")) + 
+                                       " negative:" + str(kwargs.get("negative", "")))
+
+                elif gen_ai_endpoint == "qdrant.upload_points":
+                    db_operation = SemanticConvetion.DB_OPERATION_ADD
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_ADD)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_VECTOR_COUNT,
+                                       object_count(kwargs.get("points")))
+
+                elif gen_ai_endpoint == "qdrant.update_vectors":
+                    db_operation = SemanticConvetion.DB_OPERATION_UPDATE
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_UPDATE)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_OPERATION_STATUS,
+                                       response.status)
+                    span.set_attribute(SemanticConvetion.DB_VECTOR_COUNT,
+                                       object_count(kwargs.get("points")))
+
+                elif gen_ai_endpoint == "qdrant.overwrite_payload":
+                    db_operation = SemanticConvetion.DB_OPERATION_UPDATE
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_UPDATE)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_OPERATION_STATUS,
+                                       response.status)
+                    span.set_attribute(SemanticConvetion.DB_VECTOR_COUNT,
+                                       object_count(kwargs.get("points")))
+                    span.set_attribute(SemanticConvetion.DB_PAYLOAD_COUNT,
+                                       object_count(kwargs.get("payload")))
+
+                elif gen_ai_endpoint == "qdrant.upsert":
+                    db_operation = SemanticConvetion.DB_OPERATION_UPSERT
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_UPSERT)
+                    span.set_attribute(SemanticConvetion.DB_OPERATION_STATUS,
+                                       response.status)
+                    span.set_attribute(SemanticConvetion.DB_VECTOR_COUNT,
+                                       object_count(kwargs.get("points")))
+
+                elif gen_ai_endpoint in ["qdrant.delete_payload", "qdrant.delete_vectors"]:
+                    db_operation = SemanticConvetion.DB_OPERATION_DELETE
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_DELETE)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_OPERATION_STATUS,
+                                       response.status)
+                    span.set_attribute(SemanticConvetion.DB_VECTOR_COUNT,
+                                       object_count(kwargs.get("points")))
+
+                elif gen_ai_endpoint in ["qdrant.clear_payload", "qdrant.delete"]:
+                    db_operation = SemanticConvetion.DB_OPERATION_DELETE
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_DELETE)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_OPERATION_STATUS,
+                                       response.status)
+                    span.set_attribute(SemanticConvetion.DB_VECTOR_COUNT,
+                                       object_count(kwargs.get("points_selector")))
+
+                elif gen_ai_endpoint == "qdrant.create_payload_index":
+                    db_operation = SemanticConvetion.DB_OPERATION_CREATE_INDEX
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_CREATE_INDEX)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+
+                elif gen_ai_endpoint == "qdrant.query_points":
+                    db_operation = SemanticConvetion.DB_OPERATION_QUERY
+                    span.set_attribute(SemanticConvetion.DB_OPERATION,
+                                       SemanticConvetion.DB_OPERATION_QUERY)
+                    span.set_attribute(SemanticConvetion.DB_COLLECTION_NAME,
+                                       kwargs.get("collection_name", ""))
+                    span.set_attribute(SemanticConvetion.DB_STATEMENT,
+                                       str(kwargs.get("query", "")))
+
+                span.set_status(Status(StatusCode.OK))
+
+                if disable_metrics is False:
+                    attributes = {
+                        TELEMETRY_SDK_NAME:
+                            "openlit",
+                        SemanticConvetion.GEN_AI_APPLICATION_NAME:
+                            application_name,
+                        SemanticConvetion.DB_SYSTEM:
+                            SemanticConvetion.DB_SYSTEM_QDRANT,
+                        SemanticConvetion.GEN_AI_ENVIRONMENT:
+                            environment,
+                        SemanticConvetion.GEN_AI_TYPE:
+                            SemanticConvetion.GEN_AI_TYPE_VECTORDB,
+                        SemanticConvetion.DB_OPERATION:
+                            db_operation
+                    }
+
+                    metrics["db_requests"].add(1, attributes)
+
+                return response
+
+            except Exception as e:
+                handle_exception(span, e)
+                logger.error("Error in trace creation: %s", e)
+
+                # Return original response
+                return response
+
+    return wrapper