ragaai-catalyst 2.1.6.3b0__py3-none-any.whl → 2.1.6.4__py3-none-any.whl

ragaai_catalyst/tracers/agentic_tracing/tracers/base.py

@@ -271,7 +271,7 @@ class BaseTracer:
             # Process trace spans
             self.trace = self._change_span_ids_to_int(self.trace)
             self.trace = self._change_agent_input_output(self.trace)
-            self.trace = self._extract_cost_tokens(self.trace)
+            # self.trace = self._extract_cost_tokens(self.trace)
 
             # Create traces directory and prepare file paths
             self.traces_dir = tempfile.gettempdir()
@@ -289,6 +289,7 @@ class BaseTracer:
             trace_data = self.trace.to_dict()
             trace_data["metrics"] = self.trace_metrics
             cleaned_trace_data = self._clean_trace(trace_data)
+            cleaned_trace_data = self._extract_cost_tokens(cleaned_trace_data)
             
             # Add interactions
             interactions = self.format_interactions()
@@ -507,9 +508,11 @@ class BaseTracer:
                         elif child_type == "agent":
                             process_spans([child])
 
-        process_spans(trace.data[0]["spans"])
-        trace.metadata.cost = cost
-        trace.metadata.tokens = tokens
+        process_spans(trace["data"][0]["spans"])
+        trace["metadata"].cost = cost
+        trace["metadata"].tokens = tokens
+        trace["metadata"].total_cost = cost.get("total_cost", 0)
+        trace["metadata"].total_tokens = tokens.get("total_tokens", 0)
         return trace
 
     def _clean_trace(self, trace):

ragaai_catalyst/tracers/agentic_tracing/upload/trace_uploader.py

@@ -107,6 +107,10 @@ def process_upload(task_id: str, filepath: str, hash_id: str, zip_path: str,
     }
     
     # Save initial status to file
+    # with open(filepath, 'r') as f:
+    #     data = json.load(f)
+    # with open(os.path.join(os.getcwd(), 'agentic_traces.json'), 'w') as f:
+    #     json.dump(data, f, default=str, indent=2)
     save_task_status(result)
     
     try:

ragaai_catalyst/tracers/tracer.py

@@ -485,9 +485,13 @@ class Tracer(AgenticTracing):
             data, additional_metadata = self.langchain_tracer.stop()
 
             # Add cost if possible
+            additional_metadata["cost"] = 0.0
             if additional_metadata.get('model_name'):
                 try:
-                    model_cost_data = self.model_cost_dict[additional_metadata['model_name']]
+                    if self.model_custom_cost.get(additional_metadata['model_name']):
+                        model_cost_data = self.model_custom_cost[additional_metadata['model_name']]
+                    else:
+                        model_cost_data = self.model_cost_dict[additional_metadata['model_name']]
                     if 'tokens' in additional_metadata and all(k in additional_metadata['tokens'] for k in ['prompt', 'completion']):
                         prompt_cost = additional_metadata["tokens"]["prompt"]*model_cost_data["input_cost_per_token"]
                         completion_cost = additional_metadata["tokens"]["completion"]*model_cost_data["output_cost_per_token"]
@@ -515,7 +519,8 @@ class Tracer(AgenticTracing):
 
             # Safely remove tokens and cost dictionaries if they exist
             additional_metadata.pop("tokens", None)
-            # additional_metadata.pop("cost", None)
+
+            additional_metadata["model"] = additional_metadata.get("model_name", "")
             
             # Safely merge metadata
             combined_metadata = {}
@@ -526,9 +531,9 @@ class Tracer(AgenticTracing):
                 
             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["model_name"] = additional_metadata.get("model_name", 0)
+                model_cost_latency_metadata["total_cost"] = additional_metadata.get("cost", 0)
+                model_cost_latency_metadata["total_latency"] = additional_metadata.get("latency", 0)
                 model_cost_latency_metadata["recorded_on"] = datetime.datetime.now().astimezone().isoformat()
                 combined_metadata.update(model_cost_latency_metadata)
 

ragaai_catalyst/tracers/upload_traces.py

@@ -33,7 +33,7 @@ class UploadTraces:
             "log_source": {"columnType": "metadata"},
             "vector_store":{"columnType":"pipeline"},
             "feedback": {"columnType":"feedBack"},
-            "model": {"columnType": "metadata"},
+            "model_name": {"columnType": "metadata"},
             "total_cost": {"columnType": "metadata", "dataType": "numerical"},
             "total_latency": {"columnType": "metadata", "dataType": "numerical"},
         }

{ragaai_catalyst-2.1.6.3b0.dist-info → ragaai_catalyst-2.1.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragaai_catalyst
-Version: 2.1.6.3b0
+Version: 2.1.6.4
 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.10

{ragaai_catalyst-2.1.6.3b0.dist-info → ragaai_catalyst-2.1.6.4.dist-info}/RECORD

@@ -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=CSaqVjg33KUEAhc7gcBhb8c_44I3I2wfyAwNqvz6Lu4,37003
-ragaai_catalyst/tracers/upload_traces.py,sha256=nqH6Ldng33VhEGcvQberyWKZ1WvLuBRoySEit8b0f7s,5882
+ragaai_catalyst/tracers/tracer.py,sha256=j2O_ebNNjx5w0XQtwO_2W9YVIbPSg0Mee20qe0c00Ng,37325
+ragaai_catalyst/tracers/upload_traces.py,sha256=alizdRRDobeeEPwgNIFwPfSFJvAo5I0W9CBTfUqzAzA,5887
 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,7 +45,7 @@ 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=5O8GKv5U_L3biLpsk5HEW21yiKWCJ8H4ijYjHrTzcW4,54350
+ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=1EmSvsSV_7Az4t6MBVYZcbllyYukYDZL6h40v2o31sU,54576
 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
@@ -54,7 +54,7 @@ ragaai_catalyst/tracers/agentic_tracing/tracers/network_tracer.py,sha256=m8CxYkl
 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=w1taoTdOB2Lhrmi90fenyIHqUqYvWdNS_C6pZqGbd5M,12743
+ragaai_catalyst/tracers/agentic_tracing/upload/trace_uploader.py,sha256=Tv_QMg8EIQyoDwFnDqKlNwmJVBJNkdr6-es3UT-Mugg,12939
 ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py,sha256=9s1cXH1rZ2EMPMsJ7zls8BRVVHdyGNXK-SoIF7P2MxM,8595
 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
@@ -87,8 +87,8 @@ ragaai_catalyst/tracers/utils/langchain_tracer_extraction_logic.py,sha256=XS2_x2
 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=RH9dkCnPaSygvPvAilRE4lUdUaRtALJKH85E4jHcVoM,14072
 ragaai_catalyst/tracers/utils/utils.py,sha256=ViygfJ7vZ7U0CTSA1lbxVloHp4NSlmfDzBRNCJuMhis,2374
-ragaai_catalyst-2.1.6.3b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ragaai_catalyst-2.1.6.3b0.dist-info/METADATA,sha256=VVLQ8QfjAH2rfq_wXbkfcgEsrROBMigLQSv_yLbd9hE,22141
-ragaai_catalyst-2.1.6.3b0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ragaai_catalyst-2.1.6.3b0.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.1.6.3b0.dist-info/RECORD,,
+ragaai_catalyst-2.1.6.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.1.6.4.dist-info/METADATA,sha256=BLwFthVXvG7dVl5E_nbyNZeYbfcHwQfa4wXJMq6oCuQ,22139
+ragaai_catalyst-2.1.6.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ragaai_catalyst-2.1.6.4.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.6.4.dist-info/RECORD,,