aishare-txt 2025.11.24.20__tar.gz → 2025.11.24.26__tar.gz

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/AIShareTxt/__init__.py

@@ -5,7 +5,7 @@ AIShareTxt - 股票技术指标分析工具包
 AI集成分析和报告生成功能。
 """
 
-__version__ = "2025.11.24.20"
+__version__ = "2025.11.24.26"
 __author__ = "AIShareTxt Team"
 
 # 导入核心类

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/AIShareTxt/core/analyzer.py

@@ -9,7 +9,7 @@ import warnings
 from .data_fetcher import StockDataFetcher
 from ..indicators.technical_indicators import TechnicalIndicators
 from .report_generator import ReportGenerator
-from ..utils.utils import Logger, LoggerManager, Utils, DataValidator, ErrorHandler
+from ..utils.utils import Logger, LoggerManager, Utils, DataValidator, ErrorHandler, PerformanceMonitor
 from .config import IndicatorConfig as Config
 
 warnings.filterwarnings('ignore')
@@ -120,9 +120,10 @@ class StockAnalyzer:
             # 生成报告
             self.logger.info("生成分析报告...")
             report = self.report_generator.generate_report(
-                stock_code, 
-                self.indicators, 
-                self.stock_info
+                stock_code,
+                self.indicators,
+                self.stock_info,
+                self.stock_data
             )
             
             if monitor:
@@ -172,9 +173,10 @@ class StockAnalyzer:
             
             # 生成报告（不包含基本信息和资金流）
             report = self.report_generator.generate_report(
-                stock_code, 
-                self.indicators, 
-                None  # 不包含基本信息
+                stock_code,
+                self.indicators,
+                None,  # 不包含基本信息
+                self.stock_data
             )
             
             return report
@@ -382,6 +384,15 @@ def quick_test(stock_code):
         
         # 执行分析
         report = analyzer.analyze_stock(stock_code, enable_performance_monitor=True)
+        
+        # 检查分析结果是否为错误信息
+        if report and (report.startswith("错误：") or report.startswith("数据质量验证失败") or 
+                      report.startswith("指标验证失败") or report.startswith("分析过程中出错") or
+                      "无数据" in report or "计算失败" in report):
+            print("\n" + report)
+            logger.error(f"快速测试股票 {stock_code} 失败: {report}")
+            return False
+        
         print("\n" + report)
         
         # 显示分析摘要
@@ -403,8 +414,45 @@ def quick_test(stock_code):
 
 def main():
     """主函数"""
-    analyzer = StockAnalyzer()
     utils = Utils()
+    
+    # 首先检查命令行参数（包括帮助参数）
+    stock_code = utils.parse_command_line_args()
+    if stock_code:
+        # 如果提供了股票代码，则初始化分析器并进行快速测试
+        analyzer = StockAnalyzer()
+        logger = LoggerManager.get_logger('stock_analyzer')
+        
+        print("股票技术指标分析器 (重构版)")
+        print(utils.create_separator())
+        print("提示：可以在命令行直接运行 python stock_analyzer.py 000001 来快速测试")
+        logger.info("股票技术指标分析器启动")
+        
+        # 验证分析环境
+        print("\n验证分析环境...")
+        logger.info("开始验证分析环境")
+        is_valid, errors = analyzer.validate_analysis_environment()
+        if not is_valid:
+            print("环境验证失败:")
+            logger.error("环境验证失败")
+            for error in errors:
+                print(f"  [错误] {error}")
+                logger.error(f"环境错误: {error}")
+            return
+        else:
+            print("环境验证通过")
+            logger.info("环境验证通过")
+        
+        logger.info(f"使用命令行参数启动快速测试: {stock_code}")
+        result = quick_test(stock_code)
+        if result:
+            print("\n分析完成！")
+        else:
+            print("\n分析失败，请检查日志获取详细信息。")
+        return
+    
+    # 如果没有提供命令行参数，则进入交互模式
+    analyzer = StockAnalyzer()
     logger = LoggerManager.get_logger('stock_analyzer')
     
     print("股票技术指标分析器 (重构版)")
@@ -424,16 +472,9 @@ def main():
             logger.error(f"环境错误: {error}")
         return
     else:
-        print("✅ 环境验证通过")
+        print("环境验证通过")
         logger.info("环境验证通过")
     
-    # 检查命令行参数
-    stock_code = utils.parse_command_line_args()
-    if stock_code:
-        logger.info(f"使用命令行参数启动快速测试: {stock_code}")
-        quick_test(stock_code)
-        return
-    
     # 交互模式
     while True:
         try:

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/AIShareTxt/core/data_fetcher.py

@@ -262,6 +262,11 @@ class StockDataFetcher:
                 start_date=start_date,
                 adjust=cast(str, adjust)
             )
+
+            # 对成交量列需要进行数量转换*100，从手转换为股
+            if '成交量' in raw_data.columns:
+                raw_data['成交量'] *= 100
+            
             return cast(pd.DataFrame, raw_data)
         except Exception as e:
             self.logger.warning(f"[方法1] 东方财富API获取失败：{str(e)}")
@@ -290,6 +295,11 @@ class StockDataFetcher:
                 end_date=end_date,
                 adjust=adjust
             )
+
+            # amount列更名为turnover
+            if 'amount' in raw_data.columns:
+                raw_data.rename(columns={'amount': 'turnover'}, inplace=True)
+            
             return cast(pd.DataFrame, raw_data)
         except Exception as e:
             self.logger.warning(f"[方法2] 新浪API获取失败：{str(e)}")
@@ -318,6 +328,13 @@ class StockDataFetcher:
                 end_date=end_date,
                 adjust=adjust
             )
+            
+            # 对成交量列需要进行数量转换*100，从手转换为股，并且列名从amount改为volume
+            if 'amount' in raw_data.columns:
+                raw_data['volume'] = raw_data['amount'] * 100
+                # 移除原始amount列
+                raw_data.drop(columns=['amount'], inplace=True)
+            
             return cast(pd.DataFrame, raw_data)
         except Exception as e:
             self.logger.warning(f"[方法3] 腾讯API获取失败：{str(e)}")

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/AIShareTxt/core/report_generator.py

@@ -14,15 +14,16 @@ class ReportGenerator:
     def __init__(self):
         self.config = Config()
     
-    def generate_report(self, stock_code, indicators, stock_info=None):
+    def generate_report(self, stock_code, indicators, stock_info=None, stock_data=None):
         """
         生成完整的股票分析报告
