ragaai-catalyst 2.1.5b19__py3-none-any.whl → 2.1.5b21__py3-none-any.whl

ragaai_catalyst/dataset.py

@@ -9,6 +9,10 @@ import pandas as pd
 logger = logging.getLogger(__name__)
 get_token = RagaAICatalyst.get_token
 
+# Job status constants
+JOB_STATUS_FAILED = "failed"
+JOB_STATUS_IN_PROGRESS = "in_progress"
+JOB_STATUS_COMPLETED = "success"
 
 class Dataset:
     BASE_URL = None
@@ -18,6 +22,7 @@ class Dataset:
         self.project_name = project_name
         self.num_projects = 99999
         Dataset.BASE_URL = RagaAICatalyst.BASE_URL
+        self.jobId = None
         headers = {
             "Authorization": f'Bearer {os.getenv("RAGAAI_CATALYST_TOKEN")}',
         }
@@ -219,7 +224,6 @@ class Dataset:
         try:
 
             put_csv_response = put_csv_to_presignedUrl(url)
-            print(put_csv_response)
             if put_csv_response.status_code not in (200, 201):
                 raise ValueError('Unable to put csv to the presignedUrl')
         except Exception as e:
@@ -269,6 +273,7 @@ class Dataset:
                 raise ValueError('Unable to upload csv')
             else:
                 print(upload_csv_response['message'])
+                self.jobId = upload_csv_response['data']['jobId']
         except Exception as e:
             logger.error(f"Error in create_from_csv: {e}")
             raise
@@ -436,6 +441,7 @@ class Dataset:
             response_data = response.json()
             if response_data.get('success', False):
                 print(f"{response_data['message']}")
+                self.jobId = response_data['data']['jobId']
             else:
                 raise ValueError(response_data.get('message', 'Failed to add rows'))
         
@@ -594,6 +600,7 @@ class Dataset:
             
             if response_data.get('success', False):
                 print(f"Column '{column_name}' added successfully to dataset '{dataset_name}'")
+                self.jobId = response_data['data']['jobId']
             else:
                 raise ValueError(response_data.get('message', 'Failed to add column'))
         
@@ -601,3 +608,49 @@ class Dataset:
             print(f"Error adding column: {e}")
             raise
 
+    def get_status(self):
+        headers = {
+            'Content-Type': 'application/json',
+            "Authorization": f"Bearer {os.getenv('RAGAAI_CATALYST_TOKEN')}",
+            'X-Project-Id': str(self.project_id),
+        }
+        try:
+            response = requests.get(
+                f'{Dataset.BASE_URL}/job/status', 
+                headers=headers, 
+                timeout=30)
+            response.raise_for_status()
+            if response.json()["success"]:
+
+                status_json = [item["status"] for item in response.json()["data"]["content"] if item["id"]==self.jobId]
+                status_json = status_json[0]
+                if status_json == "Failed":
+                    print("Job failed. No results to fetch.")
+                    return JOB_STATUS_FAILED
+                elif status_json == "In Progress":
+                    print(f"Job in progress. Please wait while the job completes.\nVisit Job Status: {Dataset.BASE_URL.removesuffix('/api')}/projects/job-status?projectId={self.project_id} to track")
+                    return JOB_STATUS_IN_PROGRESS
+                elif status_json == "Completed":
+                    print(f"Job completed. Fetching results.\nVisit Job Status: {Dataset.BASE_URL.removesuffix('/api')}/projects/job-status?projectId={self.project_id} to check")
+                    return JOB_STATUS_COMPLETED
+                else:
+                    logger.error(f"Unknown status received: {status_json}")
+                    return JOB_STATUS_FAILED
+            else:
+                logger.error("Request was not successful")
+                return JOB_STATUS_FAILED
+        except requests.exceptions.HTTPError as http_err:
+            logger.error(f"HTTP error occurred: {http_err}")
+            return JOB_STATUS_FAILED
+        except requests.exceptions.ConnectionError as conn_err:
+            logger.error(f"Connection error occurred: {conn_err}")
+            return JOB_STATUS_FAILED
+        except requests.exceptions.Timeout as timeout_err:
+            logger.error(f"Timeout error occurred: {timeout_err}")
+            return JOB_STATUS_FAILED
+        except requests.exceptions.RequestException as req_err:
+            logger.error(f"An error occurred: {req_err}")
+            return JOB_STATUS_FAILED
+        except Exception as e:
+            logger.error(f"An unexpected error occurred: {e}")
+            return JOB_STATUS_FAILED

