rquote 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

rquote/api/stock_info.py

@@ -3,49 +3,101 @@
 股票信息相关API
 """
 import json
-from typing import List
+from typing import List, Optional, Any
 from ..utils import hget
 from ..exceptions import HTTPError
+from ..cache import Cache
+from ..cache.memory import DictCache as DictCacheAdapter
 
 
-def get_stock_concepts(i: str) -> List[str]:
+def _normalize_stock_code(code: str) -> str:
+    """标准化股票代码"""
+    return {'6': 'sh', '0': 'sz', '3': 'sz'}.get(code[0], '') + code if code[0] in ['6', '0', '3'] else code
+
+
+def _get_cache_adapter(dd: Optional[Any]) -> Optional[Cache]:
+    """获取缓存适配器"""
+    if dd is None:
+        return None
+    if isinstance(dd, dict):
+        return DictCacheAdapter(dd)
+    elif isinstance(dd, Cache):
+        return dd
+    elif hasattr(dd, 'get') and hasattr(dd, 'put'):
+        return DictCacheAdapter(dd)
+    return None
+
+
+def _fetch_stock_plate_data(normalized_code: str, data_key: str, error_msg: str) -> List[str]:
+    """获取股票板块数据的通用函数"""
+    url = f'https://proxy.finance.qq.com/ifzqgtimg/appstock/app/stockinfo/plateNew?code={normalized_code}&app=wzq&zdf=1'
+    a = hget(url)
+    if not a:
+        raise HTTPError(f'Failed to fetch {error_msg} from QQ Finance')
+    data = json.loads(a.text)
+    if data.get('code') != 0:
+        raise HTTPError('API returned error: {}'.format(data.get('msg', 'Unknown error')))
+    return data.get('data', {}).get(data_key, [])
+
+
+def get_stock_concepts(i: str, dd: Optional[Any] = None) -> List[str]:
     """
     获取指定股票所属的概念板块
     
     Args:
         i: 股票代码
+        dd: data dictionary或Cache对象，任何有get/put方法的本地缓存
     
     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:
-        raise HTTPError('Failed to fetch concepts from QQ Finance')
-    data = json.loads(a.text)
-    if data.get('code') != 0:
-        raise HTTPError('API returned error: {}'.format(data.get('msg', 'Unknown error')))
-    return data.get('data', {}).get('concept', [])
+    cache = _get_cache_adapter(dd)
+    normalized_code = _normalize_stock_code(i)
+    cache_key = f'stock_concepts:{normalized_code}'
+    
+    # 尝试从缓存获取
+    if cache:
+        cached_result = cache.get(cache_key)
+        if cached_result is not None:
+            return cached_result
+    
+    # 缓存未命中，请求网络
+    result = _fetch_stock_plate_data(normalized_code, 'concept', 'concepts')
+    
+    # 存入缓存
+    if cache:
+        cache.put(cache_key, result)
+    
+    return result
 
 
-def get_stock_industry(i: str) -> List[str]:
+def get_stock_industry(i: str, dd: Optional[Any] = None) -> List[str]:
     """
     获取指定股票所属的行业板块
     
     Args:
         i: 股票代码
+        dd: data dictionary或Cache对象，任何有get/put方法的本地缓存
     
     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:
-        raise HTTPError('Failed to fetch industry from QQ Finance')
-    data = json.loads(a.text)
-    if data.get('code') != 0:
-        raise HTTPError('API returned error: {}'.format(data.get('msg', 'Unknown error')))
-    return data.get('data', {}).get('plate', [])
+    cache = _get_cache_adapter(dd)
+    normalized_code = _normalize_stock_code(i)
+    cache_key = f'stock_industry:{normalized_code}'
+    
+    # 尝试从缓存获取
+    if cache:
+        cached_result = cache.get(cache_key)
+        if cached_result is not None:
+            return cached_result
+    
+    # 缓存未命中，请求网络
+    result = _fetch_stock_plate_data(normalized_code, 'plate', 'industry')
+    
+    # 存入缓存
+    if cache:
+        cache.put(cache_key, result)
+    
+    return result
 

rquote/utils/logging.py

@@ -3,20 +3,40 @@
 日志工具
 """
 import logging
+import os
 
 
 def setup_logger():
     """设置日志记录器"""
     logger = logging.getLogger('rquote')
     if not logger.handlers:
-        logger.setLevel(logging.INFO)
-        file_handler = logging.FileHandler('/tmp/rquote.log')
+        # 默认关闭日志，通过环境变量 RQUOTE_LOG_LEVEL 控制
+        log_level = os.getenv('RQUOTE_LOG_LEVEL', '').upper()
+        log_file = os.getenv('RQUOTE_LOG_FILE', '/tmp/rquote.log')
         
