Upload 2 files

Dockerfile

@@ -31,4 +31,4 @@ EXPOSE 8888
 RUN chmod 777 /app
 
 # 使用gunicorn启动应用
-CMD ["gunicorn", "--bind", "0.0.0.0:8888", "--workers", "4", "web_server:app"] 
+CMD ["gunicorn", "--timeout", "120", "--bind", "0.0.0.0:8888", "--workers", "4", "web_server:app"] 

web_server.py

@@ -799,9 +799,6 @@ def get_stock_data():
         if not stock_code:
             return custom_jsonify({'error': '请提供股票代码'}), 400
 
-        # 记录详细的请求参数
-        app.logger.info(f"请求参数: stock_code={stock_code}, market_type={market_type}, period={period}")
-
         # 根据period计算start_date
         end_date = datetime.now().strftime('%Y%m%d')
         if period == '1m':
@@ -816,71 +813,47 @@ def get_stock_data():
             start_date = (datetime.now() - timedelta(days=365)).strftime('%Y%m%d')
 
         # 获取股票历史数据
-        app.logger.info(f"获取股票 {stock_code} 的历史数据，市场: {market_type}, 起始日期: {start_date}, 结束日期: {end_date}")
-        try:
-            df = analyzer.get_stock_data(stock_code, market_type, start_date, end_date)
-            app.logger.info(f"成功获取股票数据，行数: {len(df) if df is not None and not df.empty else 0}")
-        except Exception as e:
-            app.logger.error(f"获取股票数据时出错: {str(e)}")
-            app.logger.error(traceback.format_exc())
-            return custom_jsonify({'error': f'获取股票数据失败: {str(e)}'}), 500
+        app.logger.info(
+            f"获取股票 {stock_code} 的历史数据，市场: {market_type}, 起始日期: {start_date}, 结束日期: {end_date}")
+        df = analyzer.get_stock_data(stock_code, market_type, start_date, end_date)
+
+        # 计算技术指标
+        app.logger.info(f"计算股票 {stock_code} 的技术指标")
+        df = analyzer.calculate_indicators(df)
 
         # 检查数据是否为空
-        if df is None or df.empty:
+        if df.empty:
             app.logger.warning(f"股票 {stock_code} 的数据为空")
             return custom_jsonify({'error': '未找到股票数据'}), 404
 
-        # 计算技术指标
-        app.logger.info(f"计算股票 {stock_code} 的技术指标")
-        try:
-            df = analyzer.calculate_indicators(df)
-            app.logger.info(f"成功计算技术指标")
-        except Exception as e:
-            app.logger.error(f"计算技术指标时出错: {str(e)}")
-            app.logger.error(traceback.format_exc())
-            return custom_jsonify({'error': f'计算技术指标失败: {str(e)}'}), 500
-
         # 将DataFrame转为JSON格式
         app.logger.info(f"将数据转换为JSON格式，行数: {len(df)}")
 
         # 确保日期列是字符串格式 - 修复缓存问题
         if 'date' in df.columns:
             try:
-                df = df.copy()  # 创建副本避免SettingWithCopyWarning
                 if pd.api.types.is_datetime64_any_dtype(df['date']):
                     df['date'] = df['date'].dt.strftime('%Y-%m-%d')
                 else:
+                    df = df.copy()
                     df['date'] = pd.to_datetime(df['date'], errors='coerce')
                     df['date'] = df['date'].dt.strftime('%Y-%m-%d')
-                app.logger.info("日期列处理成功")
             except Exception as e:
                 app.logger.error(f"处理日期列时出错: {str(e)}")
-                app.logger.error(traceback.format_exc())
-                # 尝试简单转换为字符串
                 df['date'] = df['date'].astype(str)
 
         # 将NaN值替换为None
-        try:
-            df = df.replace({np.nan: None, np.inf: None, -np.inf: None})
-            # 确保所有数值都是JSON可序列化的
-            for col in df.select_dtypes(include=['float64']).columns:
-                df[col] = df[col].astype(float)
-        except Exception as e:
-            app.logger.error(f"处理NaN值时出错: {str(e)}")
-            app.logger.error(traceback.format_exc())
+        df = df.replace({np.nan: None, np.inf: None, -np.inf: None})
 
-        try:
-            records = df.to_dict('records')
-            app.logger.info(f"数据处理完成，返回 {len(records)} 条记录")
-            return custom_jsonify({'data': records})
-        except Exception as e:
-            app.logger.error(f"转换为JSON时出错: {str(e)}")
-            app.logger.error(traceback.format_exc())
-            return custom_jsonify({'error': f'数据格式转换失败: {str(e)}'}), 500
+        records = df.to_dict('records')
+
+        app.logger.info(f"数据处理完成，返回 {len(records)} 条记录")
+        return custom_jsonify({'data': records})
     except Exception as e:
         app.logger.error(f"获取股票数据时出错: {str(e)}")
         app.logger.error(traceback.format_exc())
-        return custom_jsonify({'error': f'服务器内部错误: {str(e)}'}), 500
+        return custom_jsonify({'error': str(e)}), 500
+
 
 # @app.route('/api/market_scan', methods=['POST'])
 # def api_market_scan():