Update app.py

app.py

@@ -1,129 +1,102 @@
-import gradio as gr  # UI 框架
-import pandas as pd  # 表格处理
-import numpy as np
-import plotly.express as px  # 专业图表
+# Compound Interest Calculator for Hugging Face Demo
+# -------------------------------------------------
+# This script uses Gradio to create a simple web UI
+to calculate compound interest with regular monthly contributions.
+# It can be deployed directly as a Hugging Face Spaces app.
 
-def calculate_schedule(
+import math
+import pandas as pd
+import gradio as gr
+
+
+def calculate_compound(
     principal: float,
-    deposit: float,
+    monthly_contrib: float,
     annual_rate: float,
-    compounding: str,
-    deposit_freq: str,
-    display_freq: str,
-    years: int,
-    stop_deposit_year: int
-):
+    years_input: str
+) -> pd.DataFrame:
     """
-    计算从第1天到第years*365天的账户余额：
-    - compounding: 复利频率 (Annual/Monthly/Daily)
-    - deposit_freq: 定投频率 (Annual/Monthly/Daily)
-    - stop_deposit_year: 在第几年(含)后停止定投
-    - display_freq: 结果展示粒度 (Yearly/Monthly/Daily)
+    Calculate future value, total contributions, and interest earned
+    for a list of investment periods under compound interest.
+
+    Parameters:
+    - principal: Initial lump-sum investment (RMB).
+    - monthly_contrib: Amount invested each month (RMB).
+    - annual_rate: Annual effective interest rate in percent (e.g., 10.22 for 10.22%).
+    - years_input: Comma-separated years (e.g., "1,3,5,7,9,41").
+
+    Returns:
+    - pd.DataFrame with columns:
+        * Years
+        * Total Contributions (RMB)
+        * Future Value (RMB)
+        * Interest Earned (RMB)
     """
