opentelemetry-instrumentation-llamaindex 0.41.0__tar.gz → 0.43.0__tar.gz

{opentelemetry_instrumentation_llamaindex-0.41.0 → opentelemetry_instrumentation_llamaindex-0.43.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-llamaindex
-Version: 0.41.0
+Version: 0.43.0
 Summary: OpenTelemetry LlamaIndex instrumentation
 License: Apache-2.0
 Author: Gal Kleinman
@@ -14,11 +14,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: instruments
+Provides-Extra: llamaparse
 Requires-Dist: inflection (>=0.5.1,<0.6.0)
 Requires-Dist: opentelemetry-api (>=1.28.0,<2.0.0)
 Requires-Dist: opentelemetry-instrumentation (>=0.50b0)
 Requires-Dist: opentelemetry-semantic-conventions (>=0.50b0)
-Requires-Dist: opentelemetry-semantic-conventions-ai (==0.4.10)
+Requires-Dist: opentelemetry-semantic-conventions-ai (==0.4.11)
 Project-URL: Repository, https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-llamaindex
 Description-Content-Type: text/markdown
 

{opentelemetry_instrumentation_llamaindex-0.41.0 → opentelemetry_instrumentation_llamaindex-0.43.0}/opentelemetry/instrumentation/llamaindex/__init__.py

@@ -28,6 +28,9 @@ from opentelemetry.instrumentation.llamaindex.custom_llm_instrumentor import (
 from opentelemetry.instrumentation.llamaindex.dispatcher_wrapper import (
     instrument_with_dispatcher,
 )
+from opentelemetry.instrumentation.llamaindex.llamaparse_instrumentor import (
+    LlamaParseInstrumentor,
+)
 from opentelemetry.instrumentation.llamaindex.query_pipeline_instrumentor import (
     QueryPipelineInstrumentor,
 )
@@ -90,6 +93,12 @@ class LlamaIndexInstrumentor(BaseInstrumentor):
             BaseAgentInstrumentor(tracer).instrument()
             BaseToolInstrumentor(tracer).instrument()
 
+        # LlamaParse instrumentation doesn't work for all versions
+        try:
+            LlamaParseInstrumentor(tracer).instrument()
+        except Exception:
+            pass
+
 
 class LlamaIndexInstrumentorCore(BaseInstrumentor):
     """An instrumentor for core LlamaIndex SDK."""

opentelemetry_instrumentation_llamaindex-0.43.0/opentelemetry/instrumentation/llamaindex/llamaparse_instrumentor.py

@@ -0,0 +1,169 @@
+from wrapt import wrap_function_wrapper
+
+from opentelemetry.instrumentation.llamaindex.utils import (
+    _with_tracer_wrapper,
+    process_request,
+    process_response,
+    start_as_current_span_async,
+)
+from opentelemetry.semconv_ai import SpanAttributes, TraceloopSpanKindValues
+
+MODULE_NAME = "llama_parse"
+CLASS_NAME = "LlamaParse"
+TASK_NAME = "llamaparse"
+
+
+class LlamaParseInstrumentor:
+    def __init__(self, tracer):
+        self._tracer = tracer
+
+    def instrument(self):
+        methods_to_wrap = [
+            ("load_data", load_data_wrapper),
+            ("aload_data", aload_data_wrapper),
+            ("get_json_result", get_json_wrapper),
+            ("aget_json", aget_json_wrapper),
+            ("get_images", get_images_wrapper),
+            ("aget_images", aget_images_wrapper),
+            ("get_charts", get_charts_wrapper),
+            ("aget_charts", aget_charts_wrapper),
+        ]
+
+        for method_name, wrapper_func in methods_to_wrap:
+            try:
+                wrap_function_wrapper(
+                    MODULE_NAME,
+                    f"{CLASS_NAME}.{method_name}",
+                    wrapper_func(self._tracer),
+                )
+            except AttributeError:
+                # Method doesn't exist, skip it
+                continue
+
+
+@_with_tracer_wrapper
+def get_json_wrapper(tracer, wrapped, instance, args, kwargs):
+    with tracer.start_as_current_span(f"{TASK_NAME}.task") as span:
+        span.set_attribute(
+            SpanAttributes.TRACELOOP_SPAN_KIND,
+            TraceloopSpanKindValues.TASK.value,
+        )
+        span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, TASK_NAME)
+
+        process_request(span, args, kwargs)
+        result = wrapped(*args, **kwargs)
+        process_response(span, result)
+        return result
+
+
+@_with_tracer_wrapper
+async def aget_json_wrapper(tracer, wrapped, instance, args, kwargs):
+    async with start_as_current_span_async(
+        tracer=tracer, name=f"{TASK_NAME}.task"
+    ) as span:
+        span.set_attribute(
+            SpanAttributes.TRACELOOP_SPAN_KIND,
+            TraceloopSpanKindValues.TASK.value,
+        )
+        span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, TASK_NAME)
+
+        process_request(span, args, kwargs)
+        result = await wrapped(*args, **kwargs)
+        process_response(span, result)
+        return result
+
+
+@_with_tracer_wrapper
+def get_images_wrapper(tracer, wrapped, instance, args, kwargs):
+    with tracer.start_as_current_span(f"{TASK_NAME}.task") as span:
+        span.set_attribute(
+            SpanAttributes.TRACELOOP_SPAN_KIND,
+            TraceloopSpanKindValues.TASK.value,
+        )
+        span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, TASK_NAME)
+
+        process_request(span, args, kwargs)
+        result = wrapped(*args, **kwargs)
+        process_response(span, result)
+        return result
+
+
+@_with_tracer_wrapper
+async def aget_images_wrapper(tracer, wrapped, instance, args, kwargs):
+    async with start_as_current_span_async(
+        tracer=tracer, name=f"{TASK_NAME}.task"
+    ) as span:
+        span.set_attribute(
+            SpanAttributes.TRACELOOP_SPAN_KIND,
+            TraceloopSpanKindValues.TASK.value,
+        )
+        span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, TASK_NAME)
+
+        process_request(span, args, kwargs)
+        result = await wrapped(*args, **kwargs)
+        process_response(span, result)
+        return result
+
+
+@_with_tracer_wrapper
+def get_charts_wrapper(tracer, wrapped, instance, args, kwargs):
+    with tracer.start_as_current_span(f"{TASK_NAME}.task") as span:
+        span.set_attribute(
+            SpanAttributes.TRACELOOP_SPAN_KIND,
+            TraceloopSpanKindValues.TASK.value,
+        )
+        span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, TASK_NAME)
+
+        process_request(span, args, kwargs)
+        result = wrapped(*args, **kwargs)
+        process_response(span, result)
+        return result
+
+
+@_with_tracer_wrapper
+async def aget_charts_wrapper(tracer, wrapped, instance, args, kwargs):
+    async with start_as_current_span_async(
+        tracer=tracer, name=f"{TASK_NAME}.task"
+    ) as span:
+        span.set_attribute(
+            SpanAttributes.TRACELOOP_SPAN_KIND,
+            TraceloopSpanKindValues.TASK.value,
+        )
+        span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, TASK_NAME)
+
+        process_request(span, args, kwargs)
+        result = await wrapped(*args, **kwargs)
+        process_response(span, result)
+        return result
+
+
+@_with_tracer_wrapper
+def load_data_wrapper(tracer, wrapped, instance, args, kwargs):
+    with tracer.start_as_current_span(f"{TASK_NAME}.task") as span:
+        span.set_attribute(
+            SpanAttributes.TRACELOOP_SPAN_KIND,
+            TraceloopSpanKindValues.TASK.value,
+        )
+        span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, TASK_NAME)
+
+        process_request(span, args, kwargs)
+        result = wrapped(*args, **kwargs)
+        process_response(span, result)
+        return result
+
+
+@_with_tracer_wrapper
+async def aload_data_wrapper(tracer, wrapped, instance, args, kwargs):
+    async with start_as_current_span_async(
+        tracer=tracer, name=f"{TASK_NAME}.task"
+    ) as span:
+        span.set_attribute(
+            SpanAttributes.TRACELOOP_SPAN_KIND,
+            TraceloopSpanKindValues.TASK.value,
+        )
+        span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, TASK_NAME)
+
+        process_request(span, args, kwargs)
+        result = await wrapped(*args, **kwargs)
+        process_response(span, result)
+        return result

