jarvis-ai-assistant 0.1.132__py3-none-any.whl → 0.1.138__py3-none-any.whl

jarvis/jarvis_methodology/main.py

@@ -0,0 +1,101 @@
+"""
+方法论导入导出命令行工具
+
+功能：
+- 导入方法论文件（合并策略）
+- 导出当前方法论
+- 列出所有方法论
+"""
+
+import hashlib
+import os
+import json
+import argparse
+from jarvis.jarvis_utils.methodology import (
+    _get_methodology_directory,
+    _load_all_methodologies
+)
+
+def import_methodology(input_file):
+    """导入方法论文件（合并策略）"""
+    try:
+        # 加载现有方法论
+        existing_methodologies = _load_all_methodologies()
+
+        # 加载要导入的方法论
+        with open(input_file, "r", encoding="utf-8") as f:
+            import_data = json.load(f)
+
+        # 合并方法论（新数据会覆盖旧数据）
+        merged_data = {**existing_methodologies, **import_data}
+
+        # 保存合并后的方法论
+        methodology_dir = _get_methodology_directory()
+        for problem_type, content in merged_data.items():
+            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
+
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump({
+                    "problem_type": problem_type,
+                    "content": content
+                }, f, ensure_ascii=False, indent=2)
+
+        print(f"成功导入 {len(import_data)} 个方法论（总计 {len(merged_data)} 个）")
+    except (json.JSONDecodeError, OSError) as e:
+        print(f"导入失败: {str(e)}")
+
+def export_methodology(output_file):
+    """导出当前方法论到单个文件"""
+    try:
+        methodologies = _load_all_methodologies()
+
+        with open(output_file, "w", encoding="utf-8") as f:
+            json.dump(methodologies, f, ensure_ascii=False, indent=2)
+
+        print(f"成功导出 {len(methodologies)} 个方法论到 {output_file}")
+    except (OSError, TypeError) as e:
+        print(f"导出失败: {str(e)}")
+
+def list_methodologies():
+    """列出所有方法论"""
+    try:
+        methodologies = _load_all_methodologies()
+
+        if not methodologies:
+            print("没有找到方法论")
+            return
+
+        print("可用方法论:")
+        for i, (problem_type, _) in enumerate(methodologies.items(), 1):
+            print(f"{i}. {problem_type}")
+    except (OSError, json.JSONDecodeError) as e:
+        print(f"列出方法论失败: {str(e)}")
+
+def main():
+    """方法论管理工具主函数"""
+    parser = argparse.ArgumentParser(description="方法论管理工具")
+    subparsers = parser.add_subparsers(dest="command", required=True)
+
+    # import命令
+    import_parser = subparsers.add_parser("import", help="导入方法论文件（合并策略）")
+    import_parser.add_argument("input_file", type=str, help="要导入的方法论文件路径")
+
+    # export命令
+    export_parser = subparsers.add_parser("export", help="导出当前方法论到单个文件")
+    export_parser.add_argument("output_file", type=str, help="导出文件路径")
+
+    # list命令
+    subparsers.add_parser("list", help="列出所有方法论")
+
+    args = parser.parse_args()
+
+    if args.command == "import":
+        import_methodology(args.input_file)
+    elif args.command == "export":
+        export_methodology(args.output_file)
+    elif args.command == "list":
+        list_methodologies()
+
+if __name__ == "__main__":
+    main()

jarvis/jarvis_multi_agent/__init__.py

@@ -35,16 +35,16 @@ class MultiAgent(OutputHandler):
 to: 智能体名称    # 目标智能体名称
 content: |
     # 消息主题
-    
+
     ## 背景信息
     [提供必要的上下文和背景]
-    
+
     ## 具体需求
     [明确表达期望完成的任务]
-    
+
     ## 相关资源
     [列出相关文档、数据或工具]
-    
+
     ## 期望结果
     [描述期望的输出格式和内容]
 
@@ -60,7 +60,7 @@ content: |
 to: 智能体名称    # 目标智能体名称
 content: |
     # 消息主题
-    
+
     ## 任务结果
     [任务完成结果，用于反馈]
 {ct("SEND_MESSAGE")}
@@ -74,22 +74,22 @@ content: |
         return len(self._extract_send_msg(response)) > 0
 
 
-    def handle(self, response: str) -> Tuple[bool, Any]:
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
         send_messages = self._extract_send_msg(response)
         if len(send_messages) > 1:
             return False, f"Send multiple messages, please only send one message at a time."
         if len(send_messages) == 0:
             return False, ""
         return True, send_messages[0]
