rquote 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

rquote/__init__.py

@@ -10,6 +10,6 @@ Copyright (c) 2021 Roi ZHAO
 from .main import get_price, get_stock_concepts, get_concept_stocks, get_bk_stocks
 from .main import get_all_concepts, get_all_industries
 from .main import get_cn_stock_list, get_hk_stocks_hsi, get_hk_stocks_ggt, get_hk_stocks_500
-from .main import get_cn_future_list, get_us_stocks_biggest, get_cn_fund_list
+from .main import get_cn_future_list, get_us_stocks, get_cn_fund_list
 from .utils import WebUtils, BasicFactors
 from .plots import PlotUtils

rquote/main.py

@@ -12,9 +12,9 @@ from .utils import WebUtils, hget, logger
 def get_cn_stock_list(money_min=2e8):
     ret = []
     try:
-        ret = get_cn_stock_list_eastmoney(money_min)
-    except Exception as e:
         ret = get_cn_stock_list_qq(money_min)
+    except Exception as e:
+        ret = get_cn_stock_list_eastmoney(money_min)
     return ret
 
 def get_cn_stock_list_eastmoney(money_min=2e8):
@@ -45,12 +45,11 @@ def get_cn_stock_list_qq(money_min=2e8):
     df = []
     while not df or float(df[-1]['turnover'])*1e4 > money_min:
         a = hget(
-            f'https://proxy.finance.qq.com/cgi/cgi-bin/rank/hs/getBoardRankList?_appver=11.17.0'+
+            'https://proxy.finance.qq.com/cgi/cgi-bin/rank/hs/getBoardRankList?_appver=11.17.0'+
             f'&board_code=aStock&sort_type=turnover&direct=down&offset={offset}&count={count}'
         )
         if a:
             a = json.loads(a.text)
-            print('===',a)
             if a['data']['rank_list']:
                 df.extend(a['data']['rank_list'])
                 offset += count
@@ -68,18 +67,18 @@ def get_hk_stocks_500():
     return a
 
 
-def get_us_stocks_biggest(k=60):
+def get_us_stocks(k=100):
     # return list of [symbol, name, price, volume, mktcap, pe]
     uscands = []
-    a = hget(
-        "https://stock.finance.sina.com.cn/usstock/api/jsonp.php/IO.XSRV2."+
-        "CallbackList['f0j3ltzVzdo2Fo4p']/US_CategoryService.getList?page=1"+
-        "&num=60&sort=&asc=0&market=&id=", headers=WebUtils.headers()).text
-    if a:
-        uslist = json.loads(a.split('(',1)[1][:-2])['data']
-        # Warning: symbol not fitted
-        uscands = [('us' + i['symbol'], i['name'], i['price'], i['volume'],
-            i['mktcap']) for i in uslist]
+    page_n = k//20 + 1
+    for page in range(1, page_n+1):
+        a = hget(
+            "https://stock.finance.sina.com.cn/usstock/api/jsonp.php/IO.XSRV2."+
+            f"CallbackList['f0j3ltzVzdo2Fo4p']/US_CategoryService.getList?page={page}"+
+            "&num=20&sort=&asc=0&market=&id=").text
+        if a:
+            uslist = json.loads(a.split('(',1)[1][:-2])['data']
+            uscands.extend(uslist)
     return uscands
 
 
@@ -115,6 +114,29 @@ def get_cn_future_list():
     return futurelist_active
 
 
