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

ragaai_catalyst/ragaai_catalyst.py

@@ -13,6 +13,7 @@ logging_level = (
 class RagaAICatalyst:
     BASE_URL = None
     TIMEOUT = 10  # Default timeout in seconds
+    TOKEN_EXPIRY_TIME = 6  # Default token expiration time (6 hours in hours)
 
     def __init__(
         self,
@@ -20,6 +21,7 @@ class RagaAICatalyst:
         secret_key,
         api_keys: Optional[Dict[str, str]] = None,
         base_url: Optional[str] = None,
+        token_expiry_time: Optional[float] = 6,
     ):
         """
         Initializes a new instance of the RagaAICatalyst class.
@@ -29,6 +31,7 @@ class RagaAICatalyst:
             secret_key (str): The secret key for the RagaAICatalyst.
             api_keys (Optional[Dict[str, str]]): A dictionary of API keys for different services. Defaults to None.
             base_url (Optional[str]): The base URL for the RagaAICatalyst API. Defaults to None.
+            token_expiry_time (Optional[float]): The time in hours before the token expires. Defaults to 0.1 hours.
 
         Raises:
             ValueError: If the RAGAAI_CATALYST_ACCESS_KEY and RAGAAI_CATALYST_SECRET_KEY environment variables are not set.
@@ -54,6 +57,9 @@ class RagaAICatalyst:
         self._token_expiry = None
         self._token_refresh_lock = threading.Lock()
         self._refresh_thread = None
+        
+        # Set token expiration time (convert hours to seconds)
+        RagaAICatalyst.TOKEN_EXPIRY_TIME = token_expiry_time * 60 * 60
 
         RagaAICatalyst.BASE_URL = (
             os.getenv("RAGAAI_CATALYST_BASE_URL")
@@ -149,9 +155,8 @@ class RagaAICatalyst:
         """Get the API key for a specific service."""
         return self.api_keys.get(service)
 
-    # Token expiration time in seconds (6 hours by default)
-    # TODO: Change this to 23 hours
-    TOKEN_EXPIRATION_TIME = 6 * 60 * 60
+    # Token expiration time is now configurable via the token_expiry_time parameter
+    # Default is 6 hours, but can be changed to 23 hours or any other value
 
     def _get_credentials(self) -> tuple[str, str]:
         """Get access key and secret key from instance or environment."""
@@ -165,6 +170,29 @@ class RagaAICatalyst:
             self.get_token(force_refresh=True)
         except Exception as e:
             logger.error(f"Background token refresh failed: {str(e)}")
+            
+    def _schedule_token_refresh(self):
+        """Schedule a token refresh to happen 20 seconds before expiration."""
+        if not self._token_expiry:
+            return
+            
+        # Calculate when to refresh (20 seconds before expiration)
+        current_time = time.time()
+        refresh_buffer = min(20, RagaAICatalyst.TOKEN_EXPIRY_TIME * 0.05)  # 20 seconds or 5% of expiry time, whichever is smaller
+        time_until_refresh = max(self._token_expiry - current_time - refresh_buffer, 1)  # At least 1 second
+        
+        def delayed_refresh():
+            # Sleep until it's time to refresh
+            time.sleep(time_until_refresh)
+            logger.debug(f"Scheduled token refresh triggered")
+            self._refresh_token_async()
+            
+        # Start a new thread for the delayed refresh
+        if not self._refresh_thread or not self._refresh_thread.is_alive():
+            self._refresh_thread = threading.Thread(target=delayed_refresh)
+            self._refresh_thread.daemon = True
+            self._refresh_thread.start()
+            logger.debug(f"Token refresh scheduled in {time_until_refresh:.1f} seconds")
 
     def get_token(self, force_refresh=False) -> Union[str, None]:
         """
@@ -226,8 +254,12 @@ class RagaAICatalyst:
             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")
+                self._token_expiry = time.time() + RagaAICatalyst.TOKEN_EXPIRY_TIME
+                logger.debug(f"Token refreshed successfully. Next refresh in {RagaAICatalyst.TOKEN_EXPIRY_TIME/3600:.1f} hours")
+                
+                # Schedule token refresh 20 seconds before expiration
+                self._schedule_token_refresh()
+                
                 return token
             else:
                 logger.error("Token(s) not set")
@@ -237,7 +269,7 @@ class RagaAICatalyst:
         """
         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
+        - Expired token: Synchronous refresh (since token is needed immediately)
 
         Returns:
             - A string representing the valid token if successful.
@@ -250,13 +282,22 @@ class RagaAICatalyst:
         if not current_token:
             return self.get_token(force_refresh=True)
 
-        # Case 2: Token expired or about to expire - async refresh
+        # Case 2: Token expired - synchronous refresh (since we need a valid token now)
         if not self._token_expiry or current_time >= self._token_expiry:
+            logger.info("Token expired, refreshing synchronously")
+            return self.get_token(force_refresh=True)
+            
+        # Case 3: Token valid but approaching expiry (less than 10% of lifetime remaining)
+        # Start background refresh but return current token
+        token_remaining_time = self._token_expiry - current_time
+        if token_remaining_time < (RagaAICatalyst.TOKEN_EXPIRY_TIME * 0.1):
             if not self._refresh_thread or not self._refresh_thread.is_alive():
+                logger.info("Token approaching expiry, starting background refresh")
                 self._refresh_thread = threading.Thread(target=self._refresh_token_async)
                 self._refresh_thread.daemon = True
                 self._refresh_thread.start()
 
+        # Return current token (which is valid)
         return current_token
 
     def get_auth_header(self) -> Dict[str, str]:

ragaai_catalyst/tracers/tracer.py

@@ -402,7 +402,50 @@ class Tracer(AgenticTracing):
         def recursive_mask_values(obj, parent_key=None):
             """Apply masking to all values in nested structure."""
             if isinstance(obj, dict):
-                return {k: recursive_mask_values(v, k) for k, v in obj.items()}
+                if self.tracer_type == "langchain":
+                    # Special handling for LangChain data
+                    if isinstance(obj, dict):
+                        if obj.get("name", "") == "retrieve_documents.langchain.workflow":
+                            prompt_structured_data = {
+                                "traceloop.entity.input": json.dumps({
+                                    "kwargs": {
+                                        "input": masking_func(json.loads(obj.get("attributes", {}).get("traceloop.entity.input", "")).get("kwargs", {}).get("input", "")),
+                                    }
+                                })
+                            }     
+                            prompt_data = {
+                                "name": "retrieve_documents.langchain.workflow",
+                                "attributes": prompt_structured_data,
+                            }
+                            return prompt_data
+                        elif obj.get("name", "") == "PromptTemplate.langchain.task":
+                            context_structured_data = {
+                                "traceloop.entity.input": json.dumps({
+                                    "kwargs": {
+                                        "context": masking_func(json.loads(obj.get("attributes", {}).get("traceloop.entity.input", "")).get("kwargs", {}).get("context", "")),
+                                    }
+                                }),
+                                "traceloop.entity.output": json.dumps({
+                                    "kwargs": {
+                                        "text": masking_func(json.loads(obj.get("attributes", {}).get("traceloop.entity.output", "")).get("kwargs", {}).get("text", "")),
+                                    }
+                                })
+                            }
+                            context_data = {
+                                "name": "PromptTemplate.langchain.task",
+                                "attributes": context_structured_data,
+                            }
+                            return context_data
+                        elif obj.get("name", "") == "ChatOpenAI.langchain.task":
+                            response_structured_data = {"gen_ai.completion.0.content": masking_func(obj.get("attributes", {}).get("gen_ai.completion.0.content", "")),
+                                                        "gen_ai.prompt.0.content": masking_func(obj.get("attributes", {}).get("gen_ai.prompt.0.content", ""))}
+                            response_data = {
+                                "name": "ChatOpenAI.langchain.task",
+                                "attributes" : response_structured_data
+                            }
+                            return response_data
+                else:
+                    return {k: recursive_mask_values(v, k) for k, v in obj.items()}
             elif isinstance(obj, list):
                 return [recursive_mask_values(item, parent_key) for item in obj]
             elif isinstance(obj, str):
@@ -492,11 +535,18 @@ class Tracer(AgenticTracing):
             'max_upload_workers': self.max_upload_workers
         }
 
+        # Save the model_custom_cost before reinitialization
+        saved_model_custom_cost = self.model_custom_cost.copy()
+
         # Reinitialize self with new external_id and stored parameters
         self.__init__(
             external_id=external_id,
             **current_params
         )
+        
+        # Restore the model_custom_cost after reinitialization
+        self.model_custom_cost = saved_model_custom_cost
+        self.dynamic_exporter.custom_model_cost = self.model_custom_cost
 
     
 

ragaai_catalyst/tracers/upload_traces.py

@@ -37,7 +37,8 @@ class UploadTraces:
             "model_name": {"columnType": "metadata"},
             "total_cost": {"columnType": "metadata", "dataType": "numerical"},
             "total_latency": {"columnType": "metadata", "dataType": "numerical"},
-            "error": {"columnType": "metadata"}
+            "error": {"columnType": "metadata"},
+            "externalId": {"columnType": "externalId"}
         }
 
         if additional_metadata_keys:

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

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

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

@@ -8,7 +8,7 @@ ragaai_catalyst/guardrails_manager.py,sha256=_VrARJ1udmCF8TklNKy7XTQUaM8ATDhTOAG
 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=lMmWPqRMr1IGVCKrCxk6Vfip-z7yfzTh9jqE-rb4I3Q,22248
+ragaai_catalyst/ragaai_catalyst.py,sha256=W_heG_ab650rzQkAhSOoxaNy3JKHAIXNvivxtOPpyeg,24590
 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
@@ -31,8 +31,8 @@ ragaai_catalyst/tracers/distributed.py,sha256=MwlBwIxCAng-OI-7Ove_rkE1mTLeuW4Jw-
 ragaai_catalyst/tracers/langchain_callback.py,sha256=CB75zzG3-DkYTELj0vI1MOHQTY0MuQJfoHIXz9Cl8S8,34568
 ragaai_catalyst/tracers/llamaindex_callback.py,sha256=ZY0BJrrlz-P9Mg2dX-ZkVKG3gSvzwqBtk7JL_05MiYA,14028
 ragaai_catalyst/tracers/llamaindex_instrumentation.py,sha256=Ys_jLkvVqo12bKgXDmkp4TxJu9HkBATrFE8cIcTYxWw,14329
-ragaai_catalyst/tracers/tracer.py,sha256=pKHP5PK4au9Gdis-anYmu2PTmqWc4tNDrJvZWWRLQVo,40753
-ragaai_catalyst/tracers/upload_traces.py,sha256=yfg1vHP5quz2Vb8xkas_vzXwIrTVqRwrmFNCTrWvFdg,6938
+ragaai_catalyst/tracers/tracer.py,sha256=w9Poa2dsN3WNMPEH_v4M7SqFF_MQp_iSam4A-qcoAXM,43921
+ragaai_catalyst/tracers/upload_traces.py,sha256=w1clGGfdOMpStUJX40NAlxe6dcFdN4pwcezyII0bGYA,6994
 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
@@ -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.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.5b5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.1.7.5b5.dist-info/METADATA,sha256=qTUNGuVyjtbjoOnA2Zq_HARkI0TgkYnYj8qDU7W33aE,17607
+ragaai_catalyst-2.1.7.5b5.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+ragaai_catalyst-2.1.7.5b5.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.7.5b5.dist-info/RECORD,,

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

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