rollback

app.py

@@ -386,12 +386,18 @@ def chatbot_response(message, history, max_tokens, temperature, top_p, window_si
         distance, ad_summary, ad_keywords=keyword_match(keywords_dict,candidates)        
     else:
         distance=1000
-        
+
     #判断相似度
     if distance and distance < threshold:
-        ad_message = f"{message} <sep>品牌<sep>{ad_summary}"
+        brands=['腾讯','阿里巴巴','百度','京东','华为','小米','苹果','微软','谷歌','亚马逊']
+        brand=random.choice(brands)
+        ad_message = f"{message} <sep>品牌{brand}<sep>{ad_summary}"
         messages = [{"role": "system", "content": "你是一个热情的聊天机器人，应微妙地嵌入广告内容。"}]
-        messages.extend([{"role": "user", "content": msg[0]}, {"role": "assistant", "content": msg[1]}] for msg in history)
+        for val in history:
+            if val[0]:
+                messages.append({"role": "user", "content": val[0]})
+            if val[1]:
+                messages.append({"role": "assistant", "content": val[1]})
         messages.append({"role": "user", "content": ad_message})
 
         for keyword in keywords_dict.keys():
@@ -399,7 +405,11 @@ def chatbot_response(message, history, max_tokens, temperature, top_p, window_si
                 triggered_keywords[keyword] = current_turn
     else:
         messages = [{"role": "system", "content": "你是一个热情的聊天机器人。"}]
-        messages.extend([{"role": "user", "content": msg[0]}, {"role": "assistant", "content": msg[1]}] for msg in history)
+        for val in history:
+            if val[0]:
+                messages.append({"role": "user", "content": val[0]})
+            if val[1]:
+                messages.append({"role": "assistant", "content": val[1]})
         messages.append({"role": "user", "content": message})
 
     #获取回复