ragaai-catalyst 2.1.7.5b2__py3-none-any.whl → 2.1.7.5b3__py3-none-any.whl

ragaai_catalyst/dataset.py

@@ -257,7 +257,10 @@ class Dataset:
         def generate_schema(mapping):
             result = {}
             for column, schema_element in mapping.items():
-                result[column] = {"columnType": schema_element}
+                if isinstance(schema_element, dict):
+                    result[column] = schema_element
+                else:
+                    result[column] = {"columnType": schema_element}
             return result
 
         try:

ragaai_catalyst/evaluation.py

@@ -171,7 +171,7 @@ class Evaluation:
         user_dataset_columns = [item["displayName"] for item in user_dataset_schema]
         variableName = None
         for key, val in schema_mapping.items():
-            if "".join(val.split("_")).lower()==schemaName:
+            if  val==schemaName: #"".join(val.split("_")).lower()==schemaName or val.lower()==schemaName:
                 if key in user_dataset_columns:
                     variableName=key
                 else:
@@ -198,7 +198,7 @@ class Evaluation:
 
                 for field in requiredFields:
                     schemaName = field["name"]
-                    variableName = self._get_variablename_from_user_schema_mapping(schemaName.lower(), metric_name, schema_mapping, metric_to_evaluate)
+                    variableName = self._get_variablename_from_user_schema_mapping(schemaName, metric_name, schema_mapping, metric_to_evaluate)
                     mapping.append({"schemaName": schemaName, "variableName": variableName})
         return mapping
 

ragaai_catalyst/ragaai_catalyst.py

@@ -2,6 +2,7 @@ import os
 import logging
 import requests
 import time
+import threading
 from typing import Dict, Optional, Union
 import re
 logger = logging.getLogger("RagaAICatalyst")
@@ -49,6 +50,11 @@ class RagaAICatalyst:
             access_key, secret_key
         )
 
