ragaai-catalyst 2.2.5b4__py3-none-any.whl → 2.2.5b5__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}")

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,8 +1,16 @@
 import os
 import json
 import re
-import requests
+import logging
+import time
+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
+
+logger = logging.getLogger(__name__)
 
 def create_dataset_schema_with_trace(project_name, dataset_name, base_url=None, user_details=None, timeout=120):
     SCHEMA_MAPPING = {}
@@ -13,31 +21,69 @@ def create_dataset_schema_with_trace(project_name, dataset_name, base_url=None,
                 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,
-            })
+    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/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 = []
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragaai_catalyst
-Version: 2.2.5b4
+Version: 2.2.5b5
 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.5b5.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=5jM-AJozLoc95OIR-K3K2fs0OJ2Oo47Lgtca_6ToFzk,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,11 +36,11 @@ 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=NuetePZOdDmwRgN3aAsQrDIytXFicNylaAqORdz8C2o,25051
+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=1c6HA_Alm5yofF-eifqwdwHboxr25mvW3xxVYBktfjA,3667
 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
@@ -58,8 +58,8 @@ ragaai_catalyst/tracers/utils/model_prices_and_context_window_backup.json,sha256
 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/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.5b5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.2.5b5.dist-info/METADATA,sha256=Oho91NQ2Otn-agTiKESdvBL1iZwLyQLeBtWTgu5nfc8,17735
+ragaai_catalyst-2.2.5b5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ragaai_catalyst-2.2.5b5.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.2.5b5.dist-info/RECORD,,