ragaai-catalyst 2.1.6b1__py3-none-any.whl → 2.1.6.1b0__py3-none-any.whl

ragaai_catalyst/guard_executor.py

@@ -164,6 +164,7 @@ class GuardExecutor:
         return doc
 
     def execute_input_guardrails(self, prompt, prompt_params):
+        self.current_trace_id =None
         doc = self.set_variables(prompt,prompt_params)
         deployment_response = self.execute_deployment(self.input_deployment_id,doc)
         self.current_trace_id = deployment_response['data']['results'][0]['executionId']

ragaai_catalyst/tracers/instrumentators/__init__.py

@@ -1,5 +0,0 @@
-from .langchain import Langchain as LangchainInstrumentor
-from .openai import OpenAI as OpenAIInstrumentor
-from .llamaindex import LlamaIndex as LlamaIndexInstrumentor
-
-__all__ = ["LangchainInstrumentor", "OpenAIInstrumentor", "LlamaIndexInstrumentor"]

ragaai_catalyst/tracers/tracer.py

@@ -21,11 +21,6 @@ from opentelemetry.sdk import trace as trace_sdk
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from ragaai_catalyst.tracers.exporters.file_span_exporter import FileSpanExporter
 from ragaai_catalyst.tracers.exporters.raga_exporter import RagaExporter
-from ragaai_catalyst.tracers.instrumentators import (
-    LangchainInstrumentor,
-    OpenAIInstrumentor,
-    LlamaIndexInstrumentor,
-)
 from ragaai_catalyst.tracers.utils import get_unique_key
 # from ragaai_catalyst.tracers.llamaindex_callback import LlamaIndexTracer
 from ragaai_catalyst.tracers.llamaindex_instrumentation import LlamaIndexInstrumentationTracer
@@ -283,6 +278,14 @@ class Tracer(AgenticTracing):
                         logger.info("Instrumenting Smolagents...")
                     except (ImportError, ModuleNotFoundError):
                         logger.debug("Smolagents not available in environment")
+
+                    # OpenAI Agents
+                    try:
+                        from openinference.instrumentation.openai_agents import OpenAIAgentsInstrumentor
+                        instrumentors.append((OpenAIAgentsInstrumentor, []))
+                        logger.info("Instrumenting OpenAI Agents...")
+                    except (ImportError, ModuleNotFoundError):
+                        logger.debug("OpenAI Agents not available in environment")
                     
                     if not instrumentors:
                         logger.warning("No agentic packages found in environment to instrument")
@@ -298,7 +301,7 @@ class Tracer(AgenticTracing):
             elif tracer_type == "agentic/llamaindex":
                 from openinference.instrumentation.llama_index import LlamaIndexInstrumentor
                 instrumentors += [(LlamaIndexInstrumentor, [])] 
-            
+
             elif tracer_type == "agentic/langchain" or tracer_type == "agentic/langgraph":
                 from openinference.instrumentation.langchain import LangChainInstrumentor
                 instrumentors += [(LangChainInstrumentor, [])]
@@ -319,6 +322,10 @@ class Tracer(AgenticTracing):
             elif tracer_type == "agentic/smolagents":
                 from openinference.instrumentation.smolagents import SmolagentsInstrumentor
                 instrumentors += [(SmolagentsInstrumentor, [])]
+
+            elif tracer_type == "agentic/openai_agents":
+                from openinference.instrumentation.openai_agents import OpenAIAgentsInstrumentor
+                instrumentors += [(OpenAIAgentsInstrumentor, [])] 
             
             else:
                 # Unknown agentic tracer type
@@ -518,6 +525,14 @@ class Tracer(AgenticTracing):
                 combined_metadata.update(user_detail['trace_user_detail']['metadata'])
             if additional_metadata:
                 combined_metadata.update(additional_metadata)
+                
+            model_cost_latency_metadata = {}
+            if additional_metadata:
+                model_cost_latency_metadata["model"] = additional_metadata["model_name"]
+                model_cost_latency_metadata["total_cost"] = additional_metadata["cost"]
+                model_cost_latency_metadata["total_latency"] = additional_metadata["latency"]
+                model_cost_latency_metadata["recorded_on"] = datetime.datetime.now().astimezone().isoformat()
+                combined_metadata.update(model_cost_latency_metadata)
 
             langchain_traces = langchain_tracer_extraction(data, self.user_context)
             final_result = convert_langchain_callbacks_output(langchain_traces)

