change version

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.3 (2022-12-07)
+### new
+- 选股器 `QuoteClient.market_scanner`
+
+
 ## 2.2.2 (2022-11-22)
 ### New
 - 订单支持GTD类型, 下单时可通过指定 Order 属性 time_in_force = "GTD" 设置

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.2.2'
+__VERSION__ = '2.2.3'

tigeropen/common/consts/__init__.py

@@ -11,6 +11,7 @@
     Leverage, Profitability
 from .quote_keys import QuoteChangeKey, QuoteKeyType
 
+OPEN_API_SERVICE_VERSION_V1 = "1.0"
 OPEN_API_SERVICE_VERSION = "2.0"
 OPEN_API_SERVICE_VERSION_V3 = "3.0"
 

tigeropen/examples/quote_client_demo.py

@@ -208,6 +208,8 @@ def test_market_scanner(self):
     page_size = 50
     # 是否为最后一页数据
     is_last_page = False
+    # 筛选后的symbol列表
+    scanner_result_symbols = set()
 
     while not is_last_page:
         # filters参数里填需要使用的过滤器
@@ -226,13 +228,18 @@ def test_market_scanner(self):
                 accumulate_filter_value = item[accumulate_filter]
                 print(
                     f'page:{result.page}, symbol:{symbol}, base_filter1 value:{base_filter1_value}, accumulate_filter value:{accumulate_filter_value}')
+            print(f'current page symbols:{result.symbols}')
+            scanner_result_symbols.update(result.symbols)
         time.sleep(1)
         # 处理分页
         if result.page >= result.total_page - 1:
             is_last_page = True
         else:
             begin_page = result.page + 1
 
+    print(f'scanned symbols:{scanner_result_symbols}')
+
+
 
 if __name__ == '__main__':
     with pd.option_context('display.max_rows', None, 'display.max_columns', None):

tigeropen/quote/domain/filter.py

@@ -166,20 +166,25 @@ def __init__(self, page, page_size, total_page, total_count, items):
         self.total_page = total_page
         self.total_count = total_count
         self.page_size = page_size
-        self.items = self._build_items(items)
+        self.items = list()
+        self.symbols = list()
+        self._build_items(items)
 
     def _build_items(self, items):
         result_items = list()
+        symbols = set()
         if items:
             for item in items:
-                item = ScannerResultItem(symbol=item.get('symbol'),
+                result_item = ScannerResultItem(symbol=item.get('symbol'),
                                          market=item.get('market'),
                                          base_data_list=item.get('base_data_list'),
                                          accumulate_data_list=item.get('accumulate_data_list'),
                                          financial_data_list=item.get('financial_data_list'),
                                          multi_tag_data_list=item.get('multi_tag_data_list'))
-                result_items.append(item)
-        return result_items
+                result_items.append(result_item)
+                symbols.add(item.get('symbol'))
+        self.items = result_items
+        self.symbols = list(symbols)
 
     def __repr__(self):
         return "ScannerResult(%s)" % self.__dict__

tigeropen/quote/quote_client.py

@@ -10,7 +10,8 @@
 
 import pandas as pd
 
-from tigeropen.common.consts import Market, QuoteRight, BarPeriod, OPEN_API_SERVICE_VERSION_V3
+from tigeropen.common.consts import Market, QuoteRight, BarPeriod, OPEN_API_SERVICE_VERSION_V3, \
+    OPEN_API_SERVICE_VERSION_V1
 from tigeropen.common.consts import THREAD_LOCAL, SecurityType, CorporateActionType, IndustryLevel
 from tigeropen.common.consts.filter_fields import FieldBelongType
 from tigeropen.common.consts.service_types import GRAB_QUOTE_PERMISSION, QUOTE_DELAY, GET_QUOTE_PERMISSION, \
@@ -1349,7 +1350,7 @@ def get_stock_industry(self, symbol, market=Market.US):
             else:
                 raise ApiException(response.code, response.message)
 
-    def market_scanner(self, market=Market.US, filters=None, sort_field_data=None, page=None, page_size=100):
+    def market_scanner(self, market=Market.US, filters=None, sort_field_data=None, page=0, page_size=100):
         """
         screen stocks
         :param market: tigeropen.common.consts.Market
@@ -1360,7 +1361,7 @@ def market_scanner(self, market=Market.US, filters=None, sort_field_data=None, p
         :return:
         """
         params = MarketScannerParams()
-        params.version = "1.0"
+        params.version = OPEN_API_SERVICE_VERSION_V1
         params.market = market.value
         if filters is not None:
             params.base_filter_list = list()

tigeropen/quote/request/model.py

@@ -942,8 +942,8 @@ def to_openapi_dict(self):
             params['multi_tags_filter_list'] = self.multi_tags_filter_list
         if self.sort_field_data:
             params['sort_field_data'] = self.sort_field_data.to_dict()
-        if self.page:
+        if self.page is not None:
             params['page'] = self.page
-        if self.page_size:
+        if self.page_size is not None:
             params['page_size'] = self.page_size
         return params