rquote 0.2.5__tar.gz → 0.2.7__tar.gz

{rquote-0.2.5 → rquote-0.2.7}/PKG-INFO

@@ -1,14 +1,16 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.2.5
+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.4.0
+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
@@ -16,11 +18,11 @@ Dynamic: requires-python
 
 # rquote
 
-`get_price`方法提供 A股/港股/美股/ETF基金/期货 日线(及其他周期)历史数据获取 
+`get_price`方法提供 A股/港股/美股/ETF基金/期货 日线历史数据获取 
 
 使用新浪/腾讯的id形式，如`sh000001`表示上证指数，`sz000001`表示深市000001股票`平安银行`，`sh510050`表示上证50指数ETF，`hk00700`表示港股腾讯。  
 期货代码需加`fu`前缀，如`fuAP2110`，美股需加对应交易所后缀，如`usBABA.N`，`usC.N`，`usAAPL.OQ`等  
-BTC/USD放在fu下面，i.e.`fuBTC`  
+BTC/USD也放在fu下面，i.d.`fuBTC`  
 
 e.g.
 ```
@@ -36,7 +38,3 @@ df.head() # 数据为pandas dataframe
 > 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  
 
-Notes:  
-使用GenImage需要补充依赖  
-> kaleido>=1.0.0rc0  
-> plolty>=5.0.0  

{rquote-0.2.5 → rquote-0.2.7}/README.md

@@ -1,10 +1,10 @@
 # rquote
 
-`get_price`方法提供 A股/港股/美股/ETF基金/期货 日线(及其他周期)历史数据获取 
+`get_price`方法提供 A股/港股/美股/ETF基金/期货 日线历史数据获取 
 
 使用新浪/腾讯的id形式，如`sh000001`表示上证指数，`sz000001`表示深市000001股票`平安银行`，`sh510050`表示上证50指数ETF，`hk00700`表示港股腾讯。  
 期货代码需加`fu`前缀，如`fuAP2110`，美股需加对应交易所后缀，如`usBABA.N`，`usC.N`，`usAAPL.OQ`等  
-BTC/USD放在fu下面，i.e.`fuBTC`  
+BTC/USD也放在fu下面，i.d.`fuBTC`  
 
 e.g.
 ```
@@ -20,7 +20,3 @@ df.head() # 数据为pandas dataframe
 > 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  
 
-Notes:  
-使用GenImage需要补充依赖  
-> kaleido>=1.0.0rc0  
-> plolty>=5.0.0  

{rquote-0.2.5 → rquote-0.2.7}/pyproject.toml

@@ -4,11 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rquote"
-version = "0.2.5"
+version = "0.2.7"
 description = "Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch"
 readme = "README.md"
-requires-python = ">=3.4"
+requires-python = ">=3.6.1"
 dependencies = [
     "httpx>=0.20.0",
     "pandas>=1.0.0",
+    "setuptools>=59.6.0",
+    "twine>=3.8.0",
 ]

{rquote-0.2.5 → rquote-0.2.7}/rquote/__init__.py

@@ -7,7 +7,9 @@ Copyright (c) 2021 Roi ZHAO
 
 '''
 
-from .main import get_price, get_stock_concepts, get_concept_stocks
+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 .utils import WebUtils, BasicFactors
 from .plots import PlotUtils

{rquote-0.2.5 → rquote-0.2.7}/rquote/main.py

@@ -8,11 +8,16 @@ import pandas as pd
 from .utils import WebUtils, hget, logger
 
 
-def make_tgts(mkts=['ch', 'hk', 'us', 'fund', 'future'], money_min=2e8) -> []:
-    cands = []
-
 
 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)
+    return ret
+
+def get_cn_stock_list_eastmoney(money_min=2e8):
     '''
     Return sorted stock list ordered by latest amount of money, cut at `money_min`
     item in returned list are [code, name, change, amount, mktcap]
@@ -28,31 +33,39 @@ def get_cn_stock_list(money_min=2e8):
     if a:
         a = json.loads(a.text.split(
             'jQuery112409458761844374801_1627288489961(')[1][:-2])
-
-    # cdir = os.path.dirname(__file__)
-    # with open(os.path.join(cdir, 'ranka'), 'wb') as f:
-    #     f.write(a.content)
-    # a = pd.read_excel(os.path.join(cdir, 'ranka'), header=1)
-    # os.remove(os.path.join(cdir, 'ranka'))
-    # a.columns = ['code', 'name', 'close', 'p_change', 'change', '_', '_', '_',
-    #              'money', 'open', 'yest_close', 'high', 'low']
-    # a = a[a.money > money_min]
     a = [ ['sh'+i['f12'] if i['f12'][0]=='6' else 'sz'+i['f12'],
          i['f14'], i['f3'], i['f6'], i['f21']] for i in a['data']['diff']
         if i['f6']!='-' and float(i['f6']) > money_min]
     #cands=[(i.code,i.name) for i in a[['code','name']].itertuples()]
     return a
 
+def get_cn_stock_list_qq(money_min=2e8):
+    offset = 0
+    count = 200 # max, or error
+    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'+
+            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
+            else:
+                break
+    return df
+    
 
-# def get_hk_stocks_hotest80():
-#     a = hget(
-#         'http://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php' +
-#         '/Market_Center.getHKStockData?page=1&num=80&sort=amount&asc=0&node=' +
-#         'qbgg_hk&_s_r_a=sort').text
-#     if a:
-#         a = [['hk'+i['symbol'], i['name'], i['changepercent'], i['amount'],
-#             i['market_value']] for i in json.loads(a)]
-#     return a
+def get_hk_stocks_500():
+    a = hget(
+        'https://stock.gtimg.cn/data/hk_rank.php?board=main_all&metric=amount&' +
+        'pageSize=500&reqPage=1&order=desc&var_name=list_data').text
+    if a:
+        a = [i.split('~') for i in json.loads(a.split('list_data=')[1])['data']['page_data']]
+    return a
 
 
 def get_us_stocks_biggest(k=60):
@@ -192,7 +205,6 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
         raise ValueError('target market not supported')
     a = hget(url)
     #a = json.loads(a.text.replace('kline_dayqfq=', ''))['data'][i]
-    print('=====',url,a)
     a = json.loads(a.text)['data'][i]
     name = ''
     try:

{rquote-0.2.5 → rquote-0.2.7}/rquote/utils.py

@@ -52,7 +52,7 @@ class WebUtils:
         return header
 
     @classmethod
-    def reqget(cls, url, headers, method, proxy=None):
+    def http_get(cls, url, headers, method, proxy=None):
         '''
         request.get() wrapper
         '''
@@ -187,7 +187,8 @@ class hget:
         self.url = url
         try:
             r = httpx.get(
-                self.url, follow_redirects=True, *args, **kwargs)
+                self.url, follow_redirects=True, headers=WebUtils.headers(),
+                *args, **kwargs)
             self.text = r.text
             self.content = r.content
         except Exception as e:

{rquote-0.2.5 → rquote-0.2.7}/rquote.egg-info/PKG-INFO

@@ -1,14 +1,16 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.2.5
+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.4.0
+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
@@ -16,11 +18,11 @@ Dynamic: requires-python
 
 # rquote
 
-`get_price`方法提供 A股/港股/美股/ETF基金/期货 日线(及其他周期)历史数据获取 
+`get_price`方法提供 A股/港股/美股/ETF基金/期货 日线历史数据获取 
 
 使用新浪/腾讯的id形式，如`sh000001`表示上证指数，`sz000001`表示深市000001股票`平安银行`，`sh510050`表示上证50指数ETF，`hk00700`表示港股腾讯。  
 期货代码需加`fu`前缀，如`fuAP2110`，美股需加对应交易所后缀，如`usBABA.N`，`usC.N`，`usAAPL.OQ`等  
-BTC/USD放在fu下面，i.e.`fuBTC`  
+BTC/USD也放在fu下面，i.d.`fuBTC`  
 
 e.g.
 ```
@@ -36,7 +38,3 @@ df.head() # 数据为pandas dataframe
 > 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  
 
-Notes:  
-使用GenImage需要补充依赖  
-> kaleido>=1.0.0rc0  
-> plolty>=5.0.0  

rquote-0.2.7/rquote.egg-info/requires.txt

@@ -0,0 +1,4 @@
+httpx>=0.20.0
+pandas>=1.0.0
+setuptools>=59.6.0
+twine>=3.8.0

{rquote-0.2.5 → rquote-0.2.7}/setup.py

@@ -14,8 +14,8 @@ def read_requirements(filename):
 
 setup(
     name='rquote',
-    python_requires='>=3.4.0',
-    version='0.2.3',
+    python_requires='>=3.6.1',
+    version='0.2.7',
     description='Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch',
     long_description=read_file('README.md'),
     long_description_content_type="text/markdown",
@@ -25,9 +25,7 @@ setup(
     packages=[
         'rquote'
     ],
-    install_requires=[
-        "httpx>=0.20.0",
-        "pandas>=1.0.0"],
+    install_requires=read_requirements('requirements.txt'),
     include_package_data=True,
     license="MIT",
     keywords=['quotes', 'stock', 'rquote'],

rquote-0.2.5/rquote.egg-info/requires.txt

@@ -1,2 +0,0 @@
-httpx>=0.20.0
-pandas>=1.0.0