feat: 重构完成开始测试debug

src/plugins/chat/relationship_manager.py

@@ -16,17 +16,16 @@ class Impression:
 class Relationship:
     user_id: int = None
     platform: str = None
-    platform: str = None
     gender: str = None
     age: int = None
     nickname: str = None
     relationship_value: float = None
     saved = False
     
-    def __init__(self, chat:ChatStream,data:dict):
-        self.user_id=chat.user_info.user_id
-        self.platform=chat.platform
-        self.nickname=chat.user_info.user_nickname
+    def __init__(self, chat:ChatStream=None,data:dict=None):
+        self.user_id=chat.user_info.user_id if chat.user_info else data.get('user_id',0)
+        self.platform=chat.platform if chat.user_info else data.get('platform','')
+        self.nickname=chat.user_info.user_nickname if chat.user_info else data.get('nickname','')
         self.relationship_value=data.get('relationship_value',0)
         self.age=data.get('age',0)
         self.gender=data.get('gender','')
@@ -35,7 +34,6 @@ class Relationship:
 class RelationshipManager:
     def __init__(self):
         self.relationships: dict[tuple[int, str], Relationship] = {}  # 修改为使用(user_id, platform)作为键
-        self.relationships: dict[tuple[int, str], Relationship] = {}  # 修改为使用(user_id, platform)作为键
     
     async def update_relationship(self, 
                                 chat_stream:ChatStream,
@@ -43,9 +41,7 @@ class RelationshipManager:
                                 **kwargs) -> Optional[Relationship]:
         """更新或创建关系
         Args:
-            user_id: 用户ID（可选，如果提供user_info则不需要）
-            platform: 平台（可选，如果提供user_info则不需要）
-            user_info: 用户信息对象（可选）
+            chat_stream: 聊天流对象
             data: 字典格式的数据（可选）
             **kwargs: 其他参数
         Returns:
@@ -66,44 +62,18 @@ class RelationshipManager:
         
         # 检查是否在内存中已存在
         relationship = self.relationships.get(key)
-        relationship = self.relationships.get(key)
         if relationship:
             # 如果存在，更新现有对象
             if isinstance(data, dict):
                 for k, value in data.items():
                     if hasattr(relationship, k) and value is not None:
                         setattr(relationship, k, value)
-                for k, value in data.items():
-                    if hasattr(relationship, k) and value is not None:
-                        setattr(relationship, k, value)
-            else:
-                for k, value in kwargs.items():
-                    if hasattr(relationship, k) and value is not None:
-                        setattr(relationship, k, value)
-                for k, value in kwargs.items():
-                    if hasattr(relationship, k) and value is not None:
-                        setattr(relationship, k, value)
         else:
             # 如果不存在，创建新对象
-            if user_info is not None:
-                relationship = Relationship(user_info=user_info, **kwargs)
-            elif isinstance(data, dict):
-                data['platform'] = platform
-                relationship = Relationship(user_id=user_id, data=data)
+            if chat_stream.user_info is not None:
+                relationship = Relationship(chat=chat_stream, **kwargs)
             else:
-                kwargs['platform'] = platform
-                kwargs['user_id'] = user_id
-                relationship = Relationship(**kwargs)
-            self.relationships[key] = relationship
-            if user_info is not None:
-                relationship = Relationship(user_info=user_info, **kwargs)
-            elif isinstance(data, dict):
-                data['platform'] = platform
-                relationship = Relationship(user_id=user_id, data=data)
-            else:
-                kwargs['platform'] = platform
-                kwargs['user_id'] = user_id
-                relationship = Relationship(**kwargs)
+                raise ValueError("必须提供user_id或user_info")
             self.relationships[key] = relationship
 
         # 保存到数据库
@@ -113,36 +83,7 @@ class RelationshipManager:
         return relationship
     
     async def update_relationship_value(self, 
-                                      user_id: int = None, 
-                                      platform: str = None,
-                                      user_info: UserInfo = None,
-                                      **kwargs) -> Optional[Relationship]:
-        """更新关系值
-        Args:
-            user_id: 用户ID（可选，如果提供user_info则不需要）
-            platform: 平台（可选，如果提供user_info则不需要）
-            user_info: 用户信息对象（可选）
-            **kwargs: 其他参数
-        Returns:
-            Relationship: 关系对象
-        """
-        # 确定user_id和platform
-        if user_info is not None:
-            user_id = user_info.user_id
-            platform = user_info.platform or 'qq'
-        else:
-            platform = platform or 'qq'
-            
-        if user_id is None:
-            raise ValueError("必须提供user_id或user_info")
-            
-        # 使用(user_id, platform)作为键
-        key = (user_id, platform)
-        
-    async def update_relationship_value(self, 
-                                      user_id: int = None, 
-                                      platform: str = None,
-                                      user_info: UserInfo = None,
+                                      chat_stream:ChatStream,
                                       **kwargs) -> Optional[Relationship]:
         """更新关系值
         Args:
