rquote 0.2.8__tar.gz → 0.2.9__tar.gz

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

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

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

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rquote"
-version = "0.2.8"
+version = "0.2.9"
 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.2.9}/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,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?' + \
@@ -173,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], 
@@ -430,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-0.2.8 → rquote-0.2.9}/rquote.egg-info/PKG-INFO

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

{rquote-0.2.8 → rquote-0.2.9}/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