Update openapi

Author: AHGIJMKLKKZNPJKQR

fishjam/_openapi_client/models/__init__.py

@@ -10,13 +10,6 @@
 from .peer_options_agent import PeerOptionsAgent
 from .peer_options_web_rtc import PeerOptionsWebRTC
 from .peer_options_web_rtc_metadata import PeerOptionsWebRTCMetadata
-from .peer_options_web_rtc_subscribe import PeerOptionsWebRTCSubscribe
-from .peer_options_web_rtc_subscribe_audio_format import (
-    PeerOptionsWebRTCSubscribeAudioFormat,
-)
-from .peer_options_web_rtc_subscribe_audio_sample_rate import (
-    PeerOptionsWebRTCSubscribeAudioSampleRate,
-)
 from .peer_refresh_token_response import PeerRefreshTokenResponse
 from .peer_refresh_token_response_data import PeerRefreshTokenResponseData
 from .peer_status import PeerStatus
@@ -30,6 +23,9 @@
 from .room_details_response import RoomDetailsResponse
 from .rooms_listing_response import RoomsListingResponse
 from .streamer_token import StreamerToken
+from .subscribe_options import SubscribeOptions
+from .subscribe_options_audio_format import SubscribeOptionsAudioFormat
+from .subscribe_options_audio_sample_rate import SubscribeOptionsAudioSampleRate
 from .track import Track
 from .track_type import TrackType
 from .viewer_token import ViewerToken
@@ -45,9 +41,6 @@
     "PeerOptionsAgent",
     "PeerOptionsWebRTC",
     "PeerOptionsWebRTCMetadata",
-    "PeerOptionsWebRTCSubscribe",
-    "PeerOptionsWebRTCSubscribeAudioFormat",
-    "PeerOptionsWebRTCSubscribeAudioSampleRate",
     "PeerRefreshTokenResponse",
     "PeerRefreshTokenResponseData",
     "PeerStatus",
@@ -61,6 +54,9 @@
     "RoomDetailsResponse",
     "RoomsListingResponse",
     "StreamerToken",
+    "SubscribeOptions",
+    "SubscribeOptionsAudioFormat",
+    "SubscribeOptionsAudioSampleRate",
     "Track",
     "TrackType",
     "ViewerToken",

fishjam/_openapi_client/models/add_peer_json_body.py

@@ -1,12 +1,4 @@
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    List,
-    Type,
-    TypeVar,
-    Union,
-)
+from typing import TYPE_CHECKING, Any, Dict, List, Type, TypeVar, Union
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field

fishjam/_openapi_client/models/peer.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Dict, List, Type, TypeVar
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type, TypeVar
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
@@ -7,6 +7,7 @@
 from ..models.peer_type import PeerType
 
 if TYPE_CHECKING:
+    from ..models.subscribe_options import SubscribeOptions
     from ..models.track import Track
 
 
@@ -27,6 +28,8 @@ class Peer:
     """List of all peer's tracks"""
     type: PeerType
     """Peer type"""
+    subscribe: Optional["SubscribeOptions"]
+    """Configuration of server-side subscriptions to the peer's tracks"""
     additional_properties: Dict[str, Any] = _attrs_field(init=False, factory=dict)
     """@private"""
 
@@ -44,6 +47,8 @@ def to_dict(self) -> Dict[str, Any]:
 
         type = self.type.value
 
+        subscribe = self.subscribe.to_dict() if self.subscribe else None
+
         field_dict: Dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
@@ -53,6 +58,7 @@ def to_dict(self) -> Dict[str, Any]:
                 "status": status,
                 "tracks": tracks,
                 "type": type,
+                "subscribe": subscribe,
             }
         )
 
@@ -61,6 +67,7 @@ def to_dict(self) -> Dict[str, Any]:
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         """@private"""
+        from ..models.subscribe_options import SubscribeOptions
         from ..models.track import Track
 
         d = src_dict.copy()
@@ -79,12 +86,20 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
 
         type = PeerType(d.pop("type"))
 
+        _subscribe = d.pop("subscribe")
+        subscribe: Optional[SubscribeOptions]
+        if _subscribe is None:
+            subscribe = None
+        else:
+            subscribe = SubscribeOptions.from_dict(_subscribe)
+
         peer = cls(
             id=id,
             metadata=metadata,
             status=status,
             tracks=tracks,
             type=type,
+            subscribe=subscribe,
         )
 
         peer.additional_properties = d