-    freq_map = {"Annual": 1, "Monthly": 12, "Daily": 365}
-    m_comp = freq_map[compounding]
-    m_dep  = freq_map[deposit_freq]
-
-    total_days    = years * 365
-    comp_interval = 365 // m_comp
-    dep_interval  = 365 // m_dep
-    stop_day      = stop_deposit_year * 365
-
-    balance       = principal
-    deposit_count = 0
-    schedule      = []
-
-    for day in range(1, total_days + 1):
-        # 复利：每日或周期性触发
-        if compounding == "Daily":
-            balance *= 1 + (annual_rate / 100) / 365
-        else:
-            if day % comp_interval == 0:
-                balance *= 1 + (annual_rate / 100) / m_comp
-        
-        # 定投：只在未超过 stop_day 且满足周期时发生
-        if day <= stop_day and day % dep_interval == 0:
-            balance += deposit
-            deposit_count += 1
-        
-        # 按展示粒度记录
-        record = False
-        if display_freq == "Daily":
-            record = True
-            period = day
-        elif display_freq == "Monthly" and day % (365 // 12) == 0:
-            record = True
-            period = day // (365 // 12)
-        elif display_freq == "Yearly" and day % 365 == 0:
-            record = True
-            period = day // 365
-        
-        if record:
-            total_inv = principal + deposit_count * deposit
-            schedule.append({
-                display_freq: period,
-                "Future Value (RMB)": balance,
-                "Total Invested (RMB)": total_inv
-            })
-
-    # 构造 DataFrame 并保留两位小数
-    df = pd.DataFrame(schedule).round(2)
-    df["Interest Earned (RMB)"] = (df["Future Value (RMB)"] - df["Total Invested (RMB)"]).round(2)
-
-    # 绘制美观折线图
-    fig = px.line(
-        df,
-        x=display_freq,
-        y="Future Value (RMB)",
-        title=f"Compound Growth over Time ({display_freq})",
-        template="plotly_white"
-    )
-    fig.update_traces(mode="lines+markers")
-    fig.update_layout(
-        title_font_size=20,
-        xaxis_title=display_freq,
-        yaxis_title="Future Value (RMB)"
-    )
+    # Convert annual rate percentage to decimal
+    r_annual = annual_rate / 100.0
+    # Compute equivalent monthly rate
+    r_monthly = (1 + r_annual) ** (1/12) - 1
+
+    # Parse the years input into a sorted list of unique integers
+    try:
+        years = sorted({int(y.strip()) for y in years_input.split(",") if y.strip()})
+    except ValueError:
+        raise ValueError("Years must be a comma-separated list of integers.")
+
+    data = []
+    for t in years:
+        n = t * 12  # total months
+        # Future value of initial principal
+        fv_principal = principal * (1 + r_monthly) ** n
+        # Future value of series of monthly contributions
+        fv_contrib = monthly_contrib * (((1 + r_monthly) ** n - 1) / r_monthly)
+        fv_total = fv_principal + fv_contrib
+        total_contrib = principal + monthly_contrib * n
+        interest = fv_total - total_contrib
+
+        data.append({
+            "Years": t,
+            "Total Contributions (RMB)": round(total_contrib, 2),
+            "Future Value (RMB)": round(fv_total, 2),
+            "Interest Earned (RMB)": round(interest, 2)
+        })
 
-    return df, fig
+    # Create DataFrame
+    df = pd.DataFrame(data)
+    df = df.sort_values(by="Years").reset_index(drop=True)
+    return df
 
+
+# Gradio UI definition
 with gr.Blocks() as demo:
-    gr.Markdown("## 复利计算器\n填写参数后点击“计算”查看结果")
-    
-    with gr.Row():
-        principal         = gr.Number(label="初始本金 (RMB)", value=20000)
-        deposit           = gr.Number(label="每次定投 (RMB)", value=5000)
-        annual_rate       = gr.Number(label="年化收益率 (%)", value=10.22)
-    
+    gr.Markdown(
+        """
+        # 复利计算器
+
+        输入初始本金、每月定投金额、年化收益率(%)，以及一个以逗号分隔的年限列表，
+        即可计算每个年限下的复利终值、总投入与利息收入。
+        """
+    )
+
     with gr.Row():
-        compounding       = gr.Radio(
-            choices=["Annual", "Monthly", "Daily"],
-            label="复利频率", value="Monthly"
-        )
-        deposit_freq      = gr.Radio(
-            choices=["Annual", "Monthly", "Daily"],
-            label="定投频率", value="Monthly"
-        )
-        display_freq      = gr.Radio(
-            choices=["Yearly", "Monthly", "Daily"],
-            label="结果展示频率", value="Yearly"
-        )
-        years             = gr.Slider(1, 50, value=41, label="计算年限 (年)")
-        stop_deposit_year = gr.Slider(0, 50, value=41, label="何年后停止定投 (年)")
-    
-    compute_btn = gr.Button("计算", variant="primary")
-
-    result_table = gr.Dataframe(interactive=False)
-    result_plot  = gr.Plot()
-
-    compute_btn.click(
-        fn=calculate_schedule,
-        inputs=[
-            principal, deposit, annual_rate,
-            compounding, deposit_freq, display_freq,
-            years, stop_deposit_year
-        ],
-        outputs=[result_table, result_plot]
+        principal_input = gr.Number(value=20000, label="初始本金 (RMB)")
+        monthly_input = gr.Number(value=5000, label="每月定投 (RMB)")
+        rate_input = gr.Number(value=10.22, label="年化收益率 (%)")
+
+    years_input = gr.Text(value="1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,37,39,41",
+                          label="年限列表 (逗号分隔)")
+
+    output_table = gr.Dataframe(headers=["Years", "Total Contributions (RMB)",
+                                         "Future Value (RMB)", "Interest Earned (RMB)"],
+                               label="计算结果")
+
+    calculate_btn = gr.Button("计算")
+    calculate_btn.click(
+        fn=calculate_compound,
+        inputs=[principal_input, monthly_input, rate_input, years_input],
+        outputs=output_table
     )
 
+# 启动 Gradio 服务
+if __name__ == "__main__":
     demo.launch()