From 7fbd80617ef1ec8dfc8fdc0d386279bad1298254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=9B=85=E5=96=86?= <gaoyazhe@igengmei.com>
Date: Mon, 25 Nov 2019 19:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E7=AD=94=E7=9A=84=E6=96=B0smart=20ran?=
 =?UTF-8?q?k=E7=81=B0=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eda/smart_rank/gm_feed_cold_start.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/eda/smart_rank/gm_feed_cold_start.py b/eda/smart_rank/gm_feed_cold_start.py
index daf8a912..53d4b917 100644
--- a/eda/smart_rank/gm_feed_cold_start.py
+++ b/eda/smart_rank/gm_feed_cold_start.py
@@ -111,12 +111,19 @@ def search_topic_by_match_phrase(tag_names):
     return topic_list
 
 
-def search_qa_by_match_phrase(tag_names):
-    sort_list = [
-        {'has_picture': {'order': 'desc'}},
-        {"good_click": {"order": "desc"}},
-        {'smart_rank': {'order': 'desc'}}
-    ]
+def search_qa_by_match_phrase(tag_names, version=0):
+    if version:
+        sort_list = [
+            {'has_picture': {'order': 'desc'}},
+            {"good_click": {"order": "desc"}},
+            {'smart_rank_v2': {'order': 'desc'}}
+        ]
+    else:
+        sort_list = [
+            {'has_picture': {'order': 'desc'}},
+            {"good_click": {"order": "desc"}},
+            {'smart_rank': {'order': 'desc'}}
+        ]
     q = dict()
     total_query_should_list = []
     for tag_name in tag_names:
@@ -157,6 +164,7 @@ if __name__ == "__main__":
     # hot_search_word_diary_queue_key = "coldstart:hot:search:word:diary:queue"
     light_clinic_beauty_topic_queue_key = "coldstart:light:clinic:beauty:topic:queue"
     light_clinic_beauty_qa_queue_key = "coldstart:light:clinic:beauty:qa:queue"
+    light_clinic_beauty_qa_queue_grey_key = "coldstart:light:clinic:beauty:qa:queue:grey"
     light_clinic_beauty_diary_queue_key = "coldstart:light:clinic:beauty:diary:queue"
     light_clinic_beauty_diary_queue_key2 = "coldstart:light:clinic:beauty:diary:queue:offline:score:v1"
     card_types = ['topic', 'qa']  # 日记有400多个城市，且是hmset，因此不用重置
@@ -202,7 +210,9 @@ if __name__ == "__main__":
     print("轻医美词更新的帖子队列长度：%s" % str(len(light_clinic_beauty_topic_queue)))
 
     light_clinic_beauty_qa_queue = search_qa_by_match_phrase(light_clinic_beauty)
+    light_clinic_beauty_qa_grey_queue = search_qa_by_match_phrase(light_clinic_beauty, version=1)
     redis_client.rpush(light_clinic_beauty_qa_queue_key, *light_clinic_beauty_qa_queue)
+    redis_client.rpush(light_clinic_beauty_qa_queue_grey_key, *light_clinic_beauty_qa_grey_queue)
     print("轻医美词更新的问答队列长度：%s" % str(len(light_clinic_beauty_qa_queue)))
 
     for city_tag_id in all_city_tag_id:
-- 
2.18.0