rquote 0.3.5__py3-none-any.whl → 0.3.8__py3-none-any.whl

rquote/__init__.py

@@ -7,6 +7,9 @@ Copyright (c) 2021 Roi ZHAO
 
 '''
 
+import re
+from pathlib import Path
+
 # API函数
 from .api import (
     get_price,
@@ -34,7 +37,38 @@ from . import exceptions
 from .cache import MemoryCache, Cache
 from .utils.http import HTTPClient
 
-__version__ = '0.3.5'
+
+def _get_version():
+    """从 pyproject.toml 读取版本号"""
+    # 优先尝试从已安装的包中读取版本
+    try:
+        from importlib import metadata
+        return metadata.version("rquote")
+    except Exception:
+        pass
+    
+    # 如果包未安装，从 pyproject.toml 读取
+    try:
+        # 获取项目根目录（__init__.py 的父目录的父目录）
+        current_file = Path(__file__).resolve()
+        project_root = current_file.parent.parent
+        pyproject_path = project_root / "pyproject.toml"
+        
+        if pyproject_path.exists():
+            with open(pyproject_path, 'r', encoding='utf-8') as f:
+                content = f.read()
+                # 使用正则表达式匹配 version = "x.x.x"
+                match = re.search(r'version\s*=\s*["\']([^"\']+)["\']', content)
+                if match:
+                    return match.group(1)
+    except Exception:
+        pass
+    
+    # 如果都失败了，返回默认版本
+    return "0.0.0"
+
+
+__version__ = _get_version()
 
 __all__ = [
     # API函数

rquote/api/lists.py

@@ -160,7 +160,7 @@ def get_industry_stocks(node):
     获取指定行业板块的股票列表
     
     Args:
-        node: 行业节点代码
+        node: 行业节点名称
     
     Returns:
         股票列表

rquote/api/price.py

@@ -20,6 +20,7 @@ def get_price(i: str, sdate: str = '', edate: str = '', freq: str = 'day',
         i: 股票代码
         sdate: 开始日期
         edate: 结束日期
+        freq: 频率，默认'day' (日线)，可选：'week', 'month', 'min'
         dd: data dictionary或Cache对象，任何有get/put方法的本地缓存
         days: 获取天数，覆盖sdate
         fq: 复权方式，qfq为前复权
@@ -71,3 +72,8 @@ def get_price_longer(i: str, l: int = 2, dd=None) -> Tuple[str, str, pd.DataFram
         d1 = d0
     return i, name, a
 
+
+if __name__ == '__main__':
+    i = 'usTSLA.N'
+    a = get_price(i, freq='min')
+    print(a)

rquote/api/stock_info.py

@@ -18,6 +18,7 @@ def get_stock_concepts(i: str) -> List[str]:
     Returns:
         概念代码列表
     """
+    i = {'6': 'sh', '0': 'sz', '3': 'sz'}.get(i[0], '') + i if i[0] in ['6', '0', '3'] else i
     url = f'https://proxy.finance.qq.com/ifzqgtimg/appstock/app/stockinfo/plateNew?code={i}&app=wzq&zdf=1'
     a = hget(url)
     if not a:
@@ -38,6 +39,7 @@ def get_stock_industry(i: str) -> List[str]:
     Returns:
         行业代码列表
     """
+    i = {'6': 'sh', '0': 'sz', '3': 'sz'}.get(i[0], '') + i if i[0] in ['6', '0', '3'] else i
     url = f'https://proxy.finance.qq.com/ifzqgtimg/appstock/app/stockinfo/plateNew?code={i}&app=wzq&zdf=1'
     a = hget(url)
     if not a:

rquote/data_sources/sina.py

@@ -57,6 +57,9 @@ class SinaDataSource(DataSource):
             return {'data': data}
         except json.JSONDecodeError as e:
             raise ParseError(f"Parse error: {e}")
+        finally:
+            # 确保响应对象被关闭，释放SSL连接
+            response.close()
     
     def fetch_tick(self, symbols: List[str]) -> Dict[str, Any]:
         """
@@ -89,4 +92,7 @@ class SinaDataSource(DataSource):
             return {'data': result}
         except Exception as e:
             raise ParseError(f"Parse tick error: {e}")
+        finally:
+            # 确保响应对象被关闭，释放SSL连接
+            response.close()
 

rquote/data_sources/tencent.py

@@ -12,9 +12,9 @@ from ..exceptions import DataSourceError, ParseError
 class TencentDataSource(DataSource):
     """腾讯数据源"""
     
-    BASE_URL = "http://web.ifzq.gtimg.cn/appstock/app/newfqkline/get"
-    BASE_URL_HK = "http://web.ifzq.gtimg.cn/appstock/app/hkfqkline/get"
-    BASE_URL_US = "http://web.ifzq.gtimg.cn/appstock/app/usfqkline/get"
+    BASE_URL = "https://web.ifzq.gtimg.cn/appstock/app/newfqkline/get"
+    BASE_URL_HK = "https://web.ifzq.gtimg.cn/appstock/app/hkfqkline/get"
+    BASE_URL_US = "https://web.ifzq.gtimg.cn/appstock/app/usfqkline/get"
     
     def __init__(self, http_client: HTTPClient = None):
         """
@@ -56,7 +56,7 @@ class TencentDataSource(DataSource):
         if not response:
             raise DataSourceError(f"Failed to fetch from Tencent: {symbol}")
         
-        # 解析响应
+        # 解析响应，确保响应对象被正确关闭
         try:
             text = response.text
             # 处理不同的响应格式
@@ -83,6 +83,9 @@ class TencentDataSource(DataSource):
             return data
         except json.JSONDecodeError as e:
             raise ParseError(f"Parse error: {e}")
+        finally:
+            # 确保响应对象被关闭，释放SSL连接
+            response.close()
     
     def fetch_tick(self, symbols: List[str]) -> Dict[str, Any]:
         """获取实时行情（暂未实现）"""

rquote/markets/cn_stock.py

@@ -159,7 +159,7 @@ class CNStockMarket(Market):
         from ..utils import hget
         import json
         
-        url = f'http://web.ifzq.gtimg.cn/appstock/app/newfqkline/get?param={symbol},{freq},{sdate},{edate},{days},{fq}'
+        url = f'https://web.ifzq.gtimg.cn/appstock/app/newfqkline/get?param={symbol},{freq},{sdate},{edate},{days},{fq}'
         response = hget(url)
         if not response:
             raise DataSourceError(f'Failed to fetch data for {symbol}')

rquote/utils/web.py

@@ -91,6 +91,7 @@ class hget:
     """
     def __init__(self, url, *args, **kwargs):
         self.url = url
+        r = None
         try:
             r = httpx.get(
                 self.url, follow_redirects=True, headers=WebUtils.headers(),
@@ -101,4 +102,8 @@ class hget:
             logger.error(f'fetch {self.url} err: {e}')
             self.text = ''
             self.content = b''
+        finally:
+            # 确保响应对象被关闭，释放SSL连接
+            if r is not None:
+                r.close()
 

{rquote-0.3.5.dist-info → rquote-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.3.5
+Version: 0.3.8
 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
@@ -83,7 +83,7 @@ sid, name, df = get_price('sh000001', dd=cache_dict)
 - `i`: 股票代码，使用新浪/腾讯的id形式
 - `sdate`: 开始日期 (可选，格式：YYYY-MM-DD)
 - `edate`: 结束日期 (可选，格式：YYYY-MM-DD)
-- `freq`: 频率，默认'day' (日线)，可选：'week', 'month', 'min'
+- `freq`: 频率，默认'day' (日线)，可选：(港A)'week', 'month', (美股)'min'
 - `days`: 获取天数，默认320天
 - `fq`: 复权方式，默认'qfq' (前复权)，可选：'hfq' (后复权)
 - `dd`: 本地缓存字典 (可选，已废弃，建议使用MemoryCache)

{rquote-0.3.5.dist-info → rquote-0.3.8.dist-info}/RECORD

@@ -1,25 +1,25 @@
-rquote/__init__.py,sha256=3FBv99rWXPeBk5g7iGA-X7bgl5DVBh01oiVLL9ugxXI,1159
+rquote/__init__.py,sha256=-U5Uq4eT3Hhl2EkVmBgr5TAfU-ZfFzpOaGeJafnhyos,2208
 rquote/config.py,sha256=noep_VzY_nJehnkPQb4mkwzpeYLwkU1riqofQJ6Hhw0,1108
 rquote/exceptions.py,sha256=lJH2GC5dDhMoW_OtlBc03wlUn684-7jNPyF1NjmfVIE,569
 rquote/plots.py,sha256=UQn4sjhIzVwagfhUDM738b2HHjKo4tRdU2UCs_1-FbY,2341
 rquote/utils.py,sha256=bH0ZFIo-ZelNztzPS6BXFShXE3yGA9USI_P9INN0Y-s,310
 rquote/api/__init__.py,sha256=ptizO--im80HaxlzxkJo9BKdJPEnbu00R9UDgcoA0mU,656
-rquote/api/lists.py,sha256=jSvxtlBsGh67ruAq0_ASCqsEXMh6xC9lZEKQWS97UCY,5331
-rquote/api/price.py,sha256=a6ARAX66iPy79Bhxjj8Sn-Gk3p84Ukw0UDywViWTTzA,2092
-rquote/api/stock_info.py,sha256=aQwAhMQi8EymV5uVwOdkOLKYYnKfMRRMm6SqvHVYl-w,1349
+rquote/api/lists.py,sha256=fRebS02Fi0qe6KpWBA-9W1UG0It6__DmRlNimtMa7L8,5331
+rquote/api/price.py,sha256=hVmQN_kHIisr38RlAB43UCGtEqdxLmj6tsiog0jaa3w,2262
+rquote/api/stock_info.py,sha256=912ICdIBr8z2lKWDbq3gG0E94czTPvbx9aXsKUi-QkE,1537
 rquote/api/tick.py,sha256=nEcjuAjtBHUaD8KPRLg643piVa21PhKDQvkVWNwvvME,1431
 rquote/cache/__init__.py,sha256=IXGSRpvSgBlcM6twLuJEOEockbb09_VqORXdQpfwpCA,138
 rquote/cache/base.py,sha256=orzG4Yo-6gzVG027j1-LTZPT718JohnCdLDnOLoLUQ4,515
 rquote/cache/memory.py,sha256=7z4keb3q91pzI4ASQWy1MU8T5nbWLCEUjJcStv_3hvk,1933
 rquote/data_sources/__init__.py,sha256=WCe1aam4677jM5G6wP4a-dQFTeBzcU5PJqsKieAVMBo,215
 rquote/data_sources/base.py,sha256=JuKsTMxH7y8yRxHg3JbLzQwXPr43rS4pnwc5625u2U4,443
-rquote/data_sources/sina.py,sha256=Ab14I7KLaBCZd9peLvv5H38C41qPnsBgIZ5kETi6lA8,3088
-rquote/data_sources/tencent.py,sha256=yRVtIt2RNe8zPMt_vgjeY0aTZCvUklVmfpzD6xyu7rc,3225
+rquote/data_sources/sina.py,sha256=T_3Dl0Mwlhx8CKRJll_UKobYecRWltGaIOiGkpHS43Q,3300
+rquote/data_sources/tencent.py,sha256=ayt1O85pheLwzX3z5c6Qij1NrmUywcsz6YcSVzdDoME,3370
 rquote/factors/__init__.py,sha256=_ZbH2XxYtXwCJpvRVdNvGncoPSpMqrtlYmf1_fMGIjM,116
 rquote/factors/technical.py,sha256=dPDs3pDEDRV9iQJBrSoKpGFLQMjOqyoBdN2rUntpOUU,4235
 rquote/markets/__init__.py,sha256=k4F8cZgb-phqemMqhZXFPdOKsR4P--DD3d5i21vKhbg,365
 rquote/markets/base.py,sha256=DjvxRcJqwUsBTxnsE28Gd-zJLFsCGwdQpezLRAZ_9sQ,1347
-rquote/markets/cn_stock.py,sha256=5qy7w5ouUqrP7VmMPO-dhmgCk4gLI5qlYCQoE3fFuwc,8063
+rquote/markets/cn_stock.py,sha256=xf-uXDvkdPBPuc-4-VhEsX0OrxSsaMVsCl1wmSqnVl0,8064
 rquote/markets/factory.py,sha256=4Txpuok0LBOLT_vAiIU-NslwVnYF7sKHCdlacAboxpo,2875
 rquote/markets/future.py,sha256=AbA-gpmBhbyrRJn8Vu-ouQLCd-TlacXSVZQ2VHYn2pg,3907
 rquote/markets/hk_stock.py,sha256=iz0BriBDNGLkUCPExcCbe2jmuoqJinxx_cbDtKblABc,1445
@@ -31,8 +31,8 @@ rquote/utils/date.py,sha256=nhK3xQ2kFvKhdkPw-2HR2V0PSzBfXmX8L7laG7VmG2E,913
 rquote/utils/helpers.py,sha256=V07n9BtRS8bEJH023Kca78-unk7iD3B9hn2UjELetYs,354
 rquote/utils/http.py,sha256=X0Alhnu0CNqyQeOt6ivUWmh2XwrWxXd2lSpQOKDdnzw,3249
 rquote/utils/logging.py,sha256=cbeRH4ODazn7iyQmGoEBT2lH5LX4Ca3zDfs_20J1T28,566
-rquote/utils/web.py,sha256=rjDTbF34U0A0kP6_iD7gQstEIvTvI-b4zUw9kcY_FJk,3704
-rquote-0.3.5.dist-info/METADATA,sha256=QOI97iovyW1IrfbctXHV4t2YqadvUshl7A-rylzaFZY,11248
-rquote-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rquote-0.3.5.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
-rquote-0.3.5.dist-info/RECORD,,
+rquote/utils/web.py,sha256=I8_pcThW6VUvahuRHdtp32iZwr85hEt1hB6TgznMy_U,3854
+rquote-0.3.8.dist-info/METADATA,sha256=33b2tfuTz_P71F71EHnUZk8CHWXcrkp-blmF0al4YQs,11262
+rquote-0.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rquote-0.3.8.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
+rquote-0.3.8.dist-info/RECORD,,