Merge branch 'update_size' into 'master'

update size

See merge request !55

search/utils/auto_tips.py

@@ -35,8 +35,10 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
         gray_number = recommed_service_category_device_id(device_id)
         if gray_number == 1:
             sub_index_name = "suggest"
+            size = 50
         else:
             sub_index_name = "suggest-v1"
+            size = 30
 
         have_read_tips_set, ret_list, result_dict = get_query_by_es(query=str(query).lower(), lat=lat, lng=lng,
                                                                     offset=offset,
@@ -49,7 +51,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
             front_data = []
             end_data = []
             equal_data = []
-            need_change_sort = ret_list[:30]
+            need_change_sort = ret_list[:size]
             for item in need_change_sort:
                 ori_name = item.get("ori_name", None)
                 if query == ori_name:
@@ -63,11 +65,9 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
             # equal_data.extend(ret_list[30:])
             ret_list = equal_data
 
-        if len(ret_list) >= 50:
-            if gray_number in (2, 3):
-                return ret_list[:30]
+        if len(ret_list) >= size:
             logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list)))
-            return ret_list[:50]
+            return ret_list[:size]
 
         else:
             query_ret_list = []
@@ -120,17 +120,12 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
                             item['results_num'] += result_num[0][0]
 
             ####
-            if len(ret_list) >= 50:
-                if gray_number in (2, 3):
-                    return ret_list[:30]
+            if len(ret_list) >= size:
 
                 logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list)))
-                return ret_list[0:50]
-
-            elif len(ret_list) < 50 and len(ret_list) > 3:
-                if gray_number in (2, 3):
-                    return ret_list[:30]
+                return ret_list[0:size]
 
+            elif len(ret_list) < size and len(ret_list) > 3:
                 logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list)))
                 return ret_list
 
@@ -151,7 +146,8 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
                 logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list)))
 
                 if gray_number in (2, 3):
-                    return ret_list[:30]
+                    return ret_list[:size]
+
                 return ret_list