fix:处理key

modules/config_loader.py

@@ -1,33 +0,0 @@
-# modules/config_loader.py
-import json
-from pathlib import Path
-from utils.logger import log
-
-class ConfigLoader:
-    def __init__(self, config_dir: Path = Path("./config")):
-        self.config_dir = config_dir
-        self.cities = {}
-        self.personas = {}
-        self.interests = {}
-        try:
-            self._load_all()
-            log.info("✅ 所有配置文件加载成功")
-        except Exception as e:
-            log.error(f"❌ 配置文件加载失败: {e}", exc_info=True)
-            raise
-
-    def _load_all(self):
-        # 加载城市
-        with open(self.config_dir / "cities.json", 'r', encoding='utf-8') as f:
-            cities_data = json.load(f)
-            for city in cities_data['cities']:
-                for alias in [city['name']] + city.get('aliases', []):
-                    self.cities[alias.lower()] = city
-        
-        # 加载 personas
-        with open(self.config_dir / "personas.json", 'r', encoding='utf-8') as f:
-            self.personas = json.load(f)['personas']
-        
-        # 加载兴趣
-        with open(self.config_dir / "interests.json", 'r', encoding='utf-8') as f:
-            self.interests = json.load(f)['interests']

modules/info_extractor.py

@@ -1,31 +0,0 @@
-# modules/info_extractor.py
-import re
-from .config_loader import ConfigLoader
-
-class InfoExtractor:
-    def __init__(self, config_loader: ConfigLoader):
-        self.configs = config_loader
-
-    def extract(self, user_input: str) -> dict:
-        """从用户输入中提取目的地、天数和旅行风格"""
-        extracted_info = {}
-        user_lower = user_input.lower()
-
-        # 提取目的地
-        for alias, city_info in self.configs.cities.items():
-            if alias in user_lower:
-                extracted_info["destination"] = city_info
-                break
-
-        # 提取天数
-        match = re.search(r'(\d+)\s*天', user_input)
-        if match:
-            extracted_info["duration"] = {"days": int(match.group(1))}
-        
-        # 提取旅行风格 (persona)
-        for p_name, p_info in self.configs.personas.items():
-            if p_info['name'] in user_input or p_name in user_input:
-                extracted_info["persona"] = p_info
-                break
-        
-        return extracted_info

modules/knowledge_base.py

@@ -1,29 +0,0 @@
-# modules/knowledge_base.py
-import json
-from pathlib import Path
-from utils.logger import log
-
-class KnowledgeBase:
-    def __init__(self, file_path: Path = Path("./config/general_travelplan.json")):
-        self.knowledge = []
-        try:
-            with open(file_path, 'r', encoding='utf-8') as f:
-                self.knowledge = json.load(f).get('clean_knowledge', [])
-            log.info(f"✅ 知识库加载完成")
-        except Exception as e:
-            log.error(f"❌ 知识库加载失败: {e}", exc_info=True)
-            raise
-
-    def search(self, query: str) -> list:
-        relevant_knowledge = []
-        query_lower = query.lower()
-        
-        for item in self.knowledge:
-            # 简单实现：如果查询的城市在知识库的目的地中，则返回该知识
-            destinations = item.get('knowledge', {}).get('travel_knowledge', {}).get('destination_info', {}).get('primary_destinations', [])
-            for dest in destinations:
-                if dest.lower() in query_lower:
-                    if item not in relevant_knowledge:
-                        relevant_knowledge.append(item)
-                    break 
-        return relevant_knowledge

modules/response_generator.py