-        formatter = logging.Formatter('%(asctime)-15s:%(lineno)s %(message)s')
-        file_handler.setFormatter(formatter)
-        
-        logger.addHandler(file_handler)
-        logger.addHandler(logging.StreamHandler())
+        # 如果设置了有效的日志级别，则启用日志
+        if log_level in ('DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'):
+            # 将字符串级别转换为logging级别
+            level_map = {
+                'DEBUG': logging.DEBUG,
+                'INFO': logging.INFO,
+                'WARNING': logging.WARNING,
+                'ERROR': logging.ERROR,
+                'CRITICAL': logging.CRITICAL,
+            }
+            logger.setLevel(level_map[log_level])
+            
+            # 添加文件handler
+            file_handler = logging.FileHandler(log_file)
+            formatter = logging.Formatter('%(asctime)-15s:%(lineno)s %(message)s')
+            file_handler.setFormatter(formatter)
+            logger.addHandler(file_handler)
+            
+            # 添加控制台handler
+            logger.addHandler(logging.StreamHandler())
+        else:
+            # 默认关闭日志：设置为CRITICAL级别，不添加handler
+            logger.setLevel(logging.CRITICAL)
     
     return logger
 

{rquote-0.4.2.dist-info → rquote-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.4.2
+Version: 0.4.4
 Summary: Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
@@ -18,7 +18,7 @@ Requires-Dist: duckdb>=0.9.0; extra == "persistent"
 
 ## 版本信息
 
-当前版本：**0.4.2**
+当前版本：**0.4.4**
 
 ## 主要特性
 
@@ -346,6 +346,50 @@ os.environ['RQUOTE_HTTP_TIMEOUT'] = '20'
 config_from_env = config.Config.from_env()
 ```
 
+### 日志配置
+
+**默认情况下，日志功能是关闭的。** 如果需要启用日志，可以通过环境变量手动开启：
+
+#### 通过环境变量开启日志
+
+```bash
+# 设置日志级别为 INFO（会同时输出到文件和控制台）
+export RQUOTE_LOG_LEVEL=INFO
+
+# 可选：自定义日志文件路径（默认为 /tmp/rquote.log）
+export RQUOTE_LOG_FILE=/path/to/your/logfile.log
+
+# 然后运行你的Python脚本
+python your_script.py
+```
+
+#### 支持的日志级别
+
+- `DEBUG`: 详细的调试信息
+- `INFO`: 一般信息（推荐）
+- `WARNING`: 警告信息
+- `ERROR`: 错误信息
+- `CRITICAL`: 严重错误
+
+#### 在Python代码中开启日志
+
+```python
+import os
+
+# 在导入 rquote 之前设置环境变量
+os.environ['RQUOTE_LOG_LEVEL'] = 'INFO'
+os.environ['RQUOTE_LOG_FILE'] = '/tmp/rquote.log'  # 可选
+
+from rquote import get_price
+
+# 现在日志已启用
+sid, name, df = get_price('sh000001')
+```
+
+#### 关闭日志
+
+如果不设置 `RQUOTE_LOG_LEVEL` 环境变量，或者设置为空值，日志功能将保持关闭状态（默认行为）。
+
 ### 使用改进的HTTP客户端
 
 ```python

{rquote-0.4.2.dist-info → rquote-0.4.4.dist-info}/RECORD

@@ -6,7 +6,7 @@ rquote/utils.py,sha256=bH0ZFIo-ZelNztzPS6BXFShXE3yGA9USI_P9INN0Y-s,310
 rquote/api/__init__.py,sha256=ptizO--im80HaxlzxkJo9BKdJPEnbu00R9UDgcoA0mU,656
 rquote/api/lists.py,sha256=fRebS02Fi0qe6KpWBA-9W1UG0It6__DmRlNimtMa7L8,5331
 rquote/api/price.py,sha256=I5lZl6cUQRlE4AtzNbR-uGZt1ho9vgP1cgNFDjaigMA,3575
-rquote/api/stock_info.py,sha256=912ICdIBr8z2lKWDbq3gG0E94czTPvbx9aXsKUi-QkE,1537
+rquote/api/stock_info.py,sha256=h_AbgsR8CLWz5zA2PtGsS3ROQ3qcw_hnRAtG3USeMos,2988
 rquote/api/tick.py,sha256=nEcjuAjtBHUaD8KPRLg643piVa21PhKDQvkVWNwvvME,1431
 rquote/cache/__init__.py,sha256=S393I5Wmp0QooaRka9n7bvDUdEbg3jUhm6u815T86rM,317
 rquote/cache/base.py,sha256=orzG4Yo-6gzVG027j1-LTZPT718JohnCdLDnOLoLUQ4,515
@@ -31,9 +31,9 @@ rquote/utils/__init__.py,sha256=-ZHABqFHQeJrCCsgnqEYWR57jl7GduCKn2V3hpFi-pE,348
 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/logging.py,sha256=fs2YF1Srux4LLTdk_Grjm5g1f4mzewI38VVSAI82goA,1471
 rquote/utils/web.py,sha256=I8_pcThW6VUvahuRHdtp32iZwr85hEt1hB6TgznMy_U,3854
-rquote-0.4.2.dist-info/METADATA,sha256=wikF__yVw-XXJb85Hy6wQKzcOQQ6gKBW8r1VITfQh3Y,13259
-rquote-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rquote-0.4.2.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
-rquote-0.4.2.dist-info/RECORD,,
+rquote-0.4.4.dist-info/METADATA,sha256=19kwtEiSyrMll1Ju8Ei1nR4CHCohDhht02hLXsHL47k,14344
+rquote-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rquote-0.4.4.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
+rquote-0.4.4.dist-info/RECORD,,