jarvis-ai-assistant 0.1.46__py3-none-any.whl → 0.1.48__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.46"
+__version__ = "0.1.48" 

jarvis/agent.py

@@ -10,11 +10,10 @@ import os
 from datetime import datetime
 from prompt_toolkit import prompt
 
-
 class Agent:
     def __init__(self, name: str = "Jarvis", is_sub_agent: bool = False):
         """Initialize Agent with a model, optional tool registry and name
-
+        
         Args:
             model: 语言模型实例
             tool_registry: 工具注册表实例
@@ -27,6 +26,7 @@ class Agent:
         self.is_sub_agent = is_sub_agent
         self.prompt = ""
 
+
     @staticmethod
     def extract_tool_calls(content: str) -> List[Dict]:
         """从内容中提取工具调用，如果检测到多个工具调用则抛出异常，并返回工具调用之前的内容和工具调用"""
@@ -34,7 +34,7 @@ class Agent:
         lines = content.split('\n')
         tool_call_lines = []
         in_tool_call = False
-
+        
         # 逐行处理
         for line in lines:
             if '<START_TOOL_CALL>' in line:
@@ -46,7 +46,7 @@ class Agent:
                         # 直接解析YAML
                         tool_call_text = '\n'.join(tool_call_lines)
                         tool_call_data = yaml.safe_load(tool_call_text)
-
+                        
                         # 验证必要的字段
                         if "name" in tool_call_data and "arguments" in tool_call_data:
                             # 返回工具调用之前的内容和工具调用
@@ -58,21 +58,17 @@ class Agent:
                             PrettyOutput.print("工具调用缺少必要字段", OutputType.ERROR)
                             raise Exception("工具调用缺少必要字段")
                     except yaml.YAMLError as e:
-                        PrettyOutput.print(
-                            f"YAML解析错误: {
-                                str(e)}", OutputType.ERROR)
+                        PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
                         raise Exception(f"YAML解析错误: {str(e)}")
                     except Exception as e:
-                        PrettyOutput.print(
-                            f"处理工具调用时发生错误: {
-                                str(e)}", OutputType.ERROR)
+                        PrettyOutput.print(f"处理工具调用时发生错误: {str(e)}", OutputType.ERROR)
                         raise Exception(f"处理工具调用时发生错误: {str(e)}")
                 in_tool_call = False
                 continue
-
+            
             if in_tool_call:
                 tool_call_lines.append(line)
-
+        
         return []
 
     def _call_model(self, message: str) -> str:
@@ -83,15 +79,14 @@ class Agent:
             if ret:
                 return ret
             else:
-                PrettyOutput.print(
-                    f"调用模型失败，重试中... 等待 {sleep_time}s",
-                    OutputType.INFO)
+                PrettyOutput.print(f"调用模型失败，重试中... 等待 {sleep_time}s", OutputType.INFO)
                 time.sleep(sleep_time)
                 sleep_time *= 2
                 if sleep_time > 30:
                     sleep_time = 30
                 continue
 
+
     def _load_methodology(self) -> str:
         """加载经验总结"""
         user_jarvis_methodology = os.path.expanduser("~/.jarvis_methodology")
@@ -101,28 +96,23 @@ class Agent:
                 data = yaml.safe_load(f)
                 for k, v in data.items():
                     ret += f"问题类型: \n{k}\n经验总结: \n{v}\n\n"
-            PrettyOutput.print(
-                f"从 {user_jarvis_methodology} 加载经验总结: {
-                    ', '.join(
-                        data.keys())}",
-                OutputType.INFO)
+            PrettyOutput.print(f"从 {user_jarvis_methodology} 加载经验总结: {', '.join(data.keys())}", OutputType.INFO)
         return ret
 
-    def run(self, user_input: str,
-            file_list: Optional[List[str]] = None, keep_history: bool = False) -> str:
+    def run(self, user_input: str, file_list: Optional[List[str]] = None, keep_history: bool = False) -> str:
         """处理用户输入并返回响应，返回任务总结报告