-        
+
     def name(self) -> str:
         return "SEND_MESSAGE"
-        
-    
+
+
     @staticmethod
     def _extract_send_msg(content: str) -> List[Dict]:
         """Extract send message from content.
-        
+
         Args:
             content: The content containing send message
         """
@@ -139,44 +139,3 @@ content: {msg['content']}
                 msg = self.agents[msg['to']].run(prompt)
         return ""
 
-
-def main():
-    """从YAML配置文件初始化并运行多智能体系统
-    
-    Returns:
-        最终处理结果
-    """
-    init_env()
-    import argparse
-    parser = argparse.ArgumentParser(description="多智能体系统启动器")
-    parser.add_argument("--config", "-c", required=True, help="YAML配置文件路径")
-    parser.add_argument("--input", "-i", help="用户输入（可选）")
-    args = parser.parse_args()
-        
-    try:
-        with open(args.config, 'r', errors="ignore") as f:
-            config_data = yaml.safe_load(f)
-            
-        # 获取agents配置
-        agents_config = config_data.get('agents', [])
-        
-        main_agent_name = config_data.get('main_agent', '')
-        if not main_agent_name:
-            raise ValueError("必须指定main_agent作为主智能体")
-            
-        # 创建并运行多智能体系统
-        multi_agent = MultiAgent(agents_config, main_agent_name)
-        user_input = args.input if args.input is not None else get_multiline_input("请输入内容（输入空行结束）：")
-        if user_input == "":
-            return
-        return multi_agent.run(user_input)
-        
-    except yaml.YAMLError as e:
-        raise ValueError(f"YAML配置文件解析错误: {str(e)}")
-    except Exception as e:
-        raise RuntimeError(f"多智能体系统初始化失败: {str(e)}")
-
-
-if __name__ == "__main__":
-    result = main()
-    

jarvis/jarvis_multi_agent/main.py

@@ -0,0 +1,43 @@
+import yaml
+from jarvis.jarvis_multi_agent import MultiAgent
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.input import get_multiline_input
+
+def main():
+    """从YAML配置文件初始化并运行多智能体系统
+
+    Returns:
+        最终处理结果
+    """
+    init_env()
+    import argparse
+    parser = argparse.ArgumentParser(description="多智能体系统启动器")
+    parser.add_argument("--config", "-c", required=True, help="YAML配置文件路径")
+    parser.add_argument("--input", "-i", help="用户输入（可选）")
+    args = parser.parse_args()
+
+    try:
+        with open(args.config, 'r', errors="ignore") as f:
+            config_data = yaml.safe_load(f)
+
+        # 获取agents配置
+        agents_config = config_data.get('agents', [])
+
+        main_agent_name = config_data.get('main_agent', '')
+        if not main_agent_name:
+            raise ValueError("必须指定main_agent作为主智能体")
+
+        # 创建并运行多智能体系统
+        multi_agent = MultiAgent(agents_config, main_agent_name)
+        user_input = args.input if args.input is not None else get_multiline_input("请输入内容（输入空行结束）：")
+        if user_input == "":
+            return
+        return multi_agent.run(user_input)
+
+    except yaml.YAMLError as e:
+        raise ValueError(f"YAML配置文件解析错误: {str(e)}")
+    except Exception as e:
+        raise RuntimeError(f"多智能体系统初始化失败: {str(e)}")
+
+if __name__ == "__main__":
+    result = main()

jarvis/jarvis_platform/__init__.py

@@ -1,3 +1,3 @@
 from .base import BasePlatform
 
-__all__ = ['BasePlatform']     
+__all__ = ['BasePlatform']

jarvis/jarvis_platform/ai8.py

@@ -9,7 +9,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class AI8Model(BasePlatform):
     """AI8 model implementation"""
-    
+
     platform_name = "ai8"
     BASE_URL = "https://ai8.rcouyi.com"
 
@@ -17,7 +17,7 @@ class AI8Model(BasePlatform):
         """获取模型列表"""
         self.get_available_models()
         return [(name,info['desc']) for name,info in self.models.items()]
-    
+
     def __init__(self):
         """Initialize model"""
         super().__init__()
@@ -28,48 +28,55 @@ class AI8Model(BasePlatform):
         self.token = os.getenv("AI8_API_KEY")
         if not self.token:
             PrettyOutput.print("未设置 AI8_API_KEY", OutputType.WARNING)
