fix: adapt to Fishjam 0.29 peer API

- Use the new PeerConfigWebRTC/PeerConfigAgent/PeerConfigVAPI models
  (PeerConfig was split per peer type in the regenerated OpenAPI client).
- Connect agents via the peer_websocket_url returned by add_peer: on
  deployments with a separate media node the agent socket no longer
  lives on the Fishjam URL. Falls back to the old URL when the field
  is absent.

Author: PiotrWodecki

fishjam/agent/agent.py

@@ -203,6 +203,7 @@ def __init__(self, id: str, room_id: str, token: str, fishjam_url: str):
         self.id = id
         self.room_id = room_id
 
+        self._fishjam_url = fishjam_url
         self._socket_url = f"{fishjam_url}/socket/agent/websocket".replace("http", "ws")
         self._token = token
 

fishjam/api/_fishjam_client.py

@@ -32,13 +32,17 @@
     MoqAccess,
     MoqAccessConfig,
     Peer,
-    PeerConfig,
+    PeerConfigAgent,
+    PeerConfigAgentType,
+    PeerConfigVAPI,
+    PeerConfigVAPIType,
+    PeerConfigWebRTC,
+    PeerConfigWebRTCType,
     PeerDetailsResponse,
     PeerOptionsAgent,
     PeerOptionsVapi,
     PeerOptionsWebRTC,
     PeerRefreshTokenResponse,
-    PeerType,
     RoomConfig,
     RoomCreateDetailsResponse,
     RoomDetailsResponse,
@@ -51,7 +55,7 @@
     ViewerToken,
     WebRTCMetadata,
 )
-from fishjam._openapi_client.types import UNSET
+from fishjam._openapi_client.types import UNSET, Unset
 from fishjam.agent import Agent
 from fishjam.api._client import Client
 from fishjam.errors import (
@@ -230,7 +234,7 @@ def create_peer(
             metadata=peer_metadata,
             subscribe_mode=SubscribeMode(options.subscribe_mode),
         )
-        body = PeerConfig(type_=PeerType.WEBRTC, options=peer_options)
+        body = PeerConfigWebRTC(type_=PeerConfigWebRTCType.WEBRTC, options=peer_options)
 
         resp = cast(
             PeerDetailsResponse,
@@ -251,8 +255,8 @@ def create_agent(self, room_id: str, options: AgentOptions | None = None):
                 and Fishjam URL.
         """
         options = options or AgentOptions()
-        body = PeerConfig(
-            type_=PeerType.AGENT,
+        body = PeerConfigAgent(
+            type_=PeerConfigAgentType.AGENT,
             options=PeerOptionsAgent(
                 output=AgentOutput(
                     audio_format=AudioFormat(options.output.audio_format),
@@ -267,7 +271,22 @@ def create_agent(self, room_id: str, options: AgentOptions | None = None):
             self._request(room_add_peer, room_id=room_id, body=body),
         )
 
-        return Agent(resp.data.peer.id, room_id, resp.data.token, self._fishjam_url)
+        socket_base_url = self._peer_socket_base_url(resp.data.peer_websocket_url)
+        return Agent(resp.data.peer.id, room_id, resp.data.token, socket_base_url)
+
+    def _peer_socket_base_url(self, peer_websocket_url: str | Unset) -> str:
+        # Fishjam deployments with a separate media node return the websocket
+        # address the peer must connect to; older deployments omit it, in which
+        # case the socket lives on the Fishjam URL itself.
+        if isinstance(peer_websocket_url, Unset) or not peer_websocket_url:
+            return self._fishjam_url
+
+        url = peer_websocket_url
+        if "://" not in url:
+            url = f"https://{url}"
+        for suffix in ("/socket/peer/websocket", "/socket/agent/websocket"):
+            url = url.removesuffix(suffix)
+        return url
 
     def create_vapi_agent(
         self,
@@ -283,7 +302,7 @@ def create_vapi_agent(
         Returns:
             - Peer: The created peer object.
         """
-        body = PeerConfig(type_=PeerType.VAPI, options=options)
+        body = PeerConfigVAPI(type_=PeerConfigVAPIType.VAPI, options=options)
 
         resp = cast(
             PeerDetailsResponse,

tests/agent/test_agent.py

@@ -105,11 +105,13 @@ async def wait_event(event: asyncio.Event, timeout: float = 5):
 
 class TestAgentConnection:
     @pytest.mark.asyncio
-    async def test_invalid_auth(self, room_api: FishjamClient):
-        agent = Agent("fake-id", "room-id", "fake-token", room_api._fishjam_url)
+    async def test_invalid_auth(self, room: Room, agent: Agent):
+        # Reuse a real agent's socket address so the connection reaches
+        # authentication instead of failing on routing.
+        bogus_agent = Agent("fake-id", room.id, "fake-token", agent._fishjam_url)
 
         with pytest.raises(AgentAuthError):
-            async with agent.connect():
+            async with bogus_agent.connect():
                 raise RuntimeError("Connect should have raised AgentAuthError.")
 
     @pytest.mark.asyncio