-
+        
         Args:
             user_input: 用户输入的任务描述
             file_list: 可选的文件列表，默认为None
             keep_history: 是否保留对话历史，默认为False
-
+        
         Returns:
             str: 任务总结报告
         """
         try:
             self.clear_history()
-
+            
             if file_list:
                 self.model.upload_files(file_list)
 
@@ -135,7 +125,7 @@ class Agent:
 {methodology}
 
 """
-
+            
             # 显示任务开始
             PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
 
@@ -146,7 +136,7 @@ class Agent:
                 tools_prompt += f"  参数: {tool['parameters']}\n"
 
             self.model.set_system_message(f"""你是 {self.name}，一个问题处理能力强大的 AI 助手。
-
+                                          
 你会严格按照以下步骤处理问题：
 1. 问题重述：确认理解问题
 2. 根因分析（如果是问题分析类需要，其他不需要）
@@ -158,7 +148,7 @@ class Agent:
 8. 监控与调整：如果执行结果与预期不符，则反思并调整行动计划，迭代之前的步骤
 9. 更新经验总结（如有必要）：任务完成后总结执行过程中的经验教训，生成同类问题的通用经验总结，使用经验总结工具进行更新或者添加
 
--------------------------------------------------------------
+-------------------------------------------------------------                       
 
 经验总结模板：
 1. 问题重述
@@ -203,30 +193,27 @@ arguments:
                 try:
                     # 显示思考状态
                     PrettyOutput.print("分析任务...", OutputType.PROGRESS)
-
+                    
                     current_response = self._call_model(self.prompt)
-
+                    
                     try:
                         result = Agent.extract_tool_calls(current_response)
                     except Exception as e:
-                        PrettyOutput.print(
-                            f"工具调用错误: {str(e)}", OutputType.ERROR)
+                        PrettyOutput.print(f"工具调用错误: {str(e)}", OutputType.ERROR)
                         self.prompt = f"工具调用错误: {str(e)}"
                         continue
-
+                    
                     if len(result) > 0:
 
                         PrettyOutput.print("执行工具调用...", OutputType.PROGRESS)
-                        tool_result = self.tool_registry.handle_tool_calls(
-                            result)
+                        tool_result = self.tool_registry.handle_tool_calls(result)
                         PrettyOutput.print(tool_result, OutputType.RESULT)
 
                         self.prompt = tool_result
                         continue
-
+                    
                     # 获取用户输入
-                    user_input = get_multiline_input(
-                        f"{self.name}: 您可以继续输入，或输入空行结束当前任务")
+                    user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行结束当前任务")
                     if user_input == "__interrupt__":
                         PrettyOutput.print("任务已取消", OutputType.WARNING)
                         return "Task cancelled by user"
@@ -234,11 +221,10 @@ arguments:
                     if user_input:
                         self.prompt = user_input
                         continue
-
+                    
                     if not user_input:
                         while True:
-                            choice = prompt(
-                                "是否需要手动为此任务生成经验总结以提升Jarvis对类似任务的处理能力？(y/n), 回车跳过: ")
+                            choice = prompt("是否需要手动为此任务生成经验总结以提升Jarvis对类似任务的处理能力？(y/n), 回车跳过: ")
                             if choice == "y":
                                 self._make_methodology()
                                 break
@@ -273,20 +259,18 @@ arguments:
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return f"Task failed: {str(e)}"
-
+        
         finally:
             # 只在不保留历史时删除会话
             if not keep_history:
                 try:
                     self.model.delete_chat()
                 except Exception as e:
-                    PrettyOutput.print(
-                        f"清理会话时发生错误: {
-                            str(e)}", OutputType.ERROR)
+                    PrettyOutput.print(f"清理会话时发生错误: {str(e)}", OutputType.ERROR)
 
     def clear_history(self):
         """清除对话历史，只保留系统提示"""
-        self.prompt = ""
+        self.prompt = "" 
         self.model.reset()
 
     def _make_methodology(self):
@@ -297,7 +281,7 @@ arguments:
 2. 最优解决方案
 3. 最优方案执行步骤（失败的行动不需要体现）
                          """)
