ragaai-catalyst 2.1.5b31__tar.gz → 2.1.5b32__tar.gz

{ragaai_catalyst-2.1.5b31/ragaai_catalyst.egg-info → ragaai_catalyst-2.1.5b32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.5b31
+Version: 2.1.5b32
 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.9

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/examples/travel_agent/config.py

@@ -15,7 +15,7 @@ def initialize_tracing():
     )
 
     tracer = Tracer(
-        project_name="UploadProcess",
+        project_name="swarnendu-4",
         dataset_name="travel_agent_dataset",
         tracer_type="Agentic",
     )

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/examples/travel_agent/main.py

@@ -1,9 +1,4 @@
-import sys
-sys.path.append('.')
-
-import os
-os.environ["DEBUG"] = "1"
-
+from dotenv import load_dotenv
 from tools import (
     llm_call,
     weather_tool,
@@ -15,7 +10,6 @@ from config import initialize_tracing
 from ragaai_catalyst import trace_agent, current_span
 
 # Load environment variables
-from dotenv import load_dotenv
 load_dotenv()
 
 # Initialize distributed tracing

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/pyproject.toml

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

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/ragaai_catalyst/ragaai_catalyst.py

@@ -3,23 +3,12 @@ import logging
 import requests
 from typing import Dict, Optional, Union
 import re
-import threading
 logger = logging.getLogger("RagaAICatalyst")
 
 
 class RagaAICatalyst:
     BASE_URL = None
     TIMEOUT = 10  # Default timeout in seconds
-    _instance = None
-    _lock = threading.Lock()
-
-    def __new__(cls, *args, **kwargs):
-        if not cls._instance:
-            with cls._lock:
-                if not cls._instance:
-                    cls._instance = super(RagaAICatalyst, cls).__new__(cls)
-                    cls._instance._initialized = False
-        return cls._instance
 
     def __init__(
         self,
@@ -44,18 +33,6 @@ class RagaAICatalyst:
         Returns:
             None
         """
-        if self._initialized:
-            return
-            
-        with self._lock:
-            if not self._initialized:
-                self.access_key = access_key
-                self.secret_key = secret_key
-                self.api_keys = api_keys or {}
-                self.base_url = base_url
-                if self.base_url:
-                    RagaAICatalyst.BASE_URL = self.base_url
-                self._initialized = True
 
         if not access_key or not secret_key:
             logger.error(

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/ragaai_catalyst/tracers/agentic_tracing/tracers/base.py

@@ -18,9 +18,13 @@ from ragaai_catalyst.tracers.agentic_tracing.data.data_structure import (
     Resources,
     Component,
 )
+from ragaai_catalyst.tracers.agentic_tracing.upload.upload_agentic_traces import UploadAgenticTraces
+from ragaai_catalyst.tracers.agentic_tracing.upload.upload_code import upload_code
+from ragaai_catalyst.tracers.agentic_tracing.upload.upload_trace_metric import upload_trace_metric
 from ragaai_catalyst.tracers.agentic_tracing.utils.file_name_tracker import TrackName
 from ragaai_catalyst.tracers.agentic_tracing.utils.zip_list_of_unique_files import zip_list_of_unique_files
 from ragaai_catalyst.tracers.agentic_tracing.utils.span_attributes import SpanAttributes
+from ragaai_catalyst.tracers.agentic_tracing.utils.create_dataset_schema import create_dataset_schema_with_trace
 from ragaai_catalyst.tracers.agentic_tracing.utils.system_monitor import SystemMonitor
 
 import logging
@@ -175,10 +179,7 @@ class BaseTracer:
         )
 
     def stop(self):
-        """Stop the trace and save to JSON file.
-        Trace upload will happen in a separate process and continue even if the main program exits.
-        """
-        from ..upload.trace_upload_manager import TraceUploadManager, TraceUploadTask
+        """Stop the trace and save to JSON file"""
         if hasattr(self, "trace"):
             self.trace.data[0]["end_time"] = datetime.now().astimezone().isoformat()
             self.trace.end_time = datetime.now().astimezone().isoformat()
@@ -262,25 +263,45 @@ class BaseTracer:
 
             logger.info(" Traces saved successfully.")
             logger.debug(f"Trace saved to {filepath}")
-            # Submit trace upload task to the manager
-            upload_task = TraceUploadTask(
-                json_file_path=str(filepath),
-                project_name=self.project_name,
-                project_id=self.project_id,
+            # Upload traces
+
+            json_file_path = str(filepath)
+            project_name = self.project_name
+            project_id = self.project_id
+            dataset_name = self.dataset_name
+            user_detail = self.user_details
+            base_url = RagaAICatalyst.BASE_URL
+
+            ## create dataset schema
+            response = create_dataset_schema_with_trace(
+                dataset_name=dataset_name, project_name=project_name
+            )
+
+            ##Upload trace metrics
+            response = upload_trace_metric(
+                json_file_path=json_file_path,
                 dataset_name=self.dataset_name,
-                user_detail=self.user_details,
-                base_url=RagaAICatalyst.BASE_URL,
+                project_name=self.project_name,
+            )
+
+            upload_traces = UploadAgenticTraces(
+                json_file_path=json_file_path,
+                project_name=project_name,
+                project_id=project_id,
+                dataset_name=dataset_name,
+                user_detail=user_detail,
+                base_url=base_url,
+            )
+            upload_traces.upload_agentic_traces()
+
+            # Upload Codehash
+            response = upload_code(
                 hash_id=hash_id,
                 zip_path=zip_path,
-                max_retries=2,  # Allow 2 retries
-                retry_delay=1.0  # 1 second between retries
+                project_name=project_name,
+                dataset_name=dataset_name,
             )
-            
-            # Get upload manager singleton and submit task
-            upload_manager = TraceUploadManager()
-            upload_manager.submit_upload(upload_task)
-            
-            logger.info(f"Trace upload task submitted and will continue in background")
+            print(response)
 
         # Cleanup
         self.components = []
@@ -878,6 +899,8 @@ class BaseTracer:
 
         return {"workflow": sorted_interactions}
 
+    # TODO: Add support for execute metrics. Maintain list of all metrics to be added for this span
+
     def execute_metrics(self,
                         name: str,
                         model: str,

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py

@@ -12,6 +12,7 @@ import contextvars
 import traceback
 import importlib
 import sys
+from litellm import model_cost
 import logging
 
 try:
@@ -47,9 +48,12 @@ class LLMTracerMixin:
         super().__init__(*args, **kwargs)
         self.file_tracker = TrackName()
         self.patches = []
-        # Get model costs from manager
-        from ..utils.cost_manager import cost_manager
-        self.cost_manager = cost_manager  # Store reference to cost manager
+        try:
+            self.model_costs = model_cost
+        except Exception as e:
+            self.model_costs = {
+                "default": {"input_cost_per_token": 0.0, "output_cost_per_token": 0.0}
+            }
         self.MAX_PARAMETERS_TO_DISPLAY = 10
         self.current_llm_call_name = contextvars.ContextVar(
             "llm_call_name", default=None
@@ -770,7 +774,7 @@ class LLMTracerMixin:
                     token_usage = extract_token_usage(result)
             else:
                 token_usage = extract_token_usage(result)
-            cost = calculate_llm_cost(token_usage, model_name)
+            cost = calculate_llm_cost(token_usage, model_name, self.model_costs, self.model_custom_cost)
             parameters = extract_parameters(kwargs)
             input_data = extract_input_data(args, kwargs, result)
 
@@ -879,7 +883,7 @@ class LLMTracerMixin:
                     token_usage = extract_token_usage(result)
             else:
                 token_usage = extract_token_usage(result)
-            cost = calculate_llm_cost(token_usage, model_name)
+            cost = calculate_llm_cost(token_usage, model_name, self.model_costs, self.model_custom_cost)
             parameters = extract_parameters(kwargs)
             input_data = extract_input_data(args, kwargs, result)
 

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py

@@ -2,7 +2,6 @@ import requests
 import json
 import os
 from datetime import datetime
-from urllib.parse import urlparse, urlunparse
 
 
 class UploadAgenticTraces:
@@ -21,71 +20,12 @@ class UploadAgenticTraces:
         self.base_url = base_url
         self.timeout = 30
 
-    @staticmethod
-    def _normalize_url_core(url):
-        """Normalize the core domain of a URL by removing common prefixes and handling ports.
-        
-        Args:
-            url (str): The URL to normalize
-            
-        Returns:
-            str: The normalized core domain
-        """
-        parsed = urlparse(url.rstrip('/'))
-        netloc = parsed.netloc.lower()
-        
-        # Split host and port
-        host = netloc.split(':')[0]
-        
-        # Remove common prefixes
-        if host.startswith('www.'):
-            host = host[4:]
-        
-        return host
-    
-    def _reconcile_urls(self, presigned_url, base_url):
-        """Reconcile two URLs by using the base URL's core if they differ.
-        
-        Args:
-            presigned_url (str): The presigned URL from the server
-            base_url (str): The base URL to compare against
-            
-        Returns:
-            str: The reconciled URL
-        """
-        # Get normalized core domains
-        presigned_core = self._normalize_url_core(presigned_url)
-        base_core = self._normalize_url_core(base_url)
-        
-        # If cores are same, return original presigned URL
-        if presigned_core == base_core:
-            return presigned_url
-            
-        # Parse URLs
-        parsed_base = urlparse(base_url.rstrip('/'))
-        parsed_presigned = urlparse(presigned_url)
-        
-        # Remove API version paths from base_url if present
-        base_path = parsed_base.path
-        for suffix in ['/api', '/v1']:
-            if base_path.endswith(suffix):
-                base_path = base_path[:-len(suffix)]
-        
-        # Construct new URL using components
-        return urlunparse((
-            parsed_base.scheme,
-            parsed_base.netloc,
-            parsed_presigned.path,  # Use presigned path
-            parsed_presigned.params,
-            parsed_presigned.query,
-            parsed_presigned.fragment
-        ))
-    
+
     def _get_presigned_url(self):
         payload = json.dumps({
-            "datasetName": self.dataset_name,
-            "numFiles": 1,
-        })
+                "datasetName": self.dataset_name,
+                "numFiles": 1,
+            })
         headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {os.getenv('RAGAAI_CATALYST_TOKEN')}",
@@ -93,16 +33,14 @@ class UploadAgenticTraces:
         }
 
         try:
-            response = requests.request(
-                "GET", 
-                f"{self.base_url}/v1/llm/presigned-url", 
-                headers=headers, 
-                data=payload,
-                timeout=self.timeout
-            )
+            response = requests.request("GET", 
+                                        f"{self.base_url}/v1/llm/presigned-url", 
+                                        headers=headers, 
+                                        data=payload,
+                                        timeout=self.timeout)
             if response.status_code == 200:
-                presigned_url = response.json()["data"]["presignedUrls"][0]
-                return self._reconcile_urls(presigned_url, self.base_url)
+                presignedUrls = response.json()["data"]["presignedUrls"][0]
+                return presignedUrls
         except requests.exceptions.RequestException as e:
             print(f"Error while getting presigned url: {e}")
             return None

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py

@@ -4,7 +4,6 @@ import json
 import os
 import logging
 from ragaai_catalyst.ragaai_catalyst import RagaAICatalyst
-from .upload_agentic_traces import UploadAgenticTraces
 logger = logging.getLogger(__name__)
 
 def upload_code(hash_id, zip_path, project_name, dataset_name):
@@ -62,8 +61,7 @@ def _fetch_presigned_url(project_name, dataset_name):
                                     timeout=99999)
 
         if response.status_code == 200:
-            presigned_url = response.json()["data"]["presignedUrls"][0]
-            return UploadAgenticTraces._reconcile_urls(presigned_url, RagaAICatalyst.BASE_URL)
+            return response.json()["data"]["presignedUrls"][0]
         else:
             raise Exception(f"Failed to fetch code hashes: {response.json()['message']}")
     except requests.exceptions.RequestException as e:

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/ragaai_catalyst/tracers/agentic_tracing/utils/create_dataset_schema.py

@@ -6,7 +6,6 @@ from ragaai_catalyst.tracers.agentic_tracing.tracers.base import RagaAICatalyst
 
 def create_dataset_schema_with_trace(project_name, dataset_name):
     def make_request():
-        import pdb; pdb.set_trace()
         headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {os.getenv('RAGAAI_CATALYST_TOKEN')}",

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/ragaai_catalyst/tracers/agentic_tracing/utils/llm_utils.py

@@ -4,6 +4,7 @@ from .trace_utils import (
     convert_usage_to_dict,
 )
 from importlib import resources
+from litellm import model_cost
 import json
 import os
 import asyncio
@@ -304,8 +305,11 @@ def extract_input_data(args, kwargs, result):
     }
 
 
-def calculate_llm_cost(token_usage, model_name, model_costs=None, model_custom_cost=None):
+def calculate_llm_cost(token_usage, model_name, model_costs, model_custom_cost=None):
     """Calculate cost based on token usage and model"""
+    if model_custom_cost is None:
+        model_custom_cost = {}
+    model_costs.update(model_custom_cost)
     if not isinstance(token_usage, dict):
         token_usage = {
             "prompt_tokens": 0,
@@ -313,17 +317,20 @@ def calculate_llm_cost(token_usage, model_name, model_costs=None, model_custom_c
             "total_tokens": token_usage if isinstance(token_usage, (int, float)) else 0
         }
     
-    # Get model costs from manager
-    from .cost_manager import cost_manager
-    model_cost = cost_manager.get_cost(model_name)
-    if not model_cost:
+    # Get model costs, defaulting to default costs if unknown
+    model_cost = model_cost = model_costs.get(model_name, {
+        "input_cost_per_token": 0.0,   
+        "output_cost_per_token": 0.0   
+    })
+    if model_cost['input_cost_per_token'] == 0.0 and model_cost['output_cost_per_token'] == 0.0:
         provide_name = model_name.split('-')[0]
         if provide_name == 'azure':
             model_name = os.path.join('azure', '-'.join(model_name.split('-')[1:]))
-            model_cost = {
+
+            model_cost = model_costs.get(model_name, {
                 "input_cost_per_token": 0.0,   
                 "output_cost_per_token": 0.0   
-            }
+            })
 
     input_cost = (token_usage.get("prompt_tokens", 0)) * model_cost.get("input_cost_per_token", 0.0)
     output_cost = (token_usage.get("completion_tokens", 0)) * model_cost.get("output_cost_per_token", 0.0)
@@ -549,9 +556,8 @@ def extract_llm_data(args, kwargs, result):
 
     token_usage = extract_token_usage(result)
 
-    # Get model costs from manager
-    from .cost_manager import cost_manager
-    model_costs = cost_manager.costs
+    # Load model costs
+    model_costs = model_cost
 
     # Calculate cost
     cost = calculate_llm_cost(token_usage, model_name, model_costs)

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/ragaai_catalyst/tracers/tracer.py

@@ -6,6 +6,7 @@ import logging
 import asyncio
 import aiohttp
 import requests
+from litellm import model_cost
 
 from contextlib import contextmanager
 from concurrent.futures import ThreadPoolExecutor
@@ -128,6 +129,7 @@ class Tracer(AgenticTracing):
         self.timeout = 30
         self.num_projects = 100
         self.start_time = datetime.datetime.now().astimezone().isoformat()
+        self.model_cost_dict = model_cost
         self.user_context = ""  # Initialize user_context to store context from add_context
         
         try:
@@ -181,8 +183,8 @@ class Tracer(AgenticTracing):
         Args:
             cost_config (dict): Dictionary containing model cost configuration with keys:
                 - model_name (str): Name of the model
-                - input_cost_per_million_token (float): Cost per million input tokens
-                - output_cost_per_million_token (float): Cost per million output tokens
+                - input_cost_per_token (float): Cost per input token
+                - output_cost_per_token (float): Cost per output token
 
         Example:
             tracer.set_model_cost({
@@ -191,14 +193,17 @@ class Tracer(AgenticTracing):
                 "output_cost_per_million_token": 2.40
             })
         """
-        from .agentic_tracing.utils.cost_manager import cost_manager
-        cost_manager.set_model_cost(cost_config)
-        
-        # Also update local model_custom_cost for backward compatibility
+        if not isinstance(cost_config, dict):
+            raise TypeError("cost_config must be a dictionary")
+
+        required_keys = {"model_name", "input_cost_per_million_token", "output_cost_per_million_token"}
+        if not all(key in cost_config for key in required_keys):
+            raise ValueError(f"cost_config must contain all required keys: {required_keys}")
+
         model_name = cost_config["model_name"]
         self.model_custom_cost[model_name] = {
-            "input_cost_per_token": float(cost_config["input_cost_per_million_token"]) / 1000000,
-            "output_cost_per_token": float(cost_config["output_cost_per_million_token"]) / 1000000
+            "input_cost_per_token": float(cost_config["input_cost_per_million_token"])/ 1000000,
+            "output_cost_per_token": float(cost_config["output_cost_per_million_token"]) /1000000
         }
 
 
@@ -307,8 +312,7 @@ class Tracer(AgenticTracing):
             # Add cost if possible
             if additional_metadata.get('model_name'):
                 try:
-                    from litellm import model_cost
-                    model_cost_data = model_cost[additional_metadata['model_name']]
+                    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"]

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32/ragaai_catalyst.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.5b31
+Version: 2.1.5b32
 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.9

{ragaai_catalyst-2.1.5b31 → ragaai_catalyst-2.1.5b32}/test/test_catalyst/upload_trace_zip_automation.py

@@ -350,8 +350,7 @@ def _fetch_presigned_url(project_name, dataset_name):
                                     timeout=300)
 
         if response.status_code == 200:
-            presigned_url = response.json()["data"]["presignedUrls"][0]
-            return UploadAgenticTraces._reconcile_urls(presigned_url, RagaAICatalyst.BASE_URL)
+            return response.json()["data"]["presignedUrls"][0]
         else:
             raise Exception(f"Failed to fetch code hashes: {response.json()['message']}")
     except requests.exceptions.RequestException as e:
@@ -531,44 +530,53 @@ def get_user_trace_metrics(project_name, dataset_name):
         print(f"Error fetching traces metrics: {e}")
         return None
 
-# # Main execution
-# if __name__ == "__main__":
-#     access_key = os.getenv('RAGAAI_ACCESS_KEY')
-#     secret_key = os.getenv('RAGAAI_SECRET_KEY')
-#     base_url = os.getenv('RAGAAI_BASE_URL')
-#     json_file_path = os.getenv('RAGAAI_JSON_FILE_PATH')
+# Main execution
+if __name__ == "__main__":
+    access_key = os.getenv('RAGAAI_ACCESS_KEY')
+    secret_key = os.getenv('RAGAAI_SECRET_KEY')
+    base_url = os.getenv('RAGAAI_BASE_URL')
+    json_file_path = os.getenv('RAGAAI_JSON_FILE_PATH')
+
+    project_name = 'project_name'
+    usecase = "Agentic Application"
+    dataset_name = "dataset_name"
+    zip_path = "zip_path"
+
+    auth = RagaAICatalyst(access_key=access_key, secret_key=secret_key, base_url=base_url, api_keys=None)
+    #if want to create project
+    # auth.create_project(
+    #     project_name=project_name,
+    #     usecase=usecase,
+    #     type="llm",
+    # )
+    
+    project_list, project_id = auth.list_projects()
+
+
+    response = create_dataset_schema_with_trace(project_name=project_name, dataset_name=dataset_name)
+
+    response = upload_trace_metric(
+        json_file_path=json_file_path,
+        dataset_name=dataset_name,
+        project_name=project_name,
+    )
+
+    upload_traces = UploadAgenticTraces(
+        json_file_path=json_file_path,
+        project_name=project_name,
+        project_id=project_id,
+        dataset_name=dataset_name,
+        user_detail=None,
+        base_url=base_url,
+    ).upload_agentic_traces()
+
+    response = upload_code(
+        hash_id=os.path.basename(zip_path).split('.')[0],
+        zip_path=zip_path,
+        project_name=project_name,
+        dataset_name=dataset_name,
+    )
+    print(response)
+
 
-#     project_name = 'project_name'
-#     usecase = "Agentic Application"
-#     dataset_name = "dataset_name"
-#     zip_path = "zip_path"
 
-#     auth = RagaAICatalyst(access_key=access_key, secret_key=secret_key, base_url=base_url, api_keys=None)
-    
-#     project_list, project_id = auth.list_projects()
-
-
-#     response = create_dataset_schema_with_trace(project_name=project_name, dataset_name=dataset_name)
-
-#     response = upload_trace_metric(
-#         json_file_path=json_file_path,
-#         dataset_name=dataset_name,
-#         project_name=project_name,
-#     )
-
-#     upload_traces = UploadAgenticTraces(
-#         json_file_path=json_file_path,
-#         project_name=project_name,
-#         project_id=project_id,
-#         dataset_name=dataset_name,
-#         user_detail=None,
-#         base_url=base_url,
-#     ).upload_agentic_traces()
-
-#     response = upload_code(
-#         hash_id=os.path.basename(zip_path).split('.')[0],
-#         zip_path=zip_path,
-#         project_name=project_name,
-#         dataset_name=dataset_name,
-#     )
-#     print(response)