auto-coder 2.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

autocoder/index/entry.py

@@ -295,7 +295,7 @@ def build_index_and_filter_files(
     # for file in final_filenames:
     #     print(f"{file} - {final_files[file].reason}")
 
-    # 先去重
+    # 先去重    
     temp_sources = []
     for file in sources:
         # print(f"{file.module_name} in project")

autocoder/inner/agentic.py

@@ -197,16 +197,7 @@ class RunAgentic:
 
         # 3. 处理特殊对话操作
         if self._handle_conversation_actions(conversation_config):
-            return conversation_config.conversation_id
-
-        # 4. 创建新对话
-        conversation_manager = get_conversation_manager()
-        conversation_id = conversation_manager.create_conversation(
-            name=query or "New Conversation",
-            description=query or "New Conversation",
-        )
-        conversation_manager.set_current_conversation(conversation_id)
-        conversation_config.conversation_id = conversation_id
+            return conversation_config.conversation_id        
 
         # 5. 配置过滤模式参数
         args_copy = deepcopy(args)

autocoder/version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = '2.0.0'
+__version__ = '2.0.1'

autocoder/workflow_agents/executor.py

@@ -7,6 +7,8 @@ Subagent Workflow 执行器
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Set, Tuple
 from copy import deepcopy
+from concurrent.futures import ThreadPoolExecutor, as_completed
+import json
 from loguru import logger
 
 from autocoder.common import AutoCoderArgs
@@ -421,6 +423,22 @@ class SubagentWorkflowExecutor:
                 step_id=step.id, status=StepStatus.FAILED, error=error_msg
             )
 