+def _check_date_format(date_str):
+    # 允许格式: 2099-01-01
+    if not re.match(r'^\d{4}-\d{2}-\d{2}$', date_str):
+        # 尝试转换
+        try:
+            # 常见格式尝试
+            t_struct = None
+            for fmt in ("%Y/%m/%d", "%Y%m%d", "%Y.%m.%d", "%Y_%m_%d", "%Y-%m-%d"):
+                try:
+                    t_struct = time.strptime(date_str, fmt)
+                    break
+                except Exception:
+                    continue
+            if t_struct is None:
+                raise ValueError(f"date format not recognized: {date_str}")
+            # 转换为标准格式
+            date_str_std = time.strftime("%Y-%m-%d", t_struct)
+            return date_str_std
+        except Exception as e:
+            raise ValueError(f"date format error: {date_str}, {e}")
+    return date_str
+
+
 def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
               dd=None) -> (str, str, pd.DataFrame):
     '''
@@ -132,6 +154,12 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
             logger.debug('loading price from dd {}'.format(i))
             return i, n, d
     logger.debug('fetching price of {}'.format(i))
+
+    # 检查sdate和edate格式
+    sdate = _check_date_format(sdate) if sdate else ''
+    edate = _check_date_format(edate) if edate else ''
+        
+
     qtimg_stock = 'http://web.ifzq.gtimg.cn/appstock/app/newfqkline/get?param=' + \
             '{},{},{},{},{},{}'
     qtimg_stock_hk = 'http://web.ifzq.gtimg.cn/appstock/app/hkfqkline/get?' + \
@@ -153,8 +181,7 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
                                'Emc2VjaWQ9OTAu').decode() + i +
                           '&fields1=f1%2Cf2%2Cf3%2Cf4%2Cf5' +
                           '&fields2=f51%2Cf52%2Cf53%2Cf54%2Cf55%2Cf56%2Cf57%2Cf58' +
-                          '&klt=101&fqt=0&beg=19900101&end=20990101&_=1',
-                          headers=WebUtils.headers())
+                          '&klt=101&fqt=0&beg=19900101&end=20990101&_=1')
             if not a:
                 logger.warning('{} hget failed: {}'.format(i, a))
                 return i, 'None', pd.DataFrame([])
@@ -175,8 +202,7 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
 
     if i[:2] == 'fu':
         try:
-            ix = i[2:] if i[-1]=='0' else i[2:-4]
-            if ix == 'btc' or ix == 'BTC':
+            if i[2:5].lower() == 'btc':
                 url = sina_btc
                 d = json.loads(hget(url).text)['result']['data'].split('|')
                 d = pd.DataFrame([i.split(',') for i in d], 
@@ -202,7 +228,7 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
     elif i[:2] == 'us':
         url = qtimg_stock_us.format(i, freq, sdate, edate, days, fq)
     else:
-        raise ValueError('target market not supported')
+        raise ValueError(f'target market not supported: {i}')
     a = hget(url)
     #a = json.loads(a.text.replace('kline_dayqfq=', ''))['data'][i]
     a = json.loads(a.text)['data'][i]
@@ -432,4 +458,8 @@ def get_hk_stocks_hsi():
 
 
 
+if __name__ == "__main__":
+    # print(get_cn_stock_list())
+    # print(get_price('fuBTC'))
+    print(get_price('sz000001', sdate='20240101', edate='20250101'))
 

rquote/utils.py

@@ -4,7 +4,6 @@ import time
 import random
 import logging
 import httpx
-import numpy as np
 import pandas as pd
 import uuid
 

rquote-0.2.9.dist-info/METADATA

@@ -0,0 +1,285 @@
+Metadata-Version: 2.4
+Name: rquote
+Version: 0.2.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
+Requires-Dist: httpx>=0.20.0
+Requires-Dist: pandas>=1.0.0
+Requires-Dist: setuptools>=42
+Requires-Dist: twine>=3.8.0
+
+# rquote
+
+`rquote` 是一个提供 A股/港股/美股/ETF基金/期货 历史数据获取的Python库
+
+## 主要功能
+
+### 历史价格数据获取
+
+#### `get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq', dd=None)`
+
+获取股票、基金、期货的历史价格数据
+
+**参数:**
+- `i`: 股票代码，使用新浪/腾讯的id形式
+- `sdate`: 开始日期 (可选)
+- `edate`: 结束日期 (可选) 
+- `freq`: 频率，默认'day' (日线)
+- `days`: 获取天数，默认320天
+- `fq`: 复权方式，默认'qfq' (前复权)
+- `dd`: 本地缓存字典 (可选)
+
+**代码格式说明:**
+- A股: `sh000001`表示上证指数，`sz000001`表示深市000001股票`平安银行`
+- ETF: `sh510050`表示上证50指数ETF
+- 港股: `hk00700`表示港股腾讯
+- 期货: 需加`fu`前缀，如`fuAP2110`，`fuBTC`表示比特币
+- 美股: 需加对应交易所后缀，如`usBABA.N`，`usC.N`，`usAAPL.OQ`等
+- 比特币：使用`fuBTC`代码
+
+**示例:**
+```python
+from rquote import get_price
+
+# 获取上证指数数据
+sid, nm, df = get_price('sh000001')
+print(df.head())  # 数据为pandas dataframe
+
+# 获取指定日期范围的数据
+sid, nm, df = get_price('sz000001', sdate='2024-01-01', edate='2024-02-01')
+
+# 获取比特币数据
+sid, nm, df = get_price('fuBTC')
+```
+
+**返回数据格式:**
+| date       | open    | close   | high    | low     | vol        |
+|------------|---------|---------|---------|---------|------------|
+| 2024-02-06 | 2680.48 | 2789.49 | 2802.93 | 2669.67 | 502849313  |
+| 2024-02-07 | 2791.51 | 2829.70 | 2829.70 | 2770.53 | 547117439  |
+| 2024-02-08 | 2832.49 | 2865.90 | 2867.47 | 2827.90 | 531108893  |
+| 2024-02-19 | 2886.59 | 2910.54 | 2910.54 | 2867.71 | 458967704  |
+| 2024-02-20 | 2902.88 | 2922.73 | 2927.31 | 2887.47 | 350138735  |
+
+#### `get_price_longer(i, l=2, dd={})`
+
+获取更长时间的历史数据，默认获取2年数据
+
+```python
+from rquote import get_price_longer
+
+# 获取2年的历史数据
+sid, nm, df = get_price_longer('sh000001', l=3)  # 获取3年数据
+```
+
+### 股票列表获取
+
+#### `get_cn_stock_list(money_min=2e8)`
+
+获取A股股票列表，按成交额排序，默认筛选成交额大于2亿的股票
+
+```python
+from rquote import get_cn_stock_list
+
+# 获取成交额大于5亿的股票列表
+stocks = get_cn_stock_list(money_min=5e8)
+# 返回格式: [{code, name, pe_ttm, volume, turnover/亿, ...}, ...] 
+# 如 {"code":"sh600519","hsl":"0.28","lb":"0.94","ltsz":"17946.80","name":"贵州茅台","pe_ttm":"20.16","pn":"6.95","speed":"0.02","state":"","stock_type":"GP-A","turnover":"499068","volume":"34816.00","zd":"2.66","zdf":"0.19","zdf_d10":"-5.16","zdf_d20":"-9.58","zdf_d5":"0.12","zdf_d60":"-9.22","zdf_w52":"-3.22","zdf_y":"-6.26","zf":"1.47","zljlr":"16268.84","zllc":"263511.99","zllc_d5":"1295957.54","zllr":"279780.83","zllr_d5":"1264966.39","zsz":"17946.80","zxj":"1428.66"}
+```
+
+#### `get_hk_stocks_500()`
+
+获取港股前500只股票列表
+
+```python
+from rquote import get_hk_stocks_500
+
+stocks = get_hk_stocks_500()
+# 返回格式: [[code, name, price, turnover, ...], ...] 
+# 如 ['00700', '腾讯控股', '505.50', '1.51', '7.50', '505.50', '505.50', '20622275.00', '10364144211.54', '504.50', '498.00', '505.50', '496.00', '0.22']
+```
+
+#### `get_hk_stocks_hsi()`
+
+获取恒生指数成分股列表
+
+```python
+from rquote import get_hk_stocks_hsi
+
+hsi_stocks = get_hk_stocks_hsi()
+```
+
+#### `get_hk_stocks_ggt()`
+
+获取港股通股票列表
+
+```python
+from rquote import get_hk_stocks_ggt
+
+ggt_stocks = get_hk_stocks_ggt()
+```
+
+#### `get_us_stocks(k=100)`
+
+获取美股最大市值的k支股票列表
+
+```python
+from rquote import get_us_stocks_biggest
+
+us_stocks = get_us_stocks_biggest(k=100)  # 获取前100只
+# 返回格式: [{name, symbol, market, mktcap, pe, ...}, ...] 
+# 如 {"name":"Microsoft Corp.","cname":"微软公司","category":"软件","symbol":"MSFT","price":"480.24","diff":"2.20","chg":"0.46","preclose":"478.04","open":"478.00","high":"481.00","low":"474.46","amplitude":"1.37%","volume":"17526452","mktcap":"3569404793144","pe":"36.94153771","market":"NASDAQ","category_id":"14"}
+```
+
+### 基金和期货
+
+#### `get_cn_fund_list()`
+
+获取A股ETF基金列表，按成交额排序
+
+```python
+from rquote import get_cn_fund_list
+
+funds = get_cn_fund_list()
+# 返回格式: [code, name, change, amount, price]
+```
+
+#### `get_cn_future_list()`
+
+获取国内期货合约列表
+
+```python
+from rquote import get_cn_future_list
+
+futures = get_cn_future_list()
+# 返回格式: ['fuSC2109', 'fuRB2110', 'fuHC2110', ...]
+```
+
+### 板块和概念
+
+#### `get_all_industries()`
+
+获取所有行业板块列表
+
+```python
+from rquote import get_all_industries
+
+industries = get_all_industries()
+# 返回格式: [code, name, change, amount, price]
+```
+
+#### `get_all_concepts()`
+
+获取所有概念板块列表
+
+```python
+from rquote import get_all_concepts
+
+concepts = get_all_concepts()
+# 返回格式: [code, name, change, amount, price]
+```
+
+#### `get_stock_concepts(i)`
+
+获取指定股票所属的概念板块
+
+```python
+from rquote import get_stock_concepts
+
+# 获取平安银行的概念板块
+concepts = get_stock_concepts('sz000001')
+# 返回概念代码列表，如 ['BK0420', 'BK0900', ...]
+```
+
+#### `get_concept_stocks(bkid, dc=None)`
+
+获取指定概念板块的股票列表
+
+```python
+from rquote import get_concept_stocks
+
+# 获取概念板块BK0420的股票
+stocks = get_concept_stocks('BK0420')
+# 返回格式: [code, name, change, amount, mktcap]
+```
+
+#### `get_bk_stocks(bkid)`
+
+获取指定板块的股票列表
+
+```python
+from rquote import get_bk_stocks
+
+# 获取板块股票
+stocks = get_bk_stocks('BK0420')
+```
+
+#### `get_industry_stocks(bkid)`
+
+获取指定行业板块的股票列表
+
+```python
+from rquote import get_industry_stocks
+
+# 获取行业板块股票
+stocks = get_industry_stocks('BK0420')
+```
+
+### 实时行情
+
+#### `get_tick(tgts=[])`
+
+获取实时行情数据
+
+```python
+from rquote import get_tick
+
+# 获取美股实时行情
+tick_data = get_tick(['AAPL', 'GOOGL'])
+# 返回格式: [{'name': 'Apple Inc', 'price': '150.25', 'price_change_rate': '1.2%', ...}]
+```
+
+### 可视化工具
+
+#### `PlotUtils.plot_candle(i, sdate='', edate='', dsh=False, vol=True)`
+
+绘制K线图
+
+```python
+from rquote import PlotUtils
+
+# 绘制平安银行的K线图
+data, layout = PlotUtils.plot_candle('sz000001', sdate='2024-01-01', edate='2024-02-01')
+
+# 使用plotly显示
+import plotly.graph_objs as go
+fig = go.Figure(data=data, layout=layout)
+fig.show()
+```
+
+### 工具类
+
+#### `WebUtils`
+
+网络请求工具类
+
+#### `BasicFactors`
+
+基础因子计算工具类
+
+## 安装
+
+```bash
+pip install rquote
+```
+
+## 注意事项
+
+1. 数据来源于新浪财经、腾讯财经、东方财富等公开数据源
+2. 建议合理控制请求频率，避免被限制访问
+3. 期货代码需要加`fu`前缀，如`fuAP2110`
+4. 美股代码需要加对应后缀，如`usAAPL.OQ` （OQ->NASDAQ, N->NYSE, AM->ETF）
+
+
+

rquote-0.2.9.dist-info/RECORD

@@ -0,0 +1,8 @@
+rquote/__init__.py,sha256=PB620yEq2QZyfDweKY_8qMEsZMKhskGfhmfDkch_0j0,462
+rquote/main.py,sha256=SiMpjcs9zvcRzvSMPByX_ZpLQuYRyx2AUEeHJnj8uE4,18272
+rquote/plots.py,sha256=N8uvD6ju9tow0DllPQiXiM7EoPC2bK8X7QF6NQainKs,2342
+rquote/utils.py,sha256=4Neb9_R-EKAd6s1Qj4O_vs9jXWyvroxEEhdqH35vxVE,6808
+rquote-0.2.9.dist-info/METADATA,sha256=QG0nVFxI0ePdTK7894Ajq8H4R2X-PbiRoLMG-h75Q3M,7273
+rquote-0.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rquote-0.2.9.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
+rquote-0.2.9.dist-info/RECORD,,

rquote-0.2.7.dist-info/METADATA

@@ -1,40 +0,0 @@
-Metadata-Version: 2.4
-Name: rquote
-Version: 0.2.7
-Summary: Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch
-Home-page: https://github.com/kids/rquote
-Author: Roizhao
-Author-email: roizhao@gmail.com
-Requires-Python: >=3.6.1
-Description-Content-Type: text/markdown
-Requires-Dist: httpx>=0.20.0
-Requires-Dist: pandas>=1.0.0
-Requires-Dist: setuptools>=59.6.0
-Requires-Dist: twine>=3.8.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: home-page
-Dynamic: requires-python
-
-# rquote
-
-`get_price`方法提供 A股/港股/美股/ETF基金/期货 日线历史数据获取 
-
-使用新浪/腾讯的id形式，如`sh000001`表示上证指数，`sz000001`表示深市000001股票`平安银行`，`sh510050`表示上证50指数ETF，`hk00700`表示港股腾讯。  
-期货代码需加`fu`前缀，如`fuAP2110`，美股需加对应交易所后缀，如`usBABA.N`，`usC.N`，`usAAPL.OQ`等  
-BTC/USD也放在fu下面，i.d.`fuBTC`  
-
-e.g.
-```
-from rquote import get_price
-sid, nm, df = get_price('sh000001')
-df.head() # 数据为pandas dataframe
-```
->                open    close     high      low          vol  
-> date  
-> 2024-02-06  2680.48  2789.49  2802.93  2669.67  502849313.0  
-> 2024-02-07  2791.51  2829.70  2829.70  2770.53  547117439.0  
-> 2024-02-08  2832.49  2865.90  2867.47  2827.90  531108893.0  
-> 2024-02-19  2886.59  2910.54  2910.54  2867.71  458967704.0  
-> 2024-02-20  2902.88  2922.73  2927.31  2887.47  350138735.0  
-

rquote-0.2.7.dist-info/RECORD

@@ -1,8 +0,0 @@
-rquote/__init__.py,sha256=owCwRRDJoYUuR7-NKb_Nj3-2CCsL7TtrRVp6px_8RGA,470
-rquote/main.py,sha256=BrY6TnYcW2NhphHHD0FBsBTr3C4cFaKUAgM1nQ097-o,17322
-rquote/plots.py,sha256=N8uvD6ju9tow0DllPQiXiM7EoPC2bK8X7QF6NQainKs,2342
-rquote/utils.py,sha256=v8j8R2xoXyTsHSAWXD7x2FUV7w1a4xgfswfSDdfg5p8,6827
-rquote-0.2.7.dist-info/METADATA,sha256=8Ztlu-8Inaa7fw9URPv_eaqw6k3h2yZx64RiEP3elOs,1457
-rquote-0.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rquote-0.2.7.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
-rquote-0.2.7.dist-info/RECORD,,