modify stock screener request param

Author: tigersk

tigeropen/common/util/string_utils.py

@@ -26,3 +26,8 @@ def camel_to_underline_obj(d):
         return [camel_to_underline_obj(i) if isinstance(i, (dict, list)) else i for i in d]
     return {camel_to_underline(k): camel_to_underline_obj(v) if isinstance(v, (dict, list)) else v
             for k, v in d.items()}
+
+
+def camel_to_underline(camel_str):
+    parts = camel_str.split('_')
+    return parts[0] + ''.join(x.title() for x in parts[1:])

tigeropen/quote/domain/filter.py

@@ -4,6 +4,7 @@
 # @Author  : sukai
 from tigeropen.common.consts import SortDirection
 from tigeropen.common.model import Field
+from tigeropen.common.util.string_utils import camel_to_underline
 
 GREEKS = ['delta', 'gamma', 'theta', 'vega', 'rho']
 
@@ -61,23 +62,24 @@ def _min_max(self, k):
 
 
 class StockFilter:
-    def __init__(self, field, min_value=None, max_value=None, sort=None, enable=True):
+    def __init__(self, field, min_value=None, max_value=None, sort_direction=None, enable=True):
         """
         stock filter
         :param field: filter field. subclass of tigeropen.common.consts.Field, or field name string
         :param min_value:
         :param max_value:
-        :param sort: tigeropen.common.consts.SortDirection. ASC or DESC
+        :param sort_direction: tigeropen.common.consts.SortDirection. ASC or DESC
         :param enable:
         """
         self.field = field
         self.min_value = min_value
         self.max_value = max_value
-        self.sort = sort
+        self.sort = sort_direction
         self.enable = enable
 
     def to_dict(self):
-        return {'field': self.field.name if isinstance(self.field, Field) else self.field,
+
+        return {'field': camel_to_underline(self.field.name if isinstance(self.field, Field) else self.field),
                 'min_value': self.min_value,
                 'max_value': self.max_value,
                 'sort_direction': self.sort.value if isinstance(self.sort, SortDirection) else self.sort,

tigeropen/quote/request/model.py

@@ -788,10 +788,10 @@ def to_openapi_dict(self):
         if self.market:
             params['market'] = self.market
         if self.stock_filters:
-            params['filters'] = list()
+            params['stock_filters'] = list()
             for item in self.stock_filters:
                 if item.enable:
-                    params['filters'].append(item.to_dict())
+                    params['stock_filters'].append(item.to_dict())
         if self.page:
             params['page'] = self.page
         if self.limit: