ragaai-catalyst 2.2.5b4__py3-none-any.whl → 2.2.5b6__py3-none-any.whl

ragaai_catalyst/tracers/agentic_tracing/upload/trace_uploader.py

@@ -240,12 +240,15 @@ def process_upload(task_id: str, filepath: str, hash_id: str, zip_path: str,
                     user_details=user_details,
                     timeout=timeout
                 )
-                logger.info(f"Dataset schema created: {response}")
 
-                # Cache the response only if status code is 200
-                if response and hasattr(response, 'status_code') and response.status_code in [200, 201]:
+                if response is None:
+                    logger.error(f"Dataset schema creation failed for {dataset_name} - received None response")
+                elif hasattr(response, 'status_code') and response.status_code in [200, 201]:
+                    logger.info(f"Dataset schema created successfully: {response.status_code}")
                     _cache_dataset_creation(cache_key, response)
                     logger.info(f"Response cached successfully for dataset: {dataset_name} and key: {cache_key}")
+                else:
+                    logger.warning(f"Dataset schema creation returned unexpected response: {response}")
 
             except Exception as e:
                 logger.error(f"Error creating dataset schema: {e}")
@@ -478,7 +481,8 @@ def submit_upload_task(filepath, hash_id, zip_path, project_name, project_id, da
         
         return task_id
     except RuntimeError as e:
-        if "cannot schedule new futures after shutdown" in str(e):
+        if any(msg in str(e) for msg in
+               ("cannot schedule new futures after shutdown", "cannot schedule new futures after interpreter shutdown")):
             logger.warning(f"Executor already shut down, falling back to synchronous processing: {e}")
             return do_sync_processing()
         else:

ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py

@@ -9,8 +9,6 @@ from requests.exceptions import ConnectionError, Timeout, RequestException
 from http.client import RemoteDisconnected
 from .session_manager import session_manager
 
-import requests
-
 logger = logging.getLogger(__name__)
 
 from ragaai_catalyst.ragaai_catalyst import RagaAICatalyst
@@ -64,8 +62,34 @@ class UploadAgenticTraces:
                 presignedURLs = response.json()["data"]["presignedUrls"][0]
                 presignedurl = self.update_presigned_url(presignedURLs, self.base_url)
                 return presignedurl
+            elif response.status_code == 401:
+                logger.warning("Received 401 error while getting presign url. Attempting to refresh token.")
+                token = RagaAICatalyst.get_token(force_refresh=True)
+                headers = {
+                    "Content-Type": "application/json",
+                    "Authorization": f"Bearer {token}",
+                    "X-Project-Name": self.project_name,
+                }
+                response = session_manager.make_request_with_retry(
+                    "POST", endpoint, headers=headers, data=payload, timeout=self.timeout
+                )
+                elapsed_ms = (time.time() - start_time) * 1000
+                logger.debug(
+                    f"API Call: [POST] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms"
+                )
+                if response.status_code == 200:
+                    presignedURLs = response.json()["data"]["presignedUrls"][0]
+                    presignedurl = self.update_presigned_url(presignedURLs, self.base_url)
+                    return presignedurl
+                else:
+                    logger.error(
+                        f"Error while getting presigned url after token refresh: {response.json()['message']}"
+                    )
+                    return None
             else:
                 # If POST fails, try GET
+                logger.warning(
+                    f"POST request failed for getting presign url with status{response.status_code}.Falling back to GET request.")
                 response = session_manager.make_request_with_retry(
                     "GET", endpoint, headers=headers, data=payload, timeout=self.timeout
                 )
@@ -80,7 +104,7 @@ class UploadAgenticTraces:
                     )
                     return presignedurl
                 elif response.status_code == 401:
-                    logger.warning("Received 401 error. Attempting to refresh token.")
+                    logger.warning("Received 401 error while getting presign url. Attempting to refresh token.")
                     token = RagaAICatalyst.get_token(force_refresh=True)
                     headers = {
                         "Content-Type": "application/json",
@@ -106,7 +130,7 @@ class UploadAgenticTraces:
                         return presignedurl
                     else:
                         logger.error(
-                            f"Error while getting presigned url: {response.json()['message']}"
+                            f"Error while getting presigned url after token refresh: {response.json()['message']}"
                         )
                         return None
                 else:

ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py

@@ -8,8 +8,6 @@ from urllib3.exceptions import PoolError, MaxRetryError, NewConnectionError
 from requests.exceptions import ConnectionError, Timeout, RequestException
 from http.client import RemoteDisconnected
 
-import requests
-
 from ragaai_catalyst.ragaai_catalyst import RagaAICatalyst
 from .session_manager import session_manager
 
@@ -106,7 +104,7 @@ def _fetch_dataset_code_hashes(project_name, dataset_name, base_url=None, timeou
         session_manager.handle_request_exceptions(e, "fetching dataset code hashes")
         return None
     except RequestException as e:
-        logger.error(f"Failed to list datasets: {e}")
+        logger.error(f"Failed to fetch dataset code hashes: {e}")
         return None
 
 
@@ -142,7 +140,7 @@ def _fetch_presigned_url(project_name, dataset_name, base_url=None, timeout=120)
         start_time = time.time()
         # Changed to POST from GET
         endpoint = f"{url_base}/v1/llm/presigned-url"
-        response = requests.request(
+        response = session_manager.make_request_with_retry(
             "POST", endpoint, headers=headers, data=payload, timeout=timeout
         )
         elapsed_ms = (time.time() - start_time) * 1000
@@ -150,20 +148,20 @@ def _fetch_presigned_url(project_name, dataset_name, base_url=None, timeout=120)
             f"API Call: [POST] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms"
         )
 
-        if response.status_code == 200:
+        if response.status_code in [200, 201]:
             presigned_url = response.json()["data"]["presignedUrls"][0]
             presigned_url = update_presigned_url(presigned_url, url_base)
             return presigned_url
         else:
             # If POST fails, try GET
-            response = requests.request(
+            response = session_manager.make_request_with_retry(
                 "POST", endpoint, headers=headers, data=payload, timeout=timeout
             )
             elapsed_ms = (time.time() - start_time) * 1000
             logger.debug(
                 f"API Call: [POST] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms"
             )
-            if response.status_code == 200:
+            if response.status_code in [200, 201]:
                 presigned_url = response.json()["data"]["presignedUrls"][0]
                 presigned_url = update_presigned_url(presigned_url, url_base)
                 return presigned_url
@@ -175,7 +173,7 @@ def _fetch_presigned_url(project_name, dataset_name, base_url=None, timeout=120)
                     "Content-Type": "application/json",
                     "X-Project-Name": project_name,
                 }
-                response = requests.request(
+                response = session_manager.make_request_with_retry(
                     "POST", endpoint, headers=headers, data=payload, timeout=timeout
                 )
                 elapsed_ms = (time.time() - start_time) * 1000
@@ -188,15 +186,18 @@ def _fetch_presigned_url(project_name, dataset_name, base_url=None, timeout=120)
                     return presigned_url
                 else:
                     logger.error(
-                        f"Failed to fetch code hashes: {response.json()['message']}"
+                        f"Failed to fetch presigned URL for code upload after 401: {response.json()['message']}"
                     )
             else:
                 logger.error(
-                    f"Failed to fetch code hashes: {response.json()['message']}"
+                    f"Failed to fetch presigned URL for code upload: {response.json()['message']}"
                 )
                 return None
-    except requests.exceptions.RequestException as e:
-        logger.error(f"Failed to list datasets: {e}")
+    except (PoolError, MaxRetryError, NewConnectionError, ConnectionError, Timeout, RemoteDisconnected) as e:
+        session_manager.handle_request_exceptions(e, "fetching presigned URL for code upload")
+        return None
+    except RequestException as e:
+        logger.error(f"Failed to fetch presigned URL for code upload: {e}")
         return None
 
 

ragaai_catalyst/tracers/agentic_tracing/utils/create_dataset_schema.py

@@ -1,43 +1,100 @@
 import os
 import json
-import re
 import requests
+import logging
+import time
+from typing import Optional
+from urllib3.exceptions import PoolError, MaxRetryError, NewConnectionError
+from requests.exceptions import ConnectionError, Timeout, RequestException
+from http.client import RemoteDisconnected
+
 from ragaai_catalyst import RagaAICatalyst
+from ragaai_catalyst.tracers.agentic_tracing.upload.session_manager import session_manager
+
+IGNORED_KEYS = {"log_source", "recorded_on"}
+logger = logging.getLogger(__name__)
+
+def create_dataset_schema_with_trace(
+        project_name: str,
+        dataset_name: str,
+        base_url: Optional[str] = None,
+        user_details: Optional[dict] = None,
+        timeout: int = 120) -> requests.Response:
+    schema_mapping = {}
 
-def create_dataset_schema_with_trace(project_name, dataset_name, base_url=None, user_details=None, timeout=120):
-    SCHEMA_MAPPING = {}
-    metadata = user_details.get("trace_user_detail").get("metadata")
-    if metadata and isinstance(metadata, dict):
+    metadata = (
+        user_details.get("trace_user_detail", {}).get("metadata", {})
+        if user_details else {}
+    )
+    if isinstance(metadata, dict):
         for key, value in metadata.items():
-            if key in ["log_source", "recorded_on"]:
+            if key in IGNORED_KEYS:
                 continue
-            SCHEMA_MAPPING[key] = {"columnType": "metadata"}
-
-    def make_request():
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {os.getenv('RAGAAI_CATALYST_TOKEN')}",
-            "X-Project-Name": project_name,
-        }
-        if SCHEMA_MAPPING:
-            payload = json.dumps({
-                "datasetName": dataset_name,
-                "traceFolderUrl": None,
-                "schemaMapping": SCHEMA_MAPPING
-            })
-        else:
-            payload = json.dumps({
-                "datasetName": dataset_name,
-                "traceFolderUrl": None,
-            })
+            schema_mapping[key] = {"columnType": "metadata"}
+
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {os.getenv('RAGAAI_CATALYST_TOKEN')}",
+        "X-Project-Name": project_name,
+    }
+
+    if schema_mapping:
+        payload = json.dumps({
+            "datasetName": dataset_name,
+            "traceFolderUrl": None,
+            "schemaMapping": schema_mapping
+        })
+    else:
+        payload = json.dumps({
+            "datasetName": dataset_name,
+            "traceFolderUrl": None,
+        })
+
+    try:
         # Use provided base_url or fall back to default
         url_base = base_url if base_url is not None else RagaAICatalyst.BASE_URL
-        response = requests.request("POST",
-            f"{url_base}/v1/llm/dataset/logs",
-            headers=headers,
-            data=payload,
-            timeout=timeout
+        start_time = time.time()
+        endpoint = f"{url_base}/v1/llm/dataset/logs"
+
+        response = session_manager.make_request_with_retry(
+            "POST", endpoint, headers=headers, data=payload, timeout=timeout
+        )
+
+        elapsed_ms = (time.time() - start_time) * 1000
+        logger.debug(
+            f"API Call: [POST] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms"
         )
-        return response
-    response = make_request()
-    return response
+
+        if response.status_code in [200, 201]:
+            logger.info(f"Dataset schema created successfully: {response.status_code}")
+            return response
+        elif response.status_code == 401:
+            logger.warning("Received 401 error during dataset schema creation. Attempting to refresh token.")
+            RagaAICatalyst.get_token(force_refresh=True)
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {os.getenv('RAGAAI_CATALYST_TOKEN')}",
+                "X-Project-Name": project_name,
+            }
+            response = session_manager.make_request_with_retry(
+                "POST", endpoint, headers=headers, data=payload, timeout=timeout
+            )
+            elapsed_ms = (time.time() - start_time) * 1000
+            logger.debug(
+                f"API Call: [POST] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms"
+            )
+            if response.status_code in [200, 201]:
+                logger.info(f"Dataset schema created successfully after 401: {response.status_code}")
+                return response
+            else:
+                logger.error(f"Failed to create dataset schema after 401: {response.status_code}")
+                return None
+        else:
+            logger.error(f"Failed to create dataset schema: {response.status_code}")
+            return None
+    except (PoolError, MaxRetryError, NewConnectionError, ConnectionError, Timeout, RemoteDisconnected) as e:
+        session_manager.handle_request_exceptions(e, "creating dataset schema")
+        return None
+    except RequestException as e:
+        logger.error(f"Failed to create dataset schema: {e}")
+        return None

ragaai_catalyst/tracers/agentic_tracing/utils/zip_list_of_unique_files.py

@@ -7,6 +7,8 @@ import re
 import ast
 import importlib.util
 import json
+from typing import List, Optional, Tuple
+
 import ipynbname
 from copy import deepcopy
 
@@ -460,8 +462,14 @@ class TraceDependencyTracker:
         logger.debug(f"Zip file created successfully at: {zip_filename}")
         return hash_id, zip_filename
 
-def zip_list_of_unique_files(filepaths, output_dir=None):
+def zip_list_of_unique_files(
+        filepaths: List[str],
+        output_dir: Optional[str] = None
+) -> Tuple[str, str]:
     """Create a zip file containing all unique files and their dependencies."""
+    if not filepaths:
+        logger.warning("The filepaths list is empty. Proceeding with an empty ZIP archive.")
+        filepaths = []
     if output_dir is None:
         # Set default output directory based on environment
         if JupyterNotebookHandler.is_running_in_colab():

ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py

@@ -4,17 +4,34 @@ Dynamic Trace Exporter - A wrapper for RAGATraceExporter that allows dynamic upd
 import logging
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 from ragaai_catalyst.tracers.exporters.ragaai_trace_exporter import RAGATraceExporter
+from typing import Optional, List, Dict, Callable
 
 logger = logging.getLogger("RagaAICatalyst")
 
+
 class DynamicTraceExporter(SpanExporter):
     """
     A wrapper around RAGATraceExporter that allows dynamic updates to properties.
     This exporter forwards all calls to the underlying RAGATraceExporter but allows
     certain properties to be updated dynamically during execution.
     """
-    
-    def __init__(self, tracer_type, files_to_zip, project_name, project_id, dataset_name, user_details, base_url, custom_model_cost, timeout=120, post_processor = None, max_upload_workers = 30,user_context = None, user_gt = None, external_id=None):
+    def __init__(
+            self,
+            project_name: str,
+            dataset_name: str,
+            base_url: str,
+            tracer_type: str,
+            files_to_zip: Optional[List[str]] = None,
+            project_id: Optional[str] = None,
+            user_details: Optional[Dict] = None,
+            custom_model_cost: Optional[dict] = None,
+            timeout: int = 120,
+            post_processor: Optional[Callable] = None,
+            max_upload_workers: int = 30,
+            user_context: Optional[str] = None,
+            user_gt: Optional[str] = None,
+            external_id: Optional[str] = None
+    ):
         """
         Initialize the DynamicTraceExporter.
         
@@ -30,22 +47,22 @@ class DynamicTraceExporter(SpanExporter):
             max_upload_workers: Maximum number of upload workers
         """
         self._exporter = RAGATraceExporter(
+            project_name=project_name,
+            dataset_name=dataset_name,
+            base_url=base_url,
             tracer_type=tracer_type,
             files_to_zip=files_to_zip,
-            project_name=project_name,
             project_id=project_id,
-            dataset_name=dataset_name,
             user_details=user_details,
-            base_url=base_url,
             custom_model_cost=custom_model_cost,
             timeout=timeout,
-            post_processor= post_processor,
-            max_upload_workers = max_upload_workers,
-            user_context = user_context,
-            user_gt = user_gt,
+            post_processor=post_processor,
+            max_upload_workers=max_upload_workers,
+            user_context=user_context,
+            user_gt=user_gt,
             external_id=external_id
         )
-        
+
         # Store the initial values
         self._files_to_zip = files_to_zip
         self._project_name = project_name
@@ -60,7 +77,6 @@ class DynamicTraceExporter(SpanExporter):
         self._user_gt = user_gt
         self._external_id = external_id
 
-    
     def export(self, spans):
         """
         Export spans by forwarding to the underlying exporter.
@@ -84,8 +100,6 @@ class DynamicTraceExporter(SpanExporter):
             return result
         except Exception as e:
             logger.error(f"Error exporting trace: {e}")
-            
-
 
     def shutdown(self):
         """
@@ -103,7 +117,7 @@ class DynamicTraceExporter(SpanExporter):
             return self._exporter.shutdown()
         except Exception as e:
             logger.error(f"Error shutting down exporter: {e}")
-    
+
     def _update_exporter_properties(self):
         """
         Update the underlying exporter's properties with the current values.
@@ -118,55 +132,55 @@ class DynamicTraceExporter(SpanExporter):
         self._exporter.post_processor = self._post_processor
         self._exporter.max_upload_workers = self._max_upload_workers
         self._exporter.user_context = self._user_context
-        self._exporter.user_gt = self._user_gt    
+        self._exporter.user_gt = self._user_gt
         self._exporter.external_id = self._external_id
-    
+
     # Getter and setter methods for dynamic properties
-    
+
     @property
     def files_to_zip(self):
         return self._files_to_zip
-    
+
     @files_to_zip.setter
     def files_to_zip(self, value):
         self._files_to_zip = value
-    
+
     @property
     def project_name(self):
         return self._project_name
-    
+
     @project_name.setter
     def project_name(self, value):
         self._project_name = value
-    
+
     @property
     def project_id(self):
         return self._project_id
-    
+
     @project_id.setter
     def project_id(self, value):
         self._project_id = value
-    
+
     @property
     def dataset_name(self):
         return self._dataset_name
-    
+
     @dataset_name.setter
     def dataset_name(self, value):
         self._dataset_name = value
-    
+
     @property
     def user_details(self):
         return self._user_details
-    
+
     @user_details.setter
     def user_details(self, value):
         self._user_details = value
-    
+
     @property
     def base_url(self):
         return self._base_url
-    
+
     @base_url.setter
     def base_url(self, value):
         self._base_url = value
@@ -174,15 +188,15 @@ class DynamicTraceExporter(SpanExporter):
     @property
     def custom_model_cost(self):
         return self._custom_model_cost
-    
+
     @custom_model_cost.setter
     def custom_model_cost(self, value):
         self._custom_model_cost = value
-    
+
     @property
     def max_upload_workers(self):
         return self._max_upload_workers
-    
+
     @max_upload_workers.setter
     def max_upload_workers(self, value):
         self._max_upload_workers = value
@@ -190,7 +204,7 @@ class DynamicTraceExporter(SpanExporter):
     @property
     def user_context(self):
         return self._user_context
-    
+
     @user_context.setter
     def user_context(self, value):
         self._user_context = value
@@ -198,7 +212,7 @@ class DynamicTraceExporter(SpanExporter):
     @property
     def user_gt(self):
         return self._user_gt
-    
+
     @user_gt.setter
     def user_gt(self, value):
         self._user_gt = value
@@ -206,8 +220,7 @@ class DynamicTraceExporter(SpanExporter):
     @property
     def external_id(self):
         return self._external_id
-    
+
     @external_id.setter
     def external_id(self, value):
         self._external_id = value
-    

ragaai_catalyst/tracers/exporters/ragaai_trace_exporter.py

@@ -3,6 +3,7 @@ import logging
 import os
 import tempfile
 from dataclasses import asdict
+from typing import Optional, Callable, Dict, List
 
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 
@@ -23,6 +24,7 @@ logging_level = (
     logger.setLevel(logging.DEBUG) if os.getenv("DEBUG") == "1" else logging.INFO
 )
 
+
 class TracerJSONEncoder(json.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, datetime):
@@ -47,8 +49,25 @@ class TracerJSONEncoder(json.JSONEncoder):
         except:
             return None  # Last resort: return None instead of failing
 
+
 class RAGATraceExporter(SpanExporter):
-    def __init__(self, tracer_type, files_to_zip, project_name, project_id, dataset_name, user_details, base_url, custom_model_cost, timeout=120, post_processor = None, max_upload_workers = 30,user_context = None, user_gt = None, external_id=None):
+    def __init__(
+            self,
+            project_name: str,
+            dataset_name: str,
+            base_url: str,
+            tracer_type: str,
+            files_to_zip: Optional[List[str]] = None,
+            project_id: Optional[str] = None,
+            user_details: Optional[Dict] = None,
+            custom_model_cost: Optional[dict] = None,
+            timeout: int = 120,
+            post_processor: Optional[Callable] = None,
+            max_upload_workers: int = 30,
+            user_context: Optional[str] = None,
+            user_gt: Optional[str] = None,
+            external_id: Optional[str] = None
+    ):
         self.trace_spans = dict()
         self.tmp_dir = tempfile.gettempdir()
         self.tracer_type = tracer_type
@@ -77,7 +96,7 @@ class RAGATraceExporter(SpanExporter):
 
                 if trace_id not in self.trace_spans:
                     self.trace_spans[trace_id] = list()
-                
+
                 if span_json.get("attributes").get("openinference.span.kind", None) is None:
                     span_json["attributes"]["openinference.span.kind"] = "UNKNOWN"
 
@@ -118,10 +137,10 @@ class RAGATraceExporter(SpanExporter):
         if ragaai_trace_details is None:
             logger.error(f"Cannot upload trace {trace_id}: conversion failed and returned None")
             return  # Exit early if conversion failed
-            
+
         # Upload the trace if upload_trace function is provided
         try:
-            if self.post_processor!=None:
+            if self.post_processor != None:
                 ragaai_trace_details['trace_file_path'] = self.post_processor(ragaai_trace_details['trace_file_path'])
             self.upload_trace(ragaai_trace_details, trace_id)
         except Exception as e:
@@ -130,13 +149,14 @@ class RAGATraceExporter(SpanExporter):
     def prepare_trace(self, spans, trace_id):
         try:
             try:
-                ragaai_trace = convert_json_format(spans, self.custom_model_cost, self.user_context, self.user_gt,self.external_id)   
+                ragaai_trace = convert_json_format(spans, self.custom_model_cost, self.user_context, self.user_gt,
+                                                   self.external_id)
             except Exception as e:
                 print(f"Error in convert_json_format function: {trace_id}: {e}")
                 return None
-            
+
             try:
-                interactions = format_interactions(ragaai_trace)         
+                interactions = format_interactions(ragaai_trace)
                 ragaai_trace["workflow"] = interactions['workflow']
             except Exception as e:
                 print(f"Error in format_interactions function: {trace_id}: {e}")
@@ -183,18 +203,26 @@ class RAGATraceExporter(SpanExporter):
             except Exception as e:
                 print(f"Error in adding tracer type: {trace_id}: {e}")
                 return None
-            
-            #Add user passed metadata to the trace
+
+            # Add user passed metadata to the trace
             try:
-                if self.user_details.get("trace_user_detail").get("metadata") and isinstance(self.user_details.get("trace_user_detail").get("metadata"), dict):
-                    for key, value in self.user_details.get("trace_user_detail").get("metadata").items():
-                        if key in ["log_source", "recorded_on"]:
-                            continue
-                        ragaai_trace["metadata"][key] = value
+                logger.debug("Started adding user passed metadata")
+
+                metadata = (
+                    self.user_details.get("trace_user_detail", {}).get("metadata", {})
+                    if self.user_details else {}
+                )
+
+                if isinstance(metadata, dict):
+                    for key, value in metadata.items():
+                        if key not in {"log_source", "recorded_on"}:
+                            ragaai_trace.setdefault("metadata", {})[key] = value
+
+                logger.debug("Completed adding user passed metadata")
             except Exception as e:
                 print(f"Error in adding metadata: {trace_id}: {e}")
                 return None
-            
+
             try:
                 # Save the trace_json 
                 trace_file_path = os.path.join(self.tmp_dir, f"{trace_id}.json")
@@ -220,16 +248,16 @@ class RAGATraceExporter(SpanExporter):
         hash_id = ragaai_trace_details['hash_id']
         zip_path = ragaai_trace_details['code_zip_path']
         self.upload_task_id = submit_upload_task(
-                filepath=filepath,
-                hash_id=hash_id,
-                zip_path=zip_path,
-                project_name=self.project_name,
-                project_id=self.project_id,
-                dataset_name=self.dataset_name,
-                user_details=self.user_details,
-                base_url=self.base_url,
-                tracer_type=self.tracer_type,
-                timeout=self.timeout
-            )
-
-        logger.info(f"Submitted upload task with ID: {self.upload_task_id}")
+            filepath=filepath,
+            hash_id=hash_id,
+            zip_path=zip_path,
+            project_name=self.project_name,
+            project_id=self.project_id,
+            dataset_name=self.dataset_name,
+            user_details=self.user_details,
+            base_url=self.base_url,
+            tracer_type=self.tracer_type,
+            timeout=self.timeout
+        )
+
+        logger.info(f"Submitted upload task with ID: {self.upload_task_id}")

ragaai_catalyst/tracers/tracer.py

@@ -170,7 +170,7 @@ class Tracer(AgenticTracing):
             logger.error(f"Failed to retrieve projects list: {e}")
 
         # Handle agentic tracers
-        if tracer_type == "agentic" or tracer_type.startswith("agentic/") or tracer_type == "langchain" or tracer_type == "google-adk":
+        if tracer_type == "agentic" or tracer_type.startswith("agentic/") or tracer_type == "langchain" or tracer_type == "llamaindex" or tracer_type == "google-adk":
             # Setup instrumentors based on tracer type
             instrumentors = []
 
@@ -600,13 +600,13 @@ class Tracer(AgenticTracing):
 
         # Create a dynamic exporter that allows property updates
         self.dynamic_exporter = DynamicTraceExporter(
+            project_name=self.project_name,
+            dataset_name=self.dataset_name,
+            base_url=self.base_url,
             tracer_type=self.tracer_type,
             files_to_zip=list_of_unique_files,
-            project_name=self.project_name,
             project_id=self.project_id,
-            dataset_name=self.dataset_name,
             user_details=self.user_details,
-            base_url=self.base_url,
             custom_model_cost=self.model_custom_cost,
             timeout = self.timeout,
             post_processor= self.post_processor,

ragaai_catalyst/tracers/utils/trace_json_converter.py

@@ -188,7 +188,13 @@ def convert_json_format(
                 ]
                 model_name = next((name for name in reversed(model_names) if name), "")
                 if not model_name and span["attributes"].get("openinference.span.kind")=="LLM":
-                    model_name = json.loads(span["attributes"].get("metadata", "")).get("ls_model_name", "")
+                    try:
+                        metadata = span["attributes"].get("metadata") or span["attributes"].get("aiq.metadata")
+                        metadata = json.loads(metadata)
+                        model_name = metadata.get("ls_model_name", "")
+                    except Exception as e:
+                        model_name = ""
+                        logger.error(f"Failed to parse metadata: {e}", exc_info=True)
                 if model_name and span["attributes"].get("openinference.span.kind") == "LLM":
                     try:
                         model_costs = get_model_cost()

{ragaai_catalyst-2.2.5b4.dist-info → ragaai_catalyst-2.2.5b6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragaai_catalyst
-Version: 2.2.5b4
+Version: 2.2.5b6
 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>, Rishabh Pandey <rishabh.pandey@raga.ai>, Jyotsana C G <jyotsana@raga.ai>
 Requires-Python: <=3.13.2,>=3.10

{ragaai_catalyst-2.2.5b4.dist-info → ragaai_catalyst-2.2.5b6.dist-info}/RECORD

@@ -27,7 +27,7 @@ ragaai_catalyst/redteaming/utils/issue_description.py,sha256=iB0XbeOjdqHTPrikCKS
 ragaai_catalyst/redteaming/utils/rt.png,sha256=HzVC8bz_4UgwafKXuMe8RJVI6CyK_UmSgo53ceAOQK8,282154
 ragaai_catalyst/tracers/__init__.py,sha256=LfgTes-nHpazssbGKnn8kyLZNr49kIPrlkrqqoTFTfc,301
 ragaai_catalyst/tracers/distributed.py,sha256=CGPuOh4CsgEk428PPibieLaAG2Tt3BVygF6ZlmbXxg4,10009
-ragaai_catalyst/tracers/tracer.py,sha256=Ig9e6Je2tFFXWsDXxIijcZr_Hm2AO8ugoF_tup5XQLc,33618
+ragaai_catalyst/tracers/tracer.py,sha256=uLSrN4HZT19YmEG5dTPx_aauuNU8UfflNTn3xjshfmI,33649
 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
@@ -36,30 +36,30 @@ ragaai_catalyst/tracers/agentic_tracing/tracers/__init__.py,sha256=47DEQpj8HBSa-
 ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=Wq4LFclPlLy47LyXvbaLeYiSMQABj7VYS3J87xyea_E,4159
 ragaai_catalyst/tracers/agentic_tracing/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ragaai_catalyst/tracers/agentic_tracing/upload/session_manager.py,sha256=sOlxeIYIP8tycaTtZC9xkZosi6EDJUxvDw0_rc_NLI8,6823
-ragaai_catalyst/tracers/agentic_tracing/upload/trace_uploader.py,sha256=Ujbu0KDl7oDr-cFtLwrQK_i7ghMuPV92mFnRfobJ1aI,24822
-ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py,sha256=0u4GWgqtaBz9cnr_KuqVIWDvhHWkgTAOTtiy0w8RPuk,13017
-ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py,sha256=CbTx2vBAPIat5bdIClv9szOo4i33YL_1v04mkUjNG2c,12170
+ragaai_catalyst/tracers/agentic_tracing/upload/trace_uploader.py,sha256=3VZjuW3OnElYE-VjhhT9ILvFSG8Rh0sH9n2M_Wds_TU,25146
+ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py,sha256=yLzYiyNk_XtwwlUFbq5uaRahDKKF-eFBoI6xqHUNedw,14526
+ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py,sha256=IAhNFS-nbV_ImNz8Xp98qU4r-2naj49qg9q08x53TFE,12521
 ragaai_catalyst/tracers/agentic_tracing/utils/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-ragaai_catalyst/tracers/agentic_tracing/utils/create_dataset_schema.py,sha256=UCecTolWXp6DwOaRut0EZo8q2e1kAeT_Bv4VeoRSVK8,1506
+ragaai_catalyst/tracers/agentic_tracing/utils/create_dataset_schema.py,sha256=tojXeuTigDoLCdPvBKRBWtTHwjtm2tFjTizM7NknSo4,3887
 ragaai_catalyst/tracers/agentic_tracing/utils/file_name_tracker.py,sha256=YG601l1a29ov9VPu9Vl4RXxgL7l16k54_WWnoTNoG58,2064
 ragaai_catalyst/tracers/agentic_tracing/utils/llm_utils.py,sha256=PiyXvEj_qu0EnJFjk4GfGyWFZbwlvQQh0hdQ_lm0p8E,22976
 ragaai_catalyst/tracers/agentic_tracing/utils/model_costs.json,sha256=2tzGw_cKCTPcfjEm7iGvFE6pTw7gMTPzeBov_MTaXNY,321336
 ragaai_catalyst/tracers/agentic_tracing/utils/system_monitor.py,sha256=H8WNsk4v_5T6OUw4TFOzlDLjQhJwjh1nAMyMAoqMEi4,6946
 ragaai_catalyst/tracers/agentic_tracing/utils/trace_utils.py,sha256=W7Nw-IpugejIoHbCtQiN4Sn4ughLocQ9AUCjuAtOhOo,17258
 ragaai_catalyst/tracers/agentic_tracing/utils/unique_decorator.py,sha256=G027toV-Km20JjKrc-Y_PilQ8ABEKrBvvzgLTnqVg7I,5819
-ragaai_catalyst/tracers/agentic_tracing/utils/zip_list_of_unique_files.py,sha256=4TeCGsFF26249fV6dJHLTZDrRa93SG9oer4rudoF8Y4,19443
+ragaai_catalyst/tracers/agentic_tracing/utils/zip_list_of_unique_files.py,sha256=Q3KXaqpvCPl7CL4bzwKvE6xhY5JNvfxar6QUXXXz3w0,19688
 ragaai_catalyst/tracers/exporters/__init__.py,sha256=qA3vx7z9CQ5kTGCn9LIDtIFvW9fJHQLkvF9-xBQUm94,237
-ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py,sha256=Rm-QaLv1qMAKpHKcFOcK_HWaKHwFBoUH45_4QYipE-g,6843
+ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py,sha256=cQvBGFOgSNLoyPIvkTrHottlpmg1vcgFgej-J2PwGtY,7149
 ragaai_catalyst/tracers/exporters/file_span_exporter.py,sha256=_icciSCktK6c86KB2HV3GZMFHvUitgKJ8x_IdPmgi1M,6363
-ragaai_catalyst/tracers/exporters/ragaai_trace_exporter.py,sha256=M3Bj311o_MpjY1gO9SGpfIIT2O0yz76uCgw6mKUwHdo,10032
+ragaai_catalyst/tracers/exporters/ragaai_trace_exporter.py,sha256=aUooYU7SlT29pYK_p9WO5udlFO-yOEZNeR3RSB-DOBo,10549
 ragaai_catalyst/tracers/instrumentators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ragaai_catalyst/tracers/utils/__init__.py,sha256=KeMaZtYaTojilpLv65qH08QmpYclfpacDA0U3wg6Ybw,64
 ragaai_catalyst/tracers/utils/model_prices_and_context_window_backup.json,sha256=WlZCZeOQ54aMVjYS8BAeka2uaFC3ftBTMZ8zzzA8TAI,495947
 ragaai_catalyst/tracers/utils/rag_extraction_logic_final.py,sha256=3ygkRT__lLDRflRttjzPu28tIA8cTCiGQVMQjqMItqQ,11309
-ragaai_catalyst/tracers/utils/trace_json_converter.py,sha256=-HZVmijeUFLO7e9OAvi1RJdWVTxPRUHPd1MkKQlCD54,11785
+ragaai_catalyst/tracers/utils/trace_json_converter.py,sha256=NPsxU04u6MCOMqisrgiAIv1bXFjWNwlrUn-LScC8f-s,12109
 ragaai_catalyst/tracers/utils/utils.py,sha256=o-p9n2ZuophdrV0wrixu-BqRHCkovup_klc3mS8mU8g,2374
-ragaai_catalyst-2.2.5b4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ragaai_catalyst-2.2.5b4.dist-info/METADATA,sha256=5mMtdrTjYKckmte2qOrBZso2ldbMSQFcvE4O6hhLfeY,17735
-ragaai_catalyst-2.2.5b4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ragaai_catalyst-2.2.5b4.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.2.5b4.dist-info/RECORD,,
+ragaai_catalyst-2.2.5b6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.2.5b6.dist-info/METADATA,sha256=kHQKCIyv8lTxRSQ7OCFbG_5WSUF83HcVyOmDVcVMCyg,17735
+ragaai_catalyst-2.2.5b6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ragaai_catalyst-2.2.5b6.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.2.5b6.dist-info/RECORD,,