ragaai_catalyst/tracers/upload_traces.py

@@ -28,11 +28,14 @@ class UploadTraces:
             "response":{"columnType": "response"},
             "context": {"columnType": "context"},
             "llm_model": {"columnType":"pipeline"},
-            "recorded_on": {"columnType": "metadata"},
+            "recorded_on": {"columnType": "timestamp"},
             "embed_model": {"columnType":"pipeline"},
             "log_source": {"columnType": "metadata"},
             "vector_store":{"columnType":"pipeline"},
-            "feedback": {"columnType":"feedBack"}
+            "feedback": {"columnType":"feedBack"},
+            "model": {"columnType": "metadata"},
+            "total_cost": {"columnType": "metadata", "dataType": "numerical"},
+            "total_latency": {"columnType": "metadata", "dataType": "numerical"},
         }
 
         if additional_metadata_keys:

ragaai_catalyst/tracers/utils/trace_json_converter.py

@@ -226,7 +226,7 @@ def get_spans(input_trace, custom_model_cost):
 
 def convert_json_format(input_trace, custom_model_cost):
     """
-    Converts a JSON from one format to UI format.
+    Converts a JSON from one format to UI format, handling nested spans.
 
     Args:
         input_trace (str): The input JSON string.
@@ -238,8 +238,8 @@ def convert_json_format(input_trace, custom_model_cost):
         "id": input_trace[0]["context"]["trace_id"],
         "trace_name": "",  
         "project_name": "",  
-        "start_time": convert_time_format(min(item["start_time"] for item in input_trace)),  # Find the minimum start_time of all spans
-        "end_time": convert_time_format(max(item["end_time"] for item in input_trace))  # Find the maximum end_time of all spans
+        "start_time": convert_time_format(min(item["start_time"] for item in input_trace)),
+        "end_time": convert_time_format(max(item["end_time"] for item in input_trace))
     }
     final_trace["metadata"] = {
         "tokens": {
@@ -253,31 +253,46 @@ def convert_json_format(input_trace, custom_model_cost):
             "total_cost": 0.0
         }    
     }
-    final_trace["replays"]={"source":None}
-    final_trace["data"]=[{}]
+    final_trace["replays"] = {"source": None}
+    final_trace["data"] = [{}]
+    final_trace["network_calls"] = []
+    final_trace["interactions"] = []
+
+    # import pdb; pdb.set_trace()
+
+    # Helper to recursively extract cost/token info from all spans
+    def accumulate_metrics(span):
+        if span["type"] == "llm" and "info" in span:
+            info = span["info"]
+            cost = info.get("cost", {})
+            tokens = info.get("tokens", {})
+
+            final_trace["metadata"]["tokens"]["prompt_tokens"] += tokens.get("prompt_tokens", 0.0)
+            final_trace["metadata"]["tokens"]["completion_tokens"] += tokens.get("completion_tokens", 0.0)
+            final_trace["metadata"]["tokens"]["total_tokens"] += tokens.get("total_tokens", 0.0)
+
+            final_trace["metadata"]["cost"]["input_cost"] += cost.get("input_cost", 0.0)
+            final_trace["metadata"]["cost"]["output_cost"] += cost.get("output_cost", 0.0)
+            final_trace["metadata"]["cost"]["total_cost"] += cost.get("total_cost", 0.0)
+
+        # Recursively process children
+        children = span.get("data", {}).get("children", [])
+        for child in children:
+            accumulate_metrics(child)
+
+    # Extract and attach spans
     try:
-        final_trace["data"][0]["spans"] = get_spans(input_trace, custom_model_cost)
+        spans = get_spans(input_trace, custom_model_cost)
+        final_trace["data"][0]["spans"] = spans
+
+        # Accumulate from root spans and their children
+        for span in spans:
+            accumulate_metrics(span)
     except Exception as e:
         raise Exception(f"Error in get_spans function: {e}")
-    final_trace["network_calls"] =[]
-    final_trace["interactions"] = []
-
-    for itr in final_trace["data"][0]["spans"]:
-        if itr["type"]=="llm":
-            if "tokens" in itr["info"]:
-                if "prompt_tokens" in itr["info"]["tokens"]:
-                    final_trace["metadata"]["tokens"]["prompt_tokens"] += itr["info"]["tokens"].get('prompt_tokens', 0.0)
-                    final_trace["metadata"]["cost"]["input_cost"] += itr["info"]["cost"].get('input_cost', 0.0) 
-                if "completion_tokens" in itr["info"]["tokens"]:
-                    final_trace["metadata"]["tokens"]["completion_tokens"] += itr["info"]["tokens"].get('completion_tokens', 0.0)
-                    final_trace["metadata"]["cost"]["output_cost"] += itr["info"]["cost"].get('output_cost', 0.0) 
-            if "tokens" in itr["info"]:
-                if "total_tokens" in itr["info"]["tokens"]:
-                    final_trace["metadata"]["tokens"]["total_tokens"] += itr["info"]["tokens"].get('total_tokens', 0.0)
-                    final_trace["metadata"]["cost"]["total_cost"] += itr["info"]["cost"].get('total_cost', 0.0) 
 
-    # get the total tokens, cost
-    final_trace["metadata"]["total_cost"] = final_trace["metadata"]["cost"]["total_cost"] 
+    # Total metadata summary
+    final_trace["metadata"]["total_cost"] = final_trace["metadata"]["cost"]["total_cost"]
     final_trace["metadata"]["total_tokens"] = final_trace["metadata"]["tokens"]["total_tokens"]
 
     return final_trace

{ragaai_catalyst-2.1.6b1.dist-info → ragaai_catalyst-2.1.6.1b0.dist-info}/METADATA

@@ -1,9 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ragaai_catalyst
-Version: 2.1.6b1
+Version: 2.1.6.1b0
 Summary: RAGA AI CATALYST
 Author-email: Kiran Scaria <kiran.scaria@raga.ai>, Kedar Gaikwad <kedar.gaikwad@raga.ai>, Dushyant Mahajan <dushyant.mahajan@raga.ai>, Siddhartha Kosti <siddhartha.kosti@raga.ai>, Ritika Goel <ritika.goel@raga.ai>, Vijay Chaurasia <vijay.chaurasia@raga.ai>, Tushar Kumar <tushar.kumar@raga.ai>
-Requires-Python: <3.13,>=3.9
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.10.2
@@ -39,7 +39,7 @@ Requires-Dist: openinference-instrumentation-openai
 Requires-Dist: openinference-instrumentation-bedrock
 Requires-Dist: openinference-instrumentation-crewai
 Requires-Dist: openinference-instrumentation-haystack
-Requires-Dist: openinference-instrumentation-autogen
+Requires-Dist: openinference-instrumentation-openai-agents
 Requires-Dist: openinference-instrumentation-smolagents
 Requires-Dist: opentelemetry-sdk
 Requires-Dist: opentelemetry-exporter-otlp
@@ -51,6 +51,7 @@ Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
+Dynamic: license-file
 
 # RagaAI Catalyst&nbsp; ![GitHub release (latest by date)](https://img.shields.io/github/v/release/raga-ai-hub/ragaai-catalyst) ![GitHub stars](https://img.shields.io/github/stars/raga-ai-hub/ragaai-catalyst?style=social)  ![Issues](https://img.shields.io/github/issues/raga-ai-hub/ragaai-catalyst) 
 

{ragaai_catalyst-2.1.6b1.dist-info → ragaai_catalyst-2.1.6.1b0.dist-info}/RECORD

@@ -3,7 +3,7 @@ ragaai_catalyst/_version.py,sha256=JKt9KaVNOMVeGs8ojO6LvIZr7ZkMzNN-gCcvryy4x8E,4
 ragaai_catalyst/dataset.py,sha256=YCj8Ovu6y38KEw-1HCe4xQWkmYPgfNTtMa8Q0g6B62o,29401
 ragaai_catalyst/evaluation.py,sha256=O96CydYVPh3duUmXjY6REIXMOR-tOPixSG-Qhrf636A,22955
 ragaai_catalyst/experiment.py,sha256=8yQo1phCHlpnJ-4CqCaIbLXg_1ZlAuLGI9kqGBl-OTE,18859
-ragaai_catalyst/guard_executor.py,sha256=rSdgf_3PB1Eaeoxz0cz6jbAoGvHXAeEfmM1jFUwL8cI,13970
+ragaai_catalyst/guard_executor.py,sha256=f2FXQSW17z4-eor61J_mtD0z-xBm9yordq8giB-GN_U,14006
 ragaai_catalyst/guardrails_manager.py,sha256=_VrARJ1udmCF8TklNKy7XTQUaM8ATDhTOAGDonBkFro,14245
 ragaai_catalyst/internal_api_completion.py,sha256=DdICI5yfEudiOAIC8L4oxH0Qz7kX-BZCdo9IWsi2gNo,2965
 ragaai_catalyst/prompt_manager.py,sha256=W8ypramzOprrJ7-22d5vkBXIuIQ8v9XAzKDGxKsTK28,16550
@@ -31,8 +31,8 @@ ragaai_catalyst/tracers/distributed.py,sha256=MwlBwIxCAng-OI-7Ove_rkE1mTLeuW4Jw-
 ragaai_catalyst/tracers/langchain_callback.py,sha256=CB75zzG3-DkYTELj0vI1MOHQTY0MuQJfoHIXz9Cl8S8,34568
 ragaai_catalyst/tracers/llamaindex_callback.py,sha256=ZY0BJrrlz-P9Mg2dX-ZkVKG3gSvzwqBtk7JL_05MiYA,14028
 ragaai_catalyst/tracers/llamaindex_instrumentation.py,sha256=Ys_jLkvVqo12bKgXDmkp4TxJu9HkBATrFE8cIcTYxWw,14329
-ragaai_catalyst/tracers/tracer.py,sha256=NFrDbko4xw7QYEWUfi98LyKlxROUyAbDktf0y3DCARg,35996
-ragaai_catalyst/tracers/upload_traces.py,sha256=OKsc-Obf8bJvKBprt3dqj8GQQNkoX3kT_t8TBDi9YDQ,5670
+ragaai_catalyst/tracers/tracer.py,sha256=juMsA9qkKffoSWYx3a-iTNCY6SnKxjMoYvTSGQ-r-Gk,37080
+ragaai_catalyst/tracers/upload_traces.py,sha256=nqH6Ldng33VhEGcvQberyWKZ1WvLuBRoySEit8b0f7s,5882
 ragaai_catalyst/tracers/agentic_tracing/README.md,sha256=X4QwLb7-Jg7GQMIXj-SerZIgDETfw-7VgYlczOR8ZeQ,4508
 ragaai_catalyst/tracers/agentic_tracing/__init__.py,sha256=yf6SKvOPSpH-9LiKaoLKXwqj5sez8F_5wkOb91yp0oE,260
 ragaai_catalyst/tracers/agentic_tracing/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -78,20 +78,17 @@ ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py,sha256=w9U8UTxvTbGTD
 ragaai_catalyst/tracers/exporters/file_span_exporter.py,sha256=RgGteu-NVGprXKkynvyIO5yOjpbtA41R3W_NzCjnkwE,6445
 ragaai_catalyst/tracers/exporters/raga_exporter.py,sha256=6xvjWXyh8XPkHKSLLmAZUQSvwuyY17ov8pv2VdfI0qA,17875
 ragaai_catalyst/tracers/exporters/ragaai_trace_exporter.py,sha256=HZG1UjcipgQOHkeqQHVGxenIab2mHqcVmWqtOXlMt6Q,5305
-ragaai_catalyst/tracers/instrumentators/__init__.py,sha256=FgnMQupoRTzmVsG9YKsLQera2Pfs-AluZv8CxwavoyQ,253
-ragaai_catalyst/tracers/instrumentators/langchain.py,sha256=yMN0qVF0pUVk6R5M1vJoUXezDo1ejs4klCFRlE8x4vE,574
-ragaai_catalyst/tracers/instrumentators/llamaindex.py,sha256=SMrRlR4xM7k9HK43hakE8rkrWHxMlmtmWD-AX6TeByc,416
-ragaai_catalyst/tracers/instrumentators/openai.py,sha256=14R4KW9wQCR1xysLfsP_nxS7cqXrTPoD8En4MBAaZUU,379
+ragaai_catalyst/tracers/instrumentators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ragaai_catalyst/tracers/utils/__init__.py,sha256=KeMaZtYaTojilpLv65qH08QmpYclfpacDA0U3wg6Ybw,64
 ragaai_catalyst/tracers/utils/convert_langchain_callbacks_output.py,sha256=ofrNrxf2b1hpjDh_zeaxiYq86azn1MF3kW8-ViYPEg0,1641
 ragaai_catalyst/tracers/utils/convert_llama_instru_callback.py,sha256=8qLo7x4Zsn3dhJfSv9gviB60YXZ2TOsWEouucJmBM0c,1724
 ragaai_catalyst/tracers/utils/extraction_logic_llama_index.py,sha256=ZhPs0YhVtB82-Pq9o1BvCinKE_WPvVxPTEcZjlJbFYM,2371
 ragaai_catalyst/tracers/utils/langchain_tracer_extraction_logic.py,sha256=XS2_x2qneqEx9oAighLg-LRiueWcESLwIC2r7eJT-Ww,3117
 ragaai_catalyst/tracers/utils/model_prices_and_context_window_backup.json,sha256=C3uwkibJ08C9sOX-54kulZYmJlIpZ-SQpfE6HNGrjbM,343502
-ragaai_catalyst/tracers/utils/trace_json_converter.py,sha256=06oTKZHtKL9ylBybpYNU8AfT9xIVMekUBOhlUnRvzB8,13969
+ragaai_catalyst/tracers/utils/trace_json_converter.py,sha256=RH9dkCnPaSygvPvAilRE4lUdUaRtALJKH85E4jHcVoM,14072
 ragaai_catalyst/tracers/utils/utils.py,sha256=ViygfJ7vZ7U0CTSA1lbxVloHp4NSlmfDzBRNCJuMhis,2374
-ragaai_catalyst-2.1.6b1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ragaai_catalyst-2.1.6b1.dist-info/METADATA,sha256=NV8zB4jW1-jQoamLp4UUpUiXh1Da1aLqMak7kEVaQUU,22110
-ragaai_catalyst-2.1.6b1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-ragaai_catalyst-2.1.6b1.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.1.6b1.dist-info/RECORD,,
+ragaai_catalyst-2.1.6.1b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.1.6.1b0.dist-info/METADATA,sha256=taTMHbwPGhj24OzzdWn_pNo03EFeqgi90NzeOWVNVUM,22141
+ragaai_catalyst-2.1.6.1b0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ragaai_catalyst-2.1.6.1b0.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.6.1b0.dist-info/RECORD,,

{ragaai_catalyst-2.1.6b1.dist-info → ragaai_catalyst-2.1.6.1b0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ragaai_catalyst/tracers/instrumentators/langchain.py

@@ -1,14 +0,0 @@
-from importlib.util import find_spec
-from opentelemetry.instrumentation.langchain import LangchainInstrumentor
-
-
-class Langchain:
-    def __init__(self) -> None:
-        # Check if the necessary part of the 'opentelemetry' package is installed
-        if find_spec("opentelemetry.instrumentation.langchain") is None:
-            raise ModuleNotFoundError(
-                "Missing `opentelemetry-instrumentation-langchain` component. Install with `pip install opentelemetry-instrumentation-langchain`."
-            )
-
-    def get(self):
-        return LangchainInstrumentor

ragaai_catalyst/tracers/instrumentators/llamaindex.py

@@ -1,14 +0,0 @@
-from importlib.util import find_spec
-
-
-class LlamaIndex:
-    def __init__(self) -> None:
-        if find_spec("llamaindex") is None:
-            raise ModuleNotFoundError(
-                "Missing `llamaindex` package. Install with `pip install llamaindex`."
-            )
-
-    def get(self):
-        from opentelemetry.instrumentation.llamaindex import LlamaIndexInstrumentor
-
-        return LlamaIndexInstrumentor

ragaai_catalyst/tracers/instrumentators/openai.py

@@ -1,13 +0,0 @@
-from importlib.util import find_spec
-from opentelemetry.instrumentation.openai import OpenAIInstrumentor
-
-
-class OpenAI:
-    def __init__(self) -> None:
-        if find_spec("openai") is None:
-            raise ModuleNotFoundError(
-                "Missing `openai` package. Install with `pip install openai`."
-            )
-
-    def get(self):
-        return OpenAIInstrumentor