{opentelemetry_instrumentation_llamaindex-0.41.0 → opentelemetry_instrumentation_llamaindex-0.43.0}/opentelemetry/instrumentation/llamaindex/span_utils.py

@@ -31,6 +31,11 @@ def set_llm_chat_request_model_attributes(event, span):
 
     model_dict = event.model_dict
     span.set_attribute(SpanAttributes.LLM_REQUEST_TYPE, LLMRequestTypeValues.CHAT.value)
+
+    # For StructuredLLM, the model and temperature are nested under model_dict.llm
+    if "llm" in model_dict:
+        model_dict = model_dict.get("llm", {})
+
     span.set_attribute(SpanAttributes.LLM_REQUEST_MODEL, model_dict.get("model"))
     span.set_attribute(
         SpanAttributes.LLM_REQUEST_TEMPERATURE, model_dict.get("temperature")

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

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

{opentelemetry_instrumentation_llamaindex-0.41.0 → opentelemetry_instrumentation_llamaindex-0.43.0}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-llamaindex"
-version = "0.41.0"
+version = "0.43.0"
 description = "OpenTelemetry LlamaIndex instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -27,7 +27,7 @@ python = ">=3.9,<4"
 opentelemetry-api = "^1.28.0"
 opentelemetry-instrumentation = ">=0.50b0"
 opentelemetry-semantic-conventions = ">=0.50b0"
-opentelemetry-semantic-conventions-ai = "0.4.10"
+opentelemetry-semantic-conventions-ai = "0.4.11"
 inflection = "^0.5.1"
 
 [tool.poetry.group.dev.dependencies]
@@ -43,15 +43,16 @@ openai = "^1.52.2"
 opentelemetry-sdk = "^1.27.0"
 llama-index = "^0.12.6"
 llama-index-postprocessor-cohere-rerank = "^0.3.0"
-opentelemetry-instrumentation-openai = "==0.41.0"
-opentelemetry-instrumentation-cohere = "==0.41.0"
-opentelemetry-instrumentation-chromadb = "==0.41.0"
+opentelemetry-instrumentation-openai = "==0.43.0"
+opentelemetry-instrumentation-cohere = "==0.43.0"
+opentelemetry-instrumentation-chromadb = "==0.43.0"
 sqlalchemy = "^2.0.31"
 llama-index-agent-openai = "^0.4.1"
 llama-index-vector-stores-chroma = "^0.4.1"
 llama-index-llms-cohere = "^0.4.0"
 llama-index-embeddings-openai = "^0.3.1"
 onnxruntime = "<1.20.0"
+llama-parse = "^0.5.20"
 
 [build-system]
 requires = ["poetry-core"]
@@ -59,6 +60,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.extras]
 instruments = ["llama-index"]
+llamaparse = ["llama-parse"]
 
 [tool.poetry.plugins."opentelemetry_instrumentor"]
 llama-index = "opentelemetry.instrumentation.llamaindex:LlamaIndexInstrumentor"

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

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