ragaai-catalyst 2.1.6.3b0__tar.gz → 2.1.6.4__tar.gz

{ragaai_catalyst-2.1.6.3b0 → ragaai_catalyst-2.1.6.4}/PKG-INFO

@@ -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 → ragaai_catalyst-2.1.6.4}/pyproject.toml

@@ -8,7 +8,7 @@ description = "RAGA AI CATALYST"
 readme = "README.md"
 requires-python = ">=3.10,<3.13"
 # license = {file = "LICENSE"}
-version = "2.1.6.3.beta.0"
+version = "2.1.6.4"
 authors = [
     {name = "Kiran Scaria", email = "kiran.scaria@raga.ai"},
     {name = "Kedar Gaikwad", email = "kedar.gaikwad@raga.ai"},

{ragaai_catalyst-2.1.6.3b0 → ragaai_catalyst-2.1.6.4}/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-2.1.6.3b0 → ragaai_catalyst-2.1.6.4}/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-2.1.6.3b0 → ragaai_catalyst-2.1.6.4}/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-2.1.6.3b0 → ragaai_catalyst-2.1.6.4}/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 → ragaai_catalyst-2.1.6.4}/ragaai_catalyst.egg-info/PKG-INFO

@@ -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 → ragaai_catalyst-2.1.6.4}/requirements.txt

@@ -39,10 +39,10 @@ jsonpatch==1.33
 jsonpointer==3.0.0
 jsonschema==4.23.0
 jsonschema-specifications==2024.10.1
-langchain-core==0.2.11
+langchain-core==0.2.43
 langsmith==0.1.147
 llama-index>=0.10.0
-litellm==1.42.12
+litellm==1.61.15
 Markdown==3.7
 MarkupSafe==3.0.2
 multidict==6.1.0