u

app.py

@@ -419,17 +419,24 @@ def chatbot_response(message, history, window_size, threshold, score_threshold,u
     #更新轮次，获取窗口历史
     current_turn = len(history) + 1
 
-    combined_user_message = " ".join([h[0] for h in history[-window_size:]] + [message])
-    combined_assistant_message = " ".join([h[1] for h in history[-window_size:]])
+    combined_user_message = message
+    combined_assistant_message = ""
+
+    for i in range(1, window_size + 1):
+        if len(history) >= i:
+            if i % 2 == 1:  # 奇数轮次，添加 assistant 的内容
+                combined_assistant_message = " ".join([history[-i][1], combined_assistant_message]).strip()
+            else:  # 偶数轮次，添加 user 的内容
+                combined_user_message = " ".join([history[-i][0], combined_user_message]).strip()
 
     #提取关键词
     user_keywords = extract_keywords(combined_user_message).split(',')
-    assistant_keywords = extract_keywords(combined_assistant_message).split(',')
-
     #获取关键词字典
     keywords_dict = {keyword: user_weight for keyword in user_keywords}
-    for keyword in assistant_keywords:
-        keywords_dict[keyword] = keywords_dict.get(keyword, 0) + 1
+    if combined_assistant_message:
+        assistant_keywords = extract_keywords(combined_assistant_message).split(',')
+        for keyword in assistant_keywords:
+            keywords_dict[keyword] = keywords_dict.get(keyword, 0) + 1
 
     for keyword in list(keywords_dict.keys()):
         if keyword in triggered_keywords and current_turn - triggered_keywords[keyword] < window_size:
@@ -496,6 +503,12 @@ def chatbot_response(message, history, window_size, threshold, score_threshold,u
                     else:
                         score = 1
 
+                if keyword in triggered_keywords and current_turn - triggered_keywords[keyword] < window_size:
+                    if(keyword == keyword_list[0]):
+                        score = triggered_weight*3
+                    else:
+                        keywords_dict[keyword] = triggered_weight
+
                 # 更新 group_scores 字典中的分数
                 if group_id in group_scores:
                     group_scores[group_id] += score
@@ -513,30 +526,12 @@ def chatbot_response(message, history, window_size, threshold, score_threshold,u
             sorted_group_scores = sorted(group_scores.items(), key=lambda item: item[1], reverse=True)
             print(f"group_scores: {sorted_group_scores}")
         
-
-        # if(candidates):
-        #     # distance, ad_summary, ad_keywords=keyword_match(keywords_dict,candidates)  
-        #     distance,ad_summary,ad_keywords=candidates[0]['distance'],candidates[0]['summary'],candidates[0]['keyword_list']      
-        # else:
-        #     distance=1000
         end_time=time.time()
         print(f"Time taken for vecDB: {end_time - start_time}")
 
         if distance < 1000:
            pass
-            # ad_message = f"{message} <sep>品牌{brand}<sep>{ad_summary}"
-            # print(f"ad_sumamry: {ad_summary}")
-            # messages = [{"role": "system", "content": "请你将生活化、原汁原味的语言提炼出来，具有亲切感，类似于拉家常的方式推销商品，具有融洽的氛围和口语化的语言。请直接输出融合的对话文本。"}]
-            # 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():
-            #     if any(ad_keyword in keyword for ad_keyword in ad_keywords.split(',')):
-            #         triggered_keywords[keyword] = current_turn
+
         else:
             messages = [{"role": "system", "content": "你是一个热情的聊天机器人。"}]
             for val in history: