fix: resume agent after choice callback

This commit is contained in:
jxxghp
2026-05-23 00:28:42 +08:00
parent b26bf2a019
commit 4f107a7cc8
2 changed files with 43 additions and 20 deletions

View File

@@ -1,6 +1,6 @@
import asyncio
import unittest
from unittest.mock import AsyncMock, patch
from unittest.mock import AsyncMock, Mock, patch
from app.agent.prompt import prompt_manager
from app.agent.tools.factory import MoviePilotToolFactory
@@ -13,6 +13,7 @@ from app.helper.interaction import (
agent_interaction_manager,
)
from app.chain.message import MessageChain
from app.core.config import settings
from app.schemas.types import MessageChannel
@@ -149,12 +150,20 @@ class TestAgentInteraction(unittest.TestCase):
],
)
with patch.object(chain, "_handle_ai_message") as handle_ai_message, patch.object(
with patch.object(settings, "AI_AGENT_ENABLE", True), patch.object(
chain.messagehelper, "put"
) as message_put, patch.object(chain.messageoper, "add") as message_add, patch.object(
) as message_put, patch.object(
chain.messageoper, "add"
) as message_add, patch.object(
chain, "edit_message", return_value=True
) as edit_message:
chain._handle_callback(
) as edit_message, patch(
"app.chain.message.agent_manager.process_message",
new_callable=AsyncMock,
) as process_message, patch(
"app.chain.message.asyncio.run_coroutine_threadsafe",
side_effect=lambda coro, _loop: (coro.close(), Mock())[1],
):
handled = chain._handle_callback(
text=f"CALLBACK:agent_interaction:choice:{request.request_id}:1",
channel=MessageChannel.Telegram,
source="telegram-test",
@@ -164,7 +173,7 @@ class TestAgentInteraction(unittest.TestCase):
original_chat_id="456",
)
handle_ai_message.assert_called_once()
self.assertTrue(handled)
edit_message.assert_called_once_with(
channel=MessageChannel.Telegram,
source="telegram-test",
@@ -173,9 +182,13 @@ class TestAgentInteraction(unittest.TestCase):
title="需要你的选择",
text="请选择\n\n已选择:电影",
)
kwargs = handle_ai_message.call_args.kwargs
self.assertEqual(kwargs["text"], "我选择电影")
process_message.assert_called_once()
kwargs = process_message.call_args.kwargs
self.assertEqual(kwargs["message"], "我选择电影")
self.assertEqual(kwargs["session_id"], "session-choice")
self.assertEqual(kwargs["channel"], MessageChannel.Telegram.value)
self.assertEqual(kwargs["source"], "telegram-test")
self.assertNotIn("processing_status", kwargs)
message_put.assert_called_once()
message_add.assert_called_once()