ragaai-catalyst 2.0.4__py3-none-any.whl → 2.0.5__py3-none-any.whl

ragaai_catalyst/evaluation.py

@@ -80,7 +80,8 @@ class Evaluation:
         try:
             response = requests.get(
                 f'{self.base_url}/v1/llm/llm-metrics', 
-                headers=headers)
+                headers=headers,
+                timeout=self.timeout)
             response.raise_for_status()
             metric_names = [metric["name"] for metric in response.json()["data"]["metrics"]]
             return metric_names
@@ -111,7 +112,8 @@ class Evaluation:
             response = requests.post(
                 f'{self.base_url}/v1/llm/docs', 
                 headers=headers,
-                json=data)
+                json=data,
+                timeout=self.timeout)
             response.raise_for_status()
             if response.status_code == 200:
                 return response.json()["data"]["columns"]
@@ -203,7 +205,8 @@ class Evaluation:
         try:
             response = requests.get(
                 f'{self.base_url}/v1/llm/llm-metrics', 
-                headers=headers)
+                headers=headers,
+                timeout=self.timeout)
             response.raise_for_status()
             metrics_schema = [metric for metric in response.json()["data"]["metrics"]]
             return metrics_schema
@@ -233,8 +236,15 @@ class Evaluation:
                 #checking if provider is one of the allowed providers
                 if key.lower()=="provider" and value.lower() not in sub_providers:
                     raise ValueError("Enter a valid provider name. The following Provider names are supported: OpenAI, Azure, Gemini, Groq")
-                
-                base_json["metricSpec"]["config"]["params"][key] = {"value": value}
+    
+                if key.lower()=="threshold":
+                    if len(value)>1:
+                        raise ValueError("'threshold' can only take one argument gte/lte/eq")
+                    else:
+                        for key_thres, value_thres in value.items():
+                            base_json["metricSpec"]["config"]["params"][key] = {f"{key_thres}":value_thres}
+                else:
+                    base_json["metricSpec"]["config"]["params"][key] = {"value": value}
 
 
             # if metric["config"]["model"]:
@@ -253,12 +263,15 @@ class Evaluation:
         }
         try:
             response = requests.get(
-                f'{self.base_url}/v1/llm/filter?datasetId={str(self.dataset_id)}', 
-                headers=headers
-                )
+                f"{self.base_url}/v2/llm/dataset/{str(self.dataset_id)}?initialCols=0",
+                headers=headers,
+                timeout=self.timeout,
+            )
             response.raise_for_status()
-            executed_metric_response = response.json()["data"]["filter"]
-            executed_metric_list = [item["displayName"] for item in executed_metric_response]
+            dataset_columns = response.json()["data"]["datasetColumnsResponses"]
+            dataset_columns = [item["displayName"] for item in dataset_columns]
+            executed_metric_list = [data for data in dataset_columns if not data.startswith('_')]
+
             return executed_metric_list
         except requests.exceptions.HTTPError as http_err:
             logger.error(f"HTTP error occurred: {http_err}")
@@ -301,7 +314,8 @@ class Evaluation:
             response = requests.post(
                 f'{self.base_url}/playground/metric-evaluation', 
                 headers=headers, 
-                json=metric_schema_mapping
+                json=metric_schema_mapping,
+                timeout=self.timeout
                 )
             if response.status_code == 400:
                 raise ValueError(response.json()["message"])
@@ -327,14 +341,14 @@ class Evaluation:
             "Authorization": f"Bearer {os.getenv('RAGAAI_CATALYST_TOKEN')}",
             'X-Project-Id': str(self.project_id),
         }
-        data = {"jobId": self.jobId}
         try:
-            response = requests.post(
+            response = requests.get(
                 f'{self.base_url}/job/status', 
                 headers=headers, 
-                json=data)
+                timeout=self.timeout)
             response.raise_for_status()
-            status_json = response.json()["data"]["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":
@@ -373,7 +387,8 @@ class Evaluation:
                 response = requests.post(
                     f'{self.base_url}/v1/llm/docs', 
                     headers=headers, 
-                    json=data)
+                    json=data,
+                    timeout=self.timeout)
                 response.raise_for_status()
                 return response.json()
             except requests.exceptions.HTTPError as http_err:
@@ -392,7 +407,7 @@ class Evaluation:
             try:
                 response = get_presignedUrl()
                 preSignedURL = response["data"]["preSignedURL"]
-                response = requests.get(preSignedURL)
+                response = requests.get(preSignedURL, timeout=self.timeout)
                 response.raise_for_status()
                 return response.text
             except requests.exceptions.HTTPError as http_err:

{ragaai_catalyst-2.0.4.dist-info → ragaai_catalyst-2.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ragaai_catalyst
-Version: 2.0.4
+Version: 2.0.5
 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>
 Requires-Python: >=3.9

{ragaai_catalyst-2.0.4.dist-info → ragaai_catalyst-2.0.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ragaai_catalyst/__init__.py,sha256=T0-X4yfIAe26-tWx6kLwNkKIjaFoQL2aNLIRp5wBG5w,424
 ragaai_catalyst/_version.py,sha256=JKt9KaVNOMVeGs8ojO6LvIZr7ZkMzNN-gCcvryy4x8E,460
 ragaai_catalyst/dataset.py,sha256=XjI06Exs6-64pQPQlky4mtcUllNMCgKP-bnM_t9EWkY,10920
-ragaai_catalyst/evaluation.py,sha256=qSiSIvUr2FvIGdisUzwWEYWllXDIiLKv5D00URBgGSw,18495
+ragaai_catalyst/evaluation.py,sha256=PR7rMkvZ4km26B24sSc60GPNS0JkrUMIYo5CPEqX2Qw,19315
 ragaai_catalyst/experiment.py,sha256=8KvqgJg5JVnt9ghhGDJvdb4mN7ETBX_E5gNxBT0Nsn8,19010
 ragaai_catalyst/prompt_manager.py,sha256=ZMIHrmsnPMq20YfeNxWXLtrxnJyMcxpeJ8Uya7S5dUA,16411
 ragaai_catalyst/proxy_call.py,sha256=nlMdJCSW73sfN0fMbCbtIk6W992Nac5FJvcfNd6UDJk,5497
@@ -19,7 +19,7 @@ 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/utils.py,sha256=ViygfJ7vZ7U0CTSA1lbxVloHp4NSlmfDzBRNCJuMhis,2374
-ragaai_catalyst-2.0.4.dist-info/METADATA,sha256=XfU--Yoer4WL2NfZ7RNJcojMkMDR5bfL8J36NV6HqQA,6625
-ragaai_catalyst-2.0.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-ragaai_catalyst-2.0.4.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.0.4.dist-info/RECORD,,
+ragaai_catalyst-2.0.5.dist-info/METADATA,sha256=tWppjo0sERHjjugIOAWdwD1p05HO6T6N_E1KYd9G9hY,6625
+ragaai_catalyst-2.0.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+ragaai_catalyst-2.0.5.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.0.5.dist-info/RECORD,,