Upload app.py

app.py

@@ -23,7 +23,9 @@ from service.report_tools import build_financial_metrics_three_year_data, calcul
 from service.three_year_table_tool import build_table_format
 from service.three_year_tool import  process_financial_data_with_metadata
 from service.tool_processor import get_stock_price
-
+# ✅ 导入缓存管理器
+from service.report_cache_manager import ReportCacheManager
+from service.financial_data_cache_manager import FinancialDataCacheManager
 
 get_companys_state = True
 my_companies = [
@@ -1270,13 +1272,19 @@ def build_income_table(table_data):
                             if year_header in yoy_map[category]:
                                 growth = yoy_map[category][year_header]
                         
-                        if growth and growth != "N/A":
+                        if growth and growth != "N/A" and growth != "--":
                             arrow = "▲" if growth.startswith("+") else "▼"
                             color = "green" if growth.startswith("+") else "red"
                             cells += f"""<td style='padding: 8px; border: 1px solid #ddd; text-align: center; font-size: 13px; position: relative;'>
                             <div>{cell}</div>
                             <div style='position: absolute; bottom: 2px; right: 5px; font-size: 10px; color: {color};'>{arrow}{growth}</div>
                             </td>"""
+                        elif growth == "--":
+                            # 显示"--"但不显示箭头
+                            cells += f"""<td style='padding: 8px; border: 1px solid #ddd; text-align: center; font-size: 13px; position: relative;'>
+                            <div>{cell}</div>
+                            <div style='position: absolute; bottom: 2px; right: 5px; font-size: 10px; color: #999;'>--</div>
+                            </td>"""
                         else:
                             cells += f"<td style='padding: 8px; border: 1px solid #ddd; text-align: center; font-size: 13px;'>{cell}</td>"
                 table_rows += f"<tr style='{row_style}'>{cells}</tr>"
@@ -1775,6 +1783,10 @@ def main():
     current_dir = os.path.dirname(os.path.abspath(__file__))
     css_dir = os.path.join(current_dir, "css")
 
+    # ✅ 初始化缓存管理器
+    report_cache = ReportCacheManager(cache_ttl_seconds=3600, max_cache_size=50)
+    data_cache = FinancialDataCacheManager(cache_ttl_seconds=1800, max_cache_size=100)
+
     # def load_css_files(css_dir, filenames):
     #     """读取多个 CSS 文件并合并为一个字符串"""
     #     css_content = ""
@@ -1852,37 +1864,14 @@ def main():
                                     # 当选中的公司改变时，重新加载tab内容
                                     def update_tab_content(company):
                                         if company:
-                                            # 显示loading状态
-                                            loading_html = f'''
-                                            <div style="display: flex; justify-content: center; align-items: center; height: 200px;">
-                                                <div style="text-align: center;">
-                                                    <div class="loading-spinner" style="width: 40px; height: 40px; border: 4px solid #f3f3f3; border-top: 4px solid #3498db; border-radius: 50%; animation: spin 1s linear infinite; margin: 0 auto;"></div>
-                                                    <p style="margin-top: 20px; color: #666;">Loading investment suggestions for {company}...</p>
-                                                    <style>
-                                                        @keyframes spin {{
-                                                            0% {{ transform: rotate(0deg); }}
-                                                            100% {{ transform: rotate(360deg); }}
-                                                        }}
-                                                    </style>
-                                                </div>
-                                            </div>
-                                            '''
-                                            yield loading_html
-                                            
-                                            # 获取投资建议数据
-                                            try:
-                                                # content = get_invest_suggest(company)
+                                            # ✅ 使用缓存管理器生成投资建议
+                                            def generate_suggestion():
                                                 stock_code = get_stock_code_by_company_name(company)
-                                                yield query_company_advanced(stock_code, "suggestion")
-                                                # yield content
-                                            except Exception as e:
-                                                error_html = f'''
-                                                <div style="padding: 20px; text-align: center; color: #666;">
-                                                    <p>Error loading investment suggestions: {str(e)}</p>
-                                                    <p>Please try again later.</p>
-                                                </div>
-                                                '''
-                                                yield error_html
+                                                return query_company_advanced(stock_code, "suggestion")
+                                            
+                                            # 使用生成器yield缓存管理器的输出
+                                            for result in report_cache.get_or_create_report(company, "suggestion", generate_suggestion):
+                                                yield result
                                         else:
                                             yield "<div style=\"padding: 20px; text-align: center; color: #666;\">Please select a company</div>"
                                     
@@ -1907,41 +1896,14 @@ def main():
                                     # 当选中的公司改变时，重新加载tab内容
                                     def update_analysis_tab_content(company):
                                         if company:
-                                            # 显示loading状态
-                                            loading_html = f'''
-                                            <div style="display: flex; justify-content: center; align-items: center; height: 200px;">
-                                                <div style="text-align: center;">
-                                                    <div class="loading-spinner" style="width: 40px; height: 40px; border: 4px solid #f3f3f3; border-top: 4px solid #3498db; border-radius: 50%; animation: spin 1s linear infinite; margin: 0 auto;"></div>
-                                                    <p style="margin-top: 20px; color: #666;">Loading analysis report for {company}...</p>
-                                                    <style>
-                                                        @keyframes spin {{
-                                                            0% {{ transform: rotate(0deg); }}
-                                                            100% {{ transform: rotate(360deg); }}
-                                                        }}
-                                                    </style>
-                                                </div>
-                                            </div>
-                                            '''
-                                            yield loading_html
-                                            
-                                            # 获取分析报告数据
-                                            try:
-                                                # 这里应该调用获取详细分析报告的函数
-                                                # 暂时使用占位内容，您需要替换为实际的函数调用
-                                                # content = f"# Analysis Report for {company}\n\nDetailed financial analysis for {company} will be displayed here."
+                                            # ✅ 使用缓存管理器生成分析报告
+                                            def generate_report():
                                                 stock_code = get_stock_code_by_company_name(company)
-                                                # result = query_company_advanced(stock_code)
-                                                # print(f"Result=====================: {result}")
-                                                # yield get_analysis_report(company)
-                                                yield query_company_advanced(stock_code, "report")
-                                            except Exception as e:
-                                                error_html = f'''
-                                                <div style="padding: 20px; text-align: center; color: #666;">
-                                                    <p>Error loading analysis report: {str(e)}</p>
-                                                    <p>Please try again later.</p>
-                                                </div>
-                                                '''
-                                                yield error_html
+                                                return query_company_advanced(stock_code, "report")
+                                            
+                                            # 使用生成器yield缓存管理器的输出
+                                            for result in report_cache.get_or_create_report(company, "report", generate_report):
+                                                yield result
                                         else:
                                             yield "<div style=\"padding: 20px; text-align: center; color: #666;\">Please select a company</div>"
                                     
@@ -2003,26 +1965,14 @@ def main():
             # 绑定公司选择事件到指标仪表板更新
             def update_metrics_dashboard_wrapper(company_name):
                 if company_name:
-                    # 显示loading状态
-                    loading_html = f'''
-                    <div style="display: flex; justify-content: center; align-items: center; height: 300px;">
-                        <div style="text-align: center;">
-                            <div class="loading-spinner" style="width: 40px; height: 40px; border: 4px solid #f3f3f3; border-top: 4px solid #3498db; border-radius: 50%; animation: spin 1s linear infinite; margin: 0 auto;"></div>
-                            <p style="margin-top: 20px; color: #666;">Loading financial data for {company_name}...</p>
-                            <style>
-                                @keyframes spin {{
-                                    0% {{ transform: rotate(0deg); }}
-                                    100% {{ transform: rotate(360deg); }}
-                                }}
-                            </style>
-                        </div>
-                    </div>
-                    '''
-                    yield loading_html, loading_html, loading_html
+                    # ✅ 使用缓存管理器加载财务数据
+                    def load_financial_data():
+                        return update_metrics_dashboard(company_name)
                     
-                    # 获取更新后的数据
+                    # 使用缓存管理器获取数据
                     try:
-                        stock_card_html, financial_metrics_html, income_table_html = update_metrics_dashboard(company_name)
+                        result = data_cache.get_or_load_data(company_name, "metrics", load_financial_data)
+                        stock_card_html, financial_metrics_html, income_table_html = result
                         yield stock_card_html, financial_metrics_html, income_table_html
                     except Exception as e:
                         error_html = f'''