rquote 0.2.8__tar.gz → 0.3.0__tar.gz

{rquote-0.2.8 → rquote-0.3.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.2.8
+Version: 0.3.0
 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>=59.6.0
+Requires-Dist: setuptools>=42
 Requires-Dist: twine>=3.8.0
 
 # rquote

{rquote-0.2.8 → rquote-0.3.0}/pyproject.toml

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

{rquote-0.2.8 → rquote-0.3.0}/rquote/main.py

@@ -114,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):
     '''
@@ -131,12 +154,20 @@ 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?' + \
             'param={},{},{},{},{},{}'
     qtimg_stock_us = 'http://web.ifzq.gtimg.cn/appstock/app/usfqkline/get?' + \
             'param={},{},{},{},{},{}'
+    qtimg_stock_us_min = 'https://web.ifzq.gtimg.cn/appstock/app/UsMinute/query?' + \
+            '_var=min_data_{}&code={}'
     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?' + \
@@ -173,8 +204,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], 
@@ -198,11 +228,20 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
     elif i[:2] == 'hk':
         url = qtimg_stock_hk.format(i, freq, sdate, edate, days, fq)
     elif i[:2] == 'us':
-        url = qtimg_stock_us.format(i, freq, sdate, edate, days, fq)
+        if freq in ('min', '1min', 'minute'):
+            url = qtimg_stock_us_min.format(i.replace('.', ''), i)
+        else:
+            url = qtimg_stock_us.format(i, freq, sdate, edate, days, fq)
     else:
         raise ValueError(f'target market not supported: {i}')
     a = hget(url)
     #a = json.loads(a.text.replace('kline_dayqfq=', ''))['data'][i]
+    if i[:2] == 'us' and freq in ('min', '1min', 'minute'):
+        a = json.loads(a.text.split('=')[1])['data'][i]
+        nm = a['qt']['usAMZN.OQ'][1]
+        b = pd.DataFrame([i.split() for i in a['data']['data']],
+        columns=['minute','price','volume']).set_index(['minute']).astype(str)
+        return i, nm, b
     a = json.loads(a.text)['data'][i]
     name = ''
     try:
@@ -221,7 +260,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:
-        logger.warning('error fetching {}, err: {}'.format(i, e))
+        raise ValueError('error fetching {}, err: {}'.format(i, e))
     return i, name, b
 
 
@@ -260,14 +299,13 @@ def get_tick(tgts=[]):
 
     a = hget(sina_tick + ','.join(tgts))
     if not a:
-        logger.warning('hget failed {}'.format(tgts))
-        return []
+        raise ValueError('hget failed {}'.format(tgts))
 
     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:
-        logger.warming('data not complete, check tgt be code str or list without'+
+        raise ValueError('data not complete, check tgt be code str or list without'+
             ' prefix, your given: {}'.format(tgts))
     return dat_trim
 
@@ -285,8 +323,7 @@ def get_stock_concepts(i) -> []:
         concepts = json.loads(hget(url).text)[
             'hxtc'][0]['ydnr'].split()
     except Exception as e:
-        logger.error(str(e))
-        concepts = ['']
+        raise ValueError(f'error fetching concepts of {i}, err: {e}')
     #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]
     #concepts = [i for i in concepts if '股' not in i]
@@ -430,4 +467,9 @@ def get_hk_stocks_hsi():
 
 
 
+if __name__ == "__main__":
+    # print(get_cn_stock_list())
+    # print(get_price('fuBTC',sdate='20250101'))
+    # print(get_price('sz000001', sdate='20240101', edate='20250101'))
+    print(get_price('usAMZN.OQ', sdate='20250101', edate='20250101', freq='min'))
 

{rquote-0.2.8 → rquote-0.3.0}/rquote.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.2.8
+Version: 0.3.0
 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>=59.6.0
+Requires-Dist: setuptools>=42
 Requires-Dist: twine>=3.8.0
 
 # rquote

{rquote-0.2.8 → rquote-0.3.0}/rquote.egg-info/requires.txt

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