feat: 支持流式输出

web_server.py

@@ -1,10 +1,15 @@
-from flask import Flask, render_template, request, jsonify
+from flask import Flask, render_template, request, jsonify, Response, stream_with_context
 from stock_analyzer import StockAnalyzer
 from us_stock_service import USStockService
 import threading
 import os
 import traceback
 import requests
+from logger import get_logger, get_stream_logger
+
+# 获取日志器
+logger = get_logger()
+stream_logger = get_stream_logger()
 
 app = Flask(__name__)
 analyzer = StockAnalyzer()
@@ -25,15 +30,20 @@ def index():
 @app.route('/analyze', methods=['POST'])
 def analyze():
     try:
+        logger.info("开始处理分析请求")
         data = request.json
         stock_codes = data.get('stock_codes', [])
         market_type = data.get('market_type', 'A') 
         
+        logger.debug(f"接收到分析请求: stock_codes={stock_codes}, market_type={market_type}")
+        
         # 获取自定义API配置
         custom_api_url = data.get('api_url')
         custom_api_key = data.get('api_key')
         custom_api_model = data.get('api_model')
         
+        logger.debug(f"自定义API配置: URL={custom_api_url}, 模型={custom_api_model}, API Key={'已提供' if custom_api_key else '未提供'}")
+        
         # 创建新的分析器实例，使用自定义配置
         custom_analyzer = StockAnalyzer(
             custom_api_url=custom_api_url,
@@ -42,26 +52,50 @@ def analyze():
         )
         
         if not stock_codes:
+            logger.warning("未提供股票代码")
             return jsonify({'error': '请输入代码'}), 400
+        
+        # 使用流式响应
+        def generate():
+            if len(stock_codes) == 1:
+                # 单个股票分析流式处理
+                stock_code = stock_codes[0].strip()
+                logger.info(f"开始单股流式分析: {stock_code}")
+                
+                stream_logger.info(f"初始化单股分析流: {stock_code}")
+                init_message = f'{{"stream_type": "single", "stock_code": "{stock_code}"}}\n'
+                stream_logger.info(f"发送初始化消息: {init_message}")
+                yield init_message
+                
+                for chunk in custom_analyzer.analyze_stock(stock_code, market_type, stream=True):
+                    stream_logger.info(f"流式输出块: {chunk}")
+                    yield chunk + '\n'
+            else:
+                # 批量分析流式处理
+                logger.info(f"开始批量流式分析: {stock_codes}")
+                
+                stream_logger.info(f"初始化批量分析流: {stock_codes}")
+                init_message = f'{{"stream_type": "batch", "stock_codes": {stock_codes}}}\n'
+                stream_logger.info(f"发送初始化消息: {init_message}")
+                yield init_message
+                
+                for chunk in custom_analyzer.scan_market(
+                    [code.strip() for code in stock_codes], 
+                    min_score=0, 
+                    market_type=market_type,
+                    stream=True
+                ):
+                    stream_logger.info(f"流式输出块: {chunk}")
+                    yield chunk + '\n'
+        
+        logger.info("成功创建流式响应生成器")
+        return Response(stream_with_context(generate()), mimetype='application/json')
             
-        results = []
-        for stock_code in stock_codes:
-            try:
-                # 使用自定义配置的分析器
-                result = custom_analyzer.analyze_stock(stock_code.strip(), market_type)
-                results.append(result)
-            except Exception as e:
-                print(f"分析股票 {stock_code} 失败: {str(e)}")
-                print(f"详细错误: {traceback.format_exc()}")
-                results.append({
-                    'code': stock_code,
-                    'error': f"分析失败: {str(e)}"
-                })
-            
-        return jsonify({'results': results})
     except Exception as e:
-        print(f"分析股票时出错: {str(e)}")
-        return jsonify({'error': str(e)}), 500
+        error_msg = f"分析股票时出错: {str(e)}"
+        logger.error(error_msg)
+        logger.exception(e)
+        return jsonify({'error': error_msg}), 500
 
 @app.route('/search_us_stocks', methods=['GET'])
 def search_us_stocks():
@@ -81,15 +115,20 @@ def search_us_stocks():
 def test_api_connection():
     """测试API连接"""
     try:
+        logger.info("开始测试API连接")
         data = request.json
         api_url = data.get('api_url')
         api_key = data.get('api_key')
         api_model = data.get('api_model')
         
+        logger.debug(f"测试API连接: URL={api_url}, 模型={api_model}, API Key={'已提供' if api_key else '未提供'}")
+        
         if not api_url:
+            logger.warning("未提供API URL")
             return jsonify({'error': '请提供API URL'}), 400
             
         if not api_key:
+            logger.warning("未提供API Key")
             return jsonify({'error': '请提供API Key'}), 400
             
         # 构建API URL
@@ -101,6 +140,8 @@ def test_api_connection():
                 test_url = f"{api_url}chat/completions"
             else:
                 test_url = f"{api_url}/v1/chat/completions"
+                
+        logger.debug(f"完整API测试URL: {test_url}")
         
         # 发送测试请求
         response = requests.post(
@@ -121,15 +162,21 @@ def test_api_connection():
         
         # 检查响应
         if response.status_code == 200:
+            logger.info(f"API连接测试成功: {response.status_code}")
             return jsonify({'success': True, 'message': '连接成功'})
         else:
             error_message = response.json().get('error', {}).get('message', '未知错误')
+            logger.warning(f"API连接测试失败: {response.status_code} - {error_message}")
             return jsonify({'success': False, 'message': f'连接失败: {error_message}', 'status_code': response.status_code}), 400
             
     except requests.exceptions.RequestException as e:
+        logger.error(f"API连接请求错误: {str(e)}")
         return jsonify({'success': False, 'message': f'请求错误: {str(e)}'}), 400
     except Exception as e:
+        logger.error(f"测试API连接时出错: {str(e)}")
+        logger.exception(e)
         return jsonify({'success': False, 'message': f'测试连接时出错: {str(e)}'}), 500
 
 if __name__ == '__main__':
+    logger.info("股票分析系统启动")
     app.run(host='0.0.0.0', port=8888, debug=True)