ragaai-catalyst 2.1.4b4__tar.gz → 2.1.4b6__tar.gz

{ragaai_catalyst-2.1.4b4/ragaai_catalyst.egg-info → ragaai_catalyst-2.1.4b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.4b4
+Version: 2.1.4b6
 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>
 Requires-Python: <3.13,>=3.9

{ragaai_catalyst-2.1.4b4 → ragaai_catalyst-2.1.4b6}/pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 requires-python = ">=3.9,<3.13"
 # license = {file = "LICENSE"}
 
-version = "2.1.4.beta.4"
+version = "2.1.4.beta.6"
 authors = [
     {name = "Kiran Scaria", email = "kiran.scaria@raga.ai"},
     {name = "Kedar Gaikwad", email = "kedar.gaikwad@raga.ai"},

{ragaai_catalyst-2.1.4b4 → ragaai_catalyst-2.1.4b6}/ragaai_catalyst/tracers/agentic_tracing/tracers/agent_tracer.py

@@ -66,8 +66,8 @@ class AgentTracerMixin:
         if metrics:
             if isinstance(metrics, dict):
                 metrics = [metrics]
-            for metric in metrics:
-                try:
+            try:
+                for metric in metrics:
                     self.span(name).add_metrics(
                         name=metric["name"],
                         score=metric["score"],
@@ -77,8 +77,10 @@ class AgentTracerMixin:
                         metadata=metric.get("metadata", {}),
                         config=metric.get("config", {}),
                     )
-                except KeyError as e:
-                    logger.error(f"Error adding metric: {e}")
+            except ValueError as e:
+                logger.error(f"Validation Error: {e}")
+            except Exception as e:
+                logger.error(f"Error adding metric: {e}")
         if feedback:
             self.span(name).add_feedback(feedback)
 
@@ -525,7 +527,14 @@ class AgentTracerMixin:
         # metrics
         metrics = []
         if name in self.span_attributes_dict:
-            metrics = self.span_attributes_dict[name].metrics or []
+            raw_metrics = self.span_attributes_dict[name].metrics or []
+            for metric in raw_metrics:
+                base_metric_name = metric["name"]
+                counter = sum(1 for x in self.visited_metrics if x.startswith(base_metric_name))
+                metric_name = f'{base_metric_name}_{counter}' if counter > 0 else base_metric_name
+                self.visited_metrics.append(metric_name)
+                metric["name"] = metric_name  
+                metrics.append(metric)
 
         component = {
             "id": kwargs["component_id"],

{ragaai_catalyst-2.1.4b4 → ragaai_catalyst-2.1.4b6}/ragaai_catalyst/tracers/agentic_tracing/tracers/base.py

@@ -9,6 +9,8 @@ from typing import List, Any
 import uuid
 import sys
 import tempfile
+import threading
+import time
 from ....ragaai_catalyst import RagaAICatalyst
 from ..data.data_structure import (
     Trace,
@@ -78,6 +80,7 @@ class BaseTracer:
         self.dataset_name = self.user_details["dataset_name"]  # Access the dataset_name
         self.project_id = self.user_details["project_id"]  # Access the project_id
         self.trace_name = self.user_details["trace_name"]  # Access the trace_name
+        self.visited_metrics = []
 
         # Initialize trace data
         self.trace_id = None
@@ -86,6 +89,14 @@ class BaseTracer:
         self.file_tracker = TrackName()
         self.span_attributes_dict = {}
 
+        self.interval_time = self.user_details['interval_time']
+        self.memory_usage_list = []
+        self.cpu_usage_list = []
+        self.disk_usage_list = []
+        self.network_usage_list = []
+        self.tracking_thread = None
+        self.tracking = False
+
     def _get_system_info(self) -> SystemInfo:
         # Get OS info
         os_info = OSInfo(
@@ -157,8 +168,49 @@ class BaseTracer:
 
         return Resources(cpu=cpu, memory=mem, disk=disk_resource, network=net)
 
+    def _track_memory_usage(self):
+        self.memory_usage_list = []
+        while self.tracking:
+            memory_usage = psutil.Process().memory_info().rss
+            self.memory_usage_list.append(memory_usage / (1024 * 1024))  # Convert to MB and append to the list
+            time.sleep(self.interval_time)
+
+    def _track_cpu_usage(self):
+        self.cpu_usage_list = []
+        while self.tracking:
+            cpu_usage = psutil.cpu_percent(interval=self.interval_time)
+            self.cpu_usage_list.append(cpu_usage)
+            time.sleep(self.interval_time)
+
+    def _track_disk_usage(self):
+        self.disk_usage_list = []
+        while self.tracking:
+            disk_io = psutil.disk_io_counters()
+            self.disk_usage_list.append({
+                'disk_read': disk_io.read_bytes / (1024 * 1024),  # Convert to MB
+                'disk_write': disk_io.write_bytes / (1024 * 1024)  # Convert to MB
+            })
+            time.sleep(self.interval_time)
+
+    def _track_network_usage(self):
+        self.network_usage_list = []
+        while self.tracking:
+            net_io = psutil.net_io_counters()
+            self.network_usage_list.append({
+                'uploads': net_io.bytes_sent / (1024 * 1024),  # Convert to MB
+                'downloads': net_io.bytes_recv / (1024 * 1024)  # Convert to MB
+            })
+            time.sleep(self.interval_time)
+
     def start(self):
         """Initialize a new trace"""
+        self.tracking = True
+        self.tracking_thread = threading.Thread(target=self._track_memory_usage)
+        self.tracking_thread.start()
+        threading.Thread(target=self._track_cpu_usage).start()
+        threading.Thread(target=self._track_disk_usage).start()
+        threading.Thread(target=self._track_network_usage).start()
+
         metadata = Metadata(
             cost={},
             tokens={},
@@ -197,6 +249,38 @@ class BaseTracer:
             self.trace.data[0]["end_time"] = datetime.now().astimezone().isoformat()
             self.trace.end_time = datetime.now().astimezone().isoformat()
 
+            #track memory usage
+            self.tracking = False
+            if self.tracking_thread is not None:
+                self.tracking_thread.join()
+            self.trace.metadata.resources.memory.values = self.memory_usage_list
+
+            #track cpu usage
+            self.trace.metadata.resources.cpu.values = self.cpu_usage_list
+
+            #track network and disk usage
+            network_upoloads, network_downloads = 0, 0
+            disk_read, disk_write = 0, 0
+            for network_usage, disk_usage in zip(self.network_usage_list, self.disk_usage_list):
+                network_upoloads += network_usage['uploads']
+                network_downloads += network_usage['downloads']
+                disk_read += disk_usage['disk_read']
+                disk_write += disk_usage['disk_write']
+
+            #track disk usage
+            self.trace.metadata.resources.disk.read = [disk_read / len(self.disk_usage_list)]
+            self.trace.metadata.resources.disk.write = [disk_write / len(self.disk_usage_list)]
+
+            #track network usage
+            self.trace.metadata.resources.network.uploads = [network_upoloads / len(self.network_usage_list)]
+            self.trace.metadata.resources.network.downloads = [network_downloads / len(self.network_usage_list)]
+
+            # update interval time
+            self.trace.metadata.resources.cpu.interval = float(self.interval_time)
+            self.trace.metadata.resources.memory.interval = float(self.interval_time)
+            self.trace.metadata.resources.disk.interval = float(self.interval_time)
+            self.trace.metadata.resources.network.interval = float(self.interval_time)
+
             # Change span ids to int
             self.trace = self._change_span_ids_to_int(self.trace)
             self.trace = self._change_agent_input_output(self.trace)
@@ -802,3 +886,4 @@ class BaseTracer:
         if span_name not in self.span_attributes_dict:
             self.span_attributes_dict[span_name] = SpanAttributes(span_name)
         return self.span_attributes_dict[span_name]
+    

{ragaai_catalyst-2.1.4b4 → ragaai_catalyst-2.1.4b6}/ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py

@@ -363,7 +363,14 @@ class LLMTracerMixin:
         # metrics
         metrics = []
         if name in self.span_attributes_dict:
-            metrics = self.span_attributes_dict[name].metrics or []
+            raw_metrics = self.span_attributes_dict[name].metrics or []
+            for metric in raw_metrics:
+                base_metric_name = metric["name"]
+                counter = sum(1 for x in self.visited_metrics if x.startswith(base_metric_name))
+                metric_name = f'{base_metric_name}_{counter}' if counter > 0 else base_metric_name
+                self.visited_metrics.append(metric_name)
+                metric["name"] = metric_name  
+                metrics.append(metric)
 
         component = {
             "id": component_id,
@@ -621,8 +628,8 @@ class LLMTracerMixin:
         if metrics:
             if isinstance(metrics, dict):
                 metrics = [metrics]
-            for metric in metrics:
-                try:
+            try:
+                for metric in metrics:
                     self.span(name).add_metrics(
                         name=metric["name"],
                         score=metric["score"],
@@ -632,8 +639,11 @@ class LLMTracerMixin:
                         metadata=metric.get("metadata", {}),
                         config=metric.get("config", {}),
                     )
-                except KeyError as e:
-                    logger.error(f"Error adding metric: {e}")
+            except ValueError as e:
+                logger.error(f"Validation Error: {e}")
+            except Exception as e:
+                logger.error(f"Error adding metric: {e}")
+                
         if feedback:
             self.span(name).add_feedback(feedback)
 

{ragaai_catalyst-2.1.4b4 → ragaai_catalyst-2.1.4b6}/ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py

@@ -209,6 +209,9 @@ class AgenticTracing(
             # Deactivate network tracing
             self.network_tracer.deactivate_patches()
 
+            # Clear visited metrics when stopping trace
+            self.visited_metrics.clear()
+
             # Stop base tracer (includes saving to file)
             super().stop()
 

{ragaai_catalyst-2.1.4b4 → ragaai_catalyst-2.1.4b6}/ragaai_catalyst/tracers/agentic_tracing/tracers/tool_tracer.py

@@ -63,8 +63,8 @@ class ToolTracerMixin:
         if metrics:
             if isinstance(metrics, dict):
                 metrics = [metrics]
-            for metric in metrics:
-                try:
+            try:
+                for metric in metrics:
                     self.span(name).add_metrics(
                         name=metric["name"],
                         score=metric["score"],
@@ -74,8 +74,11 @@ class ToolTracerMixin:
                         metadata=metric.get("metadata", {}),
                         config=metric.get("config", {}),
                     )
-                except KeyError as e:
-                    logger.error(f"Error adding metric: {e}")
+            except ValueError as e:
+                    logger.error(f"Validation Error: {e}")
+            except Exception as e:
+                logger.error(f"Error adding metric: {e}")
+            
         if feedback:
             self.span(name).add_feedback(feedback)
 
@@ -275,7 +278,14 @@ class ToolTracerMixin:
         # metrics
         metrics = []
         if name in self.span_attributes_dict:
-            metrics = self.span_attributes_dict[name].metrics or []
+            raw_metrics = self.span_attributes_dict[name].metrics or []
+            for metric in raw_metrics:
+                base_metric_name = metric["name"]
+                counter = sum(1 for x in self.visited_metrics if x.startswith(base_metric_name))
+                metric_name = f'{base_metric_name}_{counter}' if counter > 0 else base_metric_name
+                self.visited_metrics.append(metric_name)
+                metric["name"] = metric_name  
+                metrics.append(metric)
 
         start_time = kwargs["start_time"]
         component = {

{ragaai_catalyst-2.1.4b4 → ragaai_catalyst-2.1.4b6}/ragaai_catalyst/tracers/tracer.py

@@ -25,7 +25,6 @@ from ragaai_catalyst.tracers.agentic_tracing.utils.trace_utils import load_model
 
 logger = logging.getLogger(__name__)
 
-
 class Tracer(AgenticTracing):
     NUM_PROJECTS = 100
     TIMEOUT = 10
@@ -48,7 +47,8 @@ class Tracer(AgenticTracing):
             'file_io':True,
             'network':True,
             'custom':True
-        }
+        },
+        interval_time=2,
         # auto_instrumentation=True/False  # to control automatic instrumentation of everything
 
     ):
@@ -70,6 +70,7 @@ class Tracer(AgenticTracing):
             "project_name": project_name,
             "project_id": None,  # Will be set after project validation
             "dataset_name": dataset_name,
+            "interval_time": interval_time,
             "trace_name": trace_name if trace_name else f"trace_{datetime.datetime.now().strftime('%Y%m%d%H%M%S')}",
             "trace_user_detail": {"metadata": metadata} if metadata else {}
         }

{ragaai_catalyst-2.1.4b4 → ragaai_catalyst-2.1.4b6/ragaai_catalyst.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.4b4
+Version: 2.1.4b6
 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>
 Requires-Python: <3.13,>=3.9