rquote 0.3.1__tar.gz → 0.3.4__tar.gz

{rquote-0.3.1 → rquote-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.3.1
+Version: 0.3.4
 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

{rquote-0.3.1 → rquote-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rquote"
-version = "0.3.1"
+version = "0.3.4"
 description = "Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch"
 readme = "README.md"
 requires-python = ">=3.6.1"

{rquote-0.3.1 → rquote-0.3.4}/rquote/main.py

@@ -137,6 +137,13 @@ def _check_date_format(date_str):
     return date_str
 
 
+def load_js_var_json(url):
+    a = hget(url)
+    if a:
+        a = json.loads(a.text.split('(')[1].split(')')[0])
+    return a
+
+
 def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
               dd=None) -> (str, str, pd.DataFrame):
     '''
@@ -170,6 +177,8 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
             '_var=min_data_{}&code={}'
     sina_future_d = 'https://stock2.finance.sina.com.cn/futures/api/jsonp.php/' + \
             'var%20t1nf_{}=/InnerFuturesNewService.getDailyKLine?symbol={}'
+    sina_future_min = 'https://stock2.finance.sina.com.cn/futures/api/jsonp.php/' + \
+            'var%20t1nf_{}=/InnerFuturesNewService.getMinLine?symbol={}'
     sina_btc = 'https://quotes.sina.cn/fx/api/openapi.php/BtcService.getDayKLine?' + \
         'symbol=btcbtcusd'
 
@@ -209,11 +218,28 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
                 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'])
+                for col in ['open','high','low','close','vol','amount']:
+                    d[col] = pd.to_numeric(d[col], errors='coerce')
                 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']
+                ix = i[2:]
+                if freq in ('min', '1min', 'minute'):
+                    url = sina_future_min.format(ix, ix)
+                    # rtext = hget(url).text
+                    # d = pd.DataFrame(json.loads(rtext.split(i[2:])[1][2:-2]))
+                    d = pd.DataFrame(load_js_var_json(url))
+                    d.columns = ['dtime', 'close', 'avg', 'vol', 'hold','last_close','cur_date']
+                    for col in ['close','avg','vol','hold']:
+                        d[col] = pd.to_numeric(d[col], errors='coerce')
+                    d = d.set_index(['dtime'])
+                    return i[2:], i[2:], d
+                else:
+                    # d = pd.DataFrame(json.loads(hget(sina_future_d.format(
+                    #         ix, ix)).text.split('(')[1][:-2]))
+                    d = pd.DataFrame(load_js_var_json(sina_future_d.format(ix, ix)))
+                    d.columns = ['date', 'open', 'high', 'low', 'close', 'vol', 'p', 's']
+                    for col in ['open','high','low','close','vol','p','s']:
+                        d[col] = pd.to_numeric(d[col], errors='coerce')
             d = d.set_index(['date']).astype(float)
             # d.index = pd.DatetimeIndex(d.index)
             return i, ix, d
@@ -240,7 +266,9 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
         a = json.loads(a.text.split('=')[1])['data'][i]
         nm = a['qt'][i][1]
         b = pd.DataFrame([i.split() for i in a['data']['data']],
-        columns=['minute','price','volume']).set_index(['minute']).astype(str)
+                columns=['minute','price','volume']).set_index(['minute'])
+        for col in ['price','volume']:
+            b[col] = pd.to_numeric(b[col], errors='coerce')
         return i, nm, b
     a = json.loads(a.text)['data'][i]
     name = ''
@@ -251,12 +279,10 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
                 tk = tkt
                 break
         b = pd.DataFrame([j[:6] for j in a[tk]],
-                         columns=['date',
-                                  'open',
-                                  'close',
-                                  'high',
-                                  'low',
-                                  'vol']).set_index(['date']).astype(float)
+                         columns=['date','open','close','high','low','vol']
+                         ).set_index(['date'])
+        for col in ['open','high','low','close','vol']:
+            b[col] = pd.to_numeric(b[col], errors='coerce')
         if 'qt' in a:
             name = a['qt'][i][1]
     except Exception as e:
@@ -470,6 +496,8 @@ def get_hk_stocks_hsi():
 if __name__ == "__main__":
     # print(get_cn_stock_list())
     # print(get_price('fuBTC',sdate='20250101'))
+    # print(get_price('fuM2601',sdate='20250101', freq='min'))
+    # print(get_price('fuM2601',sdate='2025-01-01'))
     # print(get_price('sz000001', sdate='20240101', edate='20250101'))
     print(get_price('usAMZN.OQ', sdate='20250101', edate='20250101', freq='min'))
 

{rquote-0.3.1 → rquote-0.3.4}/rquote.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.3.1
+Version: 0.3.4
 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