ragaai-catalyst 2.1.6b1__py3-none-any.whl → 2.1.6.1__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/agentic_tracing/tracers/base.py

@@ -92,6 +92,7 @@ class BaseTracer:
         self._upload_tasks = []
         self._is_uploading = False
         self._upload_completed_callback = None
+        self.timeout = self.user_details.get("timeout", 120)
         
         ensure_uploader_running()
 
@@ -314,7 +315,8 @@ class BaseTracer:
                 project_id=self.project_id,
                 dataset_name=self.dataset_name,
                 user_details=self.user_details,
-                base_url=self.base_url
+                base_url=self.base_url,
+                timeout=self.timeout
             )
             
             # For backward compatibility

ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py

@@ -48,7 +48,7 @@ from ragaai_catalyst.tracers.upload_traces import UploadTraces
 class AgenticTracing(
     BaseTracer, LLMTracerMixin, ToolTracerMixin, AgentTracerMixin, CustomTracerMixin
 ):
-    def __init__(self, user_detail, auto_instrumentation=None):
+    def __init__(self, user_detail, auto_instrumentation=None, timeout=120):
         # Initialize all parent classes
         self.user_interaction_tracer = UserInteractionTracer()
         LLMTracerMixin.__init__(self)
@@ -60,7 +60,7 @@ class AgenticTracing(
         self.project_id = user_detail["project_id"]
         self.trace_user_detail = user_detail["trace_user_detail"]
         self.base_url = f"{RagaAICatalyst.BASE_URL}"
-        self.timeout = 10
+        self.timeout = timeout
         
         # Add warning flag
         self._warning_shown = False

ragaai_catalyst/tracers/agentic_tracing/upload/trace_uploader.py

@@ -77,7 +77,7 @@ def get_executor():
 
 def process_upload(task_id: str, filepath: str, hash_id: str, zip_path: str, 
                   project_name: str, project_id: str, dataset_name: str, 
-                  user_details: Dict[str, Any], base_url: str) -> Dict[str, Any]:
+                  user_details: Dict[str, Any], base_url: str, timeout=120) -> Dict[str, Any]:
     """
     Process a single upload task
     
@@ -147,7 +147,8 @@ def process_upload(task_id: str, filepath: str, hash_id: str, zip_path: str,
                     json_file_path=filepath,
                     dataset_name=dataset_name,
                     project_name=project_name,
-                    base_url=base_url
+                    base_url=base_url,
+                    timeout=timeout
                 )
                 logger.info(f"Trace metrics uploaded: {response}")
             except Exception as e:
@@ -167,6 +168,7 @@ def process_upload(task_id: str, filepath: str, hash_id: str, zip_path: str,
                     dataset_name=dataset_name,
                     user_detail=user_details,
                     base_url=base_url,   
+                    timeout=timeout
                 )
                 upload_traces.upload_agentic_traces()
                 logger.info("Agentic traces uploaded successfully")
@@ -185,7 +187,8 @@ def process_upload(task_id: str, filepath: str, hash_id: str, zip_path: str,
                     zip_path=zip_path,
                     project_name=project_name,
                     dataset_name=dataset_name,
-                    base_url=base_url
+                    base_url=base_url,
+                    timeout=timeout
                 )
                 logger.info(f"Code hash uploaded: {response}")
             except Exception as e:
@@ -215,7 +218,7 @@ def save_task_status(task_status: Dict[str, Any]):
     with open(status_path, "w") as f:
         json.dump(task_status, f, indent=2)
 
-def submit_upload_task(filepath, hash_id, zip_path, project_name, project_id, dataset_name, user_details, base_url):
+def submit_upload_task(filepath, hash_id, zip_path, project_name, project_id, dataset_name, user_details, base_url, timeout=120):
     """
     Submit a new upload task using futures.
     
@@ -259,7 +262,8 @@ def submit_upload_task(filepath, hash_id, zip_path, project_name, project_id, da
         project_id=project_id,
         dataset_name=dataset_name,
         user_details=user_details,
-        base_url=base_url
+        base_url=base_url,
+        timeout=timeout
     )
     
     # Store the future for later status checks

ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py

@@ -24,7 +24,7 @@ class UploadAgenticTraces:
         self.dataset_name = dataset_name
         self.user_detail = user_detail
         self.base_url = base_url
-        self.timeout = 30
+        self.timeout = 120
 
 
     def _get_presigned_url(self):

ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py

@@ -9,19 +9,19 @@ logger = logging.getLogger(__name__)
 from urllib.parse import urlparse, urlunparse
 import re
 
