Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pipecat/transports/moq/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@ async def _consume_peer(self, origin: "moq.OriginProducer") -> bool:
retried = False
while True:
logger.debug(f"MOQ: waiting for peer broadcast {self._peer_broadcast_path!r}")
announced = self._track(consumer.announced_broadcast(self._peer_broadcast_path))
announced = self._track(consumer.follow(self._peer_broadcast_path))
try:
peer_broadcast = await asyncio.wait_for(
announced.available(), timeout=max(self._peer_wait_remaining(), 0)
Expand Down
15 changes: 9 additions & 6 deletions tests/test_moq_transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -1906,8 +1906,8 @@ def cancel(self):
pass


class _FakeAnnounced:
"""Stands in for ``AnnouncedBroadcast``: resolves to a broadcast token at
class _FakeFollowing:
"""Stands in for ``Following``: resolves to a broadcast token at
once, or never when ``broadcast`` is ``None``."""

def __init__(self, broadcast):
Expand Down Expand Up @@ -1945,12 +1945,13 @@ def _origin(*broadcasts):
``None`` never resolves. The last one repeats."""
broadcasts = list(broadcasts) or ["peer-broadcast"]
origin = MagicMock(name="subscribe_origin")
origin.consume.return_value = MagicMock(spec=moq.OriginConsumer)

def announced(_path):
broadcast = broadcasts.pop(0) if len(broadcasts) > 1 else broadcasts[0]
return _FakeAnnounced(broadcast)
return _FakeFollowing(broadcast)

origin.consume.return_value.announced_broadcast.side_effect = announced
origin.consume.return_value.follow.side_effect = announced
return origin

@staticmethod
Expand Down Expand Up @@ -2251,7 +2252,8 @@ async def test_the_session_is_dropped_for_a_fresh_one_rather_than_failed(self):
peer_broadcast.catalog = AsyncMock(side_effect=self.DROPPED)
peer_broadcast.subscribe_track = AsyncMock(side_effect=self.DROPPED)
origin = MagicMock(name="subscribe_origin")
origin.consume.return_value.announced_broadcast.side_effect = lambda _path: _FakeAnnounced(
origin.consume.return_value = MagicMock(spec=moq.OriginConsumer)
origin.consume.return_value.follow.side_effect = lambda _path: _FakeFollowing(
peer_broadcast
)
with patch.object(moq_transport, "_PEER_DATA_GRACE_S", 0.05):
Expand Down Expand Up @@ -2339,7 +2341,8 @@ async def test_the_peer_is_followed_to_its_fresh_broadcast(self):
)
broadcasts = iter([first, fresh])
origin = MagicMock(name="subscribe_origin")
origin.consume.return_value.announced_broadcast.side_effect = lambda _path: _FakeAnnounced(
origin.consume.return_value = MagicMock(spec=moq.OriginConsumer)
origin.consume.return_value.follow.side_effect = lambda _path: _FakeFollowing(
next(broadcasts)
)
gone = await asyncio.wait_for(client._consume_peer(origin), timeout=2)
Expand Down
Loading