openlit 1.34.22__py3-none-any.whl → 1.34.24__py3-none-any.whl

openlit/__helpers.py

@@ -205,11 +205,22 @@ def set_server_address_and_port(client_instance: Any,
         config = getattr(client_instance, 'sdk_configuration', None)
         base_url = getattr(config, 'server_url', None)
 
+    if not base_url:
+        # Attempt to get host from instance.config.host (used by Pinecone and other vector DBs)
+        config = getattr(client_instance, 'config', None)
+        base_url = getattr(config, 'host', None)
+
     if base_url:
         if isinstance(base_url, str):
-            url = urlparse(base_url)
-            server_address = url.hostname or default_server_address
-            server_port = url.port if url.port is not None else default_server_port
+            # Check if it's a full URL or just a hostname
+            if base_url.startswith(('http://', 'https://')):
+                url = urlparse(base_url)
+                server_address = url.hostname or default_server_address
+                server_port = url.port if url.port is not None else default_server_port
+            else:
+                # If it's just a hostname (like Pinecone's case), use it directly
+                server_address = base_url
+                server_port = default_server_port
         else:  # base_url might not be a str; handle as an object.
             server_address = getattr(base_url, 'host', None) or default_server_address
             port_attr = getattr(base_url, 'port', None)
@@ -442,3 +453,37 @@ def record_image_metrics(metrics, gen_ai_operation, gen_ai_system, server_addres
     metrics["genai_client_operation_duration"].record(end_time - start_time, attributes)
     metrics["genai_requests"].add(1, attributes)
     metrics["genai_cost"].record(cost, attributes)
+
+def common_db_span_attributes(scope, db_system, server_address, server_port,
+    environment, application_name, version):
+    """
+    Set common span attributes for database operations.
+    """
+
+    scope._span.set_attribute(TELEMETRY_SDK_NAME, "openlit")
+    scope._span.set_attribute(SemanticConvention.GEN_AI_OPERATION, SemanticConvention.GEN_AI_OPERATION_TYPE_VECTORDB)
+    scope._span.set_attribute(SemanticConvention.DB_SYSTEM_NAME, db_system)
+    scope._span.set_attribute(SemanticConvention.SERVER_ADDRESS, server_address)
+    scope._span.set_attribute(SemanticConvention.SERVER_PORT, server_port)
+    scope._span.set_attribute(DEPLOYMENT_ENVIRONMENT, environment)
+    scope._span.set_attribute(SERVICE_NAME, application_name)
+    scope._span.set_attribute(SemanticConvention.DB_SDK_VERSION, version)
+
+def record_db_metrics(metrics, db_system, server_address, server_port,
+    environment, application_name, start_time, end_time):
+    """
+    Record database-specific metrics for the operation.
+    """
+
+    attributes = create_metrics_attributes(
+        operation=SemanticConvention.GEN_AI_OPERATION_TYPE_VECTORDB,
+        system=db_system,
+        request_model=db_system,
+        server_address=server_address,
+        server_port=server_port,
+        response_model=db_system,
+        service_name=application_name,
+        deployment_environment=environment,
+    )
+    metrics["db_requests"].add(1, attributes)
+    metrics["db_client_operation_duration"].record(end_time - start_time, attributes)

openlit/__init__.py

@@ -42,6 +42,7 @@ from openlit.instrumentation.premai import PremAIInstrumentor
 from openlit.instrumentation.assemblyai import AssemblyAIInstrumentor
 from openlit.instrumentation.azure_ai_inference import AzureAIInferenceInstrumentor
 from openlit.instrumentation.langchain import LangChainInstrumentor
+from openlit.instrumentation.langchain_community import LangChainCommunityInstrumentor
 from openlit.instrumentation.llamaindex import LlamaIndexInstrumentor
 from openlit.instrumentation.haystack import HaystackInstrumentor
 from openlit.instrumentation.embedchain import EmbedChainInstrumentor
@@ -267,6 +268,7 @@ def init(
         "google-ai-studio": "google.genai",
         "azure-ai-inference": "azure.ai.inference",
         "langchain": "langchain",
+        "langchain_community": "langchain_community",
         "llama_index": "llama_index",
         "haystack": "haystack",
         "embedchain": "embedchain",
@@ -387,6 +389,7 @@ def init(
             "google-ai-studio": GoogleAIStudioInstrumentor(),
             "azure-ai-inference": AzureAIInferenceInstrumentor(),
             "langchain": LangChainInstrumentor(),
+            "langchain_community": LangChainCommunityInstrumentor(),
             "llama_index": LlamaIndexInstrumentor(),
             "haystack": HaystackInstrumentor(),
             "embedchain": EmbedChainInstrumentor(),

openlit/instrumentation/ag2/__init__.py

@@ -8,40 +8,44 @@ from wrapt import wrap_function_wrapper
 from openlit.instrumentation.ag2.ag2 import (
     conversable_agent, agent_run
 )
+from openlit.instrumentation.ag2.async_ag2 import (
+    async_conversable_agent, async_agent_run
+)
 
-_instruments = ('ag2 >= 0.3.2',)
+_instruments = ("ag2 >= 0.3.2",)
 
 class AG2Instrumentor(BaseInstrumentor):
     """
-    An instrumentor for AG2's client library.
+    An instrumentor for AG2 client library.
     """
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
     def _instrument(self, **kwargs):
-        application_name = kwargs.get('application_name', 'default_application')
-        environment = kwargs.get('environment', 'default_environment')
-        tracer = kwargs.get('tracer')
-        event_provider = kwargs.get('event_provider')
-        metrics = kwargs.get('metrics_dict')
-        pricing_info = kwargs.get('pricing_info', {})
-        capture_message_content = kwargs.get('capture_message_content', False)
-        disable_metrics = kwargs.get('disable_metrics')
-        version = importlib.metadata.version('ag2')
-
+        version = importlib.metadata.version("ag2")
+        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")
+        disable_metrics = kwargs.get("disable_metrics")
+
+        # sync conversable agent
         wrap_function_wrapper(
-            'autogen.agentchat.conversable_agent',
-            'ConversableAgent.__init__',
+            "autogen.agentchat.conversable_agent",
+            "ConversableAgent.__init__",
             conversable_agent(version, environment, application_name,
-                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
+        # sync agent run
         wrap_function_wrapper(
-            'autogen.agentchat.conversable_agent',
-            'ConversableAgent.run',
+            "autogen.agentchat.conversable_agent",
+            "ConversableAgent.run",
             agent_run(version, environment, application_name,
-                  tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics),
+                tracer, pricing_info, capture_message_content, metrics, disable_metrics),
         )
 
     def _uninstrument(self, **kwargs):

openlit/instrumentation/ag2/ag2.py

@@ -2,162 +2,113 @@
 Module for monitoring AG2 API calls.
 """
 
-import logging
 import time
-from opentelemetry.trace import SpanKind, Status, StatusCode
-from opentelemetry.sdk.resources import SERVICE_NAME, TELEMETRY_SDK_NAME, DEPLOYMENT_ENVIRONMENT
+from opentelemetry.trace import SpanKind
 from openlit.__helpers import (
     handle_exception,
-    get_chat_model_cost,
-    otel_event,
+    set_server_address_and_port
+)
+from openlit.instrumentation.ag2.utils import (
+    process_agent_creation,
+    process_agent_run,
 )
 from openlit.semcov import SemanticConvention
 
-# Initialize logger for logging potential issues and operations
-logger = logging.getLogger(__name__)
-
-AGENT_NAME = ''
-REQUEST_MODEL = ''
-SYSTEM_MESSAGE = ''
-MODEL_AND_NAME_SET = False
-
-def set_span_attributes(span, version, operation_name, environment,
-        application_name, server_address, server_port, request_model):
-    """
-    Set common attributes for the span.
-    """
-
-    # Set Span attributes (OTel Semconv)
-    span.set_attribute(TELEMETRY_SDK_NAME, 'openlit')
-    span.set_attribute(SemanticConvention.GEN_AI_OPERATION, operation_name)
-    span.set_attribute(SemanticConvention.GEN_AI_SYSTEM, SemanticConvention.GEN_AI_SYSTEM_AG2)
-    span.set_attribute(SemanticConvention.GEN_AI_AGENT_NAME, AGENT_NAME)
-    span.set_attribute(SemanticConvention.SERVER_ADDRESS, server_address)
-    span.set_attribute(SemanticConvention.SERVER_PORT, server_port)
-    span.set_attribute(SemanticConvention.GEN_AI_REQUEST_MODEL, request_model)
-
-    # Set Span attributes (Extras)
-    span.set_attribute(DEPLOYMENT_ENVIRONMENT, environment)
-    span.set_attribute(SERVICE_NAME, application_name)
-    span.set_attribute(SemanticConvention.GEN_AI_SDK_VERSION, version)
-
-def calculate_tokens_and_cost(response, request_model, pricing_info):
+def conversable_agent(version, environment, application_name, tracer, pricing_info,
+    capture_message_content, metrics, disable_metrics):
     """
-    Calculate the input, output tokens, and their respective costs.
+    Generates a telemetry wrapper for AG2 conversable agent creation.
     """
-    input_tokens = 0
-    output_tokens = 0
 
-    for usage_data in response.cost.values():
-        if isinstance(usage_data, dict):
-            for model_data in usage_data.values():
-                if isinstance(model_data, dict):
-                    input_tokens += model_data.get('prompt_tokens', 0)
-                    output_tokens += model_data.get('completion_tokens', 0)
-
-    cost = get_chat_model_cost(request_model, pricing_info, input_tokens, output_tokens)
-    return input_tokens, output_tokens, cost
-
-def emit_events(response, event_provider, capture_message_content):
-    """
-    Emit OpenTelemetry events for each chat history entry.
-    """
-    for chat in response.chat_history:
-        event_type = (
-            SemanticConvention.GEN_AI_CHOICE if chat['role'] == 'user'
-            else SemanticConvention.GEN_AI_USER_MESSAGE
-        )
-        choice_event = otel_event(
-            name=event_type,
-            attributes={
-                SemanticConvention.GEN_AI_SYSTEM: SemanticConvention.GEN_AI_SYSTEM_AG2
-            },
-            body={
-                'index': response.chat_history.index(chat),
-                'message': {
-                    **({'content': chat['content']} if capture_message_content else {}),
-                    'role': 'assistant' if chat['role'] == 'user' else 'user'
-                }
-            }
-        )
-        event_provider.emit(choice_event)
-
-def conversable_agent(version, environment, application_name,
-                      tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics):
-    """
-    Generates a telemetry wrapper for GenAI function call
-    """
     def wrapper(wrapped, instance, args, kwargs):
-        server_address, server_port = '127.0.0.1', 80
-        global AGENT_NAME, MODEL_AND_NAME_SET, REQUEST_MODEL, SYSTEM_MESSAGE
+        """
+        Wraps the AG2 conversable agent creation call.
+        """
 
-        if not MODEL_AND_NAME_SET:
-            AGENT_NAME = kwargs.get('name', 'NOT_FOUND')
-            REQUEST_MODEL = kwargs.get('llm_config', {}).get('model', 'gpt-4o')
-            SYSTEM_MESSAGE = kwargs.get('system_message', '')
-            MODEL_AND_NAME_SET = True
+        server_address, server_port = set_server_address_and_port(instance, "127.0.0.1", 80)
+        agent_name = kwargs.get("name", "NOT_FOUND")
+        llm_config = kwargs.get("llm_config", {})
+        system_message = kwargs.get("system_message", "")
 
-        span_name = f'{SemanticConvention.GEN_AI_OPERATION_TYPE_CREATE_AGENT} {AGENT_NAME}'
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_CREATE_AGENT} {agent_name}"
 
         with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
-            try:
-                start_time = time.time()
-                response = wrapped(*args, **kwargs)
-                end_time = time.time()
-
-                set_span_attributes(span, version, SemanticConvention.GEN_AI_OPERATION_TYPE_CREATE_AGENT,
-                    environment, application_name, server_address, server_port, REQUEST_MODEL)
-                span.set_attribute(SemanticConvention.GEN_AI_AGENT_DESCRIPTION, SYSTEM_MESSAGE)
-                span.set_attribute(SemanticConvention.GEN_AI_RESPONSE_MODEL, REQUEST_MODEL)
-                span.set_attribute(SemanticConvention.GEN_AI_SERVER_TTFT, end_time - start_time)
-
-                span.set_status(Status(StatusCode.OK))
+            start_time = time.time()
+            response = wrapped(*args, **kwargs)
 
-                return response
+            try:
+                process_agent_creation(
+                    agent_name=agent_name,
+                    llm_config=llm_config,
+                    system_message=system_message,
+                    pricing_info=pricing_info,
+                    server_port=server_port,
+                    server_address=server_address,
+                    environment=environment,
+                    application_name=application_name,
+                    metrics=metrics,
+                    start_time=start_time,
+                    span=span,
+                    capture_message_content=capture_message_content,
+                    disable_metrics=disable_metrics,
+                    version=version
+                )
 
             except Exception as e:
                 handle_exception(span, e)
-                logger.error('Error in trace creation: %s', e)
-                return response
+
+            return response
 
     return wrapper
 
-def agent_run(version, environment, application_name,
-              tracer, event_provider, pricing_info, capture_message_content, metrics, disable_metrics):
+def agent_run(version, environment, application_name, tracer, pricing_info,
+    capture_message_content, metrics, disable_metrics):
     """
-    Generates a telemetry wrapper for GenAI function call
+    Generates a telemetry wrapper for AG2 agent run execution.
     """
+
     def wrapper(wrapped, instance, args, kwargs):
-        server_address, server_port = '127.0.0.1', 80
+        """
+        Wraps the AG2 agent run execution call.
+        """
 
-        span_name = f'{SemanticConvention.GEN_AI_OPERATION_TYPE_EXECUTE_AGENT_TASK} {AGENT_NAME}'
+        server_address, server_port = set_server_address_and_port(instance, "127.0.0.1", 80)
 
-        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
-            try:
-                start_time = time.time()
-                response = wrapped(*args, **kwargs)
-                end_time = time.time()
+        # Extract agent name from instance
+        agent_name = getattr(instance, "name", "NOT_FOUND")
 
-                input_tokens, output_tokens, cost = calculate_tokens_and_cost(response, REQUEST_MODEL, pricing_info)
-                response_model = list(response.cost.get('usage_including_cached_inference', {}).keys())[1]
+        # Extract model from instance llm_config
+        request_model = "gpt-4o"
+        if hasattr(instance, "llm_config") and isinstance(instance.llm_config, dict):
+            request_model = instance.llm_config.get("model", "gpt-4o")
 
-                set_span_attributes(span, version, SemanticConvention.GEN_AI_OPERATION_TYPE_EXECUTE_AGENT_TASK,
-                    environment, application_name, server_address, server_port, REQUEST_MODEL)
-                span.set_attribute(SemanticConvention.GEN_AI_RESPONSE_MODEL, response_model)
-                span.set_attribute(SemanticConvention.GEN_AI_USAGE_INPUT_TOKENS, input_tokens)
-                span.set_attribute(SemanticConvention.GEN_AI_USAGE_OUTPUT_TOKENS, output_tokens)
-                span.set_attribute(SemanticConvention.GEN_AI_CLIENT_TOKEN_USAGE, input_tokens + output_tokens)
-                span.set_attribute(SemanticConvention.GEN_AI_USAGE_COST, cost)
-                span.set_attribute(SemanticConvention.GEN_AI_SERVER_TTFT, end_time - start_time)
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_EXECUTE_AGENT_TASK} {agent_name}"
 
-                emit_events(response, event_provider, capture_message_content)
-                span.set_status(Status(StatusCode.OK))
+        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
+            start_time = time.time()
+            response = wrapped(*args, **kwargs)
 
-                return response
+            try:
+                response = process_agent_run(
+                    response=response,
+                    agent_name=agent_name,
+                    request_model=request_model,
+                    pricing_info=pricing_info,
+                    server_port=server_port,
+                    server_address=server_address,
+                    environment=environment,
+                    application_name=application_name,
+                    metrics=metrics,
+                    start_time=start_time,
+                    span=span,
+                    capture_message_content=capture_message_content,
+                    disable_metrics=disable_metrics,
+                    version=version
+                )
 
             except Exception as e:
                 handle_exception(span, e)
-                logger.error('Error in trace creation: %s', e)
-                return response
+
+            return response
 
     return wrapper

openlit/instrumentation/ag2/async_ag2.py

@@ -0,0 +1,114 @@
+"""
+Module for monitoring AG2 API calls (async version).
+"""
+
+import time
+from opentelemetry.trace import SpanKind
+from openlit.__helpers import (
+    handle_exception,
+    set_server_address_and_port
+)
+from openlit.instrumentation.ag2.utils import (
+    process_agent_creation,
+    process_agent_run,
+)
+from openlit.semcov import SemanticConvention
+
+def async_conversable_agent(version, environment, application_name, tracer, pricing_info,
+    capture_message_content, metrics, disable_metrics):
+    """
+    Generates a telemetry wrapper for AG2 async conversable agent creation.
+    """
+
+    async def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the AG2 async conversable agent creation call.
+        """
+
+        server_address, server_port = set_server_address_and_port(instance, "127.0.0.1", 80)
+        agent_name = kwargs.get("name", "NOT_FOUND")
+        llm_config = kwargs.get("llm_config", {})
+        system_message = kwargs.get("system_message", "")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_CREATE_AGENT} {agent_name}"
+
+        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
+            start_time = time.time()
+            response = await wrapped(*args, **kwargs)
+
+            try:
+                process_agent_creation(
+                    agent_name=agent_name,
+                    llm_config=llm_config,
+                    system_message=system_message,
+                    pricing_info=pricing_info,
+                    server_port=server_port,
+                    server_address=server_address,
+                    environment=environment,
+                    application_name=application_name,
+                    metrics=metrics,
+                    start_time=start_time,
+                    span=span,
+                    capture_message_content=capture_message_content,
+                    disable_metrics=disable_metrics,
+                    version=version
+                )
+
+            except Exception as e:
+                handle_exception(span, e)
+
+            return response
+
+    return wrapper
+
+def async_agent_run(version, environment, application_name, tracer, pricing_info,
+    capture_message_content, metrics, disable_metrics):
+    """
+    Generates a telemetry wrapper for AG2 async agent run execution.
+    """
+
+    async def wrapper(wrapped, instance, args, kwargs):
+        """
+        Wraps the AG2 async agent run execution call.
+        """
+
+        server_address, server_port = set_server_address_and_port(instance, "127.0.0.1", 80)
+
+        # Extract agent name from instance
+        agent_name = getattr(instance, "name", "NOT_FOUND")
+
+        # Extract model from instance llm_config
+        request_model = "gpt-4o"
+        if hasattr(instance, "llm_config") and isinstance(instance.llm_config, dict):
+            request_model = instance.llm_config.get("model", "gpt-4o")
+
+        span_name = f"{SemanticConvention.GEN_AI_OPERATION_TYPE_EXECUTE_AGENT_TASK} {agent_name}"
+
+        with tracer.start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
+            start_time = time.time()
+            response = await wrapped(*args, **kwargs)
+
+            try:
+                response = process_agent_run(
+                    response=response,
+                    agent_name=agent_name,
+                    request_model=request_model,
+                    pricing_info=pricing_info,
+                    server_port=server_port,
+                    server_address=server_address,
+                    environment=environment,
+                    application_name=application_name,
+                    metrics=metrics,
+                    start_time=start_time,
+                    span=span,
+                    capture_message_content=capture_message_content,
+                    disable_metrics=disable_metrics,
+                    version=version
+                )
+
+            except Exception as e:
+                handle_exception(span, e)
+
+            return response
+
+    return wrapper