jarvis-ai-assistant 0.1.126__py3-none-any.whl → 0.1.129__py3-none-any.whl

jarvis/jarvis_multi_agent/__init__.py

@@ -5,27 +5,13 @@ import yaml
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.output_handler import OutputHandler
+from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
-class AgentConfig:
-    def __init__(self, **config):
-        self.system_prompt = config.get('system_prompt', '')
-        self.name = config.get('name', 'Jarvis')
-        self.description = config.get('description', '')
-        self.is_sub_agent = config.get('is_sub_agent', False)
-        self.output_handler = config.get('output_handler', [])
-        self.platform = config.get('platform')
-        self.model_name = config.get('model_name')
-        self.summary_prompt = config.get('summary_prompt')
-        self.auto_complete = config.get('auto_complete', False)
-        self.input_handler = config.get('input_handler')
-        self.max_context_length = config.get('max_context_length')
-        self.execute_tool_confirm = config.get('execute_tool_confirm')
-
 class MultiAgent(OutputHandler):
-    def __init__(self, configs: List[AgentConfig], main_agent_name: str):
-        self.agents_config = configs
+    def __init__(self, agents_config: List[Dict], main_agent_name: str):
+        self.agents_config = agents_config
         self.agents = {}
         self.init_agents()
         self.main_agent_name = main_agent_name
@@ -76,7 +62,7 @@ content: |
    - 根据响应继续任务
 
 # 👥 可用智能体
-{chr(10).join([f"- {c.name}: {c.description}" for c in self.agents_config])}
+{chr(10).join([f"- {c['name']}: {c.get('description', '')}" for c in self.agents_config])}
 
 # ❗ 重要规则
 1. 每轮只能执行一个操作
@@ -128,29 +114,13 @@ content: |
         return ret
 
     def init_agents(self):
-        for agent_config in self.agents_config:
-            agent = Agent(system_prompt=agent_config.system_prompt,
-                          name=agent_config.name,
-                          description=agent_config.description,
-                          model_name=agent_config.model_name,
-                          platform=agent_config.platform,
-                          max_context_length=agent_config.max_context_length,
-                          execute_tool_confirm=agent_config.execute_tool_confirm,
-                          input_handler=agent_config.input_handler,
-                          use_methodology=False,
-                          record_methodology=False,
-                          need_summary=False,
-                          auto_complete=agent_config.auto_complete,
-                          summary_prompt=agent_config.summary_prompt,
-                          is_sub_agent=agent_config.is_sub_agent,
-                          output_handler=[*agent_config.output_handler, self],
-                          )
-            
-            self.agents[agent_config.name] = agent
+        for config in self.agents_config:
+            agent = Agent(**config)
+            self.agents[config['name']] = agent
 
-    def run(self, user_input: str, file_list: Optional[List[str]] = None) -> str:
+    def run(self, user_input: str) -> str:
         last_agent = self.main_agent_name
-        msg = self.agents[self.main_agent_name].run(user_input, file_list)
+        msg = self.agents[self.main_agent_name].run(user_input)
         while msg:
             if isinstance(msg, str):
                 return msg
@@ -167,4 +137,45 @@ content: {msg['content']}
                 PrettyOutput.print(f"{last_agent} 正在向 {msg['to']} 发送消息...", OutputType.INFO)
                 last_agent = self.agents[msg['to']].name
                 msg = self.agents[msg['to']].run(prompt)
-        return ""
+        return ""
+
+
+def main():
+    """从YAML配置文件初始化并运行多智能体系统
+    
+    Returns:
+        最终处理结果
+    """
+    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') 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/base.py

@@ -10,7 +10,7 @@ class BasePlatform(ABC):
     
     def __init__(self):
         """Initialize model"""
-        self.suppress_output = False  # 添加输出控制标志
+        self.suppress_output = True  # 添加输出控制标志
 
     def __del__(self):
         """Destroy model"""
@@ -46,10 +46,11 @@ class BasePlatform(ABC):
                 tokens_per_second = 0
 
             # Print statistics
-            PrettyOutput.print(
-                f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
-                OutputType.INFO,
-            )
+            if not self.suppress_output:
+                PrettyOutput.print(
+                    f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
+                    OutputType.INFO,
+                )
 
             # Keep original think tag handling
             response = re.sub(r'<think>.*?</think>', '', response, flags=re.DOTALL)

jarvis/jarvis_platform_manager/main.py

@@ -59,6 +59,7 @@ def chat_with_model(platform_name: str, model_name: str):
     try:
         # Set model
         platform.set_model_name(model_name)
+        platform.set_suppress_output(False)
         PrettyOutput.print(f"连接到 {platform_name} 平台 {model_name} 模型", OutputType.SUCCESS)
         
         # Start conversation loop
@@ -209,7 +210,6 @@ def service_command(args):
                 raise HTTPException(status_code=400, detail=f"Platform {platform_name} not found")
             
             platform.set_model_name(model_name)
-            platform.set_suppress_output(True)  # Suppress console output in server mode
             platform_instances[key] = platform
         
         return platform_instances[key]