Upload app.py

app.py

@@ -13,13 +13,19 @@ HEADERS = {
 }
 
 # 格式化数值显示
-def format_value(value, is_money=True):
-    """格式化数值：0显示为N/A，其他显示为带单位的格式"""
+def format_value(value, value_type="money"):
+    """
+    格式化数值：0显示为N/A，其他显示为带单位的格式
+    value_type: "money" (金额), "eps" (每股收益), "number" (普通数字)
+    """
     if value is None or value == 0:
         return "N/A"
-    if is_money:
+    
+    if value_type == "money":
         return f"${value:.2f}B"
-    else:
+    elif value_type == "eps":
+        return f"${value:.2f}"
+    else:  # number
         return f"{value:.2f}"
 
 # MCP 工具定义
@@ -100,11 +106,11 @@ def query_financial_data(company_name, query_type):
             return f"❌ JSON Parse Error: {str(e)}\n\nResponse: {search_resp.text[:500]}"
         
         if isinstance(company, dict) and company.get("error"):
-            return f"❌ 错误: {company['error']}"
+            return f"❌ Error: {company['error']}"
         
         result = f"# {company.get('name', 'Unknown')}\n\n"
-        result += f"**股票代码**: {company.get('tickers', ['N/A'])[0] if company.get('tickers') else 'N/A'}\n"
-        result += f"**行业**: {company.get('sic_description', 'N/A')}\n\n---\n\n"
+        result += f"**Stock Symbol**: {company.get('tickers', ['N/A'])[0] if company.get('tickers') else 'N/A'}\n"
+        result += f"**Industry**: {company.get('sic_description', 'N/A')}\n\n---\n\n"
         
         cik = company.get('cik')
         
@@ -139,7 +145,7 @@ def query_financial_data(company_name, query_type):
             
             result += f"- **Total Revenue**: {format_value(total_revenue)}\n"
             result += f"- **Net Income**: {format_value(net_income)}\n"
-            result += f"- **Earnings Per Share**: {format_value(eps, False)}\n"
+            result += f"- **Earnings Per Share**: {format_value(eps, 'eps')}\n"
             result += f"- **Operating Expenses**: {format_value(opex)}\n"
             result += f"- **Operating Cash Flow**: {format_value(ocf)}\n"
             # 使用后端返回的 source_url
@@ -182,16 +188,17 @@ def query_financial_data(company_name, query_type):
             
             # 按期间降序排序，确保显示最近的3年数据
             # 使用更智能的排序：先按年份，再按是否是季度
+            # 正确顺序：FY2024 → 2024Q3 → 2024Q2 → 2024Q1 → FY2023
             def sort_key(x):
                 period = x.get('period', '0000')
                 # 提取年份（前4位）
                 year = period[:4] if len(period) >= 4 else '0000'
-                # 如果有Q，提取季度号，否则设为5（让FY排在Q后面）
+                # 如果有Q，提取季度号
                 if 'Q' in period:
                     quarter = period[period.index('Q')+1] if period.index('Q')+1 < len(period) else '0'
-                    return (year, 0, 5 - int(quarter))  # Q4, Q3, Q2, Q1
+                    return (year, 1, 4 - int(quarter))  # Q在FY后面：Q3, Q2, Q1 (4-3=1, 4-2=2, 4-1=3)
                 else:
-                    return (year, 1, 0)  # FY 排在同年的所有Q之后
+                    return (year, 0, 0)  # FY 排在同年的所有Q之前
             
             unique_data = sorted(unique_data, key=sort_key, reverse=True)
             
@@ -218,7 +225,7 @@ def query_financial_data(company_name, query_type):
                 
                 source_link = create_source_link(source_form, source_url)
                 
