取消 score_2的逻辑计算， 只取score1

applications/functions/calculate.py

@@ -87,12 +87,13 @@ def compute_similarity(file_1, file_2):
     if data_1 and data_2:
         try:
             score_1 = calculate_v1(data_1, data_2)
-            score_2 = calculate_v2(data_1, data_2)
-            return score_1, score_2
+            return score_1
+            # score_2 = calculate_v2(data_1, data_2)
+            # return score_1, score_2
         except Exception as e:
-            return 0, 0
+            return 0
     else:
-        return 0, 0
+        return 0
 
 
 def title_mix(title_p, dt, trace_id):
@@ -112,27 +113,29 @@ def title_mix(title_p, dt, trace_id):
         for file in files:
             if file.endswith(".json"):
                 L.append(os.path.join(json_path, file))
+    print("召回的视频量", len(L))
     score_list_1 = []
     score_list_2 = []
     for file in L:
         file_name = file.split('/')[-1].replace(".json", "")
         v_id = file_name.split('_')[1]
         uid = file_name.split('_')[0]
-        score1, score2 = compute_similarity(title_p, file)
+        # score1, score2 = compute_similarity(title_p, file)
+        score1 = compute_similarity(file, file)
         score_list_1.append([score1, v_id, uid])
-        score_list_2.append([score2, v_id, uid])
+        # score_list_2.append([score2, v_id, uid])
 
     s1_list = sorted(score_list_1, key=lambda x: x[0], reverse=True)
-    s2_list = sorted(score_list_2, key=lambda x: x[0], reverse=True)
+    # s2_list = sorted(score_list_2, key=lambda x: x[0], reverse=True)
     title = title_p.split("/")[-1].replace(".json", "")
     obj = {
         "title": title,
         "s1_vid": s1_list[0][1],
         "s1_score": s1_list[0][0],
         "s1_uid": s1_list[0][2],
-        "s2_vid": s2_list[0][1],
-        "s2_score": s2_list[0][0],
-        "s2_uid": s2_list[0][2]
+        # "s2_vid": s2_list[0][1],
+        # "s2_score": s2_list[0][0],
+        # "s2_uid": s2_list[0][2]
     }
     logging(
         code="1003",

applications/process.py

@@ -51,15 +51,20 @@ def choose_video(result):
     :return: uid, video_id
     """
     # 判断 score
-    score1, score2 = result['s1_score'], result['s2_score']
-    if score1 == 0 and score2 == 0:
-        return None, None
-    elif score1 == 0 and score2 > 0:
-        return result['s2_uid'], result['s2_vid']
-    elif score1 > 0 and score2 == 0:
-        return result['s1_uid'], result['s1_vid']
-    elif score1 > 0 and score2 > 0:
+    # score1, score2 = result['s1_score'], result['s2_score']
+    score1 = result['s1_score']
+    if score1 > 0:
         return result['s1_uid'], result['s1_vid']
+    else:
+        return None, None
+    # if score1 == 0 and score2 == 0:
+    #     return None, None
+    # elif score1 == 0 and score2 > 0:
+    #     return result['s2_uid'], result['s2_vid']
+    # elif score1 > 0 and score2 == 0:
+    #     return result['s1_uid'], result['s1_vid']
+    # elif score1 > 0 and score2 > 0:
+    #     return result['s1_uid'], result['s1_vid']
 
 
 class ProcessParams(object):