-        
+
         Args:
             stock_code (str): 股票代码
             indicators (dict): 指标数据字典
             stock_info (dict): 股票基本信息
-            
+            stock_data (pd.DataFrame): 股票历史数据
+
         Returns:
             str: 格式化的报告文本
         """
@@ -47,7 +48,11 @@ class ReportGenerator:
         report.extend(self._generate_fund_flow_section(indicators))
         report.extend(self._generate_trend_strength_section(indicators))
         report.extend(self._generate_summary_section(indicators))
-        
+
+        # 最近5天OLHCV数据
+        if stock_data is not None:
+            report.extend(self._generate_recent_ohlcv_section(stock_data))
+
         # 报告尾部
         report.extend(self._generate_footer())
         
@@ -280,7 +285,7 @@ class ReportGenerator:
         summary = self._collect_summary_items(indicators)
         
         for item in summary:
-            section.append(f"• {item}")
+            section.append(f"- {item}")
         
         return section
     
@@ -779,5 +784,62 @@ class ReportGenerator:
                     summary.append(f"超大单：净流入{super_amount_wan:.{self.config.DISPLAY_PRECISION['volume_wan']}f}万元({super_ratio:+.1f}%)")
                 else:
                     summary.append(f"超大单：净流出{abs(super_amount_wan):.{self.config.DISPLAY_PRECISION['volume_wan']}f}万元({super_ratio:+.1f}%)")
-        
+
         return summary
+
+    def _generate_recent_ohlcv_section(self, stock_data):
+        """生成最近5天OLHCV数据部分"""
+        section = []
+        section.append("\n【十、最近5天交易数据】")
+        section.append(self.config.REPORT_CONFIG['section_separator'])
+
+        # 获取最近5天数据
+        recent_data = stock_data.tail(5)
+
+        # 表头
+        section.append("日期        开盘价    最高价    最低价    收盘价    成交量(万手)  成交额(亿元)")
+        section.append("─" * 70)
+
+        # 获取索引位置，用于计算涨跌幅
+        index_positions = list(range(len(recent_data)))
+        
+        for i, (idx, row) in enumerate(recent_data.iterrows()):
+            # 格式化日期 - 使用date列而不是索引
+            if 'date' in row and hasattr(row['date'], 'strftime'):
+                date_str = row['date'].strftime('%Y-%m-%d')
+            elif 'date' in row:
+                date_str = str(row['date'])[:10] if len(str(row['date'])) > 10 else str(row['date'])
+            else:
+                # 如果没有date列，尝试使用索引
+                date_str = idx.strftime('%Y-%m-%d') if hasattr(idx, 'strftime') else str(idx)[:10]
+
+            # 格式化价格数据
+            open_price = f"{row['open']:.2f}"
+            high_price = f"{row['high']:.2f}"
+            low_price = f"{row['low']:.2f}"
+            close_price = f"{row['close']:.2f}"
+
+            # 计算涨跌幅
+            if i > 0:  # 不是第一行
+                prev_close = recent_data.iloc[i-1]['close']
+                change_percent = ((row['close'] - prev_close) / prev_close * 100)
+                change_sign = "▲" if change_percent > 0 else "▼" if change_percent < 0 else "─"
+                close_price = f"{row['close']:.2f}{change_sign}"
+            else:
+                close_price = f"{row['close']:.2f}"
+
+            # 格式化成交量 (转换为万手)
+            volume_wan_hands = row['volume'] / 1000000
+            volume_str = f"{volume_wan_hands:.1f}"
+
+            # 格式化成交额 (转换为亿元)
+            # 如果没有turnover字段，使用估算值
+            amount = row.get('turnover',  row['close'] * row['volume'])  
+            amount_yi = amount / 100000000
+            amount_str = f"{amount_yi:.2f}"
+
+            # 组合一行数据
+            line = f"{date_str}  {open_price:>8}  {high_price:>8}  {low_price:>8}  {close_price:>10}  {volume_str:>10}  {amount_str:>12}"
+            section.append(line)
+
+        return section

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/AIShareTxt/indicators/technical_indicators.py

@@ -470,7 +470,6 @@ class TechnicalIndicators:
         # OBV背离验证
         if len(obv) >= 20 and len(close) >= 20:
             try:
-                from scipy.signal import argrelextrema
                 indicators['OBV_DIVERGENCE'] = self._detect_obv_divergence(obv, close, obv_config)
             except ImportError:
                 indicators['OBV_DIVERGENCE'] = "需要scipy库进行背离分析"
@@ -481,38 +480,63 @@ class TechnicalIndicators:
         """检测OBV背离"""
         try:
             from scipy.signal import argrelextrema
-            
+
             recent_close = close[-20:]
             recent_obv = obv[-20:]
             
+            # 将pandas Series转换为numpy数组以解决兼容性问题
+            if hasattr(recent_close, 'values'):
+                recent_close = recent_close.values
+            if hasattr(recent_obv, 'values'):
+                recent_obv = recent_obv.values
+
+            # 确保有足够的数据点
+            if len(recent_close) < 10 or len(recent_obv) < 10:
+                return "数据不足"
+
             # 找局部高点和低点
             order = config['extrema_order']
             price_highs = argrelextrema(recent_close, np.greater, order=order)[0]
             price_lows = argrelextrema(recent_close, np.less, order=order)[0]
             obv_highs = argrelextrema(recent_obv, np.greater, order=order)[0]
             obv_lows = argrelextrema(recent_obv, np.less, order=order)[0]
-            
-            # 顶背离：价格创新高，OBV未创新高
-            if len(price_highs) >= 2 and len(obv_highs) >= 2:
+
+            # 顶背离检测：价格创新高，但OBV未创新高
+            if len(price_highs) >= 2:
+                # 取最后两个价格高点
                 latest_price_high_idx = price_highs[-1]
                 prev_price_high_idx = price_highs[-2]
-                
-                if latest_price_high_idx < len(obv_highs) and prev_price_high_idx < len(obv_highs):
-                    if (recent_close[latest_price_high_idx] > recent_close[prev_price_high_idx] and
-                        recent_obv[latest_price_high_idx] < recent_obv[prev_price_high_idx]):
+
+                # 检查价格是否创新高
+                if recent_close[latest_price_high_idx] > recent_close[prev_price_high_idx]:
+                    # 寻找对应时间点的OBV值进行比较
+                    latest_obv_value = recent_obv[latest_price_high_idx]
+                    prev_obv_value = recent_obv[prev_price_high_idx]
+
+                    # 如果OBV没有创新高，则为顶背离
+                    if latest_obv_value < prev_obv_value:
                         return "顶背离"
-            
-            # 底背离：价格创新低，OBV未创新低
-            if len(price_lows) >= 2 and len(obv_lows) >= 2:
+
+            # 底背离检测：价格创新低，但OBV未创新低
+            if len(price_lows) >= 2:
+                # 取最后两个价格低点
                 latest_price_low_idx = price_lows[-1]
                 prev_price_low_idx = price_lows[-2]
-                
-                if latest_price_low_idx < len(obv_lows) and prev_price_low_idx < len(obv_lows):
-                    if (recent_close[latest_price_low_idx] < recent_close[prev_price_low_idx] and
-                        recent_obv[latest_price_low_idx] > recent_obv[prev_price_low_idx]):
+
+                # 检查价格是否创新低
+                if recent_close[latest_price_low_idx] < recent_close[prev_price_low_idx]:
+                    # 寻找对应时间点的OBV值进行比较
+                    latest_obv_value = recent_obv[latest_price_low_idx]
+                    prev_obv_value = recent_obv[prev_price_low_idx]
+
+                    # 如果OBV没有创新低，则为底背离
+                    if latest_obv_value > prev_obv_value:
                         return "底背离"
-            
+
             return "无明显背离"
-            
-        except Exception:
+
+        except ImportError:
+            return "需要scipy库进行背离分析"
+        except Exception as e:
+            print(f"OBV背离检测错误: {e}")
             return "背离检测失败"

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/AIShareTxt/utils/utils.py

@@ -272,12 +272,29 @@ class Utils:
             str or None: 股票代码，如果没有提供则返回None
         """
         if len(sys.argv) > 1:
