ragaai-catalyst 2.1.5b23__py3-none-any.whl → 2.1.5b24__py3-none-any.whl

ragaai_catalyst/tracers/agentic_tracing/tracers/agent_tracer.py

@@ -9,6 +9,7 @@ import contextvars
 import asyncio
 from ..utils.file_name_tracker import TrackName
 from ..utils.span_attributes import SpanAttributes
+from .base import BaseTracer
 import logging
 
 logger = logging.getLogger(__name__)
@@ -555,6 +556,10 @@ class AgentTracerMixin:
                 metrics.append(metric)
 
         # TODO agent_trace execute metric
+        formatted_metrics = BaseTracer.get_formatted_metric(self.span_attributes_dict, self.project_id, name)
+        if formatted_metrics:
+            metrics.extend(formatted_metrics)
+
         component = {
             "id": kwargs["component_id"],
             "hash_id": kwargs["hash_id"],

ragaai_catalyst/tracers/agentic_tracing/tracers/base.py

@@ -1055,29 +1055,20 @@ class BaseTracer:
         return self.span_attributes_dict[span_name]
 
     @staticmethod
-    def get_formatted_metric(span_attributes_dict, project_id, name, prompt, span_context, response, span_gt):
+    def get_formatted_metric(span_attributes_dict, project_id, name):
         if name in span_attributes_dict:
             local_metrics = span_attributes_dict[name].local_metrics or []
+            local_metrics_results = []
             for metric in local_metrics:
                 try:
-                    if metric.get("prompt") is not None:
-                        prompt = metric['prompt']
-                    if metric.get("response") is not None:
-                        response = metric['response']
-                    if metric.get('context') is not None:
-                        span_context = metric['context']
-                    if metric.get('gt') is not None:
-                        span_gt = metric['gt']
-
                     logger.info("calculating the metric, please wait....")
+
+                    mapping = metric.get("mapping", {})
                     result = calculate_metric(project_id=project_id,
                                               metric_name=metric.get("name"),
                                               model=metric.get("model"),
                                               provider=metric.get("provider"),
-                                              prompt=prompt,
-                                              context=span_context,
-                                              response=response,
-                                              expected_response=span_gt
+                                              **mapping
                                               )
 
                     result = result['data']['data'][0]
@@ -1107,9 +1098,11 @@ class BaseTracer:
                         "mappings": [],
                         "config": metric_config
                     }
-                    return formatted_metric
+                    local_metrics_results.append(formatted_metric)
                 except ValueError as e:
                     logger.error(f"Validation Error: {e}")
                 except Exception as e:
                     logger.error(f"Error executing metric: {e}")
 
+            return local_metrics_results
+

ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py

@@ -630,9 +630,9 @@ class LLMTracerMixin:
         #print("Response output: ",response)
 
         # TODO: Execute & Add the User requested metrics here