fishjam/_openapi_client/models/peer_options_web_rtc.py

@@ -7,7 +7,7 @@
 
 if TYPE_CHECKING:
     from ..models.peer_options_web_rtc_metadata import PeerOptionsWebRTCMetadata
-    from ..models.peer_options_web_rtc_subscribe import PeerOptionsWebRTCSubscribe
+    from ..models.subscribe_options import SubscribeOptions
 
 
 T = TypeVar("T", bound="PeerOptionsWebRTC")
@@ -21,8 +21,8 @@ class PeerOptionsWebRTC:
     """Enables the peer to use simulcast"""
     metadata: Union[Unset, "PeerOptionsWebRTCMetadata"] = UNSET
     """Custom peer metadata"""
-    subscribe: Union[Unset, None, "PeerOptionsWebRTCSubscribe"] = UNSET
-    """Configure server-side subscriptions to the peer's tracks"""
+    subscribe: Union[Unset, None, "SubscribeOptions"] = UNSET
+    """Configuration of server-side subscriptions to the peer's tracks"""
     additional_properties: Dict[str, Any] = _attrs_field(init=False, factory=dict)
     """@private"""
 
@@ -53,7 +53,7 @@ def to_dict(self) -> Dict[str, Any]:
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         """@private"""
         from ..models.peer_options_web_rtc_metadata import PeerOptionsWebRTCMetadata
-        from ..models.peer_options_web_rtc_subscribe import PeerOptionsWebRTCSubscribe
+        from ..models.subscribe_options import SubscribeOptions
 
         d = src_dict.copy()
         enable_simulcast = d.pop("enableSimulcast", UNSET)
@@ -66,13 +66,13 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
             metadata = PeerOptionsWebRTCMetadata.from_dict(_metadata)
 
         _subscribe = d.pop("subscribe", UNSET)
-        subscribe: Union[Unset, None, PeerOptionsWebRTCSubscribe]
+        subscribe: Union[Unset, None, SubscribeOptions]
         if _subscribe is None:
             subscribe = None
         elif isinstance(_subscribe, Unset):
             subscribe = UNSET
         else:
