扩展支持的市场类型、增加扩展市场类型的功能

Author: Micro-sheep

changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.5.0(2023-01-08)
+
+### Added
+
+- 增加获取 广期所 期货行情的功能
+- 添加扩展市场类型的函数
+
 ## v0.4.9(2022-07-29)
 
 ### Added

efinance/__version__.py

@@ -1,5 +1,5 @@
 __title__ = 'efinance'
-__version__ = '0.4.9'
+__version__ = '0.5.0'
 __author__ = 'micro sheep'
 __url__ = 'https://github.com/Micro-sheep/efinance'
 __author_email__ = '[email protected]'

efinance/common/config.py

@@ -23,7 +23,8 @@ class MagicConfig:
     '8': '中金所',
     '142': '上海能源期货交易所',
     '155': '英股',
-    '90': '板块'
+    '90': '板块',
+    '225': '广期所',
 
 }
 # ! Powerful
@@ -39,8 +40,8 @@ class MagicConfig:
     '北证A股': 'm:0 t:81 s:2048',
     '北A': 'm:0 t:81 s:2048',
     # 期货
-    'futures': 'm:113,m:114,m:115,m:8,m:142',
-    '期货': 'm:113,m:114,m:115,m:8,m:142',
+    'futures': 'm:113,m:114,m:115,m:8,m:142,m:225',
+    '期货': 'm:113,m:114,m:115,m:8,m:142,m:225',
 
     '上证A股': 'm:1 t:2,m:1 t:23',
     '沪A': 'm:1 t:2,m:1 t:23',

efinance/common/getter.py

@@ -52,7 +52,7 @@ def get_realtime_quotes_by_fs(fs: str,
     df = pd.DataFrame(json_response['data']['diff'])
     df = df.rename(columns=columns)
     df: pd.DataFrame = df[columns.values()]
-    df['行情ID'] = df['市场编号'].astype(str)+'.'+df['代码'].astype(str)
+    df['行情ID'] = df['市场编号'].astype(str) + '.' + df['代码'].astype(str)
     df['市场类型'] = df['市场编号'].astype(str).apply(
         lambda x: MARKET_NUMBER_DICT.get(x))
     df['更新时间'] = df['更新时间戳'].apply(lambda x: str(datetime.fromtimestamp(x)))
@@ -382,7 +382,7 @@ def get_deal_detail(quote_id: str,
     df = pd.DataFrame(columns=columns, index=range(len(rows)))
     df.loc[:, '代码'] = code
     df.loc[:, '名称'] = name
-    detail_df = pd.DataFrame(rows, columns=['时间',  '成交价', '成交量', '单数'])
+    detail_df = pd.DataFrame(rows, columns=['时间', '成交价', '成交量', '单数'])
     detail_df.insert(1, '昨收', js['data']['prePrice'])
     df.loc[:, detail_df.columns] = detail_df.values
     return df

efinance/utils/__init__.py

@@ -1,3 +1,5 @@
+from collections import OrderedDict
+from ..common.config import MARKET_NUMBER_DICT, FS_DICT
 from typing import Any
 import time
 import json
@@ -154,10 +156,10 @@ def search_quote_locally(keyword: str) -> Union[Quote, None]:
         return None
     last_time: float = q['last_time']
     # 缓存过期秒数
-    max_ts = 3600*24*3
+    max_ts = 3600 * 24 * 3
     now = time.time()
     # 缓存过期，在线搜索
-    if (now-last_time) > max_ts:
+    if (now - last_time) > max_ts:
         return None
     # NOTE 一定要拷贝 否则改变源对象
     _q = q.copy()
@@ -294,4 +296,32 @@ def to_type(f: Callable[[str], T],
         return default
 
 
+def add_market(category: str,
+               market_number: str,
+               market_name: str,
+               drop_duplicate: bool = True
+               ) -> None:
+    """
+    添加市场
+
+    Parameters
+    ----------
+    category : str
+        市场类别
+    market_number : str
+        市场编号
+    market_name : str
+        市场名称
+    drop_duplicate : bool, optional
+        是否去重, 默认为 ``True``
+    """
+    MARKET_NUMBER_DICT[market_number] = market_name
+    old = FS_DICT.get(category, '')
+    new = f'{old},m:{market_number}'
+    if drop_duplicate:
+        FS_DICT[category] = ','.join(OrderedDict.fromkeys(new.split(',')))
+    else:
+        FS_DICT[category] = new
+
+
 __all__ = []