+        # Initialize token management
+        self._token_expiry = None
+        self._token_refresh_lock = threading.Lock()
+        self._refresh_thread = None
+
         RagaAICatalyst.BASE_URL = (
             os.getenv("RAGAAI_CATALYST_BASE_URL")
             if os.getenv("RAGAAI_CATALYST_BASE_URL")
@@ -143,78 +149,133 @@ class RagaAICatalyst:
         """Get the API key for a specific service."""
         return self.api_keys.get(service)
 
-    @staticmethod
-    def get_token() -> Union[str, None]:
+    # Token expiration time in seconds (6 hours by default)
+    # TODO: Change this to 23 hours
+    TOKEN_EXPIRATION_TIME = 6 * 60 * 60
+
+    def _get_credentials(self) -> tuple[str, str]:
+        """Get access key and secret key from instance or environment."""
+        access_key = self.access_key or os.getenv("RAGAAI_CATALYST_ACCESS_KEY")
+        secret_key = self.secret_key or os.getenv("RAGAAI_CATALYST_SECRET_KEY")
+        return access_key, secret_key
+
+    def _refresh_token_async(self):
+        """Refresh token in background thread."""
+        try:
+            self.get_token(force_refresh=True)
+        except Exception as e:
+            logger.error(f"Background token refresh failed: {str(e)}")
+
+    def get_token(self, force_refresh=False) -> Union[str, None]:
         """
-        Retrieves a token from the server using the provided access key and secret key.
+        Retrieves or refreshes a token using the provided credentials.
+
+        Args:
+            force_refresh (bool): If True, forces a token refresh regardless of expiration.
 
         Returns:
             - A string representing the token if successful.
-            - None if the access key or secret key is not set or if there is an error retrieving the token.
-
-        Raises:
-            - requests.exceptions.HTTPError: If there is an HTTP error while retrieving the token.
-            - requests.exceptions.RequestException: If there is an error while retrieving the token.
-            - ValueError: If there is a JSON decoding error or if authentication fails.
-            - Exception: If there is an unexpected error while retrieving the token.
+            - None if credentials are not set or if there is an error.
         """
-        access_key = os.getenv("RAGAAI_CATALYST_ACCESS_KEY")
-        secret_key = os.getenv("RAGAAI_CATALYST_SECRET_KEY")
+        with self._token_refresh_lock:
+            current_token = os.getenv("RAGAAI_CATALYST_TOKEN")
+            current_time = time.time()
 
-        if not access_key or not secret_key:
-            logger.error(
-                "RAGAAI_CATALYST_ACCESS_KEY or RAGAAI_CATALYST_SECRET_KEY is not set"
-            )
-            return None
+            # Check if we need to refresh the token
+            if not force_refresh and current_token and self._token_expiry and current_time < self._token_expiry:
+                return current_token
 
-        headers = {"Content-Type": "application/json"}
-        json_data = {"accessKey": access_key, "secretKey": secret_key}
+            access_key, secret_key = self._get_credentials()
+            if not access_key or not secret_key:
+                logger.error("Access key or secret key is not set")
+                return None
 
-        start_time = time.time()
-        endpoint = f"{RagaAICatalyst.BASE_URL}/token"
-        response = requests.post(
-            endpoint,
-            headers=headers,
-            json=json_data,
-            timeout=RagaAICatalyst.TIMEOUT,
-        )
-        elapsed_ms = (time.time() - start_time) * 1000
-        logger.debug(
-            f"API Call: [POST] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms")
+            headers = {"Content-Type": "application/json"}
+            json_data = {"accessKey": access_key, "secretKey": secret_key}
 
-        # Handle specific status codes before raising an error
-        if response.status_code == 400:
+            start_time = time.time()
+            endpoint = f"{self.BASE_URL}/token"
+            response = requests.post(
+                endpoint,
+                headers=headers,
+                json=json_data,
+                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")
+
+            # Handle specific status codes before raising an error
+            if response.status_code == 400:
+                token_response = response.json()
+                if token_response.get("message") == "Please enter valid credentials":
+                    raise Exception(
+                        "Authentication failed. Invalid credentials provided. Please check your Access key and Secret key. \nTo view or create new keys, navigate to Settings -> Authenticate in the RagaAI Catalyst dashboard."
+                    )
+
+            response.raise_for_status()
             token_response = response.json()
-            if token_response.get("message") == "Please enter valid credentials":
-                raise Exception(
-                    "Authentication failed. Invalid credentials provided. Please check your Access key and Secret key. \nTo view or create new keys, navigate to Settings -> Authenticate in the RagaAI Catalyst dashboard."
+
+            if not token_response.get("success", False):
+                logger.error(
+                    "Token retrieval was not successful: %s",
+                    token_response.get("message", "Unknown error"),
                 )
+                return None
+
+            token = token_response.get("data", {}).get("token")
+            if token:
+                os.environ["RAGAAI_CATALYST_TOKEN"] = token
+                self._token_expiry = time.time() + self.TOKEN_EXPIRATION_TIME
+                logger.info(f"Token refreshed successfully. Next refresh in {self.TOKEN_EXPIRATION_TIME/3600:.1f} hours")
+                return token
+            else:
+                logger.error("Token(s) not set")
+                return None
 
-        response.raise_for_status()
+    def ensure_valid_token(self) -> Union[str, None]:
+        """
+        Ensures a valid token is available, with different handling for missing token vs expired token:
+        - Missing token: Synchronous retrieval (fail fast)
+        - Expired token: Asynchronous refresh in background
 
-        token_response = response.json()
+        Returns:
+            - A string representing the valid token if successful.
+            - None if unable to obtain a valid token.
+        """
+        current_token = os.getenv("RAGAAI_CATALYST_TOKEN")
+        current_time = time.time()
 
-        if not token_response.get("success", False):
-            logger.error(
-                "Token retrieval was not successful: %s",
-                token_response.get("message", "Unknown error"),
-            )
-            return None
+        # Case 1: No token - synchronous retrieval (fail fast)
+        if not current_token:
+            return self.get_token(force_refresh=True)
+
+        # Case 2: Token expired or about to expire - async refresh
+        if not self._token_expiry or current_time >= self._token_expiry:
+            if not self._refresh_thread or not self._refresh_thread.is_alive():
+                self._refresh_thread = threading.Thread(target=self._refresh_token_async)
+                self._refresh_thread.daemon = True
+                self._refresh_thread.start()
+
+        return current_token
 
-        token = token_response.get("data", {}).get("token")
+    def get_auth_header(self) -> Dict[str, str]:
+        """
+        Returns a dictionary containing the Authorization header with a valid token.
+        This method should be used instead of directly accessing os.getenv("RAGAAI_CATALYST_TOKEN").
+
+        Returns:
+            - A dictionary with the Authorization header if successful.
+            - An empty dictionary if no valid token could be obtained.
+        """
+        token = self.ensure_valid_token()
         if token:
-            os.environ["RAGAAI_CATALYST_TOKEN"] = token
-            print("Token(s) set successfully")
-            return token
-        else:
-            logger.error("Token(s) not set")
-            return None
+            return {"Authorization": f"Bearer {token}"}
+        return {}
 
     def project_use_cases(self):
         try:
-            headers = {
-            "Authorization": f'Bearer {os.getenv("RAGAAI_CATALYST_TOKEN")}',
-            }
+            headers = self.get_auth_header()
             start_time = time.time()
             endpoint = f"{RagaAICatalyst.BASE_URL}/v2/llm/usecase"
             response = requests.get(

ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py

@@ -57,9 +57,26 @@ class UploadAgenticTraces:
                 presignedURLs = response.json()["data"]["presignedUrls"][0]
                 presignedurl = self.update_presigned_url(presignedURLs,self.base_url)
                 return presignedurl
+            else:
+                # If POST fails, try GET
+                response = requests.request("GET", 
+                                        endpoint, 
+                                        headers=headers, 
+                                        data=payload,
+                                        timeout=self.timeout)
+                elapsed_ms = (time.time() - start_time) * 1000
+                logger.debug(
+                    f"API Call: [GET] {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
+
+                logger.error(f"Error while getting presigned url: {response.json()['message']}")
+                return None
             
         except requests.exceptions.RequestException as e:
-            print(f"Error while getting presigned url: {e}")
+            logger.error(f"Error while getting presigned url: {e}")
             return None
         
     def update_presigned_url(self, presigned_url, base_url):

ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py

@@ -98,6 +98,20 @@ def _fetch_presigned_url(project_name, dataset_name, base_url=None, timeout=120)
             presigned_url = update_presigned_url(presigned_url,url_base)
             return presigned_url
         else:
+            # If POST fails, try GET
+            response = requests.request("GET", 
+                                    endpoint, 
+                                    headers=headers, 
+                                    data=payload,
+                                    timeout=timeout)
+            elapsed_ms = (time.time() - start_time) * 1000
+            logger.debug(
+                f"API Call: [GET] {endpoint} | Status: {response.status_code} | Time: {elapsed_ms:.2f}ms")
+            if response.status_code == 200:
+                presigned_url = response.json()["data"]["presignedUrls"][0]
+                presigned_url = update_presigned_url(presigned_url,url_base)
+                return presigned_url
+
             logger.error(f"Failed to fetch code hashes: {response.json()['message']}")
             raise Exception(f"Failed to fetch code hashes: {response.json()['message']}")
     except requests.exceptions.RequestException as e:

{ragaai_catalyst-2.1.7.5b2.dist-info → ragaai_catalyst-2.1.7.5b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragaai_catalyst
-Version: 2.1.7.5b2
+Version: 2.1.7.5b3
 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.2,>=3.10

{ragaai_catalyst-2.1.7.5b2.dist-info → ragaai_catalyst-2.1.7.5b3.dist-info}/RECORD

@@ -1,14 +1,14 @@
 ragaai_catalyst/__init__.py,sha256=2wfkucAbb3Bt_p2KHelkg9zBQp4yC4iZanltyieG18w,895
 ragaai_catalyst/_version.py,sha256=JKt9KaVNOMVeGs8ojO6LvIZr7ZkMzNN-gCcvryy4x8E,460
-ragaai_catalyst/dataset.py,sha256=LefpZDCTkLoimZr0GEGK2awjOjhy8zSU-29EtqLrSG0,29404
-ragaai_catalyst/evaluation.py,sha256=O96CydYVPh3duUmXjY6REIXMOR-tOPixSG-Qhrf636A,22955
+ragaai_catalyst/dataset.py,sha256=kQy-fiU9zxVrNJkHG8ILGR_3UTIz4rUM7iOsEf4jVZs,29535
+ragaai_catalyst/evaluation.py,sha256=acCNQtoN2eM9NTehKEATquZ5hNu6Ijv7wisvaaJ4u7c,22993
 ragaai_catalyst/experiment.py,sha256=8yQo1phCHlpnJ-4CqCaIbLXg_1ZlAuLGI9kqGBl-OTE,18859
 ragaai_catalyst/guard_executor.py,sha256=f2FXQSW17z4-eor61J_mtD0z-xBm9yordq8giB-GN_U,14006
 ragaai_catalyst/guardrails_manager.py,sha256=_VrARJ1udmCF8TklNKy7XTQUaM8ATDhTOAGDonBkFro,14245
 ragaai_catalyst/internal_api_completion.py,sha256=DdICI5yfEudiOAIC8L4oxH0Qz7kX-BZCdo9IWsi2gNo,2965
 ragaai_catalyst/prompt_manager.py,sha256=W8ypramzOprrJ7-22d5vkBXIuIQ8v9XAzKDGxKsTK28,16550
 ragaai_catalyst/proxy_call.py,sha256=CHxldeceZUaLU-to_hs_Kf1z_b2vHMssLS_cOBedu78,5499
-ragaai_catalyst/ragaai_catalyst.py,sha256=1FaeK_VZpJLQ1ZqEWpMyI8J8M2MI0abLLLDFWY9W-4A,19580
+ragaai_catalyst/ragaai_catalyst.py,sha256=lMmWPqRMr1IGVCKrCxk6Vfip-z7yfzTh9jqE-rb4I3Q,22248
 ragaai_catalyst/redteaming_old.py,sha256=W2d89Ok8W-C8g7TBM3fDIFLof3q9FuYSr0jcryH2XQo,7097
 ragaai_catalyst/synthetic_data_generation.py,sha256=7lIWa3nwgW2-FlJrDaGxTN6OE4-dbbhLtKNOBQufhho,37952
 ragaai_catalyst/utils.py,sha256=TlhEFwLyRU690HvANbyoRycR3nQ67lxVUQoUOfTPYQ0,3772
@@ -55,8 +55,8 @@ ragaai_catalyst/tracers/agentic_tracing/tracers/tool_tracer.py,sha256=xxrliKPfdf
 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=qGinKWnb-NSEfIfIOsL37tB9AS8-dKa_-nNNHkUmtuE,12955
-ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py,sha256=10mSqz9X83wfEuciVlPnbCcAqG4N9dgoZ4EFxH1jQb4,8636
-ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py,sha256=DjHOh7JpS3ksJ0swsXItAgYZhxlXsIOzt9kYtdxoUQY,6727
+ragaai_catalyst/tracers/agentic_tracing/upload/upload_agentic_traces.py,sha256=u7QwUbG73zeWi-5WQ4scLo7wfw184Qd8c03TxgfoUe4,9567
+ragaai_catalyst/tracers/agentic_tracing/upload/upload_code.py,sha256=eNjKt8xC2IIs_mC9WdLaP_vUxWpYHVi2OXgJyn2oSx8,7443
 ragaai_catalyst/tracers/agentic_tracing/upload/upload_local_metric.py,sha256=m1O8lKpxKwtHofXLW3fTHX5yfqDW5GxoveARlg5cTw4,2571
 ragaai_catalyst/tracers/agentic_tracing/upload/upload_trace_metric.py,sha256=hRuh-cczHbeM_Spbf9HTYd149uSs1zP0TvkYuZKF4ec,4296
 ragaai_catalyst/tracers/agentic_tracing/utils/__init__.py,sha256=XdB3X_ufe4RVvGorxSqAiB9dYv4UD7Hvvuw3bsDUppY,60
@@ -88,8 +88,8 @@ ragaai_catalyst/tracers/utils/model_prices_and_context_window_backup.json,sha256
 ragaai_catalyst/tracers/utils/rag_trace_json_converter.py,sha256=adCKk7Nj8307XYYg2sB-QT-66OShOs2iTGwNVwqbHig,19373
 ragaai_catalyst/tracers/utils/trace_json_converter.py,sha256=E0_QfciQMMpCtQYrNB4l8HJhlaFalr5bkMqkVRgQahY,14073
 ragaai_catalyst/tracers/utils/utils.py,sha256=ViygfJ7vZ7U0CTSA1lbxVloHp4NSlmfDzBRNCJuMhis,2374
-ragaai_catalyst-2.1.7.5b2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ragaai_catalyst-2.1.7.5b2.dist-info/METADATA,sha256=elCAm8gzY4PlNrlyL5G3iicELxdvr8j-Yr7niKTE-z8,17607
-ragaai_catalyst-2.1.7.5b2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-ragaai_catalyst-2.1.7.5b2.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.1.7.5b2.dist-info/RECORD,,
+ragaai_catalyst-2.1.7.5b3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.1.7.5b3.dist-info/METADATA,sha256=gn-nsj810EAkUigEje4FodHJ7AA-vCvslLPRcBAlH94,17607
+ragaai_catalyst-2.1.7.5b3.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+ragaai_catalyst-2.1.7.5b3.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.7.5b3.dist-info/RECORD,,

{ragaai_catalyst-2.1.7.5b2.dist-info → ragaai_catalyst-2.1.7.5b3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any