-            subscribe = PeerOptionsWebRTCSubscribe.from_dict(_subscribe)
+            subscribe = SubscribeOptions.from_dict(_subscribe)
 
         peer_options_web_rtc = cls(
             enable_simulcast=enable_simulcast,

…models/peer_options_web_rtc_subscribe.py …enapi_client/models/subscribe_options.pyfishjam/_openapi_client/models/peer_options_web_rtc_subscribe.py renamed to fishjam/_openapi_client/models/subscribe_options.py fishjam/_openapi_client/models/peer_options_web_rtc_subscribe.py renamed to fishjam/_openapi_client/models/subscribe_options.py

@@ -2,34 +2,30 @@
 
 from attrs import define as _attrs_define
 
-from ..models.peer_options_web_rtc_subscribe_audio_format import (
-    PeerOptionsWebRTCSubscribeAudioFormat,
-)
-from ..models.peer_options_web_rtc_subscribe_audio_sample_rate import (
-    PeerOptionsWebRTCSubscribeAudioSampleRate,
-)
+from ..models.subscribe_options_audio_format import SubscribeOptionsAudioFormat
+from ..models.subscribe_options_audio_sample_rate import SubscribeOptionsAudioSampleRate
 from ..types import UNSET, Unset
 
-T = TypeVar("T", bound="PeerOptionsWebRTCSubscribe")
+T = TypeVar("T", bound="SubscribeOptions")
 
 
 @_attrs_define
-class PeerOptionsWebRTCSubscribe:
-    """Configure server-side subscriptions to the peer's tracks
+class SubscribeOptions:
+    """Configuration of server-side subscriptions to the peer's tracks
 
     Example:
         {'audioFormat': 'pcm16'}
 
     """
 
     audio_format: Union[
-        Unset, PeerOptionsWebRTCSubscribeAudioFormat
-    ] = PeerOptionsWebRTCSubscribeAudioFormat.PCM16
-    """The format to use for the output audio"""
+        Unset, SubscribeOptionsAudioFormat
+    ] = SubscribeOptionsAudioFormat.PCM16
+    """The format of the output audio"""
     audio_sample_rate: Union[
-        Unset, PeerOptionsWebRTCSubscribeAudioSampleRate
-    ] = PeerOptionsWebRTCSubscribeAudioSampleRate.VALUE_16000
-    """The sample rate to use for the output audio"""
+        Unset, SubscribeOptionsAudioSampleRate
+    ] = SubscribeOptionsAudioSampleRate.VALUE_16000
+    """The sample rate of the output audio"""
 
     def to_dict(self) -> Dict[str, Any]:
         """@private"""
@@ -55,24 +51,22 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         """@private"""
         d = src_dict.copy()
         _audio_format = d.pop("audioFormat", UNSET)
-        audio_format: Union[Unset, PeerOptionsWebRTCSubscribeAudioFormat]
+        audio_format: Union[Unset, SubscribeOptionsAudioFormat]
         if isinstance(_audio_format, Unset):
             audio_format = UNSET
         else:
-            audio_format = PeerOptionsWebRTCSubscribeAudioFormat(_audio_format)
+            audio_format = SubscribeOptionsAudioFormat(_audio_format)
 
         _audio_sample_rate = d.pop("audioSampleRate", UNSET)
-        audio_sample_rate: Union[Unset, PeerOptionsWebRTCSubscribeAudioSampleRate]
+        audio_sample_rate: Union[Unset, SubscribeOptionsAudioSampleRate]
         if isinstance(_audio_sample_rate, Unset):
             audio_sample_rate = UNSET
         else:
-            audio_sample_rate = PeerOptionsWebRTCSubscribeAudioSampleRate(
-                _audio_sample_rate
-            )
+            audio_sample_rate = SubscribeOptionsAudioSampleRate(_audio_sample_rate)
 
-        peer_options_web_rtc_subscribe = cls(
+        subscribe_options = cls(
             audio_format=audio_format,
             audio_sample_rate=audio_sample_rate,
         )
 
-        return peer_options_web_rtc_subscribe
+        return subscribe_options

…ptions_web_rtc_subscribe_audio_format.py …models/subscribe_options_audio_format.pyfishjam/_openapi_client/models/peer_options_web_rtc_subscribe_audio_format.py renamed to fishjam/_openapi_client/models/subscribe_options_audio_format.py fishjam/_openapi_client/models/peer_options_web_rtc_subscribe_audio_format.py renamed to fishjam/_openapi_client/models/subscribe_options_audio_format.py

@@ -1,8 +1,8 @@
 from enum import Enum
 
 
-class PeerOptionsWebRTCSubscribeAudioFormat(str, Enum):
-    """The format to use for the output audio"""
+class SubscribeOptionsAudioFormat(str, Enum):
+    """The format of the output audio"""
 
     PCM16 = "pcm16"
 

…s_web_rtc_subscribe_audio_sample_rate.py …s/subscribe_options_audio_sample_rate.pyfishjam/_openapi_client/models/peer_options_web_rtc_subscribe_audio_sample_rate.py renamed to fishjam/_openapi_client/models/subscribe_options_audio_sample_rate.py fishjam/_openapi_client/models/peer_options_web_rtc_subscribe_audio_sample_rate.py renamed to fishjam/_openapi_client/models/subscribe_options_audio_sample_rate.py

@@ -1,7 +1,7 @@
 from enum import IntEnum
 
 
-class PeerOptionsWebRTCSubscribeAudioSampleRate(IntEnum):
+class SubscribeOptionsAudioSampleRate(IntEnum):
     VALUE_16000 = 16000
     VALUE_24000 = 24000
 

fishjam/api/_fishjam_client.py

@@ -34,6 +34,7 @@
     RoomDetailsResponse,
     RoomsListingResponse,
     StreamerToken,
+    SubscribeOptions,
     ViewerToken,
 )
 from fishjam.agent import Agent
@@ -78,6 +79,7 @@ class PeerOptions:
     """Enables the peer to use simulcast"""
     metadata: dict[str, Any] | None = None
     """Peer metadata"""
+    subscribe: SubscribeOptions | None = None
 
 
 class FishjamClient(Client):
@@ -116,7 +118,9 @@ def create_peer(
 
         peer_metadata = self.__parse_peer_metadata(options.metadata)
         peer_options = PeerOptionsWebRTC(
-            enable_simulcast=options.enable_simulcast, metadata=peer_metadata
+            enable_simulcast=options.enable_simulcast,
+            metadata=peer_metadata,
+            subscribe=options.subscribe,
         )
         json_body = AddPeerJsonBody(type=PeerType.WEBRTC, options=peer_options)