jarvis-ai-assistant 0.1.128__py3-none-any.whl → 0.1.130__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.128" 
+__version__ = "0.1.130" 

jarvis/jarvis_agent/__init__.py

@@ -23,10 +23,10 @@ import os
 class Agent:
 
     def set_summary_prompt(self, summary_prompt: str):
-        """Set the summary prompt for task completion.
+        """设置任务完成时的总结提示模板。
         
-        Args:
-            summary_prompt: The prompt template for generating task summaries
+        参数:
+            summary_prompt: 用于生成任务总结的提示模板
         """
         self.summary_prompt = summary_prompt
 
@@ -49,7 +49,8 @@ class Agent:
                  record_methodology: Optional[bool] = None,
                  need_summary: Optional[bool] = None,
                  max_context_length: Optional[int] = None,
-                 execute_tool_confirm: Optional[bool] = None):
+                 execute_tool_confirm: Optional[bool] = None,
+                 multiline_inputer: Optional[Callable[[str], str]] = None):
         self.name = make_agent_name(name)
         self.description = description
         # 初始化平台和模型
@@ -69,7 +70,8 @@ class Agent:
 
         self.model.set_suppress_output(False)
 
-        self.output_handler = output_handler
+        self.output_handler = output_handler if output_handler else [ToolRegistry()]
+        self.multiline_inputer = multiline_inputer if multiline_inputer else get_multiline_input
         
         self.record_methodology = record_methodology if record_methodology is not None else is_record_methodology()
         self.use_methodology = use_methodology if use_methodology is not None else is_use_methodology()
@@ -150,23 +152,23 @@ class Agent:
 
 
     
-    def _call_model(self, message: str) -> str: 
-        """Call the AI model with retry logic.
+    def _call_model(self, message: str) -> str:
+        """调用AI模型并实现重试逻辑。
         
-        Args:
-            message: The input message for the model
+        参数:
+            message: 输入给模型的消息
             
-        Returns:
-            str: Model's response
+        返回:
+            str: 模型的响应
             
-        Note:
-            Will retry with exponential backoff up to 30 seconds between retries
+        注意:
+            将使用指数退避重试，最多重试30秒
         """
         for handler in self.input_handler:
             message, need_return = handler(message, self)
             if need_return:
                 return message
-        PrettyOutput.section("模型输出", OutputType.SYSTEM)
+        print("🤖 模型思考：")
         return self.model.chat_until_success(message)   # type: ignore
 
 
@@ -287,23 +289,17 @@ class Agent:
         return "任务完成"
 
 
-    def run(self, user_input: str, file_list: Optional[List[str]] = None) -> Any:
+    def run(self, user_input: str) -> Any:
         """Process user input and execute the task.
         
         Args:
             user_input: My task description or request
-            file_list: Optional list of files to process
             
         Returns:
             str|Dict: Task summary report or message to send
         """
         try:
             set_agent(self.name, self)
-            with yaspin(text="准备环境...", color="cyan") as spinner:
-                if file_list:
-                    self.model.upload_files(file_list) # type: ignore
-                    spinner.text = "环境准备完成"
-                    spinner.ok("✅")
             
             self.prompt = f"{user_input}"
 
@@ -338,7 +334,7 @@ class Agent:
                         return self._complete_task()
                     
                     # 获取用户输入
-                    user_input = get_multiline_input(f"{self.name}: 请输入，或输入空行来结束当前任务：")
+                    user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
 
                     if user_input:
                         self.prompt = user_input
@@ -356,16 +352,16 @@ class Agent:
             return f"Task failed: {str(e)}"
 
     def _clear_history(self):
-        """Clear conversation history while preserving system prompt.
+        """清空对话历史但保留系统提示。
         
-        This will:
-        1. Clear the prompt
-        2. Reset the model
-        3. Reset conversation length counter
+        该方法将：
+        1. 清空当前提示
+        2. 重置模型状态
+        3. 重置对话长度计数器
         """
         self.prompt = "" 
         self.model.reset() # type: ignore
-        self.conversation_length = 0  # Reset conversation length
+        self.conversation_length = 0  # 重置对话长度
 
 
 
@@ -551,7 +547,6 @@ def main():
     # Add argument parser
     init_env()
     parser = argparse.ArgumentParser(description='Jarvis AI assistant')
-    parser.add_argument('-f', '--files', nargs='*', help='List of files to process')
     parser.add_argument('-p', '--platform', type=str, help='Platform to use')
     parser.add_argument('-m', '--model', type=str, help='Model to use')
     args = parser.parse_args()
@@ -566,7 +561,7 @@ def main():
             selected_task = _select_task(tasks)
             if selected_task:
                 PrettyOutput.print(f"执行任务: {selected_task}", OutputType.INFO)
-                agent.run(selected_task, args.files)
+                agent.run(selected_task)
                 return 0
         
         # 如果没有选择预定义任务，进入交互模式
@@ -575,7 +570,7 @@ def main():
                 user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
                 if not user_input:
                     break
-                agent.run(user_input, args.files)
+                agent.run(user_input)
             except Exception as e:
                 PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 

jarvis/jarvis_agent/main.py

@@ -0,0 +1,77 @@
+import argparse
+import yaml
+import os
+from typing import Optional, List
+from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from jarvis.jarvis_utils.utils import init_env
+
+# 从__init__.py导入系统提示
+from jarvis.jarvis_agent import origin_agent_system_prompt
+
+def load_config(config_path: str) -> dict:
+    """Load configuration from YAML file
+    
+    Args:
+        config_path: Path to the YAML configuration file
+        
+    Returns:
+        dict: Configuration dictionary
+    """
+    if not os.path.exists(config_path):
+        PrettyOutput.print(f"配置文件 {config_path} 不存在，使用默认配置", OutputType.WARNING)
+        return {}
+    
+    with open(config_path, 'r', encoding='utf-8') as f:
+        try:
+            config = yaml.safe_load(f)
+            return config if config else {}
+        except yaml.YAMLError as e:
+            PrettyOutput.print(f"配置文件解析失败: {str(e)}", OutputType.ERROR)
+            return {}
+
+def main():
+    """Main entry point for Jarvis agent"""
+    # Initialize environment
+    init_env()
+    
+    # Set up argument parser
+    parser = argparse.ArgumentParser(description='Jarvis AI assistant')
+    parser.add_argument('-c', '--config', type=str, required=True, 
+                        help='Path to the YAML configuration file')
+    parser.add_argument('-t', '--task', type=str,
+                        help='Initial task to execute')
+    args = parser.parse_args()
+    
+    # Load configuration
+    config = load_config(args.config)
+    
+    # Create and run agent
+    try:
+        agent = Agent(**config)
+        
+        # Run agent with initial task if specified
+        if args.task:
+            PrettyOutput.print(f"执行初始任务: {args.task}", OutputType.INFO)
+            agent.run(args.task)
+            return 0
+        
+        # Enter interactive mode if no initial task
+        while True:
+            try:
+                user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
+                if not user_input:
+                    break
+                agent.run(user_input)
+            except Exception as e:
+                PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
+                
+    except Exception as e:
+        PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)
+        return 1
+    
+    return 0
+
+if __name__ == "__main__":
+    exit(main())