Merge branch 'dev' into 'master'

modify include to includes

See merge request !86

search/utils/group.py

@@ -38,7 +38,7 @@ class GroupUtils(object):
                 }
             }
             q["_source"] = {
-                "include":["id"]
+                "includes":["id"]
             }
 
             return ESPerform.get_search_results(ESPerform.get_cli(), "group", q, offset, size)
@@ -65,7 +65,7 @@ class GroupUtils(object):
                 {"high_quality_topic_num":{"order":"desc"}}
             ]
             q["_source"] = {
-                "include":["id"]
+                "includes":["id"]
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj,"group",q,offset,size)
@@ -100,7 +100,7 @@ class GroupUtils(object):
                 }
             }
             q["_source"] = {
-                "include":["attention_group_id_list"]
+                "includes":["attention_group_id_list"]
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj,"user",q,offset,size)

search/utils/pick.py

@@ -77,7 +77,7 @@ class PickUtils(object):
                 }
             }
             q["_source"] = {
-                "include": ["id"]
+                "includes": ["id"]
             }
             result_dict = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="celebrity",query_body=q,offset=offset,size=size)
             recommend_pick_celebrity_list = list()
@@ -123,7 +123,7 @@ class PickUtils(object):
                 }
             }
             q["_source"] = {
-                "include":["id"]
+                "includes":["id"]
             }
             result_dict = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="topic",query_body=q,offset=offset,size=size)
 
@@ -153,7 +153,7 @@ class PickUtils(object):
                 }
             }
             q["_source"] = {
-                "include":["id"]
+                "includes":["id"]
             }
             result_dict = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="celebrity",query_body=q,offset=offset,size=size)
 

search/utils/topic.py

@@ -228,7 +228,7 @@ class TopicUtils(object):
 
             q["query"]["function_score"] = query_function_score
             q["_source"] = {
-                "include":["id","group_id","offline_score"]
+                "includes":["id","group_id","offline_score"]
             }
             q["sort"] = [
                 {
@@ -329,7 +329,7 @@ class TopicUtils(object):
                 }
             q["query"]["function_score"] = query_function_score
             q["_source"] = {
-                "include":["id","group_id","user_id","_score"]
+                "includes":["id","group_id","user_id","_score"]
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj, sub_index_name="topic", query_body=q,
@@ -358,7 +358,7 @@ class TopicUtils(object):
                 }
             }
             q["_source"] = {
-                "include":[TopicDocumentField.TAG_LIST]
+                "includes":[TopicDocumentField.TAG_LIST]
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj,sub_index_name="topic",query_body=q,size=1)
@@ -441,7 +441,7 @@ class TopicUtils(object):
                 "function_score":query_function_score
             }
             q["_source"] = {
-                "include":["id","group_id","user_id","_score","offline_score","manual_score"]
+                "includes":["id","group_id","user_id","_score","offline_score","manual_score"]
             }
             q["sort"] = [
                 {

search/utils/user.py

@@ -31,7 +31,7 @@ class UserUtils(object):
                 }
             }
             q["_source"] = {
-                "include":["attention_user_id_list","user_id"]
+                "includes":["attention_user_id_list","user_id"]
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj, "user", q, offset=0, size=len(user_id_list))
@@ -78,7 +78,7 @@ class UserUtils(object):
                 }
             }
             q["_source"] = {
-                "include":["attention_user_id_list","user_id"]
+                "includes":["attention_user_id_list","user_id"]
             }
 
             result_dict = ESPerform.get_search_results(es_cli_obj, "user", q, offset=0, size=len(user_id_list))
@@ -175,7 +175,7 @@ class UserUtils(object):
             }
             q["query"]["function_score"] = query_function_score
             q["_source"] = {
-                "include":["user_id"]
+                "includes":["user_id"]
             }
             result_dict = ESPerform.get_search_results(es_cli_obj, sub_index_name="user", query_body=q,
                                                        offset=offset, size=size)
@@ -264,7 +264,7 @@ class UserUtils(object):
                         }
                         q["query"]["function_score"] = query_function_score
                         q["_source"] = {
-                            "include":["user_id"]
+                            "includes":["user_id"]
                         }
 
                         batch_query_list.append(q)

search/views/pick.py

@@ -113,7 +113,7 @@ def pick_topic(user_id,pick_id,offset=0,size=10):
             "_score"
         ]
         q["_source"] = {
-            "include":["id"]
+            "includes":["id"]
         }
         result_dict = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="topic",query_body=q,offset=offset,size=size)
 

search/views/tag.py

@@ -46,7 +46,7 @@ def query_tag(query,offset,size):
                 {'_score': {"order": "desc"}}
             ],
             "_source": {
-                "include": ["id", "name"]
+                "includes": ["id", "name"]
             }
         }
         q["highlight"] = get_highlight(["name"])            
@@ -107,7 +107,7 @@ def query_by_tag_type(tag_type_id,offset,size):
                 {"near_new_topic_num":{"order":"desc"}}
             ],
             "_source": {
-                "include": ["id", "name"]
+                "includes": ["id", "name"]
             }
         }