ragaai-catalyst 2.1b2__py3-none-any.whl → 2.1b4__py3-none-any.whl

ragaai_catalyst/tracers/agentic_tracing/agent_tracer.py

@@ -225,6 +225,52 @@ class AgentTracerMixin:
                 self.add_component(agent_component)
 
             return result
+        except Exception as e:
+            error_component = {
+                "code": 500,
+                "type": type(e).__name__,
+                "message": str(e),
+                "details": {}
+            }
+            
+            # Get children even in case of error
+            children = self.agent_children.get()
+            
+            # Set parent_id for all children
+            for child in children:
+                child["parent_id"] = component_id
+            
+            # End tracking network calls for this component
+            self.end_component(component_id)
+            
+            agent_component = self.create_agent_component(
+                component_id=component_id,
+                hash_id=hash_id,
+                name=name,
+                agent_type=agent_type,
+                version=version,
+                capabilities=capabilities or [],
+                start_time=start_time,
+                end_time=datetime.now(),
+                memory_used=0,
+                input_data=self._sanitize_input(args, kwargs),
+                output_data=None,
+                error=error_component,
+                children=children,
+                parent_id=parent_agent_id  # Add parent ID if exists
+            )
+            
+            # If this is a nested agent, add it to parent's children
+            if parent_agent_id:
+                parent_component = self._agent_components.get(parent_agent_id)
+                if parent_component:
+                    if 'children' not in parent_component['data']:
+                        parent_component['data']['children'] = []
+                    parent_component['data']['children'].append(agent_component)
+            else:
+                # Only add to root components if no parent
+                self.add_component(agent_component)
+            raise
         finally:
             self.current_agent_id.reset(agent_token)
             self.current_agent_name.reset(agent_name_token)

ragaai_catalyst/tracers/agentic_tracing/agentic_tracing.py

@@ -112,6 +112,7 @@ class AgenticTracing(BaseTracer, LLMTracerMixin, ToolTracerMixin, AgentTracerMix
             
             # Cleanup
             self.unpatch_llm_calls()
+            self.user_interaction_tracer.interactions = []  # Clear interactions list
             self.is_active = False
 
 
@@ -166,16 +167,19 @@ class AgenticTracing(BaseTracer, LLMTracerMixin, ToolTracerMixin, AgentTracerMix
     def add_component(self, component_data: dict):
         """Add a component to the trace data"""
         # Convert dict to appropriate Component type
-        filtered_data = {k: v for k, v in component_data.items() if k in ["id", "hash_id", "type", "name", "start_time", "end_time", "parent_id", "info", "data", "network_calls", "interactions"]}
+        filtered_data = {k: v for k, v in component_data.items() if k in ["id", "hash_id", "type", "name", "start_time", "end_time", "parent_id", "info", "data", "network_calls", "interactions", "error"]}
+
                
         if component_data["type"] == "llm":
             component = LLMComponent(**filtered_data)
-        elif component_data["type"] == "agent":
+        elif component_data["type"] == "agent": 
             component = AgentComponent(**filtered_data)
         elif component_data["type"] == "tool":
             component = ToolComponent(**filtered_data)
         else:
             component = Component(**component_data)
+
+        # import pdb; pdb.set_trace()
         
         # Check if there's an active agent context
         current_agent_id = self.current_agent_id.get()

ragaai_catalyst/tracers/agentic_tracing/base.py

@@ -1,27 +1,24 @@
 import json
 import os
 import platform
-import re
 import psutil
 import pkg_resources
 from datetime import datetime
 from pathlib import Path
-from typing import Optional, Dict, Any, List
+from typing import List
 import uuid
 import sys
+import tempfile
 
 from .data_structure import (
     Trace, Metadata, SystemInfo, OSInfo, EnvironmentInfo,
     Resources, CPUResource, MemoryResource, DiskResource, NetworkResource,
     ResourceInfo, MemoryInfo, DiskInfo, NetworkInfo,
-    Component, LLMComponent, AgentComponent, ToolComponent,
-    NetworkCall, Interaction, Error
+    Component, 
 )
 
-from ..upload_traces import UploadTraces
 from .upload_agentic_traces import UploadAgenticTraces
 from .upload_code import upload_code
-from ...ragaai_catalyst import RagaAICatalyst
 
 from .file_name_tracker import TrackName
 from .zip_list_of_unique_files import zip_list_of_unique_files
@@ -182,14 +179,13 @@ class BaseTracer:
             self.trace = self._extract_cost_tokens(self.trace)
             
             # Create traces directory if it doesn't exist
-            self.traces_dir = Path("traces")
-            self.traces_dir.mkdir(exist_ok=True)
+            self.traces_dir = tempfile.gettempdir()
             filename = self.trace.id + ".json"
-            filepath = self.traces_dir / filename
+            filepath = f"{self.traces_dir}/{filename}"
 
             #get unique files and zip it. Generate a unique hash ID for the contents of the files
             list_of_unique_files = self.file_tracker.get_unique_files()
-            hash_id, zip_path = zip_list_of_unique_files(list_of_unique_files)
+            hash_id, zip_path = zip_list_of_unique_files(list_of_unique_files, output_dir=self.traces_dir)
 
             #replace source code with zip_path
             self.trace.metadata.system_info.source_code = hash_id

ragaai_catalyst/tracers/agentic_tracing/data_structure.py

@@ -160,9 +160,8 @@ class ToolInfo:
     memory_used: int
 
 class Component:
-    def __init__(self, id: str, hash_id: str, type: str, name: str, start_time: str, end_time: str, parent_id: int, info: Dict[str, Any], data: Dict[str, Any], network_calls: Optional[List[NetworkCall]] = None, interactions: Optional[List[Union[Interaction, Dict]]] = None, error: Optional[Error] = None):
+    def __init__(self, id: str, hash_id: str, type: str, name: str, start_time: str, end_time: str, parent_id: int, info: Dict[str, Any], data: Dict[str, Any], network_calls: Optional[List[NetworkCall]] = None, interactions: Optional[List[Union[Interaction, Dict]]] = None, error: Optional[Dict[str, Any]] = None):
         self.id = id
-        self.error = error
         self.hash_id = hash_id
         self.type = type
         self.name = name
@@ -171,8 +170,10 @@ class Component:
         self.parent_id = parent_id
         self.info = info
         self.data = data
+        self.error = error
         self.network_calls = network_calls or []
         self.interactions = []
+        self.error = error
         if interactions:
             for interaction in interactions:
                 if isinstance(interaction, dict):
@@ -197,22 +198,24 @@ class Component:
             "end_time": self.end_time,
             "parent_id": self.parent_id,
             "info": self.info,
+            "error": self.error,
             "data": self.data,
+            "error": self.error,
             "network_calls": [call.to_dict() if hasattr(call, 'to_dict') else call for call in self.network_calls],
             "interactions": self.interactions
         }
 
 class LLMComponent(Component):
-    def __init__(self, id: str, hash_id: str, type: str, name: str, start_time: str, end_time: str, parent_id: int, info: Dict[str, Any], data: Dict[str, Any], network_calls: Optional[List[NetworkCall]] = None, interactions: Optional[List[Union[Interaction, Dict]]] = None):
-        super().__init__(id, hash_id, type, name, start_time, end_time, parent_id, info, data, network_calls, interactions)
+    def __init__(self, id: str, hash_id: str, type: str, name: str, start_time: str, end_time: str, parent_id: int, info: Dict[str, Any], data: Dict[str, Any], network_calls: Optional[List[NetworkCall]] = None, interactions: Optional[List[Union[Interaction, Dict]]] = None, error: Optional[Dict[str, Any]] = None):
+        super().__init__(id, hash_id, type, name, start_time, end_time, parent_id, info, data, network_calls, interactions, error)
 
 class AgentComponent(Component):
-    def __init__(self, id: str, hash_id: str, type: str, name: str, start_time: str, end_time: str, parent_id: int, info: Dict[str, Any], data: Dict[str, Any], network_calls: Optional[List[NetworkCall]] = None, interactions: Optional[List[Union[Interaction, Dict]]] = None):
-        super().__init__(id, hash_id, type, name, start_time, end_time, parent_id, info, data, network_calls, interactions)
+    def __init__(self, id: str, hash_id: str, type: str, name: str, start_time: str, end_time: str, parent_id: int, info: Dict[str, Any], data: Dict[str, Any], network_calls: Optional[List[NetworkCall]] = None, interactions: Optional[List[Union[Interaction, Dict]]] = None, error: Optional[Dict[str, Any]] = None):
+        super().__init__(id, hash_id, type, name, start_time, end_time, parent_id, info, data, network_calls, interactions, error)
 
 class ToolComponent(Component):
-    def __init__(self, id: str, hash_id: str, type: str, name: str, start_time: str, end_time: str, parent_id: int, info: Dict[str, Any], data: Dict[str, Any], network_calls: Optional[List[NetworkCall]] = None, interactions: Optional[List[Union[Interaction, Dict]]] = None):
-        super().__init__(id, hash_id, type, name, start_time, end_time, parent_id, info, data, network_calls, interactions)
+    def __init__(self, id: str, hash_id: str, type: str, name: str, start_time: str, end_time: str, parent_id: int, info: Dict[str, Any], data: Dict[str, Any], network_calls: Optional[List[NetworkCall]] = None, interactions: Optional[List[Union[Interaction, Dict]]] = None, error: Optional[Dict[str, Any]] = None):
+        super().__init__(id, hash_id, type, name, start_time, end_time, parent_id, info, data, network_calls, interactions, error)
 
 @dataclass
 class ComponentInfo:

ragaai_catalyst/tracers/agentic_tracing/llm_tracer.py

@@ -501,6 +501,12 @@ class LLMTracerMixin:
             name = self.current_llm_call_name.get()
             if name is None:
                 name = original_func.__name__
+
+            end_memory = psutil.Process().memory_info().rss
+            memory_used = max(0, end_memory - start_memory)
+            
+            # Get parent agent ID if exists
+            parent_agent_id = self.current_agent_id.get() if hasattr(self, 'current_agent_id') else None
             
             llm_component = self.create_llm_component(
                 component_id=component_id,
@@ -508,15 +514,24 @@ class LLMTracerMixin:
                 name=name,
                 llm_type="unknown",
                 version="1.0.0",
-                memory_used=0,
+                memory_used=memory_used,
                 start_time=start_time,
                 end_time=end_time,
                 input_data=self._extract_input_data(args, kwargs, None),
                 output_data=None,
-                error=error_component
+                error=error_component,
+                parent_id=parent_agent_id
             )
     
-            self.add_component(llm_component)
+            # If this is part of an agent trace, add it to agent's children
+            if parent_agent_id and hasattr(self, 'agent_children'):
+                parent_children = self.agent_children.get()
+                parent_children.append(llm_component)
+                self.agent_children.set(parent_children)
+            else:
+                # Only add to root components if no parent
+                self.add_component(llm_component)
+                
             raise
 
     def trace_llm_call_sync(self, original_func, *args, **kwargs):
@@ -603,6 +618,9 @@ class LLMTracerMixin:
             end_memory = psutil.Process().memory_info().rss
             memory_used = max(0, end_memory - start_memory)
             
+            # Get parent agent ID if exists
+            parent_agent_id = self.current_agent_id.get() if hasattr(self, 'current_agent_id') else None
+            
             llm_component = self.create_llm_component(
                 component_id=component_id,
                 hash_id=hash_id,
@@ -614,10 +632,19 @@ class LLMTracerMixin:
                 end_time=end_time,
                 input_data=self._extract_input_data(args, kwargs, None),
                 output_data=None,
-                error=error_component
+                error=error_component,
+                parent_id=parent_agent_id
             )
     
-            self.add_component(llm_component)
+            # If this is part of an agent trace, add it to agent's children
+            if parent_agent_id and hasattr(self, 'agent_children'):
+                parent_children = self.agent_children.get()
+                parent_children.append(llm_component)
+                self.agent_children.set(parent_children)
+            else:
+                # Only add to root components if no parent
+                self.add_component(llm_component)
+                
             raise
 
     def trace_llm(self, name: str = None):
@@ -654,6 +681,10 @@ class LLMTracerMixin:
                 finally:
 
                     llm_component = self.llm_data
+                    llm_component['name'] = name
+
+                    if self.gt:
+                        llm_component["data"]["gt"] = self.gt
 
                     if error_info:
                         llm_component["error"] = error_info["error"]

ragaai_catalyst/tracers/agentic_tracing/zip_list_of_unique_files.py

@@ -7,6 +7,8 @@ import importlib.util
 import json
 import astor
 from pathlib import Path
+import logging
+logger = logging.getLogger(__name__)
 
 # Define the PackageUsageRemover class
 class PackageUsageRemover(ast.NodeTransformer):
@@ -165,15 +167,15 @@ class TraceDependencyTracker:
                 try:
                     relative_path = os.path.relpath(filepath, base_path)
                     zipf.write(filepath, relative_path)
-                    print(f"Added to zip: {relative_path}")
+                    # logger.info(f"Added to zip: {relative_path}")
                 except Exception as e:
                     print(f"Warning: Could not add {filepath} to zip: {str(e)}")
 
         return hash_id, zip_filename
 
 # Main function for creating a zip of unique files
-def zip_list_of_unique_files(filepaths):
-    tracker = TraceDependencyTracker()
+def zip_list_of_unique_files(filepaths, output_dir):
+    tracker = TraceDependencyTracker(output_dir)
     return tracker.create_zip(filepaths)
 
 # Example usage

{ragaai_catalyst-2.1b2.dist-info → ragaai_catalyst-2.1b4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: ragaai_catalyst
-Version: 2.1b2
+Version: 2.1b4
 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.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp>=3.10.2
 Requires-Dist: opentelemetry-api==1.25.0
@@ -27,13 +27,13 @@ Requires-Dist: Markdown>=3.7
 Requires-Dist: litellm==1.51.1
 Requires-Dist: tenacity==8.3.0
 Requires-Dist: tqdm>=4.66.5
-Requires-Dist: llama-index==0.10.0
-Requires-Dist: pyopenssl==24.2.1
+Requires-Dist: llama-index>=0.10.0
+Requires-Dist: pyopenssl>=24.2.1
 Requires-Dist: psutil~=6.0.0
 Requires-Dist: py-cpuinfo~=9.0.0
 Requires-Dist: requests~=2.32.3
 Requires-Dist: GPUtil~=1.4.0
-Requires-Dist: astor==0.8.1
+Requires-Dist: astor>=0.8.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{ragaai_catalyst-2.1b2.dist-info → ragaai_catalyst-2.1b4.dist-info}/RECORD

@@ -16,12 +16,12 @@ ragaai_catalyst/tracers/llamaindex_callback.py,sha256=vPE7MieKjfwLrLUnnPs20Df0xN
 ragaai_catalyst/tracers/tracer.py,sha256=dGYQfo0RXms6w-sAJf04gqTo1zOXTqreGXaJlnvK48A,12463
 ragaai_catalyst/tracers/upload_traces.py,sha256=hs0PEmit3n3_uUqrdbwcBdyK5Nbkik3JQVwJMEwYTd4,4796
 ragaai_catalyst/tracers/agentic_tracing/__init__.py,sha256=6QyQI8P7aNFHTantNJOP1ZdSNrDKBLhlg_gGNj7tm1c,73
-ragaai_catalyst/tracers/agentic_tracing/agent_tracer.py,sha256=Ff9KbTjKkuZkGAECyvKRe8LjjAjwQ-seTwsX2ycGnIg,18995
-ragaai_catalyst/tracers/agentic_tracing/agentic_tracing.py,sha256=vlh1nvIx9qAHI1m4YKe1R9HkjWiA6sKnP_6GRUed00g,8366
-ragaai_catalyst/tracers/agentic_tracing/base.py,sha256=xnd9jE_aEh56iSharHuMlHxBvPcSQD8KtihPLjKn5Mc,14199
-ragaai_catalyst/tracers/agentic_tracing/data_structure.py,sha256=qyfCI1oGQ461WbS6BYBiAEUmgpw9xFsccpjsi_mVX3c,7152
+ragaai_catalyst/tracers/agentic_tracing/agent_tracer.py,sha256=M5RBNzcuSCEKv-rYwmzBMN-BxvthM3y6d_279UYERZQ,20832
+ragaai_catalyst/tracers/agentic_tracing/agentic_tracing.py,sha256=WsddEXn2afdPx8PfignQoLIwZfn9350XsqtkqtZdMxw,8502
+ragaai_catalyst/tracers/agentic_tracing/base.py,sha256=jRf_-5EIfCzGbaSQtkqgiDQAH4ymoKUrg9A8YqB08jk,14008
+ragaai_catalyst/tracers/agentic_tracing/data_structure.py,sha256=wkZctMTUQUViqKrHhdZiMERSBVfwURAJ-lFlQUou638,7395
 ragaai_catalyst/tracers/agentic_tracing/file_name_tracker.py,sha256=515NNDQJTyy3O-2rdlUYUoWL9qSwLIfvV3sMB9BtHp8,1366
-ragaai_catalyst/tracers/agentic_tracing/llm_tracer.py,sha256=PTOnyj4AVEyUqyQK1fY-Beckt0v_-BvJfGwIEoIxca4,32561
+ragaai_catalyst/tracers/agentic_tracing/llm_tracer.py,sha256=oxziex6mT4RcZY1zWTVgsPXVewiTWt16CQAfWi9_YD0,34072
 ragaai_catalyst/tracers/agentic_tracing/network_tracer.py,sha256=6FTA15xMnum9omM_0Jd9cMIuWdKu1gR5Tc8fOXAkP8E,10068
 ragaai_catalyst/tracers/agentic_tracing/sample.py,sha256=S4rCcKzU_5SB62BYEbNn_1VbbTdG4396N8rdZ3ZNGcE,5654
 ragaai_catalyst/tracers/agentic_tracing/tool_tracer.py,sha256=Yc4x82rk0hCANwXUt4M66Qv_4OdpsXsjlq6OIOef1io,8763
@@ -30,7 +30,7 @@ ragaai_catalyst/tracers/agentic_tracing/unique_decorator_test.py,sha256=Xk1cLzs-
 ragaai_catalyst/tracers/agentic_tracing/upload_agentic_traces.py,sha256=ydaWAbrSS5B6ijabzTnUVxlW8m6eX5dsEJnzl06ZDFU,7539
 ragaai_catalyst/tracers/agentic_tracing/upload_code.py,sha256=u9bRWcM5oDezJupEQoHUXrKz7YvZJK9IZf10ejBWoa4,4254
 ragaai_catalyst/tracers/agentic_tracing/user_interaction_tracer.py,sha256=wsCwTK7tM_L3mdNrcg5Mq3D1k07XCHZkhOB26kz_rLY,1472
-ragaai_catalyst/tracers/agentic_tracing/zip_list_of_unique_files.py,sha256=qlK-7HtybA7Z0xvK0iiVE7lC0gsDgwvdO0MJ9a37f2w,7486
+ragaai_catalyst/tracers/agentic_tracing/zip_list_of_unique_files.py,sha256=faFat_OAUnVJGnauMVo6yeHhTv-_njgyXGOtUwYJ8kE,7568
 ragaai_catalyst/tracers/agentic_tracing/examples/FinancialAnalysisSystem.ipynb,sha256=0qZxjWqYCTAVvdo3Tsp544D8Am48wfeMQ9RKpKgAL8g,34291
 ragaai_catalyst/tracers/agentic_tracing/examples/GameActivityEventPlanner.ipynb,sha256=QCMFJYbGX0fd9eMW4PqyQLZjyWuTXo7n1nqO_hMLf0s,4225
 ragaai_catalyst/tracers/agentic_tracing/examples/TravelPlanner.ipynb,sha256=fU3inXoemJbdTkGAQl_N1UwVEZ10LrKv4gCEpbQ4ISg,43481
@@ -50,7 +50,7 @@ ragaai_catalyst/tracers/instrumentators/llamaindex.py,sha256=SMrRlR4xM7k9HK43hak
 ragaai_catalyst/tracers/instrumentators/openai.py,sha256=14R4KW9wQCR1xysLfsP_nxS7cqXrTPoD8En4MBAaZUU,379
 ragaai_catalyst/tracers/utils/__init__.py,sha256=KeMaZtYaTojilpLv65qH08QmpYclfpacDA0U3wg6Ybw,64
 ragaai_catalyst/tracers/utils/utils.py,sha256=ViygfJ7vZ7U0CTSA1lbxVloHp4NSlmfDzBRNCJuMhis,2374
-ragaai_catalyst-2.1b2.dist-info/METADATA,sha256=Epkb-INU3JO8UmJXpehYK4lT3iqr62xjmf3nU1YbUI4,1795
-ragaai_catalyst-2.1b2.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-ragaai_catalyst-2.1b2.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.1b2.dist-info/RECORD,,
+ragaai_catalyst-2.1b4.dist-info/METADATA,sha256=A9MMHw5G0oZq-8lh5mwo57hNwgYsOhM80wOXe418FDQ,1796
+ragaai_catalyst-2.1b4.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+ragaai_catalyst-2.1b4.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1b4.dist-info/RECORD,,