-        formatted_metric = BaseTracer.get_formatted_metric(self.span_attributes_dict, self.project_id, name, prompt, span_context, response, span_gt)
-        if formatted_metric is not None:
-            metrics.append(formatted_metric)
+        formatted_metrics = BaseTracer.get_formatted_metric(self.span_attributes_dict, self.project_id, name)
+        if formatted_metrics:
+            metrics.extend(formatted_metrics)
 
         component = {
             "id": component_id,
@@ -683,38 +683,36 @@ class LLMTracerMixin:
         # return "\n".join(process_content(msg.get("content", "")) for msg in messages if msg.get("content"))
   
     def convert_to_content(self, input_data):
-        if isinstance(input_data, dict):
-            messages = input_data.get("kwargs", {}).get("messages", [])
-        elif isinstance(input_data, list):
-            if len(input_data)>0 and isinstance(input_data[0]['content'],ChatResponse):
-                extracted_messages = []
-
-                for item in input_data:
-                    chat_response = item.get('content')
-                    if hasattr(chat_response, 'message') and hasattr(chat_response.message, 'blocks'):
-                        for block in chat_response.message.blocks:
-                            if hasattr(block, 'text'):
-                                extracted_messages.append(block.text)
-                messages=extracted_messages
-                if isinstance(messages,list):
-                    return "\n".join(messages)
-                
-                #messages=[msg["content"] for msg in input_data if isinstance(msg, dict) and "content" in msg]
-                #messages = [msg["content"].message for msg in input_data if isinstance(msg, dict) and "content" in msg and isinstance(msg["content"], ChatResponse)]
+        try:
+            if isinstance(input_data, dict):
+                messages = input_data.get("kwargs", {}).get("messages", [])
+            elif isinstance(input_data, list):
+                if len(input_data)>0 and isinstance(input_data[0]['content'],ChatResponse):
+                    extracted_messages = []
+
+                    for item in input_data:
+                        chat_response = item.get('content')
+                        if hasattr(chat_response, 'message') and hasattr(chat_response.message, 'blocks'):
+                            for block in chat_response.message.blocks:
+                                if hasattr(block, 'text'):
+                                    extracted_messages.append(block.text)
+                    messages=extracted_messages
+                    if isinstance(messages,list):
+                        return "\n".join(messages)
+                    
+                    #messages=[msg["content"] for msg in input_data if isinstance(msg, dict) and "content" in msg]
+                    #messages = [msg["content"].message for msg in input_data if isinstance(msg, dict) and "content" in msg and isinstance(msg["content"], ChatResponse)]
+                else:
+                    messages = input_data
+            elif isinstance(input_data,ChatResponse):
+                messages=input_data['content']
             else:
-                messages = input_data
-        elif isinstance(input_data,ChatResponse):
-            messages=input_data['content']
-        else:
-            return ""
-        res=""
-        # try:
-        res="\n".join(msg.get("content", "").strip() for msg in messages if msg.get("content"))
-        # except Exception as e:
-        #     print("Exception occured for: ",e)
-        #     print("Input: ",input_data,"Meeage: ",messages)
-        #     # import sys
-        #     # sys.exit()
+                return ""
+            res=""
+            # try:
+            res="\n".join(msg.get("content", "").strip() for msg in messages if msg.get("content"))
+        except Exception as e:
+            res=str(messages)
         return res
 
     def process_content(content):

ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py

@@ -361,7 +361,7 @@ class AgenticTracing(
 
         # Check if there's an active agent context
         current_agent_id = self.current_agent_id.get()
-        if current_agent_id and component_data["type"] in ["llm", "tool"]:
+        if current_agent_id and component_data["type"] in ["llm", "tool", "custom"]:
             # Add this component as a child of the current agent
             current_children = self.agent_children.get()
             current_children.append(component_data)

ragaai_catalyst/tracers/agentic_tracing/tracers/tool_tracer.py

@@ -7,6 +7,7 @@ import functools
 from typing import Optional, Any, Dict, List
 
 from pydantic import tools
+from .base import BaseTracer
 from ..utils.unique_decorator import generate_unique_hash_simple
 import contextvars
 import asyncio
@@ -483,6 +484,10 @@ class ToolTracerMixin:
                 metric["name"] = metric_name  
                 metrics.append(metric)
 
+        formatted_metrics = BaseTracer.get_formatted_metric(self.span_attributes_dict, self.project_id, name)
+        if formatted_metrics:
+            metrics.extend(formatted_metrics)
+
         start_time = kwargs["start_time"]
         component = {
             "id": kwargs["component_id"],

ragaai_catalyst/tracers/agentic_tracing/upload/upload_local_metric.py

@@ -11,7 +11,7 @@ logging_level = (
     else logger.setLevel(logging.INFO)
 )
 
-def calculate_metric(project_id, metric_name, model, provider, prompt, response, context, expected_response=None):
+def calculate_metric(project_id, metric_name, model, provider, **kwargs):
     user_id = "1"
     org_domain = "raga"
 
@@ -41,15 +41,15 @@ def calculate_metric(project_id, metric_name, model, provider, prompt, response,
                 "trace_object": {
                     "Data": {
                         "DocId": "doc-1",
-                        "Prompt": prompt,
-                        "Response": response,
-                        "Context": context,
-                        "ExpectedResponse": "",
-                        "ExpectedContext": expected_response,
-                        "Chat": "",
-                        "Instructions": "",
-                        "SystemPrompt": "",
-                        "Text": ""
+                        "Prompt": kwargs.get("prompt"),
+                        "Response": kwargs.get("response"),
+                        "Context": kwargs.get("context"),
+                        "ExpectedResponse": kwargs.get("expected_response"),
+                        "ExpectedContext": kwargs.get("expected_context"),
+                        "Chat": kwargs.get("chat"),
+                        "Instructions": kwargs.get("instructions"),
+                        "SystemPrompt": kwargs.get("system_prompt"),
+                        "Text": kwargs.get("text")
                     },
                     "claims": {},
                     "last_computed_metrics": {

ragaai_catalyst/tracers/agentic_tracing/utils/span_attributes.py

@@ -62,6 +62,7 @@ class SpanAttributes:
         self.feedback = feedback
         logger.debug(f"Added feedback: {self.feedback}")
 
+    # TODO: Add validation to check if all the required parameters are present
     def execute_metrics(self, **kwargs: Any):
         name = kwargs.get("name")
         model = kwargs.get("model")
@@ -91,19 +92,20 @@ class SpanAttributes:
             prompt =None
             context = None
             response = None
-            if mapping is not None:
-                prompt = mapping['prompt']
-                context = mapping['context']
-                response = mapping['response']
+            # if mapping is not None:
+            #     prompt = mapping['prompt']
+            #     context = mapping['context']
+            #     response = mapping['response']
             new_metric = {
                 "name": metric_name,
                 "model": model,
                 "provider": provider,
                 "project_id": self.project_id,
-                "prompt": prompt,
-                "context": context,
-                "response": response,
-                "displayName": display_name
+                # "prompt": prompt,
+                # "context": context,
+                # "response": response,
+                "displayName": display_name,
+                "mapping": mapping
             }
             self.local_metrics.append(new_metric)
 

{ragaai_catalyst-2.1.5b23.dist-info → ragaai_catalyst-2.1.5b24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.5b23
+Version: 2.1.5b24
 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.5b23.dist-info → ragaai_catalyst-2.1.5b24.dist-info}/RECORD

@@ -29,19 +29,19 @@ ragaai_catalyst/tracers/agentic_tracing/tests/__init__.py,sha256=47DEQpj8HBSa-_T
 ragaai_catalyst/tracers/agentic_tracing/tests/ai_travel_agent.py,sha256=S4rCcKzU_5SB62BYEbNn_1VbbTdG4396N8rdZ3ZNGcE,5654
 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=983uI_vc6XTBtkUIIHs_FcyUa8VBl40d10JmlPzV6iA,26915
-ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=lMhRXfTsnKw_-sibA-LqJNV_nvh284VT-rv6_KF4clA,46621
+ragaai_catalyst/tracers/agentic_tracing/tracers/agent_tracer.py,sha256=kxZPdaSgNY0-ykyvIEF1d6qjXlR7TV81k2Nbc1k0icg,27131
+ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=WpeSzPrCwsMyDQrF7juJjTV5nrP3ewR5IiMcwVqHDtg,46095
 ragaai_catalyst/tracers/agentic_tracing/tracers/custom_tracer.py,sha256=mR4jCNjsKUPiidJ1pIthoUI5i9KCGGPe3zG5l80FUBo,14060
 ragaai_catalyst/tracers/agentic_tracing/tracers/langgraph_tracer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py,sha256=jnbJqs8ln3YWDYAZ8kqpkU8E8h6HGT1-OspHYrDijIw,48118
-ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=KTXiDhfEcF2q0FJ4rJqLXONC93MWQAJCIW_ZOsOIiuo,18139
+ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py,sha256=69A33Hyv7j9lCSX9yDTdUJeMOtPE6AD-zO38KXETxGY,48048
+ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=hbyKvuCeL084vlUk5fBeBnWkzPEjmdHJ_HTZtuw5TxM,18149
 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=CEbTzedv_AH5zXlChfTGMlQc-8oWATlwrVFb1KcO4c0,21588
+ragaai_catalyst/tracers/agentic_tracing/tracers/tool_tracer.py,sha256=G7IEr0neJWg4w-ffaAhs_Wo3BSJn1VJuECPUc9zCEVA,21804
 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/upload_agentic_traces.py,sha256=1MDKXAAPzOEdxFKWWQrRgrmM3kz--DGXSywGXQmR3lQ,6041
 ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py,sha256=HgpMgI-JTWZrizcM7GGUIaAgaZF4aRT3D0dJXVEkblY,4271
-ragaai_catalyst/tracers/agentic_tracing/upload/upload_local_metric.py,sha256=qpUjPDfeRIwKh2x-pQFLXJwT4hFRrYBKvzS1bWcJTOo,2437
+ragaai_catalyst/tracers/agentic_tracing/upload/upload_local_metric.py,sha256=PJMwYSL9TKw0LgP--hghSbosuJF5ju5K7zUltEHfQ34,2561
 ragaai_catalyst/tracers/agentic_tracing/upload/upload_trace_metric.py,sha256=V9dgYx4DwibPr38Xbk7_SOJk9gONE7xYpb0MPA1oMGI,3943
 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
@@ -51,7 +51,7 @@ ragaai_catalyst/tracers/agentic_tracing/utils/generic.py,sha256=WwXT01xmp8MSr7Ki
 ragaai_catalyst/tracers/agentic_tracing/utils/get_user_trace_metrics.py,sha256=vPZ4dn4EHFW0kqd1GyRpsYXbfrRrd0DXCmh-pzsDBNE,1109
 ragaai_catalyst/tracers/agentic_tracing/utils/llm_utils.py,sha256=gbPqWtJINW8JVlkM41UmF5zGR8oj8Q6g9KQIS3moQYM,20439
 ragaai_catalyst/tracers/agentic_tracing/utils/model_costs.json,sha256=2tzGw_cKCTPcfjEm7iGvFE6pTw7gMTPzeBov_MTaXNY,321336
-ragaai_catalyst/tracers/agentic_tracing/utils/span_attributes.py,sha256=3zTWcooXLZgbShzQCql2EWWfFkrTK2soTWkMxnzMwnE,4218
+ragaai_catalyst/tracers/agentic_tracing/utils/span_attributes.py,sha256=qmODERcFZhc8MX24boFCXkkh6sJ-vZngRHPvxhyWFeE,4347
 ragaai_catalyst/tracers/agentic_tracing/utils/supported_llm_provider.toml,sha256=LvFDivDIE96Zasp-fgDEqUJ5GEQZUawQucR3aOcSUTY,926
 ragaai_catalyst/tracers/agentic_tracing/utils/system_monitor.py,sha256=H8WNsk4v_5T6OUw4TFOzlDLjQhJwjh1nAMyMAoqMEi4,6946
 ragaai_catalyst/tracers/agentic_tracing/utils/trace_utils.py,sha256=go7FVnofviATDph-j8sk2juv09CGSRt1Vq4U868Fhd8,2259
@@ -68,8 +68,8 @@ ragaai_catalyst/tracers/utils/__init__.py,sha256=KeMaZtYaTojilpLv65qH08QmpYclfpa
 ragaai_catalyst/tracers/utils/convert_langchain_callbacks_output.py,sha256=ofrNrxf2b1hpjDh_zeaxiYq86azn1MF3kW8-ViYPEg0,1641
 ragaai_catalyst/tracers/utils/langchain_tracer_extraction_logic.py,sha256=XS2_x2qneqEx9oAighLg-LRiueWcESLwIC2r7eJT-Ww,3117
 ragaai_catalyst/tracers/utils/utils.py,sha256=ViygfJ7vZ7U0CTSA1lbxVloHp4NSlmfDzBRNCJuMhis,2374
-ragaai_catalyst-2.1.5b23.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ragaai_catalyst-2.1.5b23.dist-info/METADATA,sha256=ETuEVrAepDOTKJUD-h2JcNx9lJnJcTCPLunJVg-QRwc,13874
-ragaai_catalyst-2.1.5b23.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ragaai_catalyst-2.1.5b23.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.1.5b23.dist-info/RECORD,,
+ragaai_catalyst-2.1.5b24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.1.5b24.dist-info/METADATA,sha256=b_RiCZulVnUEc2NpbCUsN1-eMICHLEqLv4VG_8kWiRI,13874
+ragaai_catalyst-2.1.5b24.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ragaai_catalyst-2.1.5b24.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.5b24.dist-info/RECORD,,