-        
-        
+
+        self.headers = {
+            'Authorization': self.token,
+            'Content-Type': 'application/json',
+            'Accept': 'application/json, text/plain, */*',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+            'X-APP-VERSION': '2.3.0',
+            'Origin': self.BASE_URL,
+            'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat',
+            'Sec-Fetch-Site': 'same-origin',
+            'Sec-Fetch-Mode': 'cors',
+            'Sec-Fetch-Dest': 'empty',
+        }
+
         self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
         if self.model_name not in self.get_available_models():
             PrettyOutput.print(f"警告: 选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING)
-        
+
+
+
 
     def set_model_name(self, model_name: str):
         """Set model name"""
 
         self.model_name = model_name
-            
+
     def create_conversation(self) -> bool:
         """Create a new conversation"""
         try:
-            headers = {
-                'Authorization': self.token,
-                'Content-Type': 'application/json',
-                'Accept': 'application/json, text/plain, */*',
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-                'X-APP-VERSION': '2.2.2',
-                'Origin': self.BASE_URL,
-                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
-            }
-            
+
+
             # 1. 创建会话
             response = requests.post(
                 f"{self.BASE_URL}/api/chat/session",
-                headers=headers
+                headers=self.headers,
+                json={}
             )
-            
+
             if response.status_code != 200:
                 PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.WARNING)
                 return False
-            
+
             data = response.json()
             if data['code'] != 0:
                 PrettyOutput.print(f"创建会话失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
                 return False
-            
+
             self.conversation = data['data']
-            
+
             # 2. 更新会话设置
             session_data = {
                 **self.conversation,
@@ -80,13 +87,13 @@ class AI8Model(BasePlatform):
                 "localPlugins": None,
                 "useAppId": 0
             }
-            
+
             response = requests.put(
                 f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
-                headers=headers,
+                headers=self.headers,
                 json=session_data
             )
-            
+
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 0:
@@ -98,53 +105,45 @@ class AI8Model(BasePlatform):
             else:
                 PrettyOutput.print(f"更新会话设置失败: {response.status_code}", OutputType.WARNING)
                 return False
-            
+
         except Exception as e:
             PrettyOutput.print(f"创建会话失败: {str(e)}", OutputType.ERROR)
             return False
-    
+
     def set_system_message(self, message: str):
         """Set system message"""
         self.system_message = message
-        
+
     def chat(self, message: str) -> str:
         """Execute conversation"""
         try:
-            
+
             # 确保有会话ID
             if not self.conversation:
                 if not self.create_conversation():
                     raise Exception("Failed to create conversation")
-                
-            headers = {
-                'Authorization': self.token,
-                'Content-Type': 'application/json',
-                'Accept': 'text/event-stream',
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-                'X-APP-VERSION': '2.2.2',
-                'Origin': self.BASE_URL,
-                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
-            }
-            
+
+
+
             payload = {
                 "text": message,
                 "sessionId": self.conversation['id'] if self.conversation else None,
                 "files": []
             }
-            
-            
+
+
             response = requests.post(
                 f"{self.BASE_URL}/api/chat/completions",
-                headers=headers,
+                headers=self.headers,
                 json=payload,
                 stream=True
             )
-            
+
             if response.status_code != 200:
                 error_msg = f"Failed to chat: {response.status_code} {response.text}"
                 PrettyOutput.print(error_msg, OutputType.WARNING)
                 raise Exception(error_msg)
-            
+
             # 处理流式响应
             full_response = ""
             for line in response.iter_lines():
@@ -162,49 +161,37 @@ class AI8Model(BasePlatform):
 
                         except json.JSONDecodeError:
                             continue
-            
+
             if not self.suppress_output:
                 PrettyOutput.print_stream_end()
 
             return full_response
-            
+
         except Exception as e:
             PrettyOutput.print(f"对话异常: {str(e)}", OutputType.ERROR)
             raise e
-            
+
     def name(self) -> str:
         """Return model name"""
         return self.model_name
-        
-    def reset(self):
-        """Reset model state"""
-        self.conversation = None
-            
+
+
     def delete_chat(self) -> bool:
         """Delete current chat session"""
         try:
             if not self.conversation:
                 return True
-            
-            headers = {
-                'Authorization': self.token,
-                'Content-Type': 'application/json',
-                'Accept': 'application/json, text/plain, */*',
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-                'X-APP-VERSION': '2.2.2',
-                'Origin': self.BASE_URL,
-                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
-            }
-            
+
+
             response = requests.delete(
                 f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
-                headers=headers
+                headers=self.headers
             )
-            
+
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 0:
-                    self.reset()
+                    self.conversation = None
                     return True
                 else:
                     error_msg = f"删除会话失败: {data.get('msg', '未知错误')}"
@@ -214,54 +201,45 @@ class AI8Model(BasePlatform):
                 error_msg = f"删除会话请求失败: {response.status_code}"
                 PrettyOutput.print(error_msg, OutputType.WARNING)
                 return False
-            
+
         except Exception as e:
             PrettyOutput.print(f"删除会话失败: {str(e)}", OutputType.ERROR)
             return False
-        
+
     def get_available_models(self) -> List[str]:
         """Get available model list
-        
+
         Returns:
             List[str]: Available model name list
         """
         try:
             if self.models:
                 return list(self.models.keys())
-            
-            headers = {
-                'Content-Type': 'application/json',
-                'Accept': 'application/json, text/plain, */*',
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-                'X-APP-VERSION': '2.2.2',
-                'Origin': self.BASE_URL,
-                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
-            }
-            
+
             response = requests.get(
                 f"{self.BASE_URL}/api/chat/tmpl",
-                headers=headers
+                headers=self.headers
             )
-            
+
             if response.status_code != 200:
                 PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.WARNING)
                 return []
