Updating Mandi Price widget to auto-populate sub-dropdown lists based on the selection of the above dropdown

app.py

@@ -27,7 +27,8 @@ class DomState:
         self.answer = ''
         self.summary = ''
         self.mandi_price = ''
-        self.mandi_from_date = (datetime.datetime.now() - datetime.timedelta(days=5)).strftime('%Y-%m-%d')
+        # At max past 7 days of data can be fetched for Mandi price
+        self.mandi_from_date = (datetime.datetime.now() - datetime.timedelta(days=7)).strftime('%Y-%m-%d')
         self.mandi_to_date = datetime.datetime.now().strftime('%Y-%m-%d')
         self.weather_info = ''
         self.weather_forecast = ''
@@ -86,29 +87,6 @@ class DomState:
         return self.answer
     
     
-    def click_handler_for_mandi_price(
-        self,
-        state_name,
-        apmc_name,
-        commodity_name,
-        from_date,
-        to_date
-    ):
-        if state_name and apmc_name and commodity_name and from_date and to_date:
-            self.mandi_price = self.kkms_kssw_obj.mandi_utils_obj.get_mandi_price(state_name, apmc_name, commodity_name, from_date, to_date)
-
-        # NOTE: Below code is only to display Mandi Prices in Gradio front-end. It could be removed when Engineering team writes a wrapper on top of app.py.
-        self.mandi_price = sorted(self.mandi_price['data'], key=lambda x: x.get('created_at', ''), reverse=True)
-        mandi_price = ''
-        for ids in self.mandi_price:
-            mandi_price += f'='*100 + '\n'
-            for id, val in ids.items():
-                mandi_price += '%-30s: %s\n' % (id, val)
-        self.mandi_price = mandi_price
-
-        return self.mandi_price
-    
-    
     def click_handler_for_get_weather(
         self,
         city
@@ -176,6 +154,62 @@ class DomState:
         return self.kkms_kssw_obj.weather_utils_obj.get_weather_forecast(state, district)
 
 
+    def click_handler_for_mandi_price(
+        self,
+        state_name,
+        apmc_name,
+        commodity,
+        from_date,
+        to_date
+    ):
+        if state_name and apmc_name and commodity and from_date and to_date:
+            self.mandi_price = self.kkms_kssw_obj.mandi_utils_obj.get_mandi_price(state_name, apmc_name, commodity, from_date, to_date)
+
+            # NOTE: Below code is only to display Mandi Prices in Gradio front-end. It could be removed when Engineering team writes a wrapper on top of app.py.
+            if isinstance(self.mandi_price, dict) and 'data' in self.mandi_price:
+                self.mandi_price = sorted(self.mandi_price['data'], key=lambda x: x.get('created_at', ''), reverse=True)
+                mandi_price = ''
+                for ids in self.mandi_price:
+                    mandi_price += f'='*100 + '\n'
+                    for id, val in ids.items():
+                        mandi_price += '%-30s: %s\n' % (id, val)
+                self.mandi_price = mandi_price
+            else:
+                self.mandi_price = f'Mandi Price for {state_name} - {apmc_name} - {commodity} - from {from_date} to {to_date} is not available. Please select the correct State name, APMC name, Commodity with different dates.'
+        else:
+            self.mandi_price = 'Please select all the fields State name, APMC name, Commodity and from-to dates.'
+
+        return self.mandi_price
+
+
+    def click_handler_for_mandi_price_apmc_name_dropdown_list_update(
+        self,
+        state_name,
+        apmc_name
+    ):
+        return gr.update(
+            choices=self.kkms_kssw_obj.mandi_utils_obj.get_mandi_apmcs(state_name)
+        )
+
+
+    def click_handler_for_mandi_price_commodity_dropdown_list_update(
+        self,
+        state_name,
+        apmc_name,
+        from_date,
+        to_date,
+        commodity
+    ):
+        return gr.update(
+            choices=self.kkms_kssw_obj.mandi_utils_obj.get_mandi_commodity(
+                state_name,
+                apmc_name,
+                from_date,
+                to_date
+            )
+        )
+
+
     def click_handler_for_feedback(
         self,
         question_category,
@@ -370,9 +404,11 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
                     label="Select Question Category",
                     value=constants_utils.INDEX_CATEGORY[0]
                 )
+
                 question = gr.Textbox(label="Enter your question", placeholder='Type the question here')
                 # Get the Relevant paragraphs for the question asked
                 relevant_paragraphs = gr.Textbox(label="Relevant paragraphs are:", value=dom.relevant_paragraphs, interactive=False)
+                
                 b_relevant_paragraphs = gr.Button("Get Relevant paragraphs").style(size='sm')
                 b_relevant_paragraphs.click(
                     fn=dom.click_handler_for_get_relevant_paragraphs,
@@ -384,6 +420,7 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
             with gr.Tab(label='Sources of relevant paragraphs'):
                 # Get the Sources of relevant paragraphs
                 sources_relevant_paragraphs = gr.Textbox(label="Sources of relevant paragraphs are:", interactive=False)
+
                 relevant_paragraphs.change(
                         dom.click_handler_for_relevant_paragraphs_source,
                         relevant_paragraphs,
@@ -394,6 +431,7 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
             with gr.Column(scale=1, min_width=600):
                 with gr.Tab(label='Answer'):
                     answer = gr.Textbox(label="Answer is:", value=dom.answer, interactive=False)
+                    
                     relevant_paragraphs.change(
                             dom.click_handler_for_get_answer,
                             [relevant_paragraphs, question],
@@ -409,14 +447,22 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
                         label="Select language",
                         value=list(constants_utils.INDIC_LANGUAGE.keys())[0]
                     )
+
                     indic_lang_answer = gr.Textbox(label="Answer in the selected language is:", interactive=False)
+
+                    # Automatically translate answer in the selected language upon change in the answer
                     answer.change(
-                            dom.click_handler_for_get_indic_translation,
-                            answer,
-                            indic_lang_answer
-                        )
-                    b_indic_lang_answer = gr.Button("Get answer in selected language").style(size='sm')
-                    b_indic_lang_answer.click(fn=dom.click_handler_for_get_indic_translation, inputs=[answer, language], outputs=[indic_lang_answer])
+                        dom.click_handler_for_get_indic_translation,
+                        answer,
+                        indic_lang_answer
+                    )
+
+                    # Automatically translate answer in the selected language upon change in the language selection
+                    language.change(
+                        dom.click_handler_for_get_indic_translation,
+                        [answer, language],
+                        indic_lang_answer
+                    )
 
         with gr.Column(scale=1, min_width=600):
             with gr.Tab(label='Feedback'):
@@ -425,12 +471,13 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
                     [
                         "Correct",
                         "Incorrect",
-                        "Partially Correct and contains irrelevant text",
                         "Correct but not complete",
+                        "Partially Correct and also contains irrelevant text",
                     ],
                     label="Answer is",
                     value="Correct"
                 )
+
                 b_feedback = gr.Button("Submit Feedback").style(size='sm')
                 b_feedback.click(
                     fn=dom.click_handler_for_feedback,
@@ -444,38 +491,84 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
         with gr.Column(scale=1, min_width=600):
             chatbot = gr.Chatbot()
             msg = gr.Textbox()
-            submit = gr.Button("Submit")
-            clear = gr.Button("Clear")
-            submit.click(
-                dom.kkms_kssw_obj.langchain_utils_obj.user, [msg, chatbot], [msg, chatbot]
-            ).then(dom.kkms_kssw_obj.langchain_utils_obj.bot, chatbot, chatbot)
-            clear.click(
-                dom.kkms_kssw_obj.langchain_utils_obj.clear_history, None, chatbot, queue=False)
+            
+            with gr.Row():
+                submit = gr.Button("Submit")
+                submit.click(
+                    dom.kkms_kssw_obj.langchain_utils_obj.user, [msg, chatbot], [msg, chatbot]
+                ).then(dom.kkms_kssw_obj.langchain_utils_obj.bot, chatbot, chatbot)
+
+                clear = gr.Button("Clear")
+                clear.click(
+                    dom.kkms_kssw_obj.langchain_utils_obj.clear_history, None, chatbot, queue=False)
 
 
     #############################################################################
     # Widget for Mandi Price
     with gr.Row(visible=False) as rowMandiPrice:
         with gr.Column(scale=1, min_width=600):
-            # Select State
+            # Select State name
             state_name = gr.Dropdown(
-                constants_utils.MANDI_PRICE_STATES,
-                label="Select state",
-                value=constants_utils.MANDI_PRICE_STATES[0]
+                list(constants_utils.MANDI_PRICE_STATES_IDS.keys()),
+                label="Select state name",
+                value=list(constants_utils.MANDI_PRICE_STATES_IDS.keys())[0]
             )
-            # APMC name
-            apmc_name = gr.Textbox(label="Enter APMC name", placeholder='Type the APMC name here')
-            # APMC name
-            commodity_name = gr.Textbox(label="Enter Commodity name", placeholder='Type the Commodity name here')
-                      
+
+            # Select APMC Name
+            apmc_name = gr.Dropdown(
+                choices=[],
+                label="Select APMC Name"
+            )
+
+            # Select Commodity
+            commodity = gr.Dropdown(
+                choices=[],
+                label="Select Commodity"
+            )
+
+            # Get APMC of the selected state name
+            state_name.change(
+                dom.click_handler_for_mandi_price_apmc_name_dropdown_list_update,
+                state_name,
+                apmc_name
+            )
+            
             # From/To date in yyyy-mm-dd format
-            from_date = gr.Textbox(label="From date?", value=dom.mandi_from_date, placeholder='Please enter the From date here in yyyy-mm-dd format')
-            to_date = gr.Textbox(label="To date?", value=dom.mandi_to_date, placeholder='Please enter the To date here in yyyy-mm-dd format')
+            from_date = gr.Textbox(label="From date", value=dom.mandi_from_date, placeholder='Please enter the From date here in yyyy-mm-dd format')
+            to_date = gr.Textbox(label="To date", value=dom.mandi_to_date, placeholder='Please enter the To date here in yyyy-mm-dd format')
+
+            # Get Commodity of the selected State name - APMC name - From/To Date
+            apmc_name.change(
+                dom.click_handler_for_mandi_price_commodity_dropdown_list_update,
+                [state_name, apmc_name, from_date, to_date],
+                commodity
+            )
+
+            # NOTE: Commodity changes whenever there is a change in From/To date selection
+            from_date.change(
+                dom.click_handler_for_mandi_price_commodity_dropdown_list_update,
+                [state_name, apmc_name, from_date, to_date],
+                commodity
+            )
+
+            # NOTE: Commodity changes whenever there is a change in From/To date selection
+            to_date.change(
+                dom.click_handler_for_mandi_price_commodity_dropdown_list_update,
+                [state_name, apmc_name, from_date, to_date],
+                commodity
+            )
         
         with gr.Column(scale=1, min_width=600):
             mandi_price = gr.Textbox(label=f"Mandi Price is:", value=dom.mandi_price, interactive=False)
+            
+            commodity.change(
+                dom.click_handler_for_mandi_price,
+                [state_name, apmc_name, commodity, from_date, to_date],
+                mandi_price
+            )
+
             b_summary = gr.Button("Get Mandi Price").style(size='sm')
-            b_summary.click(fn=dom.click_handler_for_mandi_price, inputs=[state_name, apmc_name, commodity_name, from_date, to_date], outputs=[mandi_price])
+            b_summary.click(fn=dom.click_handler_for_mandi_price, inputs=[state_name, apmc_name, commodity, from_date, to_date], outputs=[mandi_price])
     
     
     #############################################################################
@@ -516,6 +609,7 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
             with gr.Tab(label='Weather Forecast Summary'):
                 # Get the summary of the weather forecast
                 weather_forecast_summary = gr.Textbox(label="Weather Forecast Summary is:", interactive=False)
+                
                 district.change(
                         dom.click_handler_for_weather_forecast_summary,
                         district_weather,
@@ -531,6 +625,7 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
                         label="Select language",
                         value=list(constants_utils.INDIC_LANGUAGE.keys())[0]
                     )
+
                     indic_weather_forecast_summary = gr.Textbox(label="Weather Forecast Summary in the selected language is:", interactive=False)
 
                     # By default display weather forecast summary in Hindi. User can change it later on.
@@ -574,12 +669,14 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
                 with gr.Row(visible=True) as rowUploadPdf:
                     with gr.Column(scale=1, min_width=600):
                         file_output = gr.File()
+                        
                         upload_button = gr.UploadButton(
                             "Click to Upload PDF Files",
                             file_types=['.pdf'],
                             file_count="multiple"
                         )
                         upload_button.upload(dom._upload_file, upload_button, file_output)
+                        
                         b_files = gr.Button("Load PDF Files").style(size='sm')
                         b_files.click(
                             fn=dom.click_handler_for_load_files_urls,
@@ -589,6 +686,7 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
                 with gr.Row(visible=False) as rowUploadOnlinePdf:
                     with gr.Column(scale=1, min_width=600):
                         urls = gr.Textbox(label="Enter URLs for Online PDF (Supports uploading from multiple URLs. Enter the URLs in comma (,) separated format.)", placeholder='Type the URLs here')
+                        
                         b_urls = gr.Button("Load Online PDFs").style(size='sm')
                         b_urls.click(
                             fn=dom.click_handler_for_load_files_urls,
@@ -598,12 +696,14 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
                 with gr.Row(visible=False) as rowUploadTextFile:
                     with gr.Column(scale=1, min_width=600):
                         file_output = gr.File()
+                        
                         upload_button = gr.UploadButton(
                             "Click to Upload Text Files",
                             file_types=['.txt'],
                             file_count="multiple"
                         )
                         upload_button.upload(dom._upload_file, upload_button, file_output)
+                        
                         b_files = gr.Button("Load Text Files").style(size='sm')
                         b_files.click(
                             fn=dom.click_handler_for_load_files_urls,
@@ -613,6 +713,7 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
                 with gr.Row(visible=False) as rowUploadUrls:
                     with gr.Column(scale=1, min_width=600):
                         urls = gr.Textbox(label="Enter URLs (Supports uploading from multiple URLs. Enter the URLs in comma (,) separated format.)", placeholder='Type the URLs here')
+                        
                         b_urls = gr.Button("Load URLs").style(size='sm')
                         b_urls.click(
                             fn=dom.click_handler_for_load_files_urls,
@@ -637,6 +738,7 @@ with gr.Blocks(title='KKMS-Smart-Search-Demo') as demo:
         with gr.Column(scale=1, min_width=600):
             with gr.Tab(label='Following PDFs, Text files, and URLs have been ingested and indexed in the Knowledge Base and are available for querying.'):
                 kb_sources = gr.Textbox(label=f"Data loaded from:", value=dom.kb_sources, interactive=False)
+                
                 b_kb_sources = gr.Button("Display Data Sources").style(size='sm')
                 b_kb_sources.click(
                     fn=dom.click_handler_for_get_kb_sources,

src/constants.py

@@ -1,6 +1,7 @@
 import os
 import src.web_crawler as web_crawler_utils
 import src.weather as weather_utils
+import src.mandi_price as mandi_utils
 
 # Wheater to load the existing index store or create from scratch?
 LOAD_FROM_EXISTING_INDEX_STORE = True
@@ -51,45 +52,23 @@ DATA_SOURCES = {
 
 # LangChain related constants
 SIMILARITY_TOP_K = 1
+ANSWER_SIMILARITY_TOP_K = 3
 MODE = 'embedding'
 RESPONSE_MODE = 'default'
 TEXT_SPLITTER_CHUNK_SIZE = 1000
 TEXT_SPLITTER_CHUNK_OVERLAP = 0
 TEXT_SPLITTER_SEPARATOR = '\n\n'
 
+# State list used in the Mandi Price widget dropdown list
+mandi_utils_obj = mandi_utils.MANDI_PRICE()
+MANDI_PRICE_STATES_IDS = mandi_utils_obj.get_mandi_states()
 
-URLS = [
-    # Govt. Schemes
-    'https://agricoop.nic.in/en/Major#gsc.tab=0'
-    'https://agricoop.nic.in/#gsc.tab=0',
-
-    'https://dmi.gov.in/Documents/GrantCAGrapes.pdf',
-    'https://dmi.gov.in/Documents/organicfaq.pdf',
-    'https://dmi.gov.in/Documents/CAGMOrganic-III.pdf',
-    'https://dmi.gov.in/GradesStandard.aspx',
-    'https://www.india.gov.in/topics/agriculture',
-    'https://www.india.gov.in/farmers-portal',
-    
-    # Pest Management related
-    'https://niphm.gov.in/IPMPackages/Maize.pdf',
-
-    # Banned Pesticides
-    'https://ppqs.gov.in/divisions/cib-rc/registered-products',     # Online PDF links on the page
-    
-    # Mandi Price related
-    'https://agmarknet.gov.in/',
-    
-    # General information related: Information of interests are present on the 2nd level url
-    'https://www.manage.gov.in/nf/nf.asp',
-    
-    # Weather forecast related
-    'https://nwp.imd.gov.in/blf/blf_temp/',   # need to select state -> district (on the new page) -> displays detailed table -> can get info at the block level as well from the same page on selection
-    'https://nwp.imd.gov.in/blf/blf_temp/dis.php?value=12gujarat',   # to get weather forecast for the given state
-    'https://nwp.imd.gov.in/blf/blf_temp/block.php?dis=12BHAVNAGAR',   # to get the weather forecast for the given district
-]
-
+# State list used in the Weather forecast widget dropdown list
+weather_utils_obj = weather_utils.WEATHER()
+WEATHER_FORECAST_STATE_CODES = weather_utils_obj.get_state_names_codes()
 
 # Supported Indian laguages for translating the English text to Indian language
+# NOTE: Add mappings here to add the support for any other Indic language
 INDIC_LANGUAGE = {
     'Hindi': 'hi',
     'Gujarati': 'gu',
@@ -102,41 +81,6 @@ INDIC_LANGUAGE = {
     'Malayalam': 'ml',
 }
 
-# State list used in the Mandi Price widget dropdown list
-MANDI_PRICE_STATES = [
-    'ANDAMAN AND NICOBAR ISLANDS',
-    'ANDHRA PRADESH',
-    'ASSAM',
-    'BIHAR',
-    'CHANDIGARH',
-    'CHHATTISGARH',
-    'GOA',
-    'GUJARAT',
-    'HARYANA',
-    'HIMACHAL PRADESH',
-    'JAMMU AND KASHMIR',
-    'JHARKHAND',
-    'KARNATAKA',
-    'KERALA',
-    'MADHYA PRADESH',
-    'MAHARASHTRA',
-    'NAGALAND',
-    'ODISHA',
-    'PUDUCHERRY',
-    'PUNJAB',
-    'RAJASTHAN',
-    'TAMIL NADU',
-    'TELANGANA',
-    'TRIPURA',
-    'UTTAR PRADESH',
-    'UTTARAKHAND',
-    'WEST BENGAL'
-]
-
-# State list used in the Weather forecast widget dropdown list
-weather_utils_obj = weather_utils.WEATHER()
-WEATHER_FORECAST_STATE_CODES = weather_utils_obj.get_state_names_codes()
-
 # LIST OF  PESTICIDES WHICH ARE BANNED AND RESTRICTED USE (List created from: https://pib.gov.in/PressReleaseIframePage.aspx?PRID=1896140)
 BANNED_PESTICIDES_FORMULATIONS = [
     'Alachlor',
@@ -152,3 +96,34 @@ BANNED_PESTICIDES_FORMULATIONS = [
     'Copper Acetoarsenite',
 ]
 
+# URLs used by FTAs at different KCCs
+URLS = [
+    # Govt. Schemes
+    'https://agricoop.nic.in/en/Major#gsc.tab=0'
+    'https://agricoop.nic.in/#gsc.tab=0',
+
+    'https://dmi.gov.in/Documents/GrantCAGrapes.pdf',
+    'https://dmi.gov.in/Documents/organicfaq.pdf',
+    'https://dmi.gov.in/Documents/CAGMOrganic-III.pdf',
+    'https://dmi.gov.in/GradesStandard.aspx',
+    'https://www.india.gov.in/topics/agriculture',
+    'https://www.india.gov.in/farmers-portal',
+    
+    # Pest Management related
+    'https://niphm.gov.in/IPMPackages/Maize.pdf',
+
+    # Banned Pesticides
+    'https://ppqs.gov.in/divisions/cib-rc/registered-products',     # Online PDF links on the page
+    
+    # Mandi Price related
+    'https://enam.gov.in/web/dashboard/trade-data',     # Currently Mandi Price widget fetches data from this url
+    'https://agmarknet.gov.in/',
+    
+    # General information related: Information of interests are present on the 2nd level url
+    'https://www.manage.gov.in/nf/nf.asp',
+    
+    # Weather forecast related
+    'https://nwp.imd.gov.in/blf/blf_temp/',   # need to select state -> district (on the new page) -> displays detailed table -> can get info at the block level as well from the same page on selection
+    'https://nwp.imd.gov.in/blf/blf_temp/dis.php?value=12gujarat',   # to get weather forecast for the given state
+    'https://nwp.imd.gov.in/blf/blf_temp/block.php?dis=12BHAVNAGAR',   # to get the weather forecast for the given district
+]

src/langchain_utils.py

@@ -82,28 +82,6 @@ class LANGCHAIN_UTILS:
         self.index_category_doc_type_wise_data_sources = {}
 
 
-    def generate_prompt_template(
-        self,
-        prompt_type='general'
-    ):
-        prompt_template = ''
-
-        if prompt_type == 'general':
-            prompt_template = """Write a concise summary of the following:
-
-            {text}
-
-            SUMMARIZE IN ENGLISH:"""
-
-        elif prompt_type == 'weather':
-            prompt_template = """
-                What would be the weather based on the below data:
-                {text}
-            """
-
-        return prompt_template
-
-
     def user(
         self,
         user_message,
@@ -140,6 +118,28 @@ class LANGCHAIN_UTILS:
         return None
 
 
+    def generate_prompt_template(
+        self,
+        prompt_type='general'
+    ):
+        prompt_template = ''
+
+        if prompt_type == 'general':
+            prompt_template = """Write a concise summary of the following:
+
+            {text}
+
+            SUMMARIZE IN ENGLISH:"""
+
+        elif prompt_type == 'weather':
+            prompt_template = """
+                What would be the weather based on the below data:
+                {text}
+            """
+
+        return prompt_template
+
+
     def get_textual_summary(
         self,
         text,
@@ -213,7 +213,7 @@ class LANGCHAIN_UTILS:
             )
 
         # Search for the similar docs
-        docs = docsearch.similarity_search(question, k=3)
+        docs = docsearch.similarity_search(question, k=constants_utils.ANSWER_SIMILARITY_TOP_K)
 
         llm = OpenAI(temperature=0)
         # Create a Chain for question answering

src/mandi_price.py

@@ -3,9 +3,9 @@ import requests
 
 class MANDI_PRICE:
     def __init__(self):
+        # Base URL to get the Mandi Price details
         self.base_url = "https://enam.gov.in/web/Ajax_ctrl/trade_data_list"
-        # "https://enam.gov.in/web/dashboard/trade-data",
-        # "https://enam.gov.in/web/dashboard/trade_data_list",
+        # self.base_url = "https://enam.gov.in/web/dashboard/trade-data"
 
 
     def get_mandi_price(self,
@@ -31,3 +31,84 @@ class MANDI_PRICE:
         )
 
         return response.json()
+
+
+    def get_mandi_states(
+        self
+    ):
+        base_url = 'https://enam.gov.in/web/ajax_ctrl/states_name'
+        headers = {
+            'Accept': 'application/json, text/javascript, */*; q=0.01',
+        }
+
+        response = requests.get(
+            base_url,
+            headers=headers,
+        )
+
+        response = response.json()
+        response = response.get('data', [])
+        # state_names = [i for i in map(lambda x: x.get('state_name', ''), response)]
+        state_names_ids = {}
+        for state in response:
+            if state.get('state_name', ''):
+                state_names_ids[state.get('state_name')] = state.get('state_id', '')
+        
+        return state_names_ids
+
+
+    def get_mandi_apmcs(
+        self,
+        state_name
+    ):
+        base_url = 'https://enam.gov.in/web/Ajax_ctrl/apmc_list'
+        headers = {
+            "Content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+            "Referer": "https://enam.gov.in/web/dashboard/trade-data",
+            "Accept": "application/json, text/javascript, */*; q=0.01",
+        }
+        payload = f'state_id={self.get_mandi_states().get(state_name)}'
+
+        response = requests.post(
+            base_url,
+            data=payload,
+            headers=headers
+        )
+
+        response = response.json()
+        response = response.get('data', [])
+        # apmc_names = [i for i in map(lambda x: x.get('apmc_name', ''), response)]
+        apmc_names_ids = {}
+        for apmc in response:
+            if apmc.get('apmc_name', ''):
+                apmc_names_ids[apmc.get('apmc_name')] = apmc.get('apmc_id', '')
+        
+        return list(apmc_names_ids.keys())
+
+
+    def get_mandi_commodity(
+        self,
+        state_name,
+        apmc_name,
+        from_date,
+        to_date
+    ):
+        base_url = 'https://enam.gov.in/web/Ajax_ctrl/commodity_list'
+        headers = {
+            "Content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+            "Accept": "application/json, text/javascript, */*; q=0.01",
+            "Referer": "https://enam.gov.in/web/dashboard/trade-data"
+        }
+        payload = f'language=en&stateName={state_name}&apmcName={apmc_name}&fromDate={from_date}&toDate={to_date}'
+
+        response = requests.post(
+            base_url,
+            data=payload,
+            headers=headers
+        )
+
+        response = response.json()
+        commodity_names_ids = response.get('data', [])
+        commodity_list = [i for i in map(lambda x: x.get('commodity', ''), commodity_names_ids)]
+        return commodity_list
+