Browse Source

修改排序算法-返回重复视频

罗俊辉 1 năm trước cách đây
mục cha
commit
627b87fdbb
2 tập tin đã thay đổi với 18 bổ sung14 xóa
  1. 8 4
      routes/AccountArticleRank.py
  2. 10 10
      test/rank_dev.py

+ 8 - 4
routes/AccountArticleRank.py

@@ -62,7 +62,8 @@ class AccountArticleRank(object):
             self.ghId = self.params["ghId"]
             self.strategy = self.params["strategy"]
             self.publishNum = self.params["publishNum"]
-            self.publishArticleList = self.params["publishArticleList"]
+            self.publishArticleList = [i for i in self.params["publishArticleList"] if not has_same(i['title'], self.accountName)]
+            self.history_list = [i for i in self.params["publishArticleList"] if has_same(i['title'], self.accountName)]
             self.logger.log(
                 code="1001",
                 msg="参数校验成功",
@@ -130,13 +131,11 @@ class AccountArticleRank(object):
                 obj = article_list1[index]
                 obj['score'] = value + 1000
                 ranked_1.append(obj)
-            ranked_1 = [i for i in ranked_1 if not has_same(i['title'], self.accountName)]
             ranked_1 = sorted(ranked_1, key=lambda x:x['score'], reverse=True)
         else:
             ranked_1 = []
         # rank2
         if article_list2:
-            article_list2 = [i for i in article_list2 if not has_same(i['title'], self.accountName)]
             for item in article_list2:
                 item['score'] = 100
             ranked_2 = sorted(article_list2, key=lambda x:x['crawlerViewCount'], reverse=True)
@@ -155,7 +154,6 @@ class AccountArticleRank(object):
                 obj = article_list3[index]
                 obj['score'] = value
                 ranked_3.append(obj)
-            ranked_3 = [i for i in ranked_3 if not has_same(i['title'], self.accountName, index_list=[1, 2, 3, 4, 5, 6, 7, 8])]
             ranked_3 = sorted(ranked_3, key=lambda x:x['score'], reverse=True)
         else:
             ranked_3 = []
@@ -200,6 +198,9 @@ class AccountArticleRank(object):
                     "strategy": self.strategy,
                     "publishNum": self.publishNum,
                     "rank_list": L[:self.publishNum],
+                    "filter": {
+                        "repeat": self.history_list
+                    }
                 }
                 self.logger.log(
                     code=1006,
@@ -215,6 +216,9 @@ class AccountArticleRank(object):
                     "strategy": self.strategy,
                     "publishNum": self.publishNum,
                     "rank_list": self.publishArticleList[: self.publishNum],
+                    "filter": {
+                        "repeat": self.history_list
+                    }
                 }
                 self.logger.log(
                     code=1007,

+ 10 - 10
test/rank_dev.py

@@ -6,9 +6,9 @@ import json
 import requests
 
 
-url = "http://61.48.133.26:6060/articleRank"
+# url = "http://61.48.133.26:6060/articleRank"
 
-# url = "http://localhost:6060/articleRank"
+url = "http://localhost:6060/articleRank"
 
 body = {
     "accountId": "20231213070634699511719",
@@ -86,7 +86,7 @@ body = {
             "imageUrls": [
                 "http://mmbiz.qpic.cn/sz_mmbiz_jpg/P4fYQYZ5E1LJmyaqga0fNA0mDovxTZATiaqB9iaBKRds3GSZcPP6SPbM3uK1dC70icqPdArxc9l2s7AhSA9WLTygw/0?from=appmsg"
             ],
-            "producePlanName": "【1】bing_v1 心灵情感驿站",
+            "producePlanName": "bing_v1 心灵情感驿站",
             "title": "大动作!中国这步棋太猛了,直击美国霸权2!"
         },
         {
@@ -118,7 +118,7 @@ body = {
             "imageUrls": [
                 "http://mmbiz.qpic.cn/sz_mmbiz_jpg/P4fYQYZ5E1LJmyaqga0fNA0mDovxTZATiaqB9iaBKRds3GSZcPP6SPbM3uK1dC70icqPdArxc9l2s7AhSA9WLTygw/0?from=appmsg"
             ],
-            "producePlanName": "【1】bing_v1 心灵情感驿站",
+            "producePlanName": "bing_v1 心灵情感驿站",
             "title": "大动作!中国这步棋太猛了,直击美国霸权!7"
         },
         {
@@ -134,7 +134,7 @@ body = {
             "imageUrls": [
                 "http://mmbiz.qpic.cn/sz_mmbiz_jpg/P4fYQYZ5E1LJmyaqga0fNA0mDovxTZATiaqB9iaBKRds3GSZcPP6SPbM3uK1dC70icqPdArxc9l2s7AhSA9WLTygw/0?from=appmsg"
             ],
-            "producePlanName": "【1】bing_v1 心灵情感驿站",
+            "producePlanName": "bing_v1 心灵情感驿站",
             "title": "大动作!中国这步棋太猛了,直击美国霸权!55"
         },
         {
@@ -150,7 +150,7 @@ body = {
             "imageUrls": [
                 "http://mmbiz.qpic.cn/sz_mmbiz_jpg/P4fYQYZ5E1LJmyaqga0fNA0mDovxTZATiaqB9iaBKRds3GSZcPP6SPbM3uK1dC70icqPdArxc9l2s7AhSA9WLTygw/0?from=appmsg"
             ],
-            "producePlanName": "【1】bing_v1 心灵情感驿站",
+            "producePlanName": "【2】bing_v1 心灵情感驿站",
             "title": "大动作!中国这步棋太猛了,直击美国霸权!67"
         },
         {
@@ -166,7 +166,7 @@ body = {
             "imageUrls": [
                 "http://mmbiz.qpic.cn/sz_mmbiz_jpg/P4fYQYZ5E1LJmyaqga0fNA0mDovxTZATiaqB9iaBKRds3GSZcPP6SPbM3uK1dC70icqPdArxc9l2s7AhSA9WLTygw/0?from=appmsg"
             ],
-            "producePlanName": "【1】bing_v2 心灵情感驿站",
+            "producePlanName": "【2】bing_v2 心灵情感驿站",
             "title": "大动作!中国这步棋太猛了,直击美国霸权56!"
         }
     ],
@@ -180,6 +180,6 @@ headers = {
 
 response = requests.post(url=url, headers=headers, json=body)
 
-print(response.json())
-for res in response.json()['data']['rank_list']:
-    print(res['title'], res['producePlanName'], res['score'], res['crawlerViewCount'])
+print(json.dumps(response.json(), ensure_ascii=False, indent=4))
+# for res in response.json()['data']['rank_list']:
+#     print(res['title'], res['producePlanName'], res['score'], res['crawlerViewCount'])