-                result += f"| {display_period} | {format_value(rev)} | {format_value(inc)} | {format_value(eps_val, False)} | {format_value(opex)} | {format_value(ocf)} | {source_link} |\n"
+                result += f"| {display_period} | {format_value(rev)} | {format_value(inc)} | {format_value(eps_val, 'eps')} | {format_value(opex)} | {format_value(ocf)} | {source_link} |\n"
         
         elif internal_query_type == "5年趋势":
             metrics_resp = requests.post(
@@ -253,16 +260,17 @@ def query_financial_data(company_name, query_type):
             
             # 按期间降序排序，确保显示最近的5年数据
             # 使用更智能的排序：先按年份，再按是否是季度
+            # 正确顺序：FY2024 → 2024Q3 → 2024Q2 → 2024Q1 → FY2023
             def sort_key(x):
                 period = x.get('period', '0000')
                 # 提取年份（前4位）
                 year = period[:4] if len(period) >= 4 else '0000'
-                # 如果有Q，提取季度号，否则设为5（让FY排在Q后面）
+                # 如果有Q，提取季度号
                 if 'Q' in period:
                     quarter = period[period.index('Q')+1] if period.index('Q')+1 < len(period) else '0'
-                    return (year, 0, 5 - int(quarter))  # Q4, Q3, Q2, Q1
+                    return (year, 1, 4 - int(quarter))  # Q在FY后面：Q3, Q2, Q1 (4-3=1, 4-2=2, 4-1=3)
                 else:
-                    return (year, 1, 0)  # FY 排在同年的所有Q之后
+                    return (year, 0, 0)  # FY 排在同年的所有Q之前
             
             unique_data = sorted(unique_data, key=sort_key, reverse=True)
             
@@ -290,7 +298,7 @@ def query_financial_data(company_name, query_type):
                 
                 source_link = create_source_link(source_form, source_url)
                 
-                result += f"| {display_period} | {format_value(rev)} | {format_value(inc)} | {format_value(eps_val, False)} | {format_value(opex)} | {format_value(ocf)} | {source_link} |\n"
+                result += f"| {display_period} | {format_value(rev)} | {format_value(inc)} | {format_value(eps_val, 'eps')} | {format_value(opex)} | {format_value(ocf)} | {source_link} |\n"
         
         elif internal_query_type == "公司报表列表":
             # 查询公司所有报表
@@ -388,6 +396,23 @@ def chatbot_response(message, history):
     except Exception as e:
         return f"Sorry, I encountered an error: {str(e)}. Please try asking about financial data for specific companies like Apple, Microsoft, NVIDIA, Tesla, etc."
 
+# 包装函数，显示加载状态
+def query_with_status(company, query_type):
+    """Query with loading status indicator"""
+    try:
+        # 返回加载状态和结果
+        yield "<div style='padding: 10px; background: #e3f2fd; border-left: 4px solid #2196f3; margin: 10px 0;'>🔄 <strong>Loading...</strong> Querying SEC EDGAR data for <strong>{}</strong>...</div>".format(company), ""
+        
+        # 执行实际查询
+        result = query_financial_data(company, query_type)
+        
+        # 返回成功状态和结果
+        yield "<div style='padding: 10px; background: #e8f5e9; border-left: 4px solid #4caf50; margin: 10px 0;'>✅ <strong>Query completed successfully!</strong></div>", result
+    
+    except Exception as e:
+        # 返回错误状态
+        yield "<div style='padding: 10px; background: #ffebee; border-left: 4px solid #f44336; margin: 10px 0;'>❌ <strong>Error:</strong> {}</div>".format(str(e)), ""
+
 # 创建 Gradio 界面
 with gr.Blocks(title="SEC Financial Data Query Assistant") as demo:
     gr.Markdown("# 🤖 SEC Financial Data Query Assistant")
@@ -412,6 +437,7 @@ with gr.Blocks(title="SEC Financial Data Query Assistant") as demo:
     
     with gr.Tab("Direct Query"):
         gr.Markdown("## 🔍 Direct Financial Data Query")
+        gr.Markdown("Select a company and query type to retrieve financial information.")
         
         with gr.Row():
             company_input = gr.Textbox(
@@ -426,7 +452,12 @@ with gr.Blocks(title="SEC Financial Data Query Assistant") as demo:
                 scale=1
             )
         
-        submit_btn = gr.Button("🔍 Query", variant="primary", size="lg")
+        submit_btn = gr.Button("🔍 Query Financial Data", variant="primary", size="lg")
+        
+        # 添加加载状态指示器
+        with gr.Row():
+            status_text = gr.Markdown("")
+        
         output = gr.Markdown(label="Query Results")
         
         # 示例
@@ -445,9 +476,10 @@ with gr.Blocks(title="SEC Financial Data Query Assistant") as demo:
         )
         
         submit_btn.click(
-            fn=query_financial_data,
+            fn=query_with_status,
             inputs=[company_input, query_type],
-            outputs=output
+            outputs=[status_text, output],
+            show_progress="full"  # 显示完整的进度条
         )
     
     gr.Markdown("---")