opentelemetry-instrumentation-llamaindex 0.27.0__tar.gz → 0.28.1__tar.gz

{opentelemetry_instrumentation_llamaindex-0.27.0 → opentelemetry_instrumentation_llamaindex-0.28.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-llamaindex
-Version: 0.27.0
+Version: 0.28.1
 Summary: OpenTelemetry LlamaIndex instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-llamaindex
 License: Apache-2.0

{opentelemetry_instrumentation_llamaindex-0.27.0 → opentelemetry_instrumentation_llamaindex-0.28.1}/opentelemetry/instrumentation/llamaindex/dispatcher_wrapper.py

@@ -1,18 +1,21 @@
 import inspect
 import json
 import re
-from typing import Any, Optional
+from typing import Any, Dict, Optional
 from dataclasses import dataclass
 
 from llama_index.core.bridge.pydantic import PrivateAttr
 from llama_index.core.base.llms.types import MessageRole
 from llama_index.core.instrumentation import get_dispatcher
 from llama_index.core.instrumentation.events import BaseEvent
+from llama_index.core.instrumentation.events.agent import AgentToolCallEvent
+from llama_index.core.instrumentation.events.embedding import EmbeddingStartEvent
 from llama_index.core.instrumentation.events.llm import (
     LLMChatEndEvent,
     LLMChatStartEvent,
     LLMPredictEndEvent,
 )
+from llama_index.core.instrumentation.events.rerank import ReRankStartEvent
 from llama_index.core.instrumentation.event_handlers import BaseEventHandler
 from llama_index.core.instrumentation.span_handlers import BaseSpanHandler
 from opentelemetry import context as context_api
@@ -23,6 +26,7 @@ from opentelemetry.instrumentation.llamaindex.utils import (
 )
 from opentelemetry.semconv_ai import (
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
+    LLMRequestTypeValues,
     SpanAttributes,
     TraceloopSpanKindValues,
 )
@@ -59,6 +63,7 @@ def _set_llm_chat_request(event, span) -> None:
 
 @dont_throw
 def _set_llm_chat_response(event, span) -> None:
+    response = event.response
     if should_send_prompts():
         for idx, message in enumerate(event.messages):
             span.set_attribute(
@@ -67,7 +72,6 @@ def _set_llm_chat_response(event, span) -> None:
             span.set_attribute(
                 f"{SpanAttributes.LLM_PROMPTS}.{idx}.content", message.content
             )
-        response = event.response
         span.set_attribute(
             f"{SpanAttributes.LLM_COMPLETIONS}.0.role",
             response.message.role.value,
@@ -76,12 +80,11 @@ def _set_llm_chat_response(event, span) -> None:
             f"{SpanAttributes.LLM_COMPLETIONS}.0.content",
             response.message.content,
         )
-        if not (raw := response.raw):
-            return
-        # raw can be Any, not just ChatCompletion
+    if not (raw := response.raw):
+        return
     span.set_attribute(
         SpanAttributes.LLM_RESPONSE_MODEL,
-        raw.get("model") if "model" in raw else raw.model,
+        raw.get("model") if "model" in raw else raw.model,  # raw can be Any, not just ChatCompletion
     )
     if usage := raw.get("usage") if "usage" in raw else raw.usage:
         span.set_attribute(
@@ -93,6 +96,10 @@ def _set_llm_chat_response(event, span) -> None:
         span.set_attribute(
             SpanAttributes.LLM_USAGE_TOTAL_TOKENS, usage.total_tokens
         )
+    if choices := raw.choices:
+        span.set_attribute(
+            SpanAttributes.LLM_RESPONSE_FINISH_REASON, choices[0].finish_reason
+        )
 
 
 @dont_throw
@@ -108,6 +115,39 @@ def _set_llm_predict_response(event, span) -> None:
         )
 
 
+@dont_throw
+def _set_embedding(event, span) -> None:
+    model_dict = event.model_dict
+    span.set_attribute(
+        f"{LLMRequestTypeValues.EMBEDDING.value}.model_name",
+        model_dict.get("model_name"),
+    )
+
+
+@dont_throw
+def _set_rerank(event, span) -> None:
+    span.set_attribute(
+        f"{LLMRequestTypeValues.RERANK.value}.model_name",
+        event.model_name,
+    )
+    span.set_attribute(
+        f"{LLMRequestTypeValues.RERANK.value}.top_n",
+        event.top_n,
+    )
+    if should_send_prompts():
+        span.set_attribute(
+            f"{LLMRequestTypeValues.RERANK.value}.query",
+            event.query.query_str,
+        )
+
+
+@dont_throw
+def _set_tool(event, span) -> None:
+    span.set_attribute("tool.name", event.tool.name)
+    span.set_attribute("tool.description", event.tool.description)
+    span.set_attribute("tool.arguments", event.arguments)
+
+
 @dataclass
 class SpanHolder:
     span: Span
@@ -123,7 +163,13 @@ class OpenLLSpanHandler(BaseSpanHandler[SpanHolder]):
         self._tracer = tracer
 
     def new_span(
-        self, id_: str, bound_args: inspect.BoundArguments, parent_span_id: Optional[str], **kwargs
+        self,
+        id_: str,
+        bound_args: inspect.BoundArguments,
+        instance: Optional[Any] = None,
+        parent_span_id: Optional[str] = None,
+        tags: Optional[Dict[str, Any]] = None,
+        **kwargs: Any,
     ) -> Optional[SpanHolder]:
         """Create a span."""
         parent = self.open_spans.get(parent_span_id)
@@ -217,3 +263,9 @@ class OpenLLEventHandler(BaseEventHandler):
             _set_llm_chat_response(event, span)
         elif isinstance(event, LLMPredictEndEvent):
             _set_llm_predict_response(event, span)
+        elif isinstance(event, EmbeddingStartEvent):
+            _set_embedding(event, span)
+        elif isinstance(event, ReRankStartEvent):
+            _set_rerank(event, span)
+        elif isinstance(event, AgentToolCallEvent):
+            _set_tool(event, span)

opentelemetry_instrumentation_llamaindex-0.28.1/opentelemetry/instrumentation/llamaindex/version.py

@@ -0,0 +1 @@
+__version__ = "0.28.1"

{opentelemetry_instrumentation_llamaindex-0.27.0 → opentelemetry_instrumentation_llamaindex-0.28.1}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-llamaindex"
-version = "0.27.0"
+version = "0.28.1"
 description = "OpenTelemetry LlamaIndex instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -41,14 +41,15 @@ pytest-asyncio = "^0.23.7"
 chromadb = ">=0.4.22,<0.6.0"
 openai = "^1.35.0"
 opentelemetry-sdk = "^1.23.0"
-llama-index = "^0.10.46"
+llama-index = "^0.10.59"
 llama-index-postprocessor-cohere-rerank = "^0.1.7"
-opentelemetry-instrumentation-openai = "==0.27.0"
-opentelemetry-instrumentation-cohere = "==0.27.0"
-opentelemetry-instrumentation-chromadb = "==0.27.0"
+opentelemetry-instrumentation-openai = "==0.28.1"
+opentelemetry-instrumentation-cohere = "==0.28.1"
+opentelemetry-instrumentation-chromadb = "==0.28.1"
 sqlalchemy = "^2.0.31"
 llama-index-agent-openai = ">=0.2.7,<0.3.0"
 llama-index-vector-stores-chroma = "^0.1.9"
+llama-index-llms-cohere = "^0.2.0"
 
 [build-system]
 requires = ["poetry-core"]

opentelemetry_instrumentation_llamaindex-0.27.0/opentelemetry/instrumentation/llamaindex/version.py

@@ -1 +0,0 @@
-__version__ = "0.27.0"