Merge branch 'main' into dotnet-signed2

microsoft · Jan 16, 2025 · f768b15 · f768b15
2 parents be9ef2d + 2e1a9c7
commit f768b15
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/...tchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py b/...tchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py
@@ -286,13 +286,23 @@ async def _orchestrate_step(self, cancellation_token: CancellationToken) -> None
             try:
                 assert isinstance(ledger_str, str)
                 progress_ledger = json.loads(ledger_str)
+
+                # If the team consists of a single agent, deterministically set the next speaker
+                if len(self._participant_topic_types) == 1:
+                    progress_ledger["next_speaker"] = {
+                        "reason": "The team consists of only one agent.",
+                        "answer": self._participant_topic_types[0],
+                    }
+
+                # Validate the structure
                 required_keys = [
                     "is_request_satisfied",
                     "is_progress_being_made",
                     "is_in_loop",
                     "instruction_or_question",
                     "next_speaker",
                 ]
+
                 key_error = False
                 for key in required_keys:
                     if (
@@ -303,6 +313,15 @@ async def _orchestrate_step(self, cancellation_token: CancellationToken) -> None
                     ):
                         key_error = True
                         break
+
+                # Validate the next speaker if the task is not yet complete
+                if (
+                    not progress_ledger["is_request_satisfied"]["answer"]
+                    and progress_ledger["next_speaker"]["answer"] not in self._participant_topic_types
+                ):
+                    key_error = True
+                    break
+
                 if not key_error:
                     break
                 await self._log_message(f"Failed to parse ledger information, retrying: {ledger_str}")
@@ -313,6 +332,7 @@ async def _orchestrate_step(self, cancellation_token: CancellationToken) -> None
         if key_error:
             raise ValueError("Failed to parse ledger information after multiple retries.")
         await self._log_message(f"Progress Ledger: {progress_ledger}")
+
         # Check for task completion
         if progress_ledger["is_request_satisfied"]["answer"]:
             await self._log_message("Task completed, preparing final answer...")