+        # 检查是否需要并行执行
+        if step.replicas > 1:
+            return self._execute_step_parallel(step)
+        else:
+            return self._execute_step_single(step)
+
+    def _execute_step_single(self, step: StepSpec) -> StepResult:
+        """
+        执行单个步骤（非并行）
+
+        Args:
+            step: 步骤规格
+
+        Returns:
+            StepResult 对象
+        """
         try:
             # 渲染用户输入
             user_input = render_template(
@@ -433,7 +451,7 @@ class SubagentWorkflowExecutor:
             conversation_config = self._get_conversation_config(step)
 
             # 运行代理
-            agent = self.agents[agent_id]
+            agent = self.agents[step.agent]
             completion = agent.run(
                 user_input=user_input,
                 conversation_config=conversation_config,
@@ -487,3 +505,161 @@ class SubagentWorkflowExecutor:
             return StepResult(
                 step_id=step.id, status=StepStatus.FAILED, error=error_msg
             )
+
+    def _execute_step_parallel(self, step: StepSpec) -> StepResult:
+        """
+        并行执行单个步骤的多个副本
+
+        Args:
+            step: 步骤规格
+
+        Returns:
+            StepResult 对象，包含合并后的结果
+        """
+        logger.info(f"步骤 {step.id} 将并行执行 {step.replicas} 个副本")
+
+        # 渲染用户输入（所有副本使用相同输入）
+        try:
+            user_input = render_template(
+                step.with_args.get("user_input", ""), self.context
+            )
+            if not isinstance(user_input, str):
+                user_input = str(user_input)
+        except Exception as e:
+            error_msg = f"渲染输入失败: {str(e)}"
+            logger.error(f"步骤 {step.id} {error_msg}", exc_info=True)
+            return StepResult(
+                step_id=step.id, status=StepStatus.FAILED, error=error_msg
+            )
+
+        # 并行执行所有副本
+        agent = self.agents[step.agent]
+        results = []
+        errors = []
+
+        def run_replica(replica_idx: int):
+            """运行单个副本"""
+            try:
+                logger.info(
+                    f"步骤 {step.id} 副本 {replica_idx + 1}/{step.replicas} 开始执行"
+                )
+
+                # 获取会话配置（每个副本独立会话）
+                conversation_config = self._get_conversation_config(step)
+
+                # 运行代理
+                completion = agent.run(
+                    user_input=user_input,
+                    conversation_config=conversation_config,
+                    args=self.args,
+                    llm=self.llm,
+                    cancel_token=self.cancel_token,
+                )
+
+                if completion is None:
+                    return (replica_idx, None, "代理未返回结果")
+
+                logger.info(
+                    f"步骤 {step.id} 副本 {replica_idx + 1}/{step.replicas} 执行完成"
+                )
+                return (replica_idx, completion.result, None)
+
+            except Exception as e:
+                error_msg = f"副本 {replica_idx + 1} 执行异常: {str(e)}"
+                logger.error(f"步骤 {step.id} {error_msg}", exc_info=True)
+                return (replica_idx, None, error_msg)
+
+        # 使用线程池并行执行
+        with ThreadPoolExecutor(max_workers=step.replicas) as executor:
+            futures = [executor.submit(run_replica, i) for i in range(step.replicas)]
+
+            for future in as_completed(futures):
+                replica_idx, result, error = future.result()
+                if error:
+                    errors.append(f"副本 {replica_idx + 1}: {error}")
+                else:
+                    results.append((replica_idx, result))
+
+        # 判断成功：任意一个成功即可（any-success 策略）
+        if not results:
+            # 全部失败
+            error_msg = f"所有 {step.replicas} 个副本都失败了: " + "; ".join(errors)
+            logger.error(f"步骤 {step.id} {error_msg}")
+            return StepResult(
+                step_id=step.id, status=StepStatus.FAILED, error=error_msg
+            )
+
+        # 至少有一个成功
+        logger.info(f"步骤 {step.id} 成功执行了 {len(results)}/{step.replicas} 个副本")
+
+        # 合并结果
+        merged_result = self._merge_replica_results(results, step)
+
+        # 更新上下文
+        self.context["_last_attempt_result"] = merged_result
+
+        # 提取输出（从合并后的结果中提取）
+        try:
+            outputs = extract_outputs(
+                outputs_map=step.outputs,
+                attempt_result=merged_result,
+                attempt_format=self.spec.attempt.format,
+                default_jsonpaths=self.spec.attempt.jsonpaths,
+                context=self.context,
+            )
+        except Exception as e:
+            logger.warning(f"步骤 {step.id} 提取输出失败: {e}，使用空输出")
+            outputs = {}
+
+        # 注入内置变量：conversation_id
+        outputs["conversation_id"] = self._conversation_id
+
+        # 保存到上下文
+        if step.id not in self.context["steps"]:
+            self.context["steps"][step.id] = {"outputs": {}}
+
+        self.context["steps"][step.id]["outputs"].update(outputs)
+        logger.debug(f"步骤 {step.id} 输出: {list(outputs.keys())}")
+
+        return StepResult(
+            step_id=step.id,
+            status=StepStatus.SUCCESS,
+            attempt_result=merged_result,
+            outputs=outputs,
+        )
+
+    def _merge_replica_results(
+        self, results: List[Tuple[int, str]], step: StepSpec
+    ) -> str:
+        """
+        合并多个副本的结果
+
+        Args:
+            results: [(replica_idx, attempt_result), ...]
+            step: 步骤规格
+
+        Returns:
+            合并后的结果字符串
+        """
+        # 按副本索引排序
+        sorted_results = sorted(results, key=lambda x: x[0])
+        attempt_results = [result for _, result in sorted_results]
+
+        # 根据 attempt.format 决定合并方式
+        if self.spec.attempt.format == "json":
+            # JSON 格式：尝试将多个结果打包成 JSON 数组
+            json_objects = []
+            for result in attempt_results:
+                try:
+                    obj = json.loads(result)
+                    json_objects.append(obj)
+                except json.JSONDecodeError:
+                    # 如果解析失败，保留原始字符串
+                    json_objects.append({"raw": result})
+
+            # 返回 JSON 数组字符串
+            return json.dumps(json_objects, ensure_ascii=False, indent=2)
+        else:
+            # Text 格式：用分隔符拼接
+            separator = "\n---\n"
+            return separator.join(attempt_results)

autocoder/workflow_agents/loader.py

@@ -383,6 +383,17 @@ def parse_step_spec(
         parse_step_conversation_config(conv_data, context) if conv_data else None
     )
 
+    # 解析 replicas
+    replicas = data.get("replicas", 1)
+    if not isinstance(replicas, int) or replicas < 1:
+        raise WorkflowValidationError(
+            message="replicas 必须是正整数",
+            field_path=f"{context}.replicas",
+            expected="正整数（>= 1）",
+            actual=str(replicas),
+            suggestion="将 replicas 设置为正整数，如 2（表示并行运行2个副本）",
+        )
+
     return StepSpec(
         id=step_id,
         agent=agent_id,
@@ -391,6 +402,7 @@ def parse_step_spec(
         when=when_config,
         outputs=outputs,
         conversation=conversation,
+        replicas=replicas,
     )
 
 

autocoder/workflow_agents/types.py

@@ -108,6 +108,7 @@ class StepSpec:
     when: Optional[WhenConfig] = None
     outputs: Dict[str, OutputConfig] = field(default_factory=dict)
     conversation: Optional[StepConversationConfig] = None
+    replicas: int = 1  # 并行副本数，默认为1（不并行）
 
 
 @dataclass