-            
+
             data = response.json()
             if data['code'] != 0:
                 PrettyOutput.print(f"获取模型列表失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
                 return []
-            
+
             # 保存模型信息
             self.models = {
-                model['value']: model 
+                model['value']: model
                 for model in data['data']['models']
             }
 
             for model in self.models.values():
                 # 添加标签
                 model_str = f"{model['label']}"
-                
+
                 # 添加特性标记
                 features = []
                 if model['attr'].get('multimodal'):
@@ -279,12 +257,12 @@ class AI8Model(BasePlatform):
                     model_str += f" - {model['attr']['note']}"
                 if features:
                     model_str += f" [{'|'.join(features)}]"
-                    
+
                 model['desc'] = model_str
-            
+
             return list(self.models.keys())
-            
+
         except Exception as e:
             PrettyOutput.print(f"获取模型列表失败: {str(e)}", OutputType.ERROR)
             return []
-        
+

jarvis/jarvis_platform/base.py

@@ -1,13 +1,14 @@
 from abc import ABC, abstractmethod
 import re
 from typing import Dict, List, Tuple
+from jarvis.jarvis_utils.globals import clear_read_file_record
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import ct, ot, get_context_token_count, while_success, while_true
 
 
 class BasePlatform(ABC):
     """Base class for large language models"""
-    
+
     def __init__(self):
         """Initialize model"""
         self.suppress_output = True  # 添加输出控制标志
@@ -20,7 +21,12 @@ class BasePlatform(ABC):
     def set_model_name(self, model_name: str):
         """Set model name"""
         raise NotImplementedError("set_model_name is not implemented")
-        
+
+    def reset(self):
+        """Reset model"""
+        clear_read_file_record()
+        self.delete_chat()
+
     @abstractmethod
     def chat(self, message: str) -> str:
         """Execute conversation"""
@@ -31,11 +37,11 @@ class BasePlatform(ABC):
             import time
             start_time = time.time()
             response = self.chat(message)
-            
+
             end_time = time.time()
             duration = end_time - start_time
             char_count = len(response)
-            
+
             # Calculate token count and tokens per second
             try:
                 token_count = get_context_token_count(response)
@@ -55,29 +61,24 @@ class BasePlatform(ABC):
             # Keep original think tag handling
             response = re.sub(ot("think")+r'.*?'+ct("think"), '', response, flags=re.DOTALL)
             return response
-                
+
         return while_true(lambda: while_success(lambda: _chat(), 5), 5)
 
-    @abstractmethod
-    def reset(self):
-        """Reset model"""
-        raise NotImplementedError("reset is not implemented")
-        
     @abstractmethod
     def name(self) -> str:
         """Model name"""
         raise NotImplementedError("name is not implemented")
-    
+
     @abstractmethod
     def delete_chat(self)->bool:
         """Delete chat"""
         raise NotImplementedError("delete_chat is not implemented")
-    
+
     @abstractmethod
     def set_system_message(self, message: str):
         """Set system message"""
         raise NotImplementedError("set_system_message is not implemented")
-    
+
     @abstractmethod
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get model list"""