Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(backend/copilot): address PR review round 4

Zamil Majdy3a5ce570e0b4
diff --git a/autogpt_platform/backend/backend/copilot/tools/ask_question.py b/autogpt_platform/backend/backend/copilot/tools/ask_question.py
index 60855ec437..25aa164896 100644
--- a/autogpt_platform/backend/backend/copilot/tools/ask_question.py
+++ b/autogpt_platform/backend/backend/copilot/tools/ask_question.py
@@ -96,6 +96,7 @@ class AskQuestionTool(BaseTool):
),
},
},
+ "required": ["question"],
}
@property
@@ -114,7 +115,7 @@ class AskQuestionTool(BaseTool):
) -> ClarifyingQuestion:
"""Build a single ``ClarifyingQuestion`` from raw inputs."""
safe_options = (
- [str(o) for o in options if o is not None]
+ [str(o) for o in options if o is not None and str(o).strip()]
if isinstance(options, list)
else []
)
@@ -131,7 +132,7 @@ class AskQuestionTool(BaseTool):
async def _execute(
self,
user_id: str | None,
- session: ChatSession | None,
+ session: ChatSession,
**kwargs: Any,
) -> ToolResponseBase:
del user_id # unused; required by BaseTool contract
@@ -158,8 +159,8 @@ class AskQuestionTool(BaseTool):
if not isinstance(raw_options, list):
raw_options = []
- raw_keyword = kwargs.get("keyword", "")
- keyword: str = str(raw_keyword) if raw_keyword else ""
+ raw_keyword = kwargs.get("keyword") or ""
+ keyword: str = str(raw_keyword).strip()
clarifying_question = self._build_question(question, raw_options, keyword)
return ClarificationNeededResponse(
@@ -186,7 +187,12 @@ class AskQuestionTool(BaseTool):
idx,
)
continue
- keyword = str(item.get("keyword", "")) or f"question-{idx}"
+ raw_keyword = item.get("keyword")
+ keyword = (
+ str(raw_keyword).strip()
+ if raw_keyword is not None and str(raw_keyword).strip()
+ else f"question-{idx}"
+ )
clarifying_questions.append(
self._build_question(
question=q_text.strip(),
diff --git a/autogpt_platform/backend/backend/copilot/tools/ask_question_test.py b/autogpt_platform/backend/backend/copilot/tools/ask_question_test.py
index 62134bb881..69030ee47a 100644
--- a/autogpt_platform/backend/backend/copilot/tools/ask_question_test.py
+++ b/autogpt_platform/backend/backend/copilot/tools/ask_question_test.py
@@ -309,3 +309,38 @@ async def test_execute_questions_as_non_list_falls_back(
assert isinstance(result, ClarificationNeededResponse)
assert len(result.questions) == 1
assert result.questions[0].question == "Fallback?"
+
+
+async def test_execute_multi_keyword_null_gets_fallback(
+ tool: AskQuestionTool, session: ChatSession
+):
+ """If keyword is None (JSON null), use the question-{idx} fallback."""
+ result = await tool._execute(
+ user_id=None,
+ session=session,
+ questions=[
+ {"question": "First?", "keyword": None},
+ {"question": "Second?"},
+ ],
+ )
+
+ assert len(result.questions) == 2
+ assert result.questions[0].keyword == "question-0"
+ assert result.questions[1].keyword == "question-1"
+
+
+async def test_execute_options_filters_empty_strings(
+ tool: AskQuestionTool, session: ChatSession
+):
+ """Empty-string options should be filtered out to avoid artifacts."""
+ result = await tool._execute(
+ user_id=None,
+ session=session,
+ question="Pick one",
+ options=["Email", "", "Slack", None], # type: ignore[list-item]
+ keyword="channel",
+ )
+
+ assert result.questions[0].example == "Email, Slack"