-def upload_code(hash_id, zip_path, project_name, dataset_name, base_url=None):
-    code_hashes_list = _fetch_dataset_code_hashes(project_name, dataset_name, base_url)
+def upload_code(hash_id, zip_path, project_name, dataset_name, base_url=None, timeout=120):
+    code_hashes_list = _fetch_dataset_code_hashes(project_name, dataset_name, base_url, timeout=timeout)
 
     if hash_id not in code_hashes_list:
-        presigned_url = _fetch_presigned_url(project_name, dataset_name, base_url)
-        _put_zip_presigned_url(project_name, presigned_url, zip_path)
+        presigned_url = _fetch_presigned_url(project_name, dataset_name, base_url, timeout=timeout)
+        _put_zip_presigned_url(project_name, presigned_url, zip_path, timeout=timeout)
 
-        response = _insert_code(dataset_name, hash_id, presigned_url, project_name, base_url)
+        response = _insert_code(dataset_name, hash_id, presigned_url, project_name, base_url, timeout=timeout)
         return response
     else:
         return "Code already exists"
 
-def _fetch_dataset_code_hashes(project_name, dataset_name, base_url=None):
+def _fetch_dataset_code_hashes(project_name, dataset_name, base_url=None, timeout=120):
     payload = {}
     headers = {
         "Authorization": f"Bearer {os.getenv('RAGAAI_CATALYST_TOKEN')}",
@@ -36,7 +36,7 @@ def _fetch_dataset_code_hashes(project_name, dataset_name, base_url=None):
                                     endpoint, 
                                     headers=headers, 
                                     data=payload,
-                                    timeout=99999)
+                                    timeout=timeout)
         elapsed_ms = (time.time() - start_time) * 1000
         logger.debug(
             f"API Call: [GET] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms")
@@ -66,7 +66,7 @@ def update_presigned_url(presigned_url, base_url):
     return presigned_url
 
 
-def _fetch_presigned_url(project_name, dataset_name, base_url=None):
+def _fetch_presigned_url(project_name, dataset_name, base_url=None, timeout=120):
     payload = json.dumps({
             "datasetName": dataset_name,
             "numFiles": 1,
@@ -87,7 +87,7 @@ def _fetch_presigned_url(project_name, dataset_name, base_url=None):
                                     endpoint, 
                                     headers=headers, 
                                     data=payload,
-                                    timeout=99999)
+                                    timeout=timeout)
         elapsed_ms = (time.time() - start_time) * 1000
         logger.debug(
             f"API Call: [GET] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms")
@@ -102,7 +102,7 @@ def _fetch_presigned_url(project_name, dataset_name, base_url=None):
         logger.error(f"Failed to list datasets: {e}")
         raise
 
-def _put_zip_presigned_url(project_name, presignedUrl, filename):
+def _put_zip_presigned_url(project_name, presignedUrl, filename, timeout=120):
     headers = {
             "X-Project-Name": project_name,
             "Content-Type": "application/zip",
@@ -119,14 +119,14 @@ def _put_zip_presigned_url(project_name, presignedUrl, filename):
                                 presignedUrl, 
                                 headers=headers, 
                                 data=payload,
-                                timeout=99999)
+                                timeout=timeout)
     elapsed_ms = (time.time() - start_time) * 1000
     logger.debug(
         f"API Call: [PUT] {presignedUrl} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms")
     if response.status_code != 200 or response.status_code != 201:
         return response, response.status_code
 
-def _insert_code(dataset_name, hash_id, presigned_url, project_name, base_url=None):
+def _insert_code(dataset_name, hash_id, presigned_url, project_name, base_url=None, timeout=120):
     payload = json.dumps({
         "datasetName": dataset_name,
         "codeHash": hash_id,
@@ -147,7 +147,7 @@ def _insert_code(dataset_name, hash_id, presigned_url, project_name, base_url=No
                                     endpoint, 
                                     headers=headers, 
                                     data=payload,
-                                    timeout=99999)
+                                    timeout=timeout)
         elapsed_ms = (time.time() - start_time) * 1000
         logger.debug(
             f"API Call: [POST] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms")

ragaai_catalyst/tracers/agentic_tracing/upload/upload_trace_metric.py

@@ -15,7 +15,7 @@ logging_level = (
 )
 
 
-def upload_trace_metric(json_file_path, dataset_name, project_name, base_url=None):
+def upload_trace_metric(json_file_path, dataset_name, project_name, base_url=None, timeout=120):
     try:
         with open(json_file_path, "r") as f:
             traces = json.load(f)
@@ -51,7 +51,7 @@ def upload_trace_metric(json_file_path, dataset_name, project_name, base_url=Non
                                     endpoint,
                                     headers=headers,
                                     data=payload,
-                                    timeout=10)
+                                    timeout=timeout)
         elapsed_ms = (time.time() - start_time) * 1000
         logger.debug(
             f"API Call: [POST] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms")

ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py