ragaai_catalyst/evaluation.py

@@ -7,6 +7,11 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+# Job status constants
+JOB_STATUS_FAILED = "failed"
+JOB_STATUS_IN_PROGRESS = "in_progress"
+JOB_STATUS_COMPLETED = "success"
+
 class Evaluation:
 
     def __init__(self, project_name, dataset_name):
@@ -366,22 +371,36 @@ class Evaluation:
             response.raise_for_status()
             if response.json()["success"]:
                 status_json = [item["status"] for item in response.json()["data"]["content"] if item["id"]==self.jobId][0]
-            if status_json == "Failed":
-                return print("Job failed. No results to fetch.")
-            elif status_json == "In Progress":
-                return print(f"Job in progress. Please wait while the job completes.\nVisit Job Status: {self.base_url.removesuffix('/api')}/projects/job-status?projectId={self.project_id} to track")
-            elif status_json == "Completed":
-                print(f"Job completed. Fetching results.\nVisit Job Status: {self.base_url.removesuffix('/api')}/projects/job-status?projectId={self.project_id} to check")
+                if status_json == "Failed":
+                    print("Job failed. No results to fetch.")
+                    return JOB_STATUS_FAILED
+                elif status_json == "In Progress":
+                    print(f"Job in progress. Please wait while the job completes.\nVisit Job Status: {self.base_url.removesuffix('/api')}/projects/job-status?projectId={self.project_id} to track")
+                    return JOB_STATUS_IN_PROGRESS
+                elif status_json == "Completed":
+                    print(f"Job completed. Fetching results.\nVisit Job Status: {self.base_url.removesuffix('/api')}/projects/job-status?projectId={self.project_id} to check")
+                    return JOB_STATUS_COMPLETED
+                else:
+                    logger.error(f"Unknown status received: {status_json}")
+                    return JOB_STATUS_FAILED
+            else:
+                logger.error("Request was not successful")
+                return JOB_STATUS_FAILED
         except requests.exceptions.HTTPError as http_err:
             logger.error(f"HTTP error occurred: {http_err}")
+            return JOB_STATUS_FAILED
         except requests.exceptions.ConnectionError as conn_err:
             logger.error(f"Connection error occurred: {conn_err}")
+            return JOB_STATUS_FAILED
         except requests.exceptions.Timeout as timeout_err:
             logger.error(f"Timeout error occurred: {timeout_err}")
+            return JOB_STATUS_FAILED
         except requests.exceptions.RequestException as req_err:
             logger.error(f"An error occurred: {req_err}")
+            return JOB_STATUS_FAILED
         except Exception as e:
             logger.error(f"An unexpected error occurred: {e}")
+            return JOB_STATUS_FAILED
 
     def get_results(self):
 

ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py

@@ -161,8 +161,7 @@ class AgenticTracing(
 
     def start(self):
         """Start tracing"""
-        if not self.is_active:
-            return
+        self.is_active = True
 
         # Setup user interaction tracing
         self.user_interaction_tracer.project_id.set(self.project_id)

ragaai_catalyst/tracers/tracer.py

@@ -128,6 +128,7 @@ class Tracer(AgenticTracing):
         self.num_projects = 100
         self.start_time = datetime.datetime.now().astimezone().isoformat()
         self.model_cost_dict = load_model_costs()
+        self.user_context = ""  # Initialize user_context to store context from add_context
 
         if update_llm_cost:
             # First update the model costs file from GitHub
@@ -318,7 +319,7 @@ class Tracer(AgenticTracing):
             if additional_metadata:
                 combined_metadata.update(additional_metadata)
 
-            langchain_traces = langchain_tracer_extraction(data)
+            langchain_traces = langchain_tracer_extraction(data, self.user_context)
             final_result = convert_langchain_callbacks_output(langchain_traces)
             
             # Safely set required fields in final_result
@@ -463,4 +464,23 @@ class Tracer(AgenticTracing):
                     }
                 }
             }
