fix(matrix): keep typing indicator during progress updates
This commit is contained in:
@@ -606,13 +606,14 @@ class MatrixChannel(BaseChannel):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
async def send(self, msg: OutboundMessage) -> None:
|
async def send(self, msg: OutboundMessage) -> None:
|
||||||
"""Send message text and optional attachments to a Matrix room, then clear typing state."""
|
"""Send Matrix outbound content and clear typing only for non-progress messages."""
|
||||||
if not self.client:
|
if not self.client:
|
||||||
return
|
return
|
||||||
|
|
||||||
text = msg.content or ""
|
text = msg.content or ""
|
||||||
candidates = self._collect_outbound_media_candidates(msg.media)
|
candidates = self._collect_outbound_media_candidates(msg.media)
|
||||||
relates_to = self._build_thread_relates_to(msg.metadata)
|
relates_to = self._build_thread_relates_to(msg.metadata)
|
||||||
|
is_progress = bool((msg.metadata or {}).get("_progress"))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
failures: list[str] = []
|
failures: list[str] = []
|
||||||
@@ -641,7 +642,8 @@ class MatrixChannel(BaseChannel):
|
|||||||
content["m.relates_to"] = relates_to
|
content["m.relates_to"] = relates_to
|
||||||
await self._send_room_content(msg.chat_id, content)
|
await self._send_room_content(msg.chat_id, content)
|
||||||
finally:
|
finally:
|
||||||
await self._stop_typing_keepalive(msg.chat_id, clear_typing=True)
|
if not is_progress:
|
||||||
|
await self._stop_typing_keepalive(msg.chat_id, clear_typing=True)
|
||||||
|
|
||||||
def _register_event_callbacks(self) -> None:
|
def _register_event_callbacks(self) -> None:
|
||||||
"""Register Matrix event callbacks used by this channel."""
|
"""Register Matrix event callbacks used by this channel."""
|
||||||
|
|||||||
@@ -1141,6 +1141,29 @@ async def test_send_stops_typing_keepalive_task() -> None:
|
|||||||
assert client.typing_calls[-1] == ("!room:matrix.org", False, TYPING_NOTICE_TIMEOUT_MS)
|
assert client.typing_calls[-1] == ("!room:matrix.org", False, TYPING_NOTICE_TIMEOUT_MS)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_send_progress_keeps_typing_keepalive_running() -> None:
|
||||||
|
channel = MatrixChannel(_make_config(), MessageBus())
|
||||||
|
client = _FakeAsyncClient("", "", "", None)
|
||||||
|
channel.client = client
|
||||||
|
channel._running = True
|
||||||
|
|
||||||
|
await channel._start_typing_keepalive("!room:matrix.org")
|
||||||
|
assert "!room:matrix.org" in channel._typing_tasks
|
||||||
|
|
||||||
|
await channel.send(
|
||||||
|
OutboundMessage(
|
||||||
|
channel="matrix",
|
||||||
|
chat_id="!room:matrix.org",
|
||||||
|
content="working...",
|
||||||
|
metadata={"_progress": True, "_progress_kind": "reasoning"},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
assert "!room:matrix.org" in channel._typing_tasks
|
||||||
|
assert client.typing_calls[-1] == ("!room:matrix.org", True, TYPING_NOTICE_TIMEOUT_MS)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_send_clears_typing_when_send_fails() -> None:
|
async def test_send_clears_typing_when_send_fails() -> None:
|
||||||
channel = MatrixChannel(_make_config(), MessageBus())
|
channel = MatrixChannel(_make_config(), MessageBus())
|
||||||
|
|||||||
Reference in New Issue
Block a user