rquote 0.4.3__py3-none-any.whl → 0.4.6__py3-none-any.whl

rquote/__init__.py

@@ -23,7 +23,8 @@ from .api import (
     get_us_stocks,
     get_cn_fund_list,
     get_tick,
-    get_industry_stocks
+    get_industry_stocks,
+    get_cnindex_stocks
 )
 
 # 工具类
@@ -89,6 +90,7 @@ __all__ = [
     'get_cn_fund_list',
     'get_tick',
     'get_industry_stocks',
+    'get_cnindex_stocks',
     # 工具类
     'WebUtils',
     'BasicFactors',

rquote/api/__init__.py

@@ -10,7 +10,8 @@ from .lists import (
     get_cn_fund_list,
     get_cn_future_list,
     get_all_industries,
-    get_industry_stocks
+    get_industry_stocks,
+    get_cnindex_stocks
 )
 from .tick import get_tick
 from .stock_info import get_stock_concepts, get_stock_industry
@@ -27,6 +28,7 @@ __all__ = [
     'get_stock_concepts',
     'get_stock_industry',
     'get_all_industries',
-    'get_industry_stocks'
+    'get_industry_stocks',
+    'get_cnindex_stocks'
 ]
 

rquote/api/lists.py

@@ -6,6 +6,7 @@ import json
 import re
 import base64
 import time
+from urllib.parse import urlencode
 from ..utils import hget, logger
 from ..exceptions import HTTPError
 
@@ -78,7 +79,7 @@ def get_us_stocks(k=100):
 
 def get_cn_fund_list():
     """
-    获取A股ETF基金列表
+    获取A股ETF基金列表（sina）
     
     Returns:
         基金列表，格式: [code, name, change, amount, price]
@@ -173,3 +174,66 @@ def get_industry_stocks(node):
     data = json.loads(a.text)
     return data
 
+
+def get_cnindex_stocks(index_type='hs300'):
+    """
+    获取中国指数成分股列表
+    
+    Args:
+        index_type: 指数类型，可选值: 'hs300', 'zz500', 'zz1000'
+                    hs300: 沪深300 (TYPE=1)
+                    zz500: 中证500 (TYPE=3)
+                    zz1000: 中证1000 (TYPE=7)
+    
+    Returns:
+        股票列表，包含 SECUCODE, SECURITY_CODE, SECURITY_NAME_ABBR, CLOSE_PRICE 等字段
+    """
+    # 指数类型到 TYPE 值的映射
+    index_type_map = {
+        'hs300': '1',
+        'zz500': '3',
+        'zz1000': '7'
+    }
+    
+    if index_type not in index_type_map:
+        raise ValueError(f"不支持的指数类型: {index_type}，支持的类型: {list(index_type_map.keys())}")
+    
+    type_value = index_type_map[index_type]
+    
+    # 构建 URL
+    base_url = 'https://datacenter-web.eastmoney.com/api/data/v1/get'
+    params = {
+        'callback': 'jQuery112308471143523381743_1763517709888',
+        'sortColumns': 'SECURITY_CODE',
+        'sortTypes': '-1',
+        'pageSize': '500',
+        'pageNumber': '1',
+        'reportName': 'RPT_INDEX_TS_COMPONENT',
+        'columns': 'SECURITY_CODE,SECURITY_NAME_ABBR,INDUSTRY,WEIGHT,EPS,BPS,ROE,FREE_CAP',
+        'quoteColumns': '',
+        'quoteType': '0',
+        'source': 'WEB',
+        'client': 'WEB',
+        'filter': f'(TYPE="{type_value}")'
+    }
+    
+    # 构建完整 URL
+    url = f'{base_url}?{urlencode(params)}'
+    
+    # 发送请求
+    a = hget(url)
+    if not a:
+        raise HTTPError(f'Failed to fetch {index_type} stocks from EastMoney')
+    
+    # 解析 JSONP 格式的返回数据
+    # 格式: jQuery112308471143523381743_1763517709888({...})
+    json_str = a.text.split('(', 1)[1].rstrip(');')
+    data = json.loads(json_str)
+    
+    # 返回 result.data 中的数据列表
+    if data.get('result') and data['result'].get('data'):
+        return data['result']['data']
+    else:
+        logger.warning(f'No data found in response for {index_type}')
+        return []
+

rquote/api/stock_info.py

@@ -3,49 +3,101 @@
 股票信息相关API
 """
 import json
-from typing import List
+from typing import List, Optional, Any
 from ..utils import hget
 from ..exceptions import HTTPError
+from ..cache import Cache
+from ..cache.memory import DictCache as DictCacheAdapter
 
 
-def get_stock_concepts(i: str) -> List[str]:
+def _normalize_stock_code(code: str) -> str:
+    """标准化股票代码"""
+    return {'6': 'sh', '0': 'sz', '3': 'sz'}.get(code[0], '') + code if code[0] in ['6', '0', '3'] else code
+
+
+def _get_cache_adapter(dd: Optional[Any]) -> Optional[Cache]:
+    """获取缓存适配器"""
+    if dd is None:
+        return None
+    if isinstance(dd, dict):
+        return DictCacheAdapter(dd)
+    elif isinstance(dd, Cache):
+        return dd
+    elif hasattr(dd, 'get') and hasattr(dd, 'put'):
+        return DictCacheAdapter(dd)
+    return None
+
+
+def _fetch_stock_plate_data(normalized_code: str, data_key: str, error_msg: str) -> List[str]:
+    """获取股票板块数据的通用函数"""
+    url = f'https://proxy.finance.qq.com/ifzqgtimg/appstock/app/stockinfo/plateNew?code={normalized_code}&app=wzq&zdf=1'
+    a = hget(url)
+    if not a:
+        raise HTTPError(f'Failed to fetch {error_msg} from QQ Finance')
+    data = json.loads(a.text)
+    if data.get('code') != 0:
+        raise HTTPError('API returned error: {}'.format(data.get('msg', 'Unknown error')))
+    return data.get('data', {}).get(data_key, [])
+
+
+def get_stock_concepts(i: str, dd: Optional[Any] = None) -> List[str]:
     """
     获取指定股票所属的概念板块
     
     Args:
         i: 股票代码
+        dd: data dictionary或Cache对象，任何有get/put方法的本地缓存
     
     Returns:
         概念代码列表
     """
-    i = {'6': 'sh', '0': 'sz', '3': 'sz'}.get(i[0], '') + i if i[0] in ['6', '0', '3'] else i
-    url = f'https://proxy.finance.qq.com/ifzqgtimg/appstock/app/stockinfo/plateNew?code={i}&app=wzq&zdf=1'
-    a = hget(url)
-    if not a:
-        raise HTTPError('Failed to fetch concepts from QQ Finance')
-    data = json.loads(a.text)
-    if data.get('code') != 0:
-        raise HTTPError('API returned error: {}'.format(data.get('msg', 'Unknown error')))
-    return data.get('data', {}).get('concept', [])
+    cache = _get_cache_adapter(dd)
+    normalized_code = _normalize_stock_code(i)
+    cache_key = f'stock_concepts:{normalized_code}'
+    
+    # 尝试从缓存获取
+    if cache:
+        cached_result = cache.get(cache_key)
+        if cached_result is not None:
+            return cached_result
+    
+    # 缓存未命中，请求网络
+    result = _fetch_stock_plate_data(normalized_code, 'concept', 'concepts')
+    
+    # 存入缓存
+    if cache:
+        cache.put(cache_key, result)
+    
+    return result
 
 
-def get_stock_industry(i: str) -> List[str]:
+def get_stock_industry(i: str, dd: Optional[Any] = None) -> List[str]:
     """
     获取指定股票所属的行业板块
     
     Args:
         i: 股票代码
+        dd: data dictionary或Cache对象，任何有get/put方法的本地缓存
     
     Returns:
         行业代码列表
     """
-    i = {'6': 'sh', '0': 'sz', '3': 'sz'}.get(i[0], '') + i if i[0] in ['6', '0', '3'] else i
-    url = f'https://proxy.finance.qq.com/ifzqgtimg/appstock/app/stockinfo/plateNew?code={i}&app=wzq&zdf=1'
-    a = hget(url)
-    if not a:
-        raise HTTPError('Failed to fetch industry from QQ Finance')
-    data = json.loads(a.text)
-    if data.get('code') != 0:
-        raise HTTPError('API returned error: {}'.format(data.get('msg', 'Unknown error')))
-    return data.get('data', {}).get('plate', [])
+    cache = _get_cache_adapter(dd)
+    normalized_code = _normalize_stock_code(i)
+    cache_key = f'stock_industry:{normalized_code}'
+    
+    # 尝试从缓存获取
+    if cache:
+        cached_result = cache.get(cache_key)
+        if cached_result is not None:
+            return cached_result
+    
+    # 缓存未命中，请求网络
+    result = _fetch_stock_plate_data(normalized_code, 'plate', 'industry')
+    
+    # 存入缓存
+    if cache:
+        cache.put(cache_key, result)
+    
+    return result
 

rquote/markets/base.py

@@ -98,10 +98,15 @@ class Market(ABC):
             if PersistentCache and isinstance(self.cache, PersistentCache):
                 # 从完整 key 中提取 base_key
                 parts = key.split(':')
-                if len(parts) >= 3:
+                if len(parts) == 3:
+                    # 已经是 base_key 格式：symbol:freq:fq
+                    base_key = key
+                    cached = self.cache.get(base_key, sdate=sdate, edate=edate)
+                elif len(parts) >= 6:
+                    # 完整 key 格式：symbol:sdate:edate:freq:days:fq
                     symbol = parts[0]
-                    freq = parts[3] if len(parts) > 3 else 'day'
-                    fq = parts[5] if len(parts) > 5 else 'qfq'
+                    freq = parts[3]
+                    fq = parts[5]
                     base_key = f"{symbol}:{freq}:{fq}"
                     cached = self.cache.get(base_key, sdate=sdate, edate=edate)
                 else:
@@ -119,10 +124,15 @@ class Market(ABC):
             if PersistentCache and isinstance(self.cache, PersistentCache):
                 # 从完整 key 中提取 base_key
                 parts = key.split(':')
-                if len(parts) >= 3:
+                if len(parts) == 3:
+                    # 已经是 base_key 格式：symbol:freq:fq
+                    base_key = key
+                    self.cache.put(base_key, value)
+                elif len(parts) >= 6:
+                    # 完整 key 格式：symbol:sdate:edate:freq:days:fq
                     symbol = parts[0]
-                    freq = parts[3] if len(parts) > 3 else 'day'
-                    fq = parts[5] if len(parts) > 5 else 'qfq'
+                    freq = parts[3]
+                    fq = parts[5]
                     base_key = f"{symbol}:{freq}:{fq}"
                     self.cache.put(base_key, value)
                 else:

rquote/markets/cn_stock.py

@@ -94,6 +94,13 @@ class CNStockMarket(Market):
     def _get_pt_price(self, symbol: str, sdate: str, edate: str, 
                      freq: str, days: int, fq: str) -> Tuple[str, str, pd.DataFrame]:
         """获取PT代码价格"""
+        # 先检查缓存（使用base_key格式，日期通过参数传递）
+        base_key = f"{symbol}:{freq}:{fq}"
+        cached = self._get_cached(base_key, sdate=sdate, edate=edate)
+        if cached:
+            logger.info(f"[PT CACHE HIT] symbol={symbol}, 从缓存返回数据")
+            return cached
+        
         try:
             url = f'https://proxy.finance.qq.com/ifzqgtimg/appstock/app/newfqkline/get?_var=kline_dayqfq&param={symbol},{freq},{sdate},{edate},{days},{fq}'
             response = hget(url)
@@ -117,7 +124,7 @@ class CNStockMarket(Market):
                 parser = KlineParser()
                 name, df = parser.parse_tencent_kline(data, symbol)
                 result = (symbol, name, df)
-                self._put_cache(f"{symbol}:{sdate}:{edate}:{freq}", result)
+                self._put_cache(base_key, result)
                 return result
             except Exception as e:
                 logger.warning(f'Failed to parse {symbol}, using fallback: {e}')
@@ -147,7 +154,7 @@ class CNStockMarket(Market):
                     df[col] = pd.to_numeric(df[col], errors='coerce')
                 
                 result = (symbol, name, df)
-                self._put_cache(f"{symbol}:{sdate}:{edate}:{freq}", result)
+                self._put_cache(base_key, result)
                 return result
         except Exception as e:
             logger.warning(f'error fetching {symbol}, err: {e}')

{rquote-0.4.3.dist-info → rquote-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.4.3
+Version: 0.4.6
 Summary: Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
@@ -18,7 +18,7 @@ Requires-Dist: duckdb>=0.9.0; extra == "persistent"
 
 ## 版本信息
 
-当前版本：**0.4.3**
+当前版本：**0.4.6**
 
 ## 主要特性
 
@@ -219,6 +219,28 @@ us_stocks = get_us_stocks(k=100)  # 获取前100只
 # 返回格式: [{name, symbol, market, mktcap, pe, ...}, ...]
 ```
 
+#### `get_cnindex_stocks(index_type='hs300')`
+
+获取中国指数成分股列表
+
+```python
+from rquote import get_cnindex_stocks
+
+# 获取沪深300成分股
+hs300_stocks = get_cnindex_stocks('hs300')
+# 获取中证500成分股
+zz500_stocks = get_cnindex_stocks('zz500')
+# 获取中证1000成分股
+zz1000_stocks = get_cnindex_stocks('zz1000')
+
+# 返回格式: [{SECURITY_CODE, SECURITY_NAME_ABBR, INDUSTRY, WEIGHT, EPS, BPS, ROE, FREE_CAP, ...}, ...]
+```
+
+支持的指数类型：
+- `'hs300'`: 沪深300
+- `'zz500'`: 中证500
+- `'zz1000'`: 中证1000
+
 ### 基金和期货
 
 #### `get_cn_fund_list()`

{rquote-0.4.3.dist-info → rquote-0.4.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
-rquote/__init__.py,sha256=HMXqZ_wfGoRqw1V3xm2MyBGYKB9ooGWIRnk60bisLZo,2370
+rquote/__init__.py,sha256=VEZOnqv7Erc34qqllI17bG9cezoaf9uNoOtX9fmhtyw,2420
 rquote/config.py,sha256=noep_VzY_nJehnkPQb4mkwzpeYLwkU1riqofQJ6Hhw0,1108
 rquote/exceptions.py,sha256=lJH2GC5dDhMoW_OtlBc03wlUn684-7jNPyF1NjmfVIE,569
 rquote/plots.py,sha256=UQn4sjhIzVwagfhUDM738b2HHjKo4tRdU2UCs_1-FbY,2341
 rquote/utils.py,sha256=bH0ZFIo-ZelNztzPS6BXFShXE3yGA9USI_P9INN0Y-s,310
-rquote/api/__init__.py,sha256=ptizO--im80HaxlzxkJo9BKdJPEnbu00R9UDgcoA0mU,656
-rquote/api/lists.py,sha256=fRebS02Fi0qe6KpWBA-9W1UG0It6__DmRlNimtMa7L8,5331
+rquote/api/__init__.py,sha256=17VgPOKsbQX8kKcuU8fKqn4qOHxMamV9GBTXTCcbdvw,706
+rquote/api/lists.py,sha256=WGyliA9pkpPrN019xkhKL-5nzrmTGrsb8bnG8Zz4cRs,7395
 rquote/api/price.py,sha256=I5lZl6cUQRlE4AtzNbR-uGZt1ho9vgP1cgNFDjaigMA,3575
-rquote/api/stock_info.py,sha256=912ICdIBr8z2lKWDbq3gG0E94czTPvbx9aXsKUi-QkE,1537
+rquote/api/stock_info.py,sha256=h_AbgsR8CLWz5zA2PtGsS3ROQ3qcw_hnRAtG3USeMos,2988
 rquote/api/tick.py,sha256=nEcjuAjtBHUaD8KPRLg643piVa21PhKDQvkVWNwvvME,1431
 rquote/cache/__init__.py,sha256=S393I5Wmp0QooaRka9n7bvDUdEbg3jUhm6u815T86rM,317
 rquote/cache/base.py,sha256=orzG4Yo-6gzVG027j1-LTZPT718JohnCdLDnOLoLUQ4,515
@@ -19,8 +19,8 @@ rquote/data_sources/tencent.py,sha256=ayt1O85pheLwzX3z5c6Qij1NrmUywcsz6YcSVzdDoM
 rquote/factors/__init__.py,sha256=_ZbH2XxYtXwCJpvRVdNvGncoPSpMqrtlYmf1_fMGIjM,116
 rquote/factors/technical.py,sha256=dPDs3pDEDRV9iQJBrSoKpGFLQMjOqyoBdN2rUntpOUU,4235
 rquote/markets/__init__.py,sha256=k4F8cZgb-phqemMqhZXFPdOKsR4P--DD3d5i21vKhbg,365
-rquote/markets/base.py,sha256=nHBMzQRkuDUrsx9GvB_QiMh2deMUjTiUZsIRYPJpB_8,11206
-rquote/markets/cn_stock.py,sha256=nu2ebTE4a6FAJkvpMN0FEPuqwom_hqTRjnUg96cQGKc,8320
+rquote/markets/base.py,sha256=SyzghAMvSoQNL8DbHCXbWQ0bhu0pDlJrYmO16L_blOI,11646
+rquote/markets/cn_stock.py,sha256=lATGlunbR5cV-D84S3iD-VKc3L71hz4dyYx8YBYiuQg,8596
 rquote/markets/factory.py,sha256=4Txpuok0LBOLT_vAiIU-NslwVnYF7sKHCdlacAboxpo,2875
 rquote/markets/future.py,sha256=yGMyUu9Fv75jbzPbvW6_36otEeebSij7vnzow_zyEn8,7358
 rquote/markets/hk_stock.py,sha256=AhRJpWp027ACew9ogxkVCJXbqbYQ1AkbFwDJccXbvAs,1183
@@ -33,7 +33,7 @@ rquote/utils/helpers.py,sha256=V07n9BtRS8bEJH023Kca78-unk7iD3B9hn2UjELetYs,354
 rquote/utils/http.py,sha256=X0Alhnu0CNqyQeOt6ivUWmh2XwrWxXd2lSpQOKDdnzw,3249
 rquote/utils/logging.py,sha256=fs2YF1Srux4LLTdk_Grjm5g1f4mzewI38VVSAI82goA,1471
 rquote/utils/web.py,sha256=I8_pcThW6VUvahuRHdtp32iZwr85hEt1hB6TgznMy_U,3854
-rquote-0.4.3.dist-info/METADATA,sha256=R9zS71G3lxp8C43qrY67DBn2Y2t_1P7rTtCztfj7Kq8,14344
-rquote-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rquote-0.4.3.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
-rquote-0.4.3.dist-info/RECORD,,
+rquote-0.4.6.dist-info/METADATA,sha256=LRPiTig-kVH_yqrJpXu2h_8wlq4q9pjghHs3Fmv687w,14898
+rquote-0.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rquote-0.4.6.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
+rquote-0.4.6.dist-info/RECORD,,