-
+        
         try:
             result = Agent.extract_tool_calls(current_response)
         except Exception as e:
@@ -307,3 +291,4 @@ arguments:
             PrettyOutput.print("执行工具调用...", OutputType.PROGRESS)
             tool_result = self.tool_registry.handle_tool_calls(result)
             PrettyOutput.print(tool_result, OutputType.RESULT)
+                         

jarvis/main.py

@@ -1,9 +1,6 @@
 #!/usr/bin/env python3
 """Command line interface for Jarvis."""
 
-from jarvis.utils import PrettyOutput, OutputType, get_multiline_input, load_env_from_file
-from jarvis.tools import ToolRegistry
-from jarvis.agent import Agent
 import argparse
 import yaml
 import os
@@ -16,76 +13,73 @@ from jarvis.models.registry import PlatformRegistry
 # 添加父目录到Python路径以支持导入
 sys.path.insert(0, str(Path(__file__).parent.parent))
 
+from jarvis.agent import Agent
+from jarvis.tools import ToolRegistry
+from jarvis.utils import PrettyOutput, OutputType, get_multiline_input, load_env_from_file
+
 
 def load_tasks() -> dict:
     """Load tasks from .jarvis files in user home and current directory."""
     tasks = {}
-
+    
     # 检查用户目录下的 .jarvis
     user_jarvis = os.path.expanduser("~/.jarvis")
     if os.path.exists(user_jarvis):
         try:
             with open(user_jarvis, "r", encoding="utf-8") as f:
                 user_tasks = yaml.safe_load(f)
-
+                
             if isinstance(user_tasks, dict):
                 # 验证并添加用户目录的任务
                 for name, desc in user_tasks.items():
                     if desc:  # 确保描述不为空
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print(
-                    "Warning: ~/.jarvis file should contain a dictionary of task_name: task_description",
-                    OutputType.ERROR)
+                PrettyOutput.print("Warning: ~/.jarvis file should contain a dictionary of task_name: task_description", OutputType.ERROR)
         except Exception as e:
-            PrettyOutput.print(
-                f"Error loading ~/.jarvis file: {str(e)}", OutputType.ERROR)
-
+            PrettyOutput.print(f"Error loading ~/.jarvis file: {str(e)}", OutputType.ERROR)
+    
     # 检查当前目录下的 .jarvis
     if os.path.exists(".jarvis"):
         try:
             with open(".jarvis", "r", encoding="utf-8") as f:
                 local_tasks = yaml.safe_load(f)
-
+                
             if isinstance(local_tasks, dict):
                 # 验证并添加当前目录的任务，如果有重名则覆盖用户目录的任务
                 for name, desc in local_tasks.items():
                     if desc:  # 确保描述不为空
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print(
-                    "Warning: .jarvis file should contain a dictionary of task_name: task_description",
-                    OutputType.ERROR)
+                PrettyOutput.print("Warning: .jarvis file should contain a dictionary of task_name: task_description", OutputType.ERROR)
         except Exception as e:
-            PrettyOutput.print(
-                f"Error loading .jarvis file: {
-                    str(e)}", OutputType.ERROR)
-
+            PrettyOutput.print(f"Error loading .jarvis file: {str(e)}", OutputType.ERROR)
+    
     return tasks
 
-
 def select_task(tasks: dict) -> str:
     """Let user select a task from the list or skip. Returns task description if selected."""
     if not tasks:
         return ""
-
+    
     # Convert tasks to list for ordered display
     task_names = list(tasks.keys())
-
+    
     PrettyOutput.print("\nAvailable tasks:", OutputType.INFO)
     for i, name in enumerate(task_names, 1):
         PrettyOutput.print(f"[{i}] {name}", OutputType.INFO)
     PrettyOutput.print("[0] 跳过预定义任务", OutputType.INFO)
-
+    
+    
     while True:
         try:
             choice = prompt(
                 "\n请选择一个任务编号(0跳过): ",
             ).strip()