@@ -154,6 +95,7 @@ class RelationshipManager:
             Relationship: 关系对象
         """
         # 确定user_id和platform
+        user_info = chat_stream.user_info
         if user_info is not None:
             user_id = user_info.user_id
             platform = user_info.platform or 'qq'
@@ -168,10 +110,7 @@ class RelationshipManager:
         
         # 检查是否在内存中已存在
         relationship = self.relationships.get(key)
-        relationship = self.relationships.get(key)
         if relationship:
-            for k, value in kwargs.items():
-                if k == 'relationship_value':
             for k, value in kwargs.items():
                 if k == 'relationship_value':
                     relationship.relationship_value += value
@@ -181,43 +120,12 @@ class RelationshipManager:
         else:
             # 如果不存在且提供了user_info，则创建新的关系
             if user_info is not None:
-                return await self.update_relationship(user_info=user_info, **kwargs)
-            print(f"\033[1;31m[关系管理]\033[0m 用户 {user_id}({platform}) 不存在，无法更新")
-            # 如果不存在且提供了user_info，则创建新的关系
-            if user_info is not None:
-                return await self.update_relationship(user_info=user_info, **kwargs)
+                return await self.update_relationship(chat_stream=chat_stream, **kwargs)
             print(f"\033[1;31m[关系管理]\033[0m 用户 {user_id}({platform}) 不存在，无法更新")
             return None
     
     def get_relationship(self, 
-                        user_id: int = None, 
-                        platform: str = None,
-                        user_info: UserInfo = None) -> Optional[Relationship]:
-        """获取用户关系对象
-        Args:
-            user_id: 用户ID（可选，如果提供user_info则不需要）
-            platform: 平台（可选，如果提供user_info则不需要）
-            user_info: 用户信息对象（可选）
-        Returns:
-            Relationship: 关系对象
-        """
-        # 确定user_id和platform
-        if user_info is not None:
-            user_id = user_info.user_id
-            platform = user_info.platform or 'qq'
-        else:
-            platform = platform or 'qq'
-            
-        if user_id is None:
-            raise ValueError("必须提供user_id或user_info")
-            
-        key = (user_id, platform)
-        if key in self.relationships:
-            return self.relationships[key]
-    def get_relationship(self, 
-                        user_id: int = None, 
-                        platform: str = None,
-                        user_info: UserInfo = None) -> Optional[Relationship]:
+                        chat_stream:ChatStream) -> Optional[Relationship]:
         """获取用户关系对象
         Args:
             user_id: 用户ID（可选，如果提供user_info则不需要）
@@ -227,6 +135,8 @@ class RelationshipManager:
             Relationship: 关系对象
         """
         # 确定user_id和platform
+        user_info = chat_stream.user_info
+        platform = chat_stream.user_info.platform or 'qq'
         if user_info is not None:
             user_id = user_info.user_id
             platform = user_info.platform or 'qq'
@@ -248,18 +158,10 @@ class RelationshipManager:
         if 'platform' not in data:
             data['platform'] = 'qq'
             
-        rela = Relationship(data=data)
-        """从数据库加载或创建新的关系对象"""
-        # 确保data中有platform字段，如果没有则默认为'qq'
-        if 'platform' not in data:
-            data['platform'] = 'qq'
-            
         rela = Relationship(data=data)
         rela.saved = True
         key = (rela.user_id, rela.platform)
         self.relationships[key] = rela
-        key = (rela.user_id, rela.platform)
-        self.relationships[key] = rela
         return rela
     
     async def load_all_relationships(self):
@@ -277,7 +179,6 @@ class RelationshipManager:
         # 依次加载每条记录
         for data in all_relationships:
             await self.load_relationship(data)
-            await self.load_relationship(data)
         print(f"\033[1;32m[关系管理]\033[0m 已加载 {len(self.relationships)} 条关系记录")
         
         while True:
@@ -288,19 +189,15 @@ class RelationshipManager:
     async def _save_all_relationships(self):
         """将所有关系数据保存到数据库"""         
         # 保存所有关系数据
-        for (userid, platform), relationship in self.relationships.items():
         for (userid, platform), relationship in self.relationships.items():
             if not relationship.saved:
                 relationship.saved = True
                 await self.storage_relationship(relationship)
     
-    async def storage_relationship(self, relationship: Relationship):
-        """将关系记录存储到数据库中"""
     async def storage_relationship(self, relationship: Relationship):
         """将关系记录存储到数据库中"""
         user_id = relationship.user_id
         platform = relationship.platform
-        platform = relationship.platform
         nickname = relationship.nickname
         relationship_value = relationship.relationship_value
         gender = relationship.gender
@@ -309,10 +206,8 @@ class RelationshipManager:
         
         db = Database.get_instance()
         db.db.relationships.update_one(
-            {'user_id': user_id, 'platform': platform},
             {'user_id': user_id, 'platform': platform},
             {'$set': {
-                'platform': platform,
                 'platform': platform,
                 'nickname': nickname,
                 'relationship_value': relationship_value,
@@ -323,27 +218,6 @@ class RelationshipManager:
             upsert=True
         )
         
-    def get_name(self, 
-                 user_id: int = None, 
-                 platform: str = None,
-                 user_info: UserInfo = None) -> str:
-        """获取用户昵称
-        Args:
-            user_id: 用户ID（可选，如果提供user_info则不需要）
-            platform: 平台（可选，如果提供user_info则不需要）
-            user_info: 用户信息对象（可选）
-        Returns:
-            str: 用户昵称
-        """
-        # 确定user_id和platform
-        if user_info is not None:
-            user_id = user_info.user_id
-            platform = user_info.platform or 'qq'
-        else:
-            platform = platform or 'qq'
-            
-        if user_id is None:
-            raise ValueError("必须提供user_id或user_info")
             
     def get_name(self, 
                  user_id: int = None, 
@@ -370,11 +244,6 @@ class RelationshipManager:
         # 确保user_id是整数类型
         user_id = int(user_id)
         key = (user_id, platform)
-        if key in self.relationships:
-            return self.relationships[key].nickname
-        elif user_info is not None:
-            return user_info.user_nickname or user_info.user_cardname or "某人"
-        key = (user_id, platform)
         if key in self.relationships:
             return self.relationships[key].nickname
         elif user_info is not None: