Update app.py

app.py

@@ -379,7 +379,7 @@ def gradio_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
                 </div>
             </div>
         </div>
-        <div style='text-align: center; margin-bottom: 24px; font-size: 24px;'>➜</div>
+        <div>➜</div>
         <div style='text-align: center;'>
             <div style="margin-bottom: 24px;">
                 <div style="font-size: 24px; margin-bottom: 24px;"></div>
@@ -399,86 +399,129 @@ def gradio_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
     return result_html
 
 
-
-
-
-# Define the interface for the Portfolio tab
-def portfolio_interface(input_text, cash_amount, cash_ratio):
-    result = rebalancing_tool(input_text, cash_amount, cash_ratio)
-    return result
-
-portfolio_inputs = [
-    gr.Textbox(label="🔥 Holdings", lines=2, placeholder="Format: [stock code  currency  quantity  target weight,    ...]"),
-    gr.Number(label="🪵 Cash", value=""),
-    gr.Slider(label="⚖️ Cash Ratio (%)", minimum=0, maximum=100, step=1)
-]
-
-portfolio_interface = gr.Interface(
-    fn=portfolio_interface,
-    inputs=portfolio_inputs,
-    outputs=gr.HTML(),
-    examples = [
+pf_dataset_samples = [
     ["458730 krw 571 8,\n368590 krw 80 2", 17172, 0],
     ["SCHD USD 400 8,\nQQQ USD 40 2", 1000000, 25],
     ["458730 krw 571 8,\n368590 krw 80 2,\nSCHD USD 400 8,\nQQQ USD 40 2", 1000000, 25]
-    ],
-    live=False
-)
-
-# Define the interface for the Compare tab
-def compare_interface(stock_codes, period):
-    result = plot_stock_prices(stock_codes, period)
-    return result
-
-compare_inputs = [
-    gr.Textbox(label="📈 Stock Codes", lines=2, placeholder="Enter stock codes separated by comma (e.g., AAPL,GOOGL,MSFT)"),
-    gr.Number(label="📆 Period (days)", value=90)
 ]
-
-compare_interface = gr.Interface(
-    fn=compare_interface,
-    inputs=compare_inputs,
-    outputs=gr.HTML(),
-    examples = [
-    ["SCHD,QQQ", 90],
-    ["458730,368590", 90],
-    ["AAPL,GOOGL,MSFT", 90]
-    ],
-    live=False
-)
-
-# Define the interface for the Cost Averaging tab
-def cost_averaging_interface(old_avg_price, old_quantity, new_price, new_quantity):
-    result = gradio_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity)
-    return result
-
-cost_averaging_inputs = [
-    gr.Number(label="Old Price", value=""),
-    gr.Number(label="Quantity", value=""),
-    gr.Number(label="New Price", value=""),
-    gr.Number(label="Quantity", value="")
+stock_dataset_samples = [
+    ["SCHD,QQQ", 30],
+    ["458730,368590", 30],
+    ["AAPL,GOOGL,MSFT", 30]
 ]
-
-cost_averaging_interface = gr.Interface(
-    fn=cost_averaging_interface,
-    inputs=cost_averaging_inputs,
-    outputs=gr.HTML(),
-    examples = [
+average_dataset_samples = [
     [78.15, 6.024272, 77.11, 1]
-    ],
-    live=False
-)
-
-# Combine all interfaces into a tabbed interface
+]
 with gr.Blocks(css='style.css') as demo:
     with gr.Column(elem_id="col-container"):
+
         with gr.Tabs():
             with gr.TabItem("Portfolio"):
-                portfolio_interface.render()
+                with gr.Column():
+                    input_text = gr.Textbox(label="🔥 Holdings", lines=2, placeholder="Format: [stock code  currency  quantity  target weight,    ...]")
+                with gr.Row():
+                    cash_amount = gr.Number(label="🪵 Cash", value="")
+                    cash_ratio = gr.Slider(label="⚖️ Cash Ratio (%)", minimum=0, maximum=100, step=1)
+                pf_dataset = Dataset(components=[input_text], samples=pf_dataset_samples, label=None)
+                pf_dataset.click(fn=lambda x: x, inputs=pf_dataset, outputs=[input_text, cash_amount, cash_ratio])
+                rebalance_button = gr.Button("Analyze Data")
+                gr.Markdown("---")
+                pf_result = gr.HTML()
+                # input_text.change(
+                #     rebalancing_tool,
+                #     inputs=[input_text, cash_amount, cash_ratio],
+                #     outputs=pf_result
+                # )
+                # cash_amount.change(
+                #     rebalancing_tool,
+                #     inputs=[input_text, cash_amount, cash_ratio],
+                #     outputs=pf_result
+                # )
+                # cash_ratio.change(
+                #     rebalancing_tool,
+                #     inputs=[input_text, cash_amount, cash_ratio],
+                #     outputs=pf_result
+                # )
+                rebalance_button.click(rebalancing_tool, [input_text, cash_amount, cash_ratio], pf_result)
+                clear_button = gr.ClearButton([input_text, cash_amount, cash_ratio, pf_result], value="Clear")
+                
+
             with gr.TabItem("Compare"):
-                compare_interface.render()
+                with gr.Row():
+                    stock_codes = gr.Textbox(label="📈 Stock Codes", lines=2, placeholder="Enter stock codes separated by comma (e.g., AAPL,GOOGL,MSFT)")
+                    period = gr.Textbox(label="📆 Period (days)", placeholder="e.g. 30")
+                stock_dataset = Dataset(components=[stock_codes], samples=stock_dataset_samples, label=None)
+                stock_dataset.click(
+                    fn=lambda x: x,
+                    inputs=stock_dataset,  # 데이터세트 자체를 입력으로 지정
+                    outputs=[stock_codes, period]  # 결과 메시지 및 입력 필드들을 출력으로 설정
+                )
+                compare_button = gr.Button("Compare Stock Prices")
+                gr.Markdown("---")                
+                comparison_result = gr.HTML()
+                # stock_codes.change(
+                #     plot_stock_prices,
+                #     inputs=[stock_codes, period],
+                #     outputs=comparison_result
+                # )
+                # period.change(
+                #     plot_stock_prices,
+                #     inputs=[stock_codes, period],
+                #     outputs=comparison_result
+                # )
+                compare_button.click(plot_stock_prices, [stock_codes, period], comparison_result)
+                clear_button = gr.ClearButton([stock_codes, period, comparison_result], value="Clear")                
+
             with gr.TabItem("Cost Averaging"):
-                cost_averaging_interface.render()
+                with gr.Accordion("📉 First Purchase", open=True):
+                    old_avg_price_input = gr.Number(label="Old Price", value="")
+                    old_quantity_input = gr.Number(label="Quantity", value="")
+                with gr.Accordion("💧 Second Purchase", open=True):    
+                    new_price_input = gr.Number(label="New Price", value="")
+                    new_quantity_input = gr.Number(label="Quantity", value="")
+                
+                average_button = gr.Button("Calculate Cost Averaging")
+                gr.Markdown("---")                
+                average_results = gr.HTML()  # Changed to HTML for styled output
+                
+                inputs = [old_avg_price_input, old_quantity_input, new_price_input, new_quantity_input]
+
+                # old_avg_price_input.change(
+                #     gradio_cost_averaging,
+                #     inputs=inputs,
+                #     outputs=average_results
+                # )
+                # old_quantity_input.change(
+                #     gradio_cost_averaging,
+                #     inputs=inputs,
+                #     outputs=average_results
+                # )
+                # new_price_input.change(
+                #     gradio_cost_averaging,
+                #     inputs=inputs,
+                #     outputs=average_results
+                # )
+                # new_quantity_input.change(
+                #     gradio_cost_averaging,
+                #     inputs=inputs,
+                #     outputs=average_results
+                # )
+                
+                average_dataset = Dataset(components=[old_avg_price_input], samples=average_dataset_samples, label=None)
+                average_dataset.click(
+                    fn=lambda x: x,
+                    inputs=average_dataset,  # 데이터세트 자체를 입력으로 지정
+                    outputs=[old_avg_price_input, old_quantity_input, new_price_input, new_quantity_input]  # 결과 메시지 및 입력 필드들을 출력으로 설정
+                )
+                
+                average_button.click(
+                    gradio_cost_averaging,
+                    inputs=inputs,
+                    outputs=average_results
+                )
+                
+                clear_button = gr.ClearButton([old_avg_price_input, old_quantity_input, new_price_input, new_quantity_input, average_results], value="Clear")
+
             with gr.TabItem("📄 About"):
                 gr.Markdown("""
                 # About This Application
@@ -535,6 +578,11 @@ with gr.Blocks(css='style.css') as demo:
                 We hope you find this tool useful for managing your investments. If you have any feedback or suggestions, feel free to reach out!
 
                 Happy Investing!
+
+
                 """)
+        
+        
 
-demo.launch(share=True)
+demo.launch(share=True)
+