@@ -14,7 +14,7 @@ class DynamicTraceExporter(SpanExporter):
     certain properties to be updated dynamically during execution.
     """
     
-    def __init__(self, files_to_zip, project_name, project_id, dataset_name, user_details, base_url, custom_model_cost):
+    def __init__(self, files_to_zip, project_name, project_id, dataset_name, user_details, base_url, custom_model_cost, timeout=120):
         """
         Initialize the DynamicTraceExporter.
         
@@ -33,7 +33,8 @@ class DynamicTraceExporter(SpanExporter):
             dataset_name=dataset_name,
             user_details=user_details,
             base_url=base_url,
-            custom_model_cost=custom_model_cost
+            custom_model_cost=custom_model_cost,
+            timeout=timeout
         )
         
         # Store the initial values

ragaai_catalyst/tracers/exporters/ragaai_trace_exporter.py

@@ -19,7 +19,7 @@ logging_level = (
 
 
 class RAGATraceExporter(SpanExporter):
-    def __init__(self, files_to_zip, project_name, project_id, dataset_name, user_details, base_url, custom_model_cost):
+    def __init__(self, files_to_zip, project_name, project_id, dataset_name, user_details, base_url, custom_model_cost, timeout=120):
         self.trace_spans = dict()
         self.tmp_dir = tempfile.gettempdir()
         self.files_to_zip = files_to_zip
@@ -30,6 +30,7 @@ class RAGATraceExporter(SpanExporter):
         self.base_url = base_url
         self.custom_model_cost = custom_model_cost
         self.system_monitor = SystemMonitor(dataset_name)
+        self.timeout = timeout
 
     def export(self, spans):
         for span in spans:
@@ -122,7 +123,8 @@ class RAGATraceExporter(SpanExporter):
                 project_id=self.project_id,
                 dataset_name=self.dataset_name,
                 user_details=self.user_details,
-                base_url=self.base_url
+                base_url=self.base_url,
+                timeout=self.timeout
             )
 
         logger.info(f"Submitted upload task with ID: {self.upload_task_id}")

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
@@ -42,7 +37,6 @@ logging_level = (
 
 class Tracer(AgenticTracing):
     NUM_PROJECTS = 99999
-    TIMEOUT = 10
     def __init__(
         self,
         project_name,
@@ -52,7 +46,7 @@ class Tracer(AgenticTracing):
         pipeline=None,
         metadata=None,
         description=None,
-        upload_timeout=30,  # Default timeout of 30 seconds
+        timeout=120,  # Default timeout of 120 seconds
         update_llm_cost=True,  # Parameter to control model cost updates
         auto_instrumentation={ # to control automatic instrumentation of different components
             'llm':True,
@@ -77,7 +71,7 @@ class Tracer(AgenticTracing):
             pipeline (dict, optional): The pipeline configuration. Defaults to None.
             metadata (dict, optional): The metadata. Defaults to None.
             description (str, optional): The description. Defaults to None.
-            upload_timeout (int, optional): The upload timeout in seconds. Defaults to 30.
+            timeout (int, optional): The upload timeout in seconds. Defaults to 30.
             update_llm_cost (bool, optional): Whether to update model costs from GitHub. Defaults to True.
         """
 
@@ -138,9 +132,8 @@ class Tracer(AgenticTracing):
         # self.metadata["total_tokens"] = 0
         self.pipeline = pipeline
         self.description = description
-        self.upload_timeout = upload_timeout
+        self.timeout = timeout
         self.base_url = f"{RagaAICatalyst.BASE_URL}"
-        self.timeout = 30
         self.num_projects = 99999
         self.start_time = datetime.datetime.now().astimezone().isoformat()
         self.model_cost_dict = model_cost
@@ -283,6 +276,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 +299,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 +320,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
@@ -392,7 +397,7 @@ class Tracer(AgenticTracing):
                 'pipeline': self.pipeline,
                 'metadata': self.metadata,
                 'description': self.description,
-                'upload_timeout': self.upload_timeout
+                'timeout': self.timeout
             }
             
             # Reinitialize self with new dataset_name and stored parameters
@@ -518,6 +523,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)
@@ -600,11 +613,11 @@ class Tracer(AgenticTracing):
 
         This function uploads the traces generated by the RagaAICatalyst client to the RagaAICatalyst server. It uses the `aiohttp` library to make an asynchronous HTTP request to the server. The function first checks if the `RAGAAI_CATALYST_TOKEN` environment variable is set. If not, it raises a `ValueError` with the message "RAGAAI_CATALYST_TOKEN not found. Cannot upload traces.".
 
-        The function then uses the `asyncio.wait_for` function to wait for the `check_and_upload_files` method of the `raga_client` object to complete. The `check_and_upload_files` method is called with the `session` object and a list of file paths to be uploaded. The `timeout` parameter is set to the value of the `upload_timeout` attribute of the `Tracer` object.
+        The function then uses the `asyncio.wait_for` function to wait for the `check_and_upload_files` method of the `raga_client` object to complete. The `check_and_upload_files` method is called with the `session` object and a list of file paths to be uploaded. The `timeout` parameter is set to the value of the `timeout` attribute of the `Tracer` object.
 
         If the upload is successful, the function returns the string "Files uploaded successfully" if the `upload_stat` variable is truthy, otherwise it returns the string "No files to upload".
 
-        If the upload times out, the function returns a string with the message "Upload timed out after {self.upload_timeout} seconds".
+        If the upload times out, the function returns a string with the message "Upload timed out after {self.timeout} seconds".
 
         If any other exception occurs during the upload, the function returns a string with the message "Upload failed: {str(e)}", where `{str(e)}` is the string representation of the exception.
 
@@ -626,7 +639,7 @@ class Tracer(AgenticTracing):
                         session=session,
                         file_paths=[self.filespanx.sync_file],
                     ),
-                    timeout=self.upload_timeout,
+                    timeout=self.timeout,
                 )
                 return (
                     "Files uploaded successfully"
@@ -634,7 +647,7 @@ class Tracer(AgenticTracing):
                     else "No files to upload"
                 )
             except asyncio.TimeoutError:
-                return f"Upload timed out after {self.upload_timeout} seconds"
+                return f"Upload timed out after {self.timeout} seconds"
             except Exception as e:
                 return f"Upload failed: {str(e)}"
 
@@ -734,7 +747,8 @@ class Tracer(AgenticTracing):
             dataset_name=self.dataset_name,
             user_details=self.user_details,
             base_url=self.base_url,
-            custom_model_cost=self.model_custom_cost
+            custom_model_cost=self.model_custom_cost,
+            timeout=self.timeout
         )
         
         # Set up tracer provider

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.1.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.1
 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.1.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=CSaqVjg33KUEAhc7gcBhb8c_44I3I2wfyAwNqvz6Lu4,37003
+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
@@ -45,20 +45,20 @@ ragaai_catalyst/tracers/agentic_tracing/tests/ai_travel_agent.py,sha256=S4rCcKzU
 ragaai_catalyst/tracers/agentic_tracing/tests/unique_decorator_test.py,sha256=Xk1cLzs-2A3dgyBwRRnCWs7Eubki40FVonwd433hPN8,4805
 ragaai_catalyst/tracers/agentic_tracing/tracers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ragaai_catalyst/tracers/agentic_tracing/tracers/agent_tracer.py,sha256=LzbsHvELwBmH8ObFomJRhiQ98b6MEi18irm0DPiplt0,29743
-ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=Kmy1kgwy19e7MuMMq9GPUq9VXpJV2bXeaIhx8UxX5Sc,54251
+ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=5O8GKv5U_L3biLpsk5HEW21yiKWCJ8H4ijYjHrTzcW4,54350
 ragaai_catalyst/tracers/agentic_tracing/tracers/custom_tracer.py,sha256=OBJJjFSvwRjCGNJyqX3yIfC1W05ZN2QUXasCJ4gmCjQ,13930
 ragaai_catalyst/tracers/agentic_tracing/tracers/langgraph_tracer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py,sha256=z-qzmCQCkhyW0aLDUR_rNq4pmxhAaVhNY-kZQsox-Ws,50221
-ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=aiFobQb5ePPhyRADXJTZgI8_PrSGhjXnOu9W_o3ngEA,16148
+ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=9Kn6gppITCJ8obLyAGgfpWOlyqKfx2Zd4RkkMZMHYn8,16166
 ragaai_catalyst/tracers/agentic_tracing/tracers/network_tracer.py,sha256=m8CxYkl7iMiFya_lNwN1ykBc3Pmo-2pR_2HmpptwHWQ,10352
 ragaai_catalyst/tracers/agentic_tracing/tracers/tool_tracer.py,sha256=xxrliKPfdfbIZRZqMnUewsaTD8_Hv0dbuoBivNZGD4U,21674
 ragaai_catalyst/tracers/agentic_tracing/tracers/user_interaction_tracer.py,sha256=bhSUhNQCuJXKjgJAXhjKEYjnHMpYN90FSZdR84fNIKU,4614
 ragaai_catalyst/tracers/agentic_tracing/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ragaai_catalyst/tracers/agentic_tracing/upload/trace_uploader.py,sha256=UnGpcMpRbntUrYsIU11r-gMHtzNkDGSGCbepiL_XTFA,12379
-ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py,sha256=icycLgfA0734xxoM1rTMG_iIrI3iM94th8RQggJ7sSw,8541
-ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py,sha256=aw_eHhUYRbR_9IbIkNjYb7NOsmETD3k1p4a6gxaGI7Q,6462
+ragaai_catalyst/tracers/agentic_tracing/upload/trace_uploader.py,sha256=HREkAmANj21XqiR1Hf5chCpK8UjECEoryUjH4IuGEjA,12540
+ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py,sha256=fKg_3svwWDGDYmlqHCK4lXGq_LFpRzA3wmERRIDoqy4,8542
+ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py,sha256=bRJGqdLPm0fTORAdUGRo0aDPiZeqB30gK_iC7SsymL4,6603
 ragaai_catalyst/tracers/agentic_tracing/upload/upload_local_metric.py,sha256=m1O8lKpxKwtHofXLW3fTHX5yfqDW5GxoveARlg5cTw4,2571
-ragaai_catalyst/tracers/agentic_tracing/upload/upload_trace_metric.py,sha256=dmgcFZtCUpTGV2GayKQ9znaFRDLlXY8NW6RiyNwerOk,4278
+ragaai_catalyst/tracers/agentic_tracing/upload/upload_trace_metric.py,sha256=hRuh-cczHbeM_Spbf9HTYd149uSs1zP0TvkYuZKF4ec,4296
 ragaai_catalyst/tracers/agentic_tracing/utils/__init__.py,sha256=XdB3X_ufe4RVvGorxSqAiB9dYv4UD7Hvvuw3bsDUppY,60
 ragaai_catalyst/tracers/agentic_tracing/utils/api_utils.py,sha256=JyNCbfpW-w4O9CjtemTqmor2Rh1WGpQwhRaDSRmBxw8,689
 ragaai_catalyst/tracers/agentic_tracing/utils/create_dataset_schema.py,sha256=xHTe7YiCmCY7kRxe0kB7wwo_ueT1UB_hnAA36R2m-pQ,941
@@ -74,24 +74,21 @@ ragaai_catalyst/tracers/agentic_tracing/utils/trace_utils.py,sha256=rssHolDvKxZ9
 ragaai_catalyst/tracers/agentic_tracing/utils/unique_decorator.py,sha256=G027toV-Km20JjKrc-Y_PilQ8ABEKrBvvzgLTnqVg7I,5819
 ragaai_catalyst/tracers/agentic_tracing/utils/zip_list_of_unique_files.py,sha256=4TeCGsFF26249fV6dJHLTZDrRa93SG9oer4rudoF8Y4,19443
 ragaai_catalyst/tracers/exporters/__init__.py,sha256=wQbaqyeIjVZxYprHCKZ9BeiqxeXYBKjzEgP79LWNxCU,293
-ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py,sha256=w9U8UTxvTbGTDUoMtsgy2BsdpYp-APTKFdGV4o5JPaM,5051
+ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py,sha256=oFIubzCCmC3fpoH_ybohevjOE5WIEG9ahcPIEtwn99c,5093
 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/exporters/ragaai_trace_exporter.py,sha256=n78Yky-32yVI8fiL_3yD-iShgizb8IcN8OqQ5gOwZ9w,5387
+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.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.1.6.1.dist-info/METADATA,sha256=jwIl1_mf_YsEQvnTruG2ki9kl34EhgSxpjJWBVGGOH0,22139
+ragaai_catalyst-2.1.6.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ragaai_catalyst-2.1.6.1.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.6.1.dist-info/RECORD,,

{ragaai_catalyst-2.1.6b1.dist-info → ragaai_catalyst-2.1.6.1.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