Change to flexible target_type & target_value

api_calls.py

@@ -20,24 +20,26 @@ def call_api(api_path, api_params):
     )
     return response.json()
 
-def api_rag_qa_chain_demo(openai_model_name, query, year, company_name, history):
+def api_rag_qa_chain_demo(openai_model_name, query, year, target_type, target_value, history):
     api_path = "qa/demo"
     api_params = {
         "openai_model_name": openai_model_name,
         "query": query,
         "year": year,
-        "company_name": company_name,
+        "target_type": target_type,
+        "target_value": target_value,
         "prev_turn_of_conversation": history,
     }
     return call_api_stream(api_path, api_params)
 
-def api_rag_summ_chain_demo(openai_model_name, query, year, company_name, tone):
+def api_rag_summ_chain_demo(openai_model_name, query, year, target_type, target_value, tone):
     api_path = "summary/demo"
     api_params = {
         "openai_model_name": openai_model_name,
         "query": query,
         "year": year,
-        "company_name": company_name,
+        "target_type": target_type,
+        "target_value": target_value,
         "tone": tone,
     }
     return call_api_stream(api_path, api_params)

app.py

@@ -29,9 +29,9 @@ def add_text(history, text):
     history = history + [(text, None)]
     return history, gr.Textbox(value="", interactive=False)
 
-def esgsumm_exe(openai_model_name, year, company_name, tone):
+def esgsumm_exe(openai_model_name, year, target_type, target_value, tone):
     query = "根據您提供的相關資訊和偏好語氣，以繁體中文生成一份符合GRI標準的報告草稿。報告將包括每個GRI披露項目的標題、相關公司行為的概要，以及公司的具體措施和效果。"
-    response = api_rag_summ_chain_demo(openai_model_name, query, year, company_name, tone)
+    response = api_rag_summ_chain_demo(openai_model_name, query, year, target_type, target_value, tone)
     full_anwser = ""
     for chunk in response.iter_content(chunk_size=32):
         if chunk:
@@ -45,9 +45,9 @@ def esgsumm_exe(openai_model_name, year, company_name, tone):
     #     full_text += character
     #     yield full_text
 
-def esgqabot(history, openai_model_name, year, company_name):
+def esgqabot(history, openai_model_name, year, target_type, target_value):
     query = history[-1][0]
-    response = api_rag_qa_chain_demo(openai_model_name, query, year, company_name, history[:-1])
+    response = api_rag_qa_chain_demo(openai_model_name, query, year, target_type, target_value, history[:-1])
     history[-1][1] = ""
     for chunk in response.iter_content(chunk_size=32):
         if chunk:
@@ -89,8 +89,12 @@ with gr.Blocks(css=css, theme=gr.themes.Monochrome(neutral_hue="green", primary_
                     label="Year",
                     choices=["111", "110", "109"]
                 )
-                esgsumm_company_name = gr.Dropdown(
-                    label="Company Name",
+                esgsumm_target_type = gr.Dropdown(
+                    label="Target Type",
+                    choices=["company_name", "industry"]
+                )
+                esgsumm_target_value = gr.Dropdown(
+                    label="Target Value",
                     choices=["台泥", "聯電", "裕融", "大同", "台積電", "鴻海", "中鋼", "中華電信"]
                 )
                 esgsumm_report_gen_button = gr.Button("Generate Report")
@@ -129,8 +133,12 @@ with gr.Blocks(css=css, theme=gr.themes.Monochrome(neutral_hue="green", primary_
                     label="Year",
                     choices=["111", "110", "109"]
                 )
-                esgqa_company_name = gr.Dropdown(
-                    label="Company Name",
+                esgqa_target_type = gr.Dropdown(
+                    label="Target Type",
+                    choices=["company_name", "industry"]
+                )
+                esgqa_target_value = gr.Dropdown(
+                    label="Target Value",
                     choices=["台泥", "聯電", "裕融", "大同", "台積電", "鴻海", "中鋼", "中華電信"]
                 )
 
@@ -163,7 +171,7 @@ with gr.Blocks(css=css, theme=gr.themes.Monochrome(neutral_hue="green", primary_
 
     # esgsumm
     esgsumm_report_gen_button.click(
-        esgsumm_exe, [esgsumm_openai_model_name, esgsumm_year, esgsumm_company_name, esgsumm_report_tone], [esgsumm_report_output]
+        esgsumm_exe, [esgsumm_openai_model_name, esgsumm_year, esgsumm_target_type, esgsumm_target_value, esgsumm_report_tone], [esgsumm_report_output]
     ).then(
         markdown2html, [esgsumm_report_output], [esgsumm_report_output_html]
     )
@@ -177,14 +185,14 @@ with gr.Blocks(css=css, theme=gr.themes.Monochrome(neutral_hue="green", primary_
     esgqa_chatbot_input.submit(
         add_text, [esgqa_chatbot, esgqa_chatbot_input], [esgqa_chatbot, esgqa_chatbot_input], queue=False
     ).then(
-        esgqabot, [esgqa_chatbot, esgqa_openai_model_name, esgqa_year, esgqa_company_name], esgqa_chatbot, api_name="esgqa_response"
+        esgqabot, [esgqa_chatbot, esgqa_openai_model_name, esgqa_year, esgqa_target_type, esgqa_target_value], esgqa_chatbot, api_name="esgqa_response"
     ).then(
         lambda: gr.Textbox(interactive=True), None, [esgqa_chatbot_input], queue=False
     )
     esgqa_chat_btn.click(
         add_text, [esgqa_chatbot, esgqa_chatbot_input], [esgqa_chatbot, esgqa_chatbot_input], queue=False
     ).then(
-        esgqabot, [esgqa_chatbot, esgqa_openai_model_name, esgqa_year, esgqa_company_name], esgqa_chatbot, api_name="esgqa_response"
+        esgqabot, [esgqa_chatbot, esgqa_openai_model_name, esgqa_year, esgqa_target_type, esgqa_target_value], esgqa_chatbot, api_name="esgqa_response"
     ).then(
         lambda: gr.Textbox(interactive=True), None, [esgqa_chatbot_input], queue=False
     )