-            stock_code = sys.argv[1].strip()
-            if Utils.validate_stock_code(stock_code):
-                return stock_code
+            arg = sys.argv[1].strip()
+            
+            # 处理帮助参数
+            if arg in ['-h', '--help', 'help']:
+                print("\n股票技术指标分析器 (重构版)")
+                print("\n使用方法:")
+                print("  aishare [股票代码]     - 分析指定股票")
+                print("  aishare -h/--help     - 显示帮助信息")
+                print("\n示例:")
+                print("  aishare 000001        - 分析平安银行")
+                print("  aishare 600036        - 分析招商银行")
+                print("\n交互模式:")
+                print("  不带参数运行将进入交互模式，可以输入股票代码进行分析")
+                print("  输入 'quit' 或 'exit' 退出程序")
+                sys.exit(0)
+            
+            # 处理股票代码
+            if Utils.validate_stock_code(arg):
+                return arg
             else:
-                print(f"错误：股票代码 '{stock_code}' 格式不正确")
+                print(f"错误：股票代码 '{arg}' 格式不正确")
                 print("正确格式：6位数字，如 000001")
+                print("使用 'aishare --help' 查看更多帮助信息")
                 return None
         return None
     

{aishare_txt-2025.11.24.20/aishare_txt.egg-info → aishare_txt-2025.11.24.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aishare-txt
-Version: 2025.11.24.20
+Version: 2025.11.24.26
 Summary: 中国股票技术指标文本生成工具包，用于为金融分析相关领域的AI智能体提供上下文服务。
 Home-page: https://gitee.com/chaofanat/aishare-txt
 Author: AIShareTxt Team
@@ -23,6 +23,7 @@ Requires-Dist: pandas>=1.5.0
 Requires-Dist: numpy>=1.21.0
 Requires-Dist: requests>=2.28.0
 Requires-Dist: pandas_market_calendars>=1.1.0
+Requires-Dist: scipy>=1.9.0
 Requires-Dist: openai>=1.0.0
 Requires-Dist: zhipuai>=2.0.0
 Provides-Extra: dev

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26/aishare_txt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aishare-txt
-Version: 2025.11.24.20
+Version: 2025.11.24.26
 Summary: 中国股票技术指标文本生成工具包，用于为金融分析相关领域的AI智能体提供上下文服务。
 Home-page: https://gitee.com/chaofanat/aishare-txt
 Author: AIShareTxt Team
@@ -23,6 +23,7 @@ Requires-Dist: pandas>=1.5.0
 Requires-Dist: numpy>=1.21.0
 Requires-Dist: requests>=2.28.0
 Requires-Dist: pandas_market_calendars>=1.1.0
+Requires-Dist: scipy>=1.9.0
 Requires-Dist: openai>=1.0.0
 Requires-Dist: zhipuai>=2.0.0
 Provides-Extra: dev

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/aishare_txt.egg-info/requires.txt

@@ -4,6 +4,7 @@ pandas>=1.5.0
 numpy>=1.21.0
 requests>=2.28.0
 pandas_market_calendars>=1.1.0
+scipy>=1.9.0
 openai>=1.0.0
 zhipuai>=2.0.0
 

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/requirements.txt

@@ -5,6 +5,7 @@ pandas>=1.5.0
 numpy>=1.21.0
 requests>=2.28.0
 pandas_market_calendars>=1.1.0
+scipy>=1.9.0
 
 
 

{aishare_txt-2025.11.24.20 → aishare_txt-2025.11.24.26}/setup.py

@@ -42,7 +42,7 @@ dev_requires = read_requirements("requirements-dev.txt")
 
 setup(
     name="aishare-txt",
-    version="2025.11.24.20",
+    version="2025.11.24.26",
     author="AIShareTxt Team",
     author_email="chaofanat@gmail.com",
     description="中国股票技术指标文本生成工具包，用于为金融分析相关领域的AI智能体提供上下文服务。",