-        return user_detail
+        return user_detail
+
+    def add_context(self, context):
+        """
+        Add context information to the trace. This method is only supported for 'langchain' and 'llamaindex' tracer types.
+
+        Args:
+            context: Additional context information to be added to the trace. Can be a string.
+
+        Raises:
+            ValueError: If tracer_type is not 'langchain' or 'llamaindex'.
+        """
+        if self.tracer_type not in ["langchain", "llamaindex"]:
+            raise ValueError("add_context is only supported for 'langchain' and 'llamaindex' tracer types")
+        
+        # Convert string context to string if needed
+        if isinstance(context, str):
+            self.user_context = context
+        else:
+            raise TypeError("context must be a string")

ragaai_catalyst/tracers/utils/langchain_tracer_extraction_logic.py

@@ -1,7 +1,7 @@
 import json
 import uuid
 
-def langchain_tracer_extraction(data):
+def langchain_tracer_extraction(data, user_context=""):
     trace_aggregate = {}
     import uuid
 
@@ -55,7 +55,9 @@ def langchain_tracer_extraction(data):
                     response = llm_end_response["text"]
                 return response.strip()
 
-    def get_context(data):
+    def get_context(data, user_context):
+        if user_context:
+            return user_context
         if "retriever_actions" in data and data["retriever_actions"] != []:
             for item in data["retriever_actions"]:
                 if item["event"] == "retriever_end":
@@ -72,7 +74,7 @@ def langchain_tracer_extraction(data):
 
     prompt = get_prompt(data)
     response = get_response(data)
-    context = get_context(data)
+    context = get_context(data, user_context)
 
     trace_aggregate["data"]["prompt"]=prompt
     trace_aggregate["data"]["response"]=response

