Merge pull request #36 from devfinwiz/fix/nse

Modifications to fix two of the nse APIs

Author: devfinwiz

fin_maestro_kin/modules/data_toolkit/nse/nse_operations.py

@@ -333,6 +333,21 @@ def process_index_data(data):
             processed_data.append(processed_entry)
         return processed_data
 
+    @staticmethod
+    def process_index_ratios(historical_data):
+        rounded_data = Helper.convert_dataframe_to_dict(historical_data)
+        processed_data = []
+        for entry in rounded_data:
+            processed_entry = {
+                "INDEX_NAME": entry["INDEX_NAME"],
+                "HistoricalDate": entry["HistoricalDate"],
+                "OPEN": entry["OPEN"],
+                "HIGH": entry["HIGH"],
+                "LOW": entry["LOW"],
+                "CLOSE": entry["CLOSE"],
+            }
+            processed_data.append(processed_entry)   
+        return processed_data
 
 class NSEIndices(Helper):
     def __init__(self):
@@ -372,12 +387,12 @@ def get_nse_index_history(
         except Exception as e:
             raise HTTPException(status_code=500, detail=f"Error fetching historical data: {e}")
 
-    def index_pe_pb_div(self, symbol, start_date, end_date):
+    def index_pe_pb_div(self, symbol, start_date, end_date, index_name):
         start_date = datetime.datetime.strptime(start_date, "%d-%b-%Y").strftime("%d %b %Y")
         end_date = datetime.datetime.strptime(end_date, "%d-%b-%Y").strftime("%d %b %Y")
 
-        data = {"cinfo": f"{{'name':'{symbol}','startDate':'{start_date}','endDate':'{end_date}'}}"}
-        payload = requests.post('https://niftyindices.com/Backpage.aspx/getpepbHistoricaldataDBtoString', headers=self.niftyindices_headers, json=data).json()
+        data = {"cinfo": f"{{'name':'{symbol}','startDate':'{start_date}','endDate':'{end_date}','indexName':'{index_name}'}}"}
+        payload = requests.post('https://niftyindices.com/Backpage.aspx/getHistoricaldatatabletoString', headers=self.niftyindices_headers, json=data).json()
         payload = json.loads(payload["d"])
 
         if not payload:
@@ -390,19 +405,21 @@ def get_nse_indices_ratios(
         self,
         symbol: str = Query(..., title="Symbol", description="Nifty indices symbol"),
         start_date: str = Query(..., title="Start Date", description="Start date for historical data in dd-mmm-yyyy format"),
-        end_date: str = Query(..., title="End Date", description="End date for historical data in dd-mmm-yyyy format")
+        end_date: str = Query(..., title="End Date", description="End date for historical data in dd-mmm-yyyy format"),
+        index_name: str = Query(..., title="Index Name", description="Nifty index name")
     ):
         try:
-            historical_ratios_data = self.index_pe_pb_div(symbol, start_date, end_date)
-            return historical_ratios_data.to_dict(orient='records')
+            historical_ratios_data = self.index_pe_pb_div(symbol, start_date, end_date, index_name)
+            processed_data = self.process_index_ratios(historical_ratios_data)
+            return processed_data
         except Exception as e:
             raise HTTPException(status_code=500, detail=f"Error fetching historical ratios data: {e}")
 
-    def index_total_returns(self, symbol,start_date,end_date):
+    def index_total_returns(self, symbol,start_date,end_date, index_name):
         start_date = datetime.datetime.strptime(start_date, "%d-%b-%Y").strftime("%d %b %Y")
         end_date = datetime.datetime.strptime(end_date, "%d-%b-%Y").strftime("%d %b %Y")
 
-        data = {"cinfo": f"{{'name':'{symbol}','startDate':'{start_date}','endDate':'{end_date}'}}"}
+        data = {"cinfo": f"{{'name':'{symbol}','startDate':'{start_date}','endDate':'{end_date}','indexName':'{index_name}'}}"}
         payload = requests.post('https://niftyindices.com/Backpage.aspx/getTotalReturnIndexString', headers=self.niftyindices_headers, json=data).json()
         payload = json.loads(payload["d"])
 
@@ -416,10 +433,11 @@ def get_nse_indices_returns(
         self,
         symbol: str = Query(..., title="Symbol", description="Nifty indices symbol"),
         start_date: str = Query(..., title="Start Date", description="Start date for historical data in dd-mmm-yyyy format"),
-        end_date: str = Query(..., title="End Date", description="End date for historical data in dd-mmm-yyyy format")
+        end_date: str = Query(..., title="End Date", description="End date for historical data in dd-mmm-yyyy format"),
+        index_name: str = Query(..., title="Index Name", description="Nifty index name")
     ):
         try:
-            historical_returns_data = self.index_total_returns(symbol, start_date, end_date)
+            historical_returns_data = self.index_total_returns(symbol, start_date, end_date, index_name)
             return historical_returns_data.to_dict(orient='records')
         except Exception as e:
             raise HTTPException(status_code=500, detail=f"Error fetching historical ratios data: {e}")