@@ -1,45 +0,0 @@
-# modules/response_generator.py
-from .ai_model import AIModel
-from .knowledge_base import KnowledgeBase
-
-class ResponseGenerator:
-    def __init__(self, ai_model: AIModel, knowledge_base: KnowledgeBase):
-        self.ai_model = ai_model
-        self.kb = knowledge_base
-
-    def generate(self, user_message: str, session_state: dict) -> str:
-        # 1. 优先使用 RAG (检索增强生成)
-        # 我们用目的地名称来强化检索查询
-        search_query = user_message
-        if session_state.get("destination"):
-            search_query += f" {session_state['destination']['name']}"
-            
-        relevant_knowledge = self.kb.search(search_query)
-        if relevant_knowledge:
-            context = self._format_knowledge_context(relevant_knowledge)
-            return self.ai_model.generate(user_message, context)
-
-        # 2. 如果没有知识库匹配，则使用基于规则的引导式对话
-        if not session_state.get("destination"):
-            return "听起来很棒！你想去欧洲的哪个城市呢？比如巴黎, 罗马, 巴塞罗那？"
-        if not session_state.get("duration"):
-            return f"好的，{session_state['destination']['name']}是个很棒的选择！你计划玩几天呢？"
-        if not session_state.get("persona"):
-            return "最后一个问题，这次旅行对你来说什么最重要呢？（例如：美食、艺术、购物、历史）"
-        
-        # 3. 如果信息都收集全了，但没触发RAG，让Gemma生成一个通用计划
-        plan_prompt = (
-            f"请为用户生成一个在 {session_state['destination']['name']} 的 "
-            f"{session_state['duration']['days']} 天旅行计划。"
-            f"旅行风格侧重于: {session_state['persona']['description']}。"
-        )
-        return self.ai_model.generate(plan_prompt, context="用户需要一个详细的旅行计划。")
-
-    def _format_knowledge_context(self, knowledge_items: list) -> str:
-        if not knowledge_items: return "没有特定的背景知识。"
-        # 简化处理，只用最相关的一条知识
-        item = knowledge_items[0]['knowledge']['travel_knowledge']
-        context = f"相关知识：\n- 目的地: {item['destination_info']['primary_destinations']}\n"
-        context += f"- 推荐天数: {item['destination_info']['recommended_duration']}天\n"
-        context += f"- 专业见解: {item['professional_insights']['key_takeaways']}\n"
-        return context

modules/session_manager.py

@@ -23,10 +23,22 @@ class SessionManager:
             self.sessions[session_id].update(updates)
 
     def format_session_info(self, session_state: dict) -> str:
+        """格式化会话状态信息 - 修复版本"""
         parts = [f"ID: {session_state.get('session_id', 'N/A')}"]
-        if session_state.get('destination'): parts.append(f"目的地: {session_state['destination']['name']}")
-        if session_state.get('duration'): parts.append(f"天数: {session_state['duration']['days']}")
-        if session_state.get('persona'): parts.append(f"风格: {session_state['persona']['name']}")
+    
+        if session_state.get('destination'): 
+            parts.append(f"目的地: {session_state['destination']['name']}")
+    
+        if session_state.get('duration'): 
+            parts.append(f"天数: {session_state['duration']['days']}")
+    
+        if session_state.get('persona'): 
+            # 使用name字段而不是假设存在的其他字段
+            persona_name = session_state['persona'].get('name', '未知风格')
+            # 清理emoji用于显示
+            clean_name = ''.join(char for char in persona_name if not char.startswith(('🗓️', '🤝', '🎨')))
+            parts.append(f"风格: {clean_name.strip()}")
+    
         return " | ".join(parts)
 
     def reset(self, session_id: str):

modules/travel_assistant.py

@@ -1,45 +0,0 @@
-# modules/travel_assistant.py
-from .config_loader import ConfigLoader
-from .ai_model import AIModel
-from .knowledge_base import KnowledgeBase
-from .info_extractor import InfoExtractor
-from .session_manager import SessionManager
-from .response_generator import ResponseGenerator
-from utils.logger import log
-
-class TravelAssistant:
-    def __init__(self):
-        # 依赖注入：在这里实例化所有需要的模块
-        log.info("开始初始化 Travel Assistant 核心模块...")
-        self.config = ConfigLoader()
-        self.kb = KnowledgeBase()
-        self.ai_model = AIModel()
-        self.session_manager = SessionManager()
-        self.info_extractor = InfoExtractor(self.config)
-        self.response_generator = ResponseGenerator(self.ai_model, self.kb)
-        log.info("✅ Travel Assistant 核心模块全部初始化完成！")
-
-    def chat(self, message: str, session_id: str, history: list):
-        # 1. 获取或创建会话
-        session_state = self.session_manager.get_or_create_session(session_id)
-        current_session_id = session_state['session_id']
-
-        # 2. 从用户输入中提取信息
-        extracted_info = self.info_extractor.extract(message)
-        
-        # 3. 更新会话状态
-        if extracted_info:
-            self.session_manager.update_session(current_session_id, extracted_info)
-            # 重新获取更新后的状态
-            session_state = self.session_manager.get_or_create_session(current_session_id)
-
-        # 4. 生成回复
-        bot_response = self.response_generator.generate(message, session_state)
-        
-        # 5. 格式化状态信息用于前端显示
-        status_info = self.session_manager.format_session_info(session_state)
-        
-        # 6. 更新对话历史
-        new_history = history + [[message, bot_response]]
-        
-        return bot_response, current_session_id, status_info, new_history