rquote 0.2.2__tar.gz → 0.2.5__tar.gz

rquote-0.2.5/PKG-INFO

@@ -0,0 +1,42 @@
+Metadata-Version: 2.4
+Name: rquote
+Version: 0.2.5
+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
+Description-Content-Type: text/markdown
+Requires-Dist: httpx>=0.20.0
+Requires-Dist: pandas>=1.0.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.e.`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  
+
+Notes:  
+使用GenImage需要补充依赖  
+> kaleido>=1.0.0rc0  
+> plolty>=5.0.0  

rquote-0.2.5/README.md

@@ -0,0 +1,26 @@
+# 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.e.`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  
+
+Notes:  
+使用GenImage需要补充依赖  
+> kaleido>=1.0.0rc0  
+> plolty>=5.0.0  

rquote-0.2.5/pyproject.toml

@@ -0,0 +1,14 @@
+[build-system]
+requires = ["setuptools>=42", "wheel", "httpx>=0.20.0", "pandas>=1.0.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "rquote"
+version = "0.2.5"
+description = "Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch"
+readme = "README.md"
+requires-python = ">=3.4"
+dependencies = [
+    "httpx>=0.20.0",
+    "pandas>=1.0.0",
+]

rquote-0.2.5/rquote/__init__.py

@@ -0,0 +1,13 @@
+'''
+rquote
+
+A stock history data api and related tools
+
+Copyright (c) 2021 Roi ZHAO
+
+'''
+
+from .main import get_price, get_stock_concepts, get_concept_stocks
+from .main import get_all_concepts, get_all_industries
+from .utils import WebUtils, BasicFactors
+from .plots import PlotUtils

rquote-0.2.2/rquote/rquote.py → rquote-0.2.5/rquote/main.py

@@ -1,20 +1,11 @@
 # -*- coding: utf-8 -*-
 
-import os
-import requests
 import json
 import time
-import random
 import re
-import sys
 import base64
-import logging
 import pandas as pd
-from .utils import WebUtils, reqget
-# logging.getLogger().setLevel(logging.INFO)
-logging.basicConfig(filename='/tmp/rquote.log',
-                    format='%(asctime)-15s:%(lineno)s %(message)s',
-                    level=logging.INFO)
+from .utils import WebUtils, hget, logger
 
 
 def make_tgts(mkts=['ch', 'hk', 'us', 'fund', 'future'], money_min=2e8) -> []:
@@ -26,7 +17,7 @@ def get_cn_stock_list(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]
     '''
-    a = reqget(
+    a = hget(
         base64.b64decode('aHR0cDovLzM4LnB1c2gyLmVhc3Rtb25leS5jb20vYXBpL3F0L2Ns'+
             'aXN0L2dldD9jYj1qUXVlcnkxMTI0MDk0NTg3NjE4NDQzNzQ4MDFfMTYyNzI4ODQ4O'+
             'Tk2MSZwbj0xJnB6PTEwMDAwJnBvPTEmbnA9MSZ1dD1iZDFkOWRkYjA0MDg5NzAwY2'+
@@ -54,7 +45,7 @@ def get_cn_stock_list(money_min=2e8):
 
 
 # def get_hk_stocks_hotest80():
-#     a = reqget(
+#     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
@@ -67,12 +58,12 @@ def get_cn_stock_list(money_min=2e8):
 def get_us_stocks_biggest(k=60):
     # return list of [symbol, name, price, volume, mktcap, pe]
     uscands = []
-    a = reqget(
+    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][:-2])['data']
+        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]
@@ -84,7 +75,7 @@ def get_cn_fund_list():
     Return sorted etf list (ordered by latest amount of money),
         of [code, name, change, amount, price]
     '''
-    a = reqget(base64.b64decode('aHR0cDovL3ZpcC5zdG9jay5maW5hbmNlLnNpbmEuY29tL'+
+    a = hget(base64.b64decode('aHR0cDovL3ZpcC5zdG9jay5maW5hbmNlLnNpbmEuY29tL'+
         'mNuL3F1b3Rlc19zZXJ2aWNlL2FwaS9qc29ucC5waHAvSU8uWFNSVjIuQ2FsbGJhY2tMaX'+
         'N0WydrMldhekswNk5Rd2xoeVh2J10vTWFya2V0X0NlbnRlci5nZXRIUU5vZGVEYXRhU2l'+
         'tcGxlP3BhZ2U9MSZudW09MTAwMCZzb3J0PWFtb3VudCZhc2M9MCZub2RlPWV0Zl9ocV9m'+
@@ -104,7 +95,7 @@ def get_cn_future_list():
           'fuFU2109',
           ...]
     '''
-    a = reqget('https://finance.sina.com.cn/futuremarket/').text
+    a = hget('https://finance.sina.com.cn/futuremarket/').text
     if a:
         futurelist_active = [
             'fu' + i for i in re.findall(r'quotes/(.*?\d+).shtml', a)]
@@ -125,9 +116,9 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
         a = dd.get(i)
         if a:
             n, d = a
-            logging.debug('loading price from dd {}'.format(i))
+            logger.debug('loading price from dd {}'.format(i))
             return i, n, d
-    logging.debug('fetching price of {}'.format(i))
+    logger.debug('fetching price of {}'.format(i))
     qtimg_stock = 'http://web.ifzq.gtimg.cn/appstock/app/newfqkline/get?param=' + \
             '{},{},{},{},{},{}'
     qtimg_stock_hk = 'http://web.ifzq.gtimg.cn/appstock/app/hkfqkline/get?' + \
@@ -136,25 +127,28 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
             'param={},{},{},{},{},{}'
     sina_future_d = 'https://stock2.finance.sina.com.cn/futures/api/jsonp.php/' + \
             'var%20t1nf_{}=/InnerFuturesNewService.getDailyKLine?symbol={}'
+    sina_btc = 'https://quotes.sina.cn/fx/api/openapi.php/BtcService.getDayKLine?' + \
+        'symbol=btcbtcusd'
+
     # sina_future_d.format('FB0','FB0')
 
     if i[:2] == 'BK':
         try:
-            a = reqget(base64.b64decode('aHR0cDovL3B1c2gyaGlzLmVhc3' +
+            a = hget(base64.b64decode('aHR0cDovL3B1c2gyaGlzLmVhc3' +
                                'Rtb25leS5jb20vYXBpL3F0L3N0b2NrL2tsaW5lL2dldD9jYj1qUX' +
                                'VlcnkxMTI0MDIyNTY2NDQ1ODczNzY2OTcyXzE2MTc4NjQ1NjgxMz' +
                                '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=20220101&_=1',
+                          '&klt=101&fqt=0&beg=19900101&end=20990101&_=1',
                           headers=WebUtils.headers())
             if not a:
-                logging.warning('{} reqget failed: {}'.format(i, a))
+                logger.warning('{} hget failed: {}'.format(i, a))
                 return i, 'None', pd.DataFrame([])
             a = json.loads(a.text.split(
                 'jQuery1124022566445873766972_1617864568131(')[1][:-2])
             if not a['data']:
-                logging.warning('{} data empty: {}'.format(i, a))
+                logger.warning('{} data empty: {}'.format(i, a))
                 return i, 'None', pd.DataFrame([])
             name = a['data']['name']
             d = pd.DataFrame([i.split(',') for i in a['data']['klines']], columns=[
@@ -163,20 +157,27 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
             # d.index = pd.DatetimeIndex(d.index)
             return i, name, d
         except Exception as e:
-            logging.warning('error fetching {}, err: {}'.format(i, e))
+            logger.warning('error fetching {}, err: {}'.format(i, e))
             return i, 'None', pd.DataFrame([])
 
     if i[:2] == 'fu':
         try:
             ix = i[2:] if i[-1]=='0' else i[2:-4]
-            d = pd.DataFrame(json.loads(reqget(sina_future_d.format(
-                    ix, ix)).text.split('(')[1][:-2]))
-            d.columns = ['date', 'open', 'high', 'low', 'close', 'vol', 'p', 's']
+            if ix == 'btc' or ix == 'BTC':
+                url = sina_btc
+                d = json.loads(hget(url).text)['result']['data'].split('|')
+                d = pd.DataFrame([i.split(',') for i in d], 
+                                 columns=['date', 'open', 'high', 'low', 'close', 'vol', 'amount'])
+                return i, 'BTC', d
+            else:
+                d = pd.DataFrame(json.loads(hget(sina_future_d.format(
+                        ix, ix)).text.split('(')[1][:-2]))
+                d.columns = ['date', 'open', 'high', 'low', 'close', 'vol', 'p', 's']
             d = d.set_index(['date']).astype(float)
             # d.index = pd.DatetimeIndex(d.index)
-            return i, '', d
+            return i, ix, d
         except Exception as e:
-            logging.warning('error get price {}, err {}'.format(i[2:-4], e))
+            logger.warning('error get price {}, err {}'.format(i[2:-4], e))
             return i, 'None', pd.DataFrame([])
 
     if i[0] in ['0', '1', '3', '5', '6']:
@@ -189,8 +190,9 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
         url = qtimg_stock_us.format(i, freq, sdate, edate, days, fq)
     else:
         raise ValueError('target market not supported')
-    a = reqget(url)
+    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:
@@ -209,7 +211,7 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
         if 'qt' in a:
             name = a['qt'][i][1]
     except Exception as e:
-        logging.warning('error fetching {}, err: {}'.format(i, e))
+        logger.warning('error fetching {}, err: {}'.format(i, e))
     return i, name, b
 
 
@@ -246,16 +248,16 @@ def get_tick(tgts=[]):
     else:
         raise ValueError('tgt should be list or str, e.g. APPL,')
 
-    a = reqget(sina_tick + ','.join(tgts))
+    a = hget(sina_tick + ','.join(tgts))
     if not a:
-        logging.warning('reqget failed {}'.format(tgts))
+        logger.warning('hget failed {}'.format(tgts))
         return []
 
     try:
         dat = [i.split('"')[1].split(',') for i in a.text.split(';\n') if ',' in i]
         dat_trim = [{k:i[j] for j,k in enumerate(head_row) if k!='_'} for i in dat]
     except Exception as e:
-        logging.warming('data not complete, check tgt be code str or list without'+
+        logger.warming('data not complete, check tgt be code str or list without'+
             ' prefix, your given: {}'.format(tgts))
     return dat_trim
 
@@ -270,10 +272,10 @@ def get_stock_concepts(i) -> []:
     #drop_tails = ['板块', '概念', '0_', '成份', '重仓']
     url = f10url + i
     try:
-        concepts = json.loads(reqget(url).text)[
+        concepts = json.loads(hget(url).text)[
             'hxtc'][0]['ydnr'].split()
     except Exception as e:
-        logging.error(str(e))
+        logger.error(str(e))
         concepts = ['']
     #concepts = [i for i in concepts if i not in drop_cons]
     #concepts = [i for i in concepts if i[-2:] not in drop_tails]
@@ -291,7 +293,7 @@ def get_concept_stocks(bkid, dc=None):
         if a:
             return a
     bkid = bkid if isinstance(bkid, str) else 'BK' + str(bkid).zfill(4)
-    a = reqget(
+    a = hget(
         base64.b64decode('aHR0cDovL3B1c2gyLmVhc3Rtb25leS5jb20vYXBpL3F0L2NsaXN0' +
                          'L2dldD9jYj1qUXVlcnkxMTIzMDQwNTcwNTM4NTY5NDcwMTA1XzE2MTgwNDc5OTA2O' +
                          'TAmZmlkPWY2MiZwbz0xJnB6PTUwMCZwbj0xJm5wPTEmZmx0dD0yJmludnQ9MiZmcz' +
@@ -300,7 +302,7 @@ def get_concept_stocks(bkid, dc=None):
         '&fields=f3%2Cf6%2Cf12%2Cf14%2Cf21').text
     a = json.loads(
         a.split('jQuery1123040570538569470105_1618047990690(')[1][:-2])['data']['diff']
-    logging.debug('get fresh conc {}'.format(bkid))
+    logger.debug('get fresh conc {}'.format(bkid))
     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]
     return a
@@ -312,7 +314,7 @@ def _east_list_fmt(burl, api_name):
     Return list of list:
         [sid, name, rise, amount, mkt]
     '''
-    a = reqget(base64.b64decode(burl).decode() +
+    a = hget(base64.b64decode(burl).decode() +
         str(int(time.time()*1e3)))
     if a:
         a = a.text
@@ -334,7 +336,7 @@ def get_all_industries():
         'zQyNjI4MSZmbHR0PTImaW52dD0yJmZpZD1mMyZmcz1tOjkwK3Q6MitmOiE1MCZmaWVsZH'+
         'M9ZjMsZjYsZjEyLGYxNCxmMjAsZjEwNCxmMTA1Jl89',
         'jQuery1124037117565571971345_1627047188599')
-    logging.debug('get industries {}'.format(len(a)))
+    logger.debug('get industries {}'.format(len(a)))
     return a
 
 
@@ -349,7 +351,7 @@ def get_all_concepts():
         'DI2MjgxJmZsdHQ9MiZpbnZ0PTImZmlkPWYzJmZzPW06OTArdDozK2Y6ITUwJmZpZWxkcz'+
         '1mMyxmNixmMTIsZjE0LGYyMCxmMTA0LGYxMDUmXz0='
         ,'jQuery112407329841930768979_1627109460633')
-    logging.debug('get concepts {}'.format(len(a)))
+    logger.debug('get concepts {}'.format(len(a)))
     return a
 
 
@@ -365,7 +367,7 @@ def get_bk_stocks(bkid):
         bkid + '+f:!50&fields=f3,f6,f12,f14,f20&_='
     a = _east_list_fmt(base64.b64encode(bytes(url, encoding='utf-8')),
         'jQuery1124048699630095137714_1627477495064')
-    logging.debug('get bk stocks {}'.format(len(a)))
+    logger.debug('get bk stocks {}'.format(len(a)))
     return a
 
 
@@ -381,7 +383,7 @@ def get_industry_stocks(bkid):
         bkid + '+f:!50&fields=f3,f6,f12,f14,f20&_='
     a = _east_list_fmt(base64.b64encode(bytes(url, encoding='utf-8')),
         'jQuery112408378200074444309_1627824603562')
-    logging.debug('get industry stocks {}'.format(len(a)))
+    logger.debug('get industry stocks {}'.format(len(a)))
     return a
 
 
@@ -397,7 +399,7 @@ def get_hk_stocks_ggt():
         'DQmZmllbGRzPWYzLGY2LGYxMixmMTQsZjIwJl89',
         'jQuery1124024362308906615082_1628258931224')
     a = [ ['hk'+i[0], i[1], i[2], i[3], i[4]] for i in a]
-    logging.debug('get hk stocks GangGuTong {}'.format(len(a)))
+    logger.debug('get hk stocks GangGuTong {}'.format(len(a)))
     return a
 
 
@@ -413,7 +415,7 @@ def get_hk_stocks_hsi():
         'yxmNixmMTIsZjE0LGYyMCZfPQ==',
         'jQuery112407888868459479792_1628259564671')
     a = [ ['hk'+i[0], i[1], i[2], i[3], i[4]] for i in a]
-    logging.debug('get hk stocks HSI {}'.format(len(a)))
+    logger.debug('get hk stocks HSI {}'.format(len(a)))
     return a
 
 

{rquote-0.2.2 → rquote-0.2.5}/rquote/plots.py

@@ -1,16 +1,13 @@
 # -*- coding: utf-8 -*-
 
-import os
-import time
-import logging
-import plotly.graph_objs as go
-from .rquote import get_price
-# logging.getLogger().setLevel(logging.INFO)
-logging.basicConfig(filename='/tmp/rquote.log',
-                    format='%(asctime)-15s:%(lineno)s %(message)s',
-                    level=logging.INFO)
+from .main import get_price
+
+
 class PlotUtils:
+
     def plot_candle(i, sdate='', edate='', dsh=False, vol=True):
+
+        import plotly.graph_objs as go
         '''
             Plot candles of i
             Input: id
@@ -29,6 +26,7 @@ class PlotUtils:
         icolor, dcolor = 'red', 'green'
         _, n, v = get_price(i, sdate=sdate, edate=edate)
         v = (v - v.low.min()) * 10 / (v.high.max() - v.low.min()) + 2
+        v = v.round(3) # compress html data
         
         dt += [
                 go.Candlestick(

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

@@ -1,43 +1,28 @@
 # -*- coding: utf-8 -*-
 
-import re
-import os
 import time
-import json
 import random
 import logging
-import requests
+import httpx
 import numpy as np
 import pandas as pd
+import uuid
 
-logger = logging.getLogger(__name__)
-hdl = logging.FileHandler('/tmp/rquote.log')
-hdl.setFormatter(logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s'))
-logger.addHandler(hdl)
-logger.addHandler(logging.StreamHandler())
-logger.setLevel(logging.DEBUG)
-
-
-class CommonUtils:
-    @staticmethod
-    def rand_string():
-        return ''.join([chr(random.choice(range(97, 123))) for _ in
-                        range(random.choice(range(3, 7)))])
-
-    @staticmethod
-    def yesterday_of(day):
-        '''return 2020-12-31 if day = 2021-01-01'''
-        return time.strftime('%Y-%m-%d', time.localtime(time.mktime(
-            time.strptime(day, '%Y-%m-%d')) - 24 * 60 * 60))
+def setup_logger():
+    logger = logging.getLogger('rquote')
+    if not logger.handlers:
+        logger.setLevel(logging.INFO)
+        file_handler = logging.FileHandler('/tmp/rquote.log')
+        
+        formatter = logging.Formatter('%(asctime)-15s:%(lineno)s %(message)s')
+        file_handler.setFormatter(formatter)
+        
+        logger.addHandler(file_handler)
+        logger.addHandler(logging.StreamHandler())
+    
+    return logger
 
-    @staticmethod
-    def sample_dates(year_earliest=2010, year_range=2):
-        y = random.randint(year_earliest, 2021 - 2)
-        m = str(random.randint(1, 12)).zfill(2)
-        d = str(random.randint(1, 28)).zfill(2)
-        date_begin = '{}-{}-{}'.format(y, m, d)
-        date_end = '{}-{}-{}'.format(y + 2, m, d)
-        return date_begin, date_end
+logger = setup_logger()
 
 
 class WebUtils:
@@ -61,24 +46,19 @@ class WebUtils:
     @classmethod
     def headers(cls):
         header = {
-            'referer': CommonUtils.rand_string(),
+            'referer': str(uuid.uuid4()),
             'user-agent': cls.ua()
             }
         return header
 
     @classmethod
-    def reqget(cls, url, headers, method, proxy=None, proxy_type='http'):
+    def reqget(cls, url, headers, method, proxy=None):
         '''
         request.get() wrapper
         '''
         headers['user-agent'] = cls.ua
         try:
-            if proxy is not None:
-                r = requests.get(
-                    url, allow_redirects=True, proxies={
-                        proxy_type: proxy})
-            else:
-                r = requests.get(url, allow_redirects=True)
+            r = httpx.get(url, allow_redirects=True)
         except Exception as e:
             logger.error('Fetch url {} err: {}'.format(url, e))
             return None
@@ -89,18 +69,19 @@ class WebUtils:
                 return r.content
 
     @classmethod
-    def test_proxy(cls, proxy: str, proxy_type='http'):
+    def test_proxy(cls, proxy: str):
         '''
         proxy format 'ip:port'
         test baidu.com for cn
         # test google.com for non-cn (not effective due to DNS hijacking)
         '''
         try:
-            r = requests.get(
-                'https://baidu.com',
-                proxies={
-                    proxy_type: proxy},
-                timeout=2)
+            with httpx.Client(proxies=proxy) as client:
+                r = client.get('https://baidu.com', timeout=2)
+                if r.ok:
+                    return 1
+                else:
+                    return 0
         except Exception as e:
             logger.info(f'test proxy {proxy} negative')
             return 0
@@ -133,23 +114,6 @@ class BasicFactors:
         minres = round(minres, 2)
         return minres
 
-    @staticmethod
-    def ma_divergence(d) -> float:
-        '''moving averages diverging rate'''
-        d = d.close
-        dlog5 = np.log(d.rolling(5).mean())
-        dlog10 = np.log(d.rolling(10).mean())
-        dlog20 = np.log(d.rolling(20).mean())
-        dlog60 = np.log(d.rolling(60).mean())
-        logmas = pd.DataFrame({'dl5': dlog5, 'dl10': dlog10, 'dl20': dlog20})
-        mstd20 = logmas.std(1).rolling(5).mean()
-        logmas = pd.DataFrame({'dl5': dlog5, 'dl10': dlog10,
-                              'dl20': dlog20, 'dl60': dlog60})
-        # mstd60=logmas.std(1).rolling(5).mean()
-        mv = logmas.max(1) + logmas.min(1) - \
-            logmas.max(1).shift(1) - logmas.min(1).shift(1)
-        return round(mv[-1] / mstd20[-2], 2)
-
     @staticmethod
     def vol_extreme(d):
         d = d.vol
@@ -215,101 +179,19 @@ class BasicFactors:
         return ret
 
 
-class DataFormatter:
-    @staticmethod
-    def s_join_sh_close_change(d, dsh=None, sdate='', edate=''):
-        '''
-        join 2 DataFrames, used in single stock with sh index;
-        keeping columns of 'close' and 'change'
-        '''
-        dsh['p_change'] = (dsh.close - dsh.close.shift(1)) * 100 / dsh.close.shift(1)
-        d['p_change'] = (d.close - d.close.shift(1)) * 100 / d.close.shift(1)
-        if not len(d) or dsh is None:
-            return d
-        d = d.join(dsh[['open', 'close', 'p_change']], rsuffix='_sh').sort_index()
-        d['p_change_on_sh'] = d['p_change'] - d['p_change_sh']
-        return d
-
-    @staticmethod
-    def sort_keys_by_cossim(df):
-        '''
-        Input:
-            DataFrame with index column as keys
-        sort by dataframe values cosine similarity
-        '''
-        from sklearn.metrics.pairwise import cosine_similarity
-        keys = list(df.index)
-        cs = cosine_similarity(df)
-
-        to_sort_keys = [i for i in keys[1:]]
-        sorted_keys = [keys[0]]
-        
-        cid = 0
-        for i in range(len(keys)-1):
-            for j in np.argsort(cs[cid])[::-1]:
-                if keys[j] not in sorted_keys:
-                    sorted_keys.append(keys[j])
-                    to_sort_keys.remove(keys[j])
-                    cid = j
-                    break
-        return sorted_keys
-
-    @staticmethod
-    def join_stock_concepts(nhe, nhb, dc):
-        '''
-        merge stock df with concept df with summerized result
-        nhe: stock df with sid, sname
-        nhb: concept df with sid, sname
-        dc: dict of concept {concept: [stock]}
-        TODO abstract it
-        '''
-        from collections import Counter
-        nhb.index = nhb.sid
-        nhe.index = nhe.sname
-        nhe['conc'] = ''
-        nhb['list'] = [''] * len(nhb)
-        stks = nhe.sname.tolist()  # candidates
-        stkinconc = []
-        for i, j in nhb.sort_values('imf2', ascending=False)[
-                ['sid', 'sname']].iterrows():
-            ti = []
-            n = dc.get(j.sid)
-            for s in n:
-                if s in stks:
-                    stkinconc.append(s)
-                    ti.append(s)
-                    nhe.loc[s, 'conc'] = nhe.loc[s, 'conc'] + ',' + j.sname
-            if ti:
-                nhb.loc[j.sid,
-                        'list'] = '{}/{}:{}'.format(len(ti),
-                                                    len(n),
-                                                    ';'.join(ti))
-        stkr = Counter(stkinconc).most_common(200)
-        stkr = pd.DataFrame(stkr, columns=['sname', 'concs'])
-        nhe.index = nhe.sid
-        nhe = nhe.merge(
-            stkr,
-            on='sname',
-            how='left',
-            suffixes=(
-                '',
-                '_')).fillna('')
-        return nhe, nhb
-
-
-class reqget:
+class hget:
     '''
     class version request.get wrapper
     '''
     def __init__(self, url, *args, **kwargs):
         self.url = url
         try:
-            self.r = requests.get(
-                self.url, allow_redirects=True, *args, **kwargs)
-            self.text = self.r.text
-            self.content = self.r.content
-        except BaseException:
-            logger.error(f'fetch {self.url} err')
+            r = httpx.get(
+                self.url, follow_redirects=True, *args, **kwargs)
+            self.text = r.text
+            self.content = r.content
+        except Exception as e:
+            logger.error(f'fetch {self.url} err: {e}')
             self.text = ''
             self.content = b''
 

rquote-0.2.5/rquote.egg-info/PKG-INFO

@@ -0,0 +1,42 @@
+Metadata-Version: 2.4
+Name: rquote
+Version: 0.2.5
+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
+Description-Content-Type: text/markdown
+Requires-Dist: httpx>=0.20.0
+Requires-Dist: pandas>=1.0.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.e.`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  
+
+Notes:  
+使用GenImage需要补充依赖  
+> kaleido>=1.0.0rc0  
+> plolty>=5.0.0  

{rquote-0.2.2 → rquote-0.2.5}/rquote.egg-info/SOURCES.txt

@@ -1,10 +1,9 @@
-MANIFEST.in
 README.md
-requirements.txt
+pyproject.toml
 setup.py
 rquote/__init__.py
+rquote/main.py
 rquote/plots.py
-rquote/rquote.py
 rquote/utils.py
 rquote.egg-info/PKG-INFO
 rquote.egg-info/SOURCES.txt

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

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

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

@@ -1,8 +1,6 @@
 from os import path as os_path
 from setuptools import setup
 
-import rquote
-
 this_directory = os_path.abspath(os_path.dirname(__file__))
 
 def read_file(filename):
@@ -17,7 +15,7 @@ def read_requirements(filename):
 setup(
     name='rquote',
     python_requires='>=3.4.0',
-    version='0.2.2',
+    version='0.2.3',
     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",
@@ -27,7 +25,9 @@ setup(
     packages=[
         'rquote'
     ],
-    install_requires=read_requirements('requirements.txt'),
+    install_requires=[
+        "httpx>=0.20.0",
+        "pandas>=1.0.0"],
     include_package_data=True,
     license="MIT",
     keywords=['quotes', 'stock', 'rquote'],
@@ -40,5 +40,8 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
 )

rquote-0.2.2/MANIFEST.in

@@ -1 +0,0 @@
-include requirements.txt

rquote-0.2.2/PKG-INFO

@@ -1,28 +0,0 @@
-Metadata-Version: 2.1
-Name: rquote
-Version: 0.2.2
-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
-License: MIT
-Description: # rquote
-        
-        `get_price`方法提供 A股/港股/美股/ETF基金/期货 日线历史数据获取
-        
-        使用新浪/腾讯的id形式，如`sh000001`表示上证指数，`sz000001`表示深市000001股票`平安银行`，`sh510050`表示上证50指数ETF，`hk00700`表示港股腾讯。
-        期货代码需加`fu`前缀，如`fuAP2110`，美股需加对应交易所后缀，如`usBABA.N	`，`usC.N`	，`usAAPL.OQ`等
-        
-        
-Keywords: quotes,stock,rquote
-Platform: UNKNOWN
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Requires-Python: >=3.4.0
-Description-Content-Type: text/markdown

rquote-0.2.2/README.md

@@ -1,7 +0,0 @@
-# rquote
-
-`get_price`方法提供 A股/港股/美股/ETF基金/期货 日线历史数据获取
-
-使用新浪/腾讯的id形式，如`sh000001`表示上证指数，`sz000001`表示深市000001股票`平安银行`，`sh510050`表示上证50指数ETF，`hk00700`表示港股腾讯。
-期货代码需加`fu`前缀，如`fuAP2110`，美股需加对应交易所后缀，如`usBABA.N	`，`usC.N`	，`usAAPL.OQ`等
-

rquote-0.2.2/requirements.txt

@@ -1,2 +0,0 @@
-requests
-pandas

rquote-0.2.2/rquote/__init__.py

@@ -1,13 +0,0 @@
-'''
-rquote
-
-A stock history data api
-
-Copyright (c) 2021 Roi ZHAO
-
-'''
-
-from .rquote import get_price, get_stock_concepts, get_concept_stocks
-from .rquote import get_all_concepts, get_all_industries
-from .utils import CommonUtils, WebUtils, BasicFactors, DataFormatter, reqget
-from .plots import PlotUtils

rquote-0.2.2/rquote.egg-info/PKG-INFO

@@ -1,28 +0,0 @@
-Metadata-Version: 2.1
-Name: rquote
-Version: 0.2.2
-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
-License: MIT
-Description: # rquote
-        
-        `get_price`方法提供 A股/港股/美股/ETF基金/期货 日线历史数据获取
-        
-        使用新浪/腾讯的id形式，如`sh000001`表示上证指数，`sz000001`表示深市000001股票`平安银行`，`sh510050`表示上证50指数ETF，`hk00700`表示港股腾讯。
-        期货代码需加`fu`前缀，如`fuAP2110`，美股需加对应交易所后缀，如`usBABA.N	`，`usC.N`	，`usAAPL.OQ`等
-        
-        
-Keywords: quotes,stock,rquote
-Platform: UNKNOWN
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Requires-Python: >=3.4.0
-Description-Content-Type: text/markdown

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

@@ -1,2 +0,0 @@
-requests
-pandas