rquote 0.3.8__tar.gz → 0.3.9__tar.gz

{rquote-0.3.8 → rquote-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.3.8
+Version: 0.3.9
 Summary: Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch
 Requires-Python: >=3.6.1
 Description-Content-Type: text/markdown

{rquote-0.3.8 → rquote-0.3.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rquote"
-version = "0.3.8"
+version = "0.3.9"
 description = "Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch"
 readme = "README.md"
 requires-python = ">=3.6.1"

{rquote-0.3.8 → rquote-0.3.9}/rquote/api/price.py

@@ -11,6 +11,33 @@ from ..utils.date import check_date_format
 from ..exceptions import SymbolError
 
 
+def _normalize_dataframe_index(df: pd.DataFrame) -> pd.DataFrame:
+    """
+    统一处理 DataFrame 索引，转换为 DatetimeIndex
+    
+    Args:
+        df: 输入的 DataFrame
+    
+    Returns:
+        处理后的 DataFrame，索引为 DatetimeIndex
+    """
+    if df.empty:
+        return df
+    
+    # 如果已经是 DatetimeIndex，直接返回
+    if isinstance(df.index, pd.DatetimeIndex):
+        return df
+    
+    # 尝试转换为 DatetimeIndex
+    try:
+        df.index = pd.to_datetime(df.index)
+    except (ValueError, TypeError) as e:
+        # 如果转换失败，保持原样（可能是其他类型的索引）
+        pass
+    
+    return df
+
+
 def get_price(i: str, sdate: str = '', edate: str = '', freq: str = 'day', 
               days: int = 320, fq: str = 'qfq', dd=None) -> Tuple[str, str, pd.DataFrame]:
     '''
@@ -49,7 +76,12 @@ def get_price(i: str, sdate: str = '', edate: str = '', freq: str = 'day',
     market = MarketFactory.create_from_symbol(i, cache=cache)
     
     # 调用市场的get_price方法
-    return market.get_price(i, sdate=sdate, edate=edate, freq=freq, days=days, fq=fq)
+    symbol, name, df = market.get_price(i, sdate=sdate, edate=edate, freq=freq, days=days, fq=fq)
+    
+    # 统一后处理：转换索引为 DatetimeIndex
+    df = _normalize_dataframe_index(df)
+    
+    return symbol, name, df
 
 
 def get_price_longer(i: str, l: int = 2, dd=None) -> Tuple[str, str, pd.DataFrame]:
@@ -65,7 +97,16 @@ def get_price_longer(i: str, l: int = 2, dd=None) -> Tuple[str, str, pd.DataFram
         (symbol, name, DataFrame)
     """
     _, name, a = get_price(i, dd=dd)
-    d1 = a.index.format()[0]
+    # 使用 DatetimeIndex 的格式化方法（get_price 已统一转换为 DatetimeIndex）
+    if isinstance(a.index, pd.DatetimeIndex) and len(a.index) > 0:
+        d1 = a.index[0].strftime('%Y%m%d')
+    else:
+        # 降级处理：如果索引不是 DatetimeIndex（理论上不应该发生），尝试格式化
+        try:
+            d1 = str(a.index[0])[:8] if len(str(a.index[0])) >= 8 else str(a.index[0])
+        except:
+            d1 = a.index.format()[0] if hasattr(a.index, 'format') else str(a.index[0])
+    
     for y in range(1, l):
         d0 = str(int(d1[:4]) - 1) + d1[4:]
         a = pd.concat((get_price(i, d0, d1, dd=dd)[2], a), 0).drop_duplicates()

{rquote-0.3.8 → rquote-0.3.9}/rquote/markets/cn_stock.py

@@ -82,7 +82,10 @@ class CNStockMarket(Market):
             name = data['data']['name']
             df = pd.DataFrame([i.split(',') for i in data['data']['klines']], 
                              columns=['date', 'open', 'close', 'high', 'low', 'vol', 'money', 'p'])
-            df = df.set_index(['date']).astype(float)
+            df = df.set_index(['date'])
+            # 转换数值列
+            for col in ['open', 'close', 'high', 'low', 'vol', 'money', 'p']:
+                df[col] = pd.to_numeric(df[col], errors='coerce')
             
             result = (symbol, name, df)
             self._put_cache(symbol, result)

{rquote-0.3.8 → rquote-0.3.9}/rquote/markets/future.py

@@ -27,7 +27,10 @@ class FutureMarket(Market):
         
         # 特殊处理BTC
         if symbol[2:5].lower() == 'btc':
-            return self._get_btc_price(symbol)
+            if freq in ('min', '1min', 'minute'):
+                return self._get_btc_minute_price(symbol)
+            else:
+                return self._get_btc_price(symbol)
         
         cache_key = f"{symbol}:{sdate}:{edate}:{freq}:{days}"
         cached = self._get_cached(cache_key)
@@ -49,7 +52,7 @@ class FutureMarket(Market):
             return self._get_price_fallback(symbol, future_code, freq)
     
     def _get_btc_price(self, symbol: str) -> Tuple[str, str, pd.DataFrame]:
-        """获取比特币价格"""
+        """获取比特币日线价格"""
         url = 'https://quotes.sina.cn/fx/api/openapi.php/BtcService.getDayKLine?symbol=btcbtcusd'
         response = hget(url)
         if not response:
@@ -60,12 +63,95 @@ class FutureMarket(Market):
                           columns=['date', 'open', 'high', 'low', 'close', 'vol', 'amount'])
         for col in ['open', 'high', 'low', 'close', 'vol', 'amount']:
             df[col] = pd.to_numeric(df[col], errors='coerce')
-        df = df.set_index('date').astype(float)
+        df = df.set_index('date')
         
         result = (symbol, 'BTC', df)
         self._put_cache(symbol, result)
         return result
     
+    def _get_btc_minute_price(self, symbol: str, datalen: int = 1440) -> Tuple[str, str, pd.DataFrame]:
+        """
+        获取比特币分钟级价格
+        
+        Args:
+            symbol: 股票代码（如 'fuBTC'）
+            datalen: 数据长度，默认1440（24小时，每分钟1条）
+        
+        Returns:
+            (symbol, name, DataFrame)
+        """
+        cache_key = f"{symbol}:min:{datalen}"
+        cached = self._get_cached(cache_key)
+        if cached:
+            return cached
+        
+        url = f'https://quotes.sina.cn/fx/api/openapi.php/BtcService.getMinKline?symbol=btcbtcusd&scale=1&datalen={datalen}&callback=var%20_btcbtcusd'
+        response = hget(url)
+        if not response:
+            raise DataSourceError("Failed to fetch BTC minute data")
+        
+        # 解析 JavaScript callback 格式: var _btcbtcusd({...})
+        text = response.text
+        
+        # 移除开头的注释和脚本标签
+        if '*/' in text:
+            text = text.split('*/', 1)[1]
+        text = text.strip()
+        
+        # 查找 JSON 部分（从第一个 { 开始）
+        json_start = text.find('{')
+        if json_start == -1:
+            raise DataSourceError("Invalid BTC minute data format: no JSON found")
+        
+        # 提取 JSON 部分，需要找到匹配的最后一个 }
+        # 格式: var _btcbtcusd({...}) 或 var _btcbtcusd({...});
+        json_str = text[json_start:]
+        # 移除末尾可能的 ); 或 )
+        json_str = json_str.rstrip(');').rstrip(')')
+        
+        try:
+            data = json.loads(json_str)
+        except json.JSONDecodeError as e:
+            raise DataSourceError(f"Failed to parse BTC minute data JSON: {e}")
+        
+        # 检查返回状态
+        if data.get('result', {}).get('status', {}).get('code') != 0:
+            raise DataSourceError(f"BTC API error: {data.get('result', {}).get('status', {}).get('msg', 'Unknown error')}")
+        
+        # 提取数据
+        kline_data = data.get('result', {}).get('data', [])
+        if not kline_data:
+            raise DataSourceError("No BTC minute data returned")
+        
+        # 转换为 DataFrame
+        # 数据格式: {"d":"2025-11-16 15:35:00","o":"95835.37","h":"95919.90","l":"95835.37","c":"95919.89","v":"6","a":"551441.4297"}
+        records = []
+        for item in kline_data:
+            records.append({
+                'date': item.get('d', ''),
+                'open': item.get('o', '0'),
+                'high': item.get('h', '0'),
+                'low': item.get('l', '0'),
+                'close': item.get('c', '0'),
+                'vol': item.get('v', '0'),
+                'amount': item.get('a', '0')
+            })
+        
+        df = pd.DataFrame(records)
+        if df.empty:
+            raise DataSourceError("Empty BTC minute data")
+        
+        # 转换数据类型
+        for col in ['open', 'high', 'low', 'close', 'vol', 'amount']:
+            df[col] = pd.to_numeric(df[col], errors='coerce')
+        
+        # 设置索引
+        df = df.set_index('date')
+        
+        result = (symbol, 'BTC', df)
+        self._put_cache(cache_key, result)
+        return result
+    
     def _get_price_fallback(self, symbol: str, future_code: str, freq: str) -> Tuple[str, str, pd.DataFrame]:
         """降级方法"""
         from ..utils.helpers import load_js_var_json
@@ -84,7 +170,7 @@ class FutureMarket(Market):
             df.columns = ['date', 'open', 'high', 'low', 'close', 'vol', 'p', 's']
             for col in ['open', 'high', 'low', 'close', 'vol', 'p', 's']:
                 df[col] = pd.to_numeric(df[col], errors='coerce')
-            df = df.set_index('date').astype(float)
+            df = df.set_index('date')
             result = (symbol, future_code, df)
         
         self._put_cache(f"{symbol}:{freq}", result)

{rquote-0.3.8 → rquote-0.3.9}/rquote/markets/hk_stock.py

@@ -35,7 +35,7 @@ class HKStockMarket(Market):
             )
             
             parser = KlineParser()
-            name, df = parser.parse_tencent_kline(raw_data, symbol)
+            name, df = parser.parse_tencent_kline(raw_data, symbol, fq=fq)
             
             result = (symbol, name, df)
             self._put_cache(cache_key, result)

{rquote-0.3.8 → rquote-0.3.9}/rquote/parsers/kline.py

@@ -11,7 +11,7 @@ class KlineParser:
     """K线数据解析器"""
     
     @staticmethod
-    def parse_tencent_kline(data: Dict[str, Any], symbol: str) -> Tuple[str, pd.DataFrame]:
+    def parse_tencent_kline(data: Dict[str, Any], symbol: str, fq: str = 'qfq') -> Tuple[str, pd.DataFrame]:
         """
         解析腾讯K线数据
         
@@ -27,9 +27,17 @@ class KlineParser:
             if not symbol_data:
                 raise ParseError(f"No data for symbol {symbol}")
             
-            # 查找时间键
-            time_keys = ['day', 'qfqday', 'hfqday', 'week', 'qfqweek', 'hfqweek',
-                        'month', 'qfqmonth', 'hfqmonth']
+            # 查找时间键，优先使用与fq参数匹配的键
+            # 根据fq参数确定优先级：qfq -> qfqday优先，hfq -> hfqday优先，否则day优先
+            if fq == 'qfq':
+                time_keys = ['qfqday', 'day', 'hfqday', 'qfqweek', 'week', 'hfqweek',
+                            'qfqmonth', 'month', 'hfqmonth']
+            elif fq == 'hfq':
+                time_keys = ['hfqday', 'day', 'qfqday', 'hfqweek', 'week', 'qfqweek',
+                            'hfqmonth', 'month', 'qfqmonth']
+            else:
+                time_keys = ['day', 'qfqday', 'hfqday', 'week', 'qfqweek', 'hfqweek',
+                            'month', 'qfqmonth', 'hfqmonth']
             tk = None
             for tkt in time_keys:
                 if tkt in symbol_data:

{rquote-0.3.8 → rquote-0.3.9}/rquote.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.3.8
+Version: 0.3.9
 Summary: Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch
 Requires-Python: >=3.6.1
 Description-Content-Type: text/markdown