-
+            
             if not choice:
                 return ""
-
+            
             choice = int(choice)
             if choice == 0:
                 return ""
@@ -93,10 +87,8 @@ def select_task(tasks: dict) -> str:
                 selected_name = task_names[choice - 1]
                 return tasks[selected_name]  # Return the task description
             else:
-                PrettyOutput.print(
-                    "Invalid choice. Please select a number from the list.",
-                    OutputType.ERROR)
-
+                PrettyOutput.print("Invalid choice. Please select a number from the list.", OutputType.ERROR)
+                
         except KeyboardInterrupt:
             return ""  # Return empty on Ctrl+C
         except EOFError:
@@ -105,17 +97,14 @@ def select_task(tasks: dict) -> str:
             PrettyOutput.print(f"选择失败: {str(e)}", OutputType.ERROR)
             continue
 
-
 def main():
     """Jarvis 的主入口点"""
     # 添加参数解析器
     parser = argparse.ArgumentParser(description='Jarvis AI 助手')
     parser.add_argument('-f', '--files', nargs='*', help='要处理的文件列表')
-    parser.add_argument(
-        '--keep-history',
-        action='store_true',
-        help='保持聊天历史(不删除会话)')
+    parser.add_argument('--keep-history', action='store_true', help='保持聊天历史(不删除会话)')
     parser.add_argument('-p', '--platform', default='', help='选择AI平台')
+    parser.add_argument('-m', '--model', default='', help='模型')  # 用于指定使用的模型名称，默认使用环境变量或平台默认模型
     args = parser.parse_args()
 
     load_env_from_file()
@@ -123,45 +112,41 @@ def main():
     platform = args.platform if args.platform else os.getenv('JARVIS_PLATFORM')
 
     if not platform:
-        PrettyOutput.print(
-            "未指定AI平台，请使用 -p 参数或者设置 JARVIS_PLATFORM 环境变量",
-            OutputType.ERROR)
+        PrettyOutput.print("未指定AI平台，请使用 -p 参数或者设置 JARVIS_PLATFORM 环境变量", OutputType.ERROR)
         return 1
 
     PlatformRegistry.get_global_platform_registry().set_global_platform_name(platform)
-
+    
     try:
         # 获取全局模型实例
         agent = Agent()
 
+        # 如果用户传入了模型参数，则更换当前模型为用户指定的模型
+        if args.model:
+            PrettyOutput.print(f"用户传入了模型参数，更换模型: {args.model}", OutputType.USER)
+            agent.model.set_model_name(args.model)
+
         # 欢迎信息
-        PrettyOutput.print(
-            f"Jarvis 已初始化 - With {platform} 平台，模型: {agent.model.name()}", OutputType.SYSTEM)
+        PrettyOutput.print(f"Jarvis 已初始化 - With {platform} 平台，模型: {agent.model.name()}", OutputType.SYSTEM)
         if args.keep_history:
             PrettyOutput.print("已启用历史保留模式", OutputType.INFO)
-
+        
         # 加载预定义任务
         tasks = load_tasks()
         if tasks:
             selected_task = select_task(tasks)
             if selected_task:
                 PrettyOutput.print(f"\n执行任务: {selected_task}", OutputType.INFO)
-                agent.run(
-                    selected_task,
-                    args.files,
-                    keep_history=args.keep_history)
+                agent.run(selected_task, args.files, keep_history=args.keep_history)
                 return 0
-
+        
         # 如果没有选择预定义任务，进入交互模式
         while True:
             try:
                 user_input = get_multiline_input("请输入您的任务(输入空行退出):")
                 if not user_input or user_input == "__interrupt__":
                     break
-                agent.run(
-                    user_input,
-                    args.files,
-                    keep_history=args.keep_history)
+                agent.run(user_input, args.files, keep_history=args.keep_history)
             except Exception as e:
                 PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 
@@ -171,6 +156,5 @@ def main():
 
     return 0
 
-
 if __name__ == "__main__":
     exit(main())

jarvis/models/__init__.py

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