{ragaai_catalyst-2.1.5b19.dist-info → ragaai_catalyst-2.1.5b21.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.5b19
+Version: 2.1.5b21
 Summary: RAGA AI CATALYST
-Author-email: Kiran Scaria <kiran.scaria@raga.ai>, Siddhartha Kosti <siddhartha.kosti@raga.ai>, Vijay Chaurasia <vijay.chaurasia@raga.ai>, Tanaya Pakhale <tanaya.pakhale@raga.ai>, Ritika Goel <ritika.goel@raga.ai>, Kedar Gaikwad <kedar.gaikwad@raga.ai>, Dushyant Mahajan <dushyant.mahajan@raga.ai>
+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>
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE

{ragaai_catalyst-2.1.5b19.dist-info → ragaai_catalyst-2.1.5b21.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ragaai_catalyst/__init__.py,sha256=tvESV8UuVtth14E89wQxgf0WvQZSApWfDeLiIdmMhkE,791
 ragaai_catalyst/_version.py,sha256=JKt9KaVNOMVeGs8ojO6LvIZr7ZkMzNN-gCcvryy4x8E,460
-ragaai_catalyst/dataset.py,sha256=8EbZEpcV4Fb8oO0vhYIK_WIwGyYvJ4VzwGeIZDtu2E8,23475
-ragaai_catalyst/evaluation.py,sha256=34H2bYZNSrcu0jMQgDZw1OLVbQU80PaVLo2avju8POM,20311
+ragaai_catalyst/dataset.py,sha256=VPfFt7dLUiQ9xmHZ0WhcRNJyMs2KHuOtawow-2Lujrw,26183
+ragaai_catalyst/evaluation.py,sha256=pcmgCxmrugvIzBApu0BVaiPIueOcFj8uig3F1Br_PKs,21035
 ragaai_catalyst/experiment.py,sha256=8yQo1phCHlpnJ-4CqCaIbLXg_1ZlAuLGI9kqGBl-OTE,18859
 ragaai_catalyst/guard_executor.py,sha256=llPbE3DyVtrybojXknzBZj8-dtUrGBQwi9-ZiPJxGRo,3762
 ragaai_catalyst/guardrails_manager.py,sha256=DILMOAASK57FH9BLq_8yC1AQzRJ8McMFLwCXgYwNAd4,11904
@@ -15,7 +15,7 @@ ragaai_catalyst/tracers/__init__.py,sha256=LfgTes-nHpazssbGKnn8kyLZNr49kIPrlkrqq
 ragaai_catalyst/tracers/distributed.py,sha256=AIRvS5Ur4jbFDXsUkYuCTmtGoHHx3LOG4n5tWOh610U,10330
 ragaai_catalyst/tracers/langchain_callback.py,sha256=ZXN378gloGh5EVpTJuUScHD964WuIeVeE4_hp60gxG4,30686
 ragaai_catalyst/tracers/llamaindex_callback.py,sha256=ZY0BJrrlz-P9Mg2dX-ZkVKG3gSvzwqBtk7JL_05MiYA,14028
-ragaai_catalyst/tracers/tracer.py,sha256=TftNxiYO13Qb6AA4qst__zGS2-Xn_COkQOce1gFgjjc,20169
+ragaai_catalyst/tracers/tracer.py,sha256=_WSX0XS4XflHdQdMaqarTAoW2iz2lux0IxhTibZsD8k,21048
 ragaai_catalyst/tracers/upload_traces.py,sha256=2TWdRTN6FMaX-dqDv8BJWQS0xrCGYKkXEYOi2kK3Z3Y,5487
 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
@@ -33,7 +33,7 @@ ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=xzJKOpL0Wm5hAIJp8
 ragaai_catalyst/tracers/agentic_tracing/tracers/custom_tracer.py,sha256=OHet_Cphyrsq2CP4WiooTsWSgg3Rc1n8QsOl1s2vqdY,13480
 ragaai_catalyst/tracers/agentic_tracing/tracers/langgraph_tracer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py,sha256=OSRGwftAYpylvziXD50HGjEfEMe8k11-3SRSZKw2tHI,35255
-ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=JEwvFV6KdYcg8zt2qUTKmmPvrkEft0YNAyUYK6FWF7c,18335
+ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=ZAG5aKBAr0O7oWd_EXcljH9PpSIo6QpWnZWH4NhKgAE,18315
 ragaai_catalyst/tracers/agentic_tracing/tracers/network_tracer.py,sha256=m8CxYkl7iMiFya_lNwN1ykBc3Pmo-2pR_2HmpptwHWQ,10352
 ragaai_catalyst/tracers/agentic_tracing/tracers/tool_tracer.py,sha256=nmgkE3jRlTpq_uk6FYw0hTv2VgT8ejxvvBRL7gso39I,21037
 ragaai_catalyst/tracers/agentic_tracing/tracers/user_interaction_tracer.py,sha256=bhSUhNQCuJXKjgJAXhjKEYjnHMpYN90FSZdR84fNIKU,4614
@@ -64,10 +64,10 @@ ragaai_catalyst/tracers/instrumentators/llamaindex.py,sha256=SMrRlR4xM7k9HK43hak
 ragaai_catalyst/tracers/instrumentators/openai.py,sha256=14R4KW9wQCR1xysLfsP_nxS7cqXrTPoD8En4MBAaZUU,379
 ragaai_catalyst/tracers/utils/__init__.py,sha256=KeMaZtYaTojilpLv65qH08QmpYclfpacDA0U3wg6Ybw,64
 ragaai_catalyst/tracers/utils/convert_langchain_callbacks_output.py,sha256=ofrNrxf2b1hpjDh_zeaxiYq86azn1MF3kW8-ViYPEg0,1641
-ragaai_catalyst/tracers/utils/langchain_tracer_extraction_logic.py,sha256=qK67fdUBz5Xr99ajqXbYf1ueKS1V3a3_XR0zCcN4iGI,3061
+ragaai_catalyst/tracers/utils/langchain_tracer_extraction_logic.py,sha256=LxJaZYErYlG8Zc4LfPHuX1_TgAYvT7sb28OZl9iBxC0,3163
 ragaai_catalyst/tracers/utils/utils.py,sha256=ViygfJ7vZ7U0CTSA1lbxVloHp4NSlmfDzBRNCJuMhis,2374
-ragaai_catalyst-2.1.5b19.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ragaai_catalyst-2.1.5b19.dist-info/METADATA,sha256=GrXo-ai5bjeLWnyq2OVaWWMBYDkFWe3XXewhCbKX4_0,12837
-ragaai_catalyst-2.1.5b19.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ragaai_catalyst-2.1.5b19.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.1.5b19.dist-info/RECORD,,
+ragaai_catalyst-2.1.5b21.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.1.5b21.dist-info/METADATA,sha256=2SR-RpaHL2T7-q3useysaBDwhDQpPqCNZVAyfrD-T6c,12796
+ragaai_catalyst-2.1.5b21.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ragaai_catalyst-2.1.5b21.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.5b21.dist-info/RECORD,,