ragaai-catalyst 2.1.4b2__py3-none-any.whl → 2.1.4b3__py3-none-any.whl

ragaai_catalyst/tracers/agentic_tracing/tracers/base.py

@@ -284,17 +284,25 @@ class BaseTracer:
     def __exit__(self, exc_type, exc_value, traceback):
         self.stop()
 
+    def _process_children(self, children_list, parent_id, current_id):
+        """Helper function to process children recursively."""
+        for child in children_list:
+            child["id"] = current_id
+            child["parent_id"] = parent_id
+            current_id += 1
+            # Recursively process nested children if they exist
+            if "children" in child["data"]:
+                current_id = self._process_children(child["data"]["children"], child["id"], current_id)
+        return current_id
+
     def _change_span_ids_to_int(self, trace):
         id, parent_id = 1, 0
         for span in trace.data[0]["spans"]:
             span.id = id
             span.parent_id = parent_id
             id += 1
-            if span.type == "agent":
-                for children in span.data["children"]:
-                    children["id"] = id
-                    children["parent_id"] = span.id
-                    id += 1
+            if span.type == "agent" and "children" in span.data:
+                id = self._process_children(span.data["children"], span.id, id)
         return trace
 
     def _change_agent_input_output(self, trace):
@@ -445,63 +453,169 @@ class BaseTracer:
     def add_tags(self, tags: List[str]):
         raise NotImplementedError
 
-    # def _add_span_attributes_to_trace(self, trace):
-    #     if not hasattr(trace, 'data'):
-    #         return trace
-    #     for data in trace.data:
-    #         for span in data.get('spans', []):
-    #             if not hasattr(span, 'name'):
-    #                 continue
-    #             span_name = span.name
-    #             if span_name in self.span_attributes_dict:
-    #                 span_attributes = self.span_attributes_dict[span_name]
-    #                 span = self._add_span_attributes_to_span(span_attributes, span)
-    #             if hasattr(span, 'type'):
-    #                 if span.type == 'agent':
-    #                     if hasattr(span, 'data'):
-    #                         if 'children' in span.data:
-    #                             span.data['children'] = self._add_span_attributes_to_children(span_attributes, span.data['children'])
-
-    #     return trace
-
-    # def _add_span_attributes_to_children(self, span_attributes: SpanAttributes, children):
-    #     attributed_children = []
-    #     for child in children:
-    #         if 'name' not in child:
-    #             continue
-    #         child_name = child['name']
-    #         if child_name in self.span_attributes_dict:
-    #             span_attributes = self.span_attributes_dict[child_name]
-    #             child = self._add_span_attributes_to_span(span_attributes, child)
-    #         if 'type' in child:
-    #             if child['type'] == 'agent':
-    #                 if 'data' in child:
-    #                     if 'children' in child['data']:
-    #                         child['data']['children'] = self._add_span_attributes_to_children(span_attributes, child['data']['children'])
-    #         attributed_children.append(child)
-    #     return attributed_children
-
-    # def _add_span_attributes_to_span(self, span_attributes: SpanAttributes, span):
-    #     metadata = {
-    #         'tags': span_attributes.tags,
-    #         'user_metadata': span_attributes.metadata
-    #     }
-    #     metrics = span_attributes.metrics
-    #     feedback = span_attributes.feedback
-    #     if isinstance(span, dict):
-    #         span['metadata'] = metadata
-    #         span['metrics'] = metrics
-    #         span['feedback'] = feedback
-    #     else:
-    #         span.metadata = metadata
-    #         span.metrics = metrics
-    #         span.feedback = feedback
-    #     return span
+    def _process_child_interactions(self, child, interaction_id, interactions):
+        """
+        Helper method to process child interactions recursively.
+        
+        Args:
+            child (dict): The child span to process
+            interaction_id (int): Current interaction ID
+            interactions (list): List of interactions to append to
+            
+        Returns:
+            int: Next interaction ID to use
+        """
+        child_type = child.get("type")
+        
+        if child_type == "tool":
+            # Tool call start
+            interactions.append(
+                {
+                    "id": str(interaction_id),
+                    "span_id": child.get("id"),
+                    "interaction_type": "tool_call_start",
+                    "name": child.get("name"),
+                    "content": {
+                        "parameters": [
+                            child.get("data", {}).get("input", {}).get("args"),
+                            child.get("data", {}).get("input", {}).get("kwargs"),
+                        ]
+                    },
+                    "timestamp": child.get("start_time"),
+                    "error": child.get("error"),
+                }
+            )
+            interaction_id += 1
+
+            # Tool call end
+            interactions.append(
+                {
+                    "id": str(interaction_id),
+                    "span_id": child.get("id"),
+                    "interaction_type": "tool_call_end",
+                    "name": child.get("name"),
+                    "content": {
+                        "returns": child.get("data", {}).get("output"),
+                    },
+                    "timestamp": child.get("end_time"),
+                    "error": child.get("error"),
+                }
+            )
+            interaction_id += 1
+
+        elif child_type == "llm":
+            interactions.append(
+                {
+                    "id": str(interaction_id),
+                    "span_id": child.get("id"),
+                    "interaction_type": "llm_call_start",
+                    "name": child.get("name"),
+                    "content": {
+                        "prompt": child.get("data", {}).get("input"),
+                    },
+                    "timestamp": child.get("start_time"),
+                    "error": child.get("error"),
+                }
+            )
+            interaction_id += 1
+
+            interactions.append(
+                {
+                    "id": str(interaction_id),
+                    "span_id": child.get("id"),
+                    "interaction_type": "llm_call_end",
+                    "name": child.get("name"),
+                    "content": {
+                        "response": child.get("data", {}).get("output")
+                    },
+                    "timestamp": child.get("end_time"),
+                    "error": child.get("error"),
+                }
+            )
+            interaction_id += 1
+
+        elif child_type == "agent":
+            interactions.append(
+                {
+                    "id": str(interaction_id),
+                    "span_id": child.get("id"),
+                    "interaction_type": "agent_call_start",
+                    "name": child.get("name"),
+                    "content": None,
+                    "timestamp": child.get("start_time"),
+                    "error": child.get("error"),
+                }
+            )
+            interaction_id += 1
 
-    def span(self, span_name):
-        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]
+            # Process nested children recursively
+            if "children" in child.get("data", {}):
+                for nested_child in child["data"]["children"]:
+                    interaction_id = self._process_child_interactions(
+                        nested_child, interaction_id, interactions
+                    )
+
+            interactions.append(
+                {
+                    "id": str(interaction_id),
+                    "span_id": child.get("id"),
+                    "interaction_type": "agent_call_end",
+                    "name": child.get("name"),
+                    "content": child.get("data", {}).get("output"),
+                    "timestamp": child.get("end_time"),
+                    "error": child.get("error"),
+                }
+            )
+            interaction_id += 1
+
+        else:
+            interactions.append(
+                {
+                    "id": str(interaction_id),
+                    "span_id": child.get("id"),
+                    "interaction_type": child_type,
+                    "name": child.get("name"),
+                    "content": child.get("data", {}),
+                    "timestamp": child.get("start_time"),
+                    "error": child.get("error"),
+                }
+            )
+            interaction_id += 1
+
+        # Process additional interactions and network calls
+        if "interactions" in child:
+            for interaction in child["interactions"]:
+                interaction["id"] = str(interaction_id)
+                interaction["span_id"] = child.get("id")
+                interaction["error"] = None
+                interactions.append(interaction)
+                interaction_id += 1
+
+        if "network_calls" in child:
+            for child_network_call in child["network_calls"]:
+                network_call = {}
+                network_call["id"] = str(interaction_id)
+                network_call["span_id"] = child.get("id")
+                network_call["interaction_type"] = "network_call"
+                network_call["name"] = None
+                network_call["content"] = {
+                    "request": {
+                        "url": child_network_call.get("url"),
+                        "method": child_network_call.get("method"),
+                        "headers": child_network_call.get("headers"),
+                    },
+                    "response": {
+                        "status_code": child_network_call.get("status_code"),
+                        "headers": child_network_call.get("response_headers"),
+                        "body": child_network_call.get("response_body"),
+                    },
+                }
+                network_call["timestamp"] = child_network_call.get("start_time")
+                network_call["error"] = child_network_call.get("error")
+                interactions.append(network_call)
+                interaction_id += 1
+
+        return interaction_id
 
     def format_interactions(self) -> dict:
         """
@@ -513,14 +627,14 @@ class BaseTracer:
         tool_call_end, llm_call, file_read, file_write, network_call.
 
         Returns:
-            dict: A dictionary with "interactions" key containing a list of interactions
+            dict: A dictionary with "workflow" key containing a list of interactions
                   sorted by timestamp.
         """
         interactions = []
         interaction_id = 1
 
         if not hasattr(self, "trace") or not self.trace.data:
-            return {"interactions": []}
+            return {"workflow": []}
 
         for span in self.trace.data[0]["spans"]:
             # Process agent spans
@@ -539,159 +653,12 @@ class BaseTracer:
                 )
                 interaction_id += 1
 
-                # Process children of agent
+                # Process children of agent recursively
                 if "children" in span.data:
                     for child in span.data["children"]:
-                        child_type = child.get("type")
-                        if child_type == "tool":
-                            # Tool call start
-                            interactions.append(
-                                {
-                                    "id": str(interaction_id),
-                                    "span_id": child.get("id"),
-                                    "interaction_type": "tool_call_start",
-                                    "name": child.get("name"),
-                                    "content": {
-                                        "parameters": [
-                                            child.get("data", {})
-                                            .get("input")
-                                            .get("args"),
-                                            child.get("data", {})
-                                            .get("input")
-                                            .get("kwargs"),
-                                        ]
-                                    },
-                                    "timestamp": child.get("start_time"),
-                                    "error": child.get("error"),
-                                }
-                            )
-                            interaction_id += 1
-
-                            # Tool call end
-                            interactions.append(
-                                {
-                                    "id": str(interaction_id),
-                                    "span_id": child.get("id"),
-                                    "interaction_type": "tool_call_end",
-                                    "name": child.get("name"),
-                                    "content": {
-                                        "returns": child.get("data", {}).get("output"),
-                                    },
-                                    "timestamp": child.get("end_time"),
-                                    "error": child.get("error"),
-                                }
-                            )
-                            interaction_id += 1
-
-                        elif child_type == "llm":
-                            interactions.append(
-                                {
-                                    "id": str(interaction_id),
-                                    "span_id": child.get("id"),
-                                    "interaction_type": "llm_call_start",
-                                    "name": child.get("name"),
-                                    "content": {
-                                        "prompt": child.get("data", {}).get("input"),
-                                    },
-                                    "timestamp": child.get("start_time"),
-                                    "error": child.get("error"),
-                                }
-                            )
-                            interaction_id += 1
-
-                            interactions.append(
-                                {
-                                    "id": str(interaction_id),
-                                    "span_id": child.get("id"),
-                                    "interaction_type": "llm_call_end",
-                                    "name": child.get("name"),
-                                    "content": {
-                                        "response": child.get("data", {}).get("output")
-                                    },
-                                    "timestamp": child.get("end_time"),
-                                    "error": child.get("error"),
-                                }
-                            )
-                            interaction_id += 1
-
-                        elif child_type == "agent":
-                            interactions.append(
-                                {
-                                    "id": str(interaction_id),
-                                    "span_id": child.get("id"),
-                                    "interaction_type": "agent_call_start",
-                                    "name": child.get("name"),
-                                    "content": None,
-                                    "timestamp": child.get("start_time"),
-                                    "error": child.get("error"),
-                                }
-                            )
-                            interaction_id += 1
-
-                            interactions.append(
-                                {
-                                    "id": str(interaction_id),
-                                    "span_id": child.get("id"),
-                                    "interaction_type": "agent_call_end",
-                                    "name": child.get("name"),
-                                    "content": child.get("data", {}).get("output"),
-                                    "timestamp": child.get("end_time"),
-                                    "error": child.get("error"),
-                                }
-                            )
-                            interaction_id += 1
-
-                        else:
-                            interactions.append(
-                                {
-                                    "id": str(interaction_id),
-                                    "span_id": child.get("id"),
-                                    "interaction_type": child_type,
-                                    "name": child.get("name"),
-                                    "content": child.get("data", {}),
-                                    "timestamp": child.get("start_time"),
-                                    "error": child.get("error"),
-                                }
-                            )
-                            interaction_id += 1
-
-                        if "interactions" in child:
-                            for interaction in child["interactions"]:
-                                interaction["id"] = str(interaction_id)
-                                interaction["span_id"] = child.get("id")
-                                interaction["error"] = None
-                                interactions.append(interaction)
-                                interaction_id += 1
-
-                        if "network_calls" in child:
-                            for child_network_call in child["network_calls"]:
-                                network_call = {}
-                                network_call["id"] = str(interaction_id)
-                                network_call["span_id"] = child.get("id")
-                                network_call["interaction_type"] = "network_call"
-                                network_call["name"] = None
-                                network_call["content"] = {
-                                    "request": {
-                                        "url": child_network_call.get("url"),
-                                        "method": child_network_call.get("method"),
-                                        "headers": child_network_call.get("headers"),
-                                    },
-                                    "response": {
-                                        "status_code": child_network_call.get(
-                                            "status_code"
-                                        ),
-                                        "headers": child_network_call.get(
-                                            "response_headers"
-                                        ),
-                                        "body": child_network_call.get("response_body"),
-                                    },
-                                }
-                                network_call["timestamp"] = child_network_call[
-                                    "start_time"
-                                ]
-                                network_call["error"] = child_network_call.get("error")
-                                interactions.append(network_call)
-                                interaction_id += 1
+                        interaction_id = self._process_child_interactions(
+                            child, interaction_id, interactions
+                        )
 
                 # Add agent_end interaction
                 interactions.append(
@@ -830,3 +797,8 @@ class BaseTracer:
             interaction["id"] = str(idx)
 
         return {"workflow": sorted_interactions}
+
+    def span(self, span_name):
+        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/tracers/agentic_tracing/tracers/custom_tracer.py

@@ -91,7 +91,6 @@ class CustomTracerMixin:
                         pass
                 return trace_variables_func
 
-            sys.settrace(trace_variables_func)
 
         # Start tracking network calls for this component
         self.start_component(component_id)
@@ -187,8 +186,6 @@ class CustomTracerMixin:
                         pass
                 return trace_variables_func
 
-            sys.settrace(trace_variables_func)
-
         try:
             # Execute the function
             result = await func(*args, **kwargs)

{ragaai_catalyst-2.1.4b2.dist-info → ragaai_catalyst-2.1.4b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.4b2
+Version: 2.1.4b3
 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.4b2.dist-info → ragaai_catalyst-2.1.4b3.dist-info}/RECORD

@@ -27,8 +27,8 @@ 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=unr4AVpXu2IJeNz_oL-fEtJ-tNmbCgdWJN5euCfdC8c,24951
-ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=z2e1kGVAi_oBK__tCs0OiSVMYjqAeAdXd7CeZYzYWJA,34660
-ragaai_catalyst/tracers/agentic_tracing/tracers/custom_tracer.py,sha256=tcOXzWTZlDdlBamCR0g5Sks5WwmKCK93R0ijIbDeSpI,12467
+ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=Ly9UhNu5G8MWZhIM2Rj7L0uYV65w6mC6caokbjXcwQE,31201
+ragaai_catalyst/tracers/agentic_tracing/tracers/custom_tracer.py,sha256=JR_XhRWmw01XpzAc2P3VdUCkuXkmHtbFHSsJ7d3uL2w,12372
 ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py,sha256=9EYrfkMYNYXYur9msb0wmxJlN_c58mzSj-GTDbLb154,28759
 ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=Tthd1lm_QKeY8E4HLYWW9djujnOO_5X-LIKnv1pNwJI,15092
 ragaai_catalyst/tracers/agentic_tracing/tracers/network_tracer.py,sha256=Tq9by4DV51UR4BCUc3fnAiNR4SZku-gOaOfjJryowAA,10218
@@ -59,7 +59,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.1.4b2.dist-info/METADATA,sha256=hAIHL6OVFHUiGDUdh94meRnU5YUhuBdRcco94cTtA8c,12770
-ragaai_catalyst-2.1.4b2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ragaai_catalyst-2.1.4b2.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.1.4b2.dist-info/RECORD,,
+ragaai_catalyst-2.1.4b3.dist-info/METADATA,sha256=5Pc4_m7M2O8YxyhO4kJNYJwVmemLutem1Tmew_77ygY,12770
+ragaai_catalyst-2.1.4b3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ragaai_catalyst-2.1.4b3.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.4b3.dist-info/RECORD,,