Openapi changes

Author: AHGIJMKLKKZNPJKQR

fishjam/_openapi_client/models/__init__.py

@@ -10,6 +10,13 @@
 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_options import PeerOptionsWebRTCSubscribeOptions
+from .peer_options_web_rtc_subscribe_options_audio_format import (
+    PeerOptionsWebRTCSubscribeOptionsAudioFormat,
+)
+from .peer_options_web_rtc_subscribe_options_audio_sample_rate import (
+    PeerOptionsWebRTCSubscribeOptionsAudioSampleRate,
+)
 from .peer_refresh_token_response import PeerRefreshTokenResponse
 from .peer_refresh_token_response_data import PeerRefreshTokenResponseData
 from .peer_status import PeerStatus
@@ -41,6 +48,9 @@
     "PeerOptionsAgent",
     "PeerOptionsWebRTC",
     "PeerOptionsWebRTCMetadata",
+    "PeerOptionsWebRTCSubscribeOptions",
+    "PeerOptionsWebRTCSubscribeOptionsAudioFormat",
+    "PeerOptionsWebRTCSubscribeOptionsAudioSampleRate",
     "PeerRefreshTokenResponse",
     "PeerRefreshTokenResponseData",
     "PeerStatus",

fishjam/_openapi_client/models/add_peer_json_body.py

@@ -1,4 +1,12 @@
-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_options_web_rtc.py

@@ -7,7 +7,9 @@
 
 if TYPE_CHECKING:
     from ..models.peer_options_web_rtc_metadata import PeerOptionsWebRTCMetadata
-    from ..models.subscribe_options import SubscribeOptions
+    from ..models.peer_options_web_rtc_subscribe_options import (
+        PeerOptionsWebRTCSubscribeOptions,
+    )
 
 
 T = TypeVar("T", bound="PeerOptionsWebRTC")
@@ -21,7 +23,7 @@ class PeerOptionsWebRTC:
     """Enables the peer to use simulcast"""
     metadata: Union[Unset, "PeerOptionsWebRTCMetadata"] = UNSET
     """Custom peer metadata"""
-    subscribe: Union[Unset, None, "SubscribeOptions"] = UNSET
+    subscribe: Union[Unset, None, "PeerOptionsWebRTCSubscribeOptions"] = 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 +55,9 @@ 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.subscribe_options import SubscribeOptions
+        from ..models.peer_options_web_rtc_subscribe_options import (
+            PeerOptionsWebRTCSubscribeOptions,
+        )
 
         d = src_dict.copy()
         enable_simulcast = d.pop("enableSimulcast", UNSET)
@@ -66,13 +70,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, SubscribeOptions]
+        subscribe: Union[Unset, None, PeerOptionsWebRTCSubscribeOptions]
         if _subscribe is None:
             subscribe = None
         elif isinstance(_subscribe, Unset):
             subscribe = UNSET
         else:
-            subscribe = SubscribeOptions.from_dict(_subscribe)
+            subscribe = PeerOptionsWebRTCSubscribeOptions.from_dict(_subscribe)
 
         peer_options_web_rtc = cls(
             enable_simulcast=enable_simulcast,

fishjam/_openapi_client/models/peer_options_web_rtc_subscribe_options.py

@@ -0,0 +1,80 @@
+from typing import Any, Dict, Type, TypeVar, Union
+
+from attrs import define as _attrs_define
+
+from ..models.peer_options_web_rtc_subscribe_options_audio_format import (
+    PeerOptionsWebRTCSubscribeOptionsAudioFormat,
+)
+from ..models.peer_options_web_rtc_subscribe_options_audio_sample_rate import (
+    PeerOptionsWebRTCSubscribeOptionsAudioSampleRate,
+)
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="PeerOptionsWebRTCSubscribeOptions")
+
+
+@_attrs_define
+class PeerOptionsWebRTCSubscribeOptions:
+    """Configuration of server-side subscriptions to the peer's tracks
+
+    Example:
+        {'audioFormat': 'pcm16'}
+
+    """
+
+    audio_format: Union[
+        Unset, PeerOptionsWebRTCSubscribeOptionsAudioFormat
+    ] = PeerOptionsWebRTCSubscribeOptionsAudioFormat.PCM16
+    """The format of the output audio"""
+    audio_sample_rate: Union[
+        Unset, PeerOptionsWebRTCSubscribeOptionsAudioSampleRate
+    ] = PeerOptionsWebRTCSubscribeOptionsAudioSampleRate.VALUE_16000
+    """The sample rate of the output audio"""
+
+    def to_dict(self) -> Dict[str, Any]:
+        """@private"""
+        audio_format: Union[Unset, str] = UNSET
+        if not isinstance(self.audio_format, Unset):
+            audio_format = self.audio_format.value
+
+        audio_sample_rate: Union[Unset, int] = UNSET
+        if not isinstance(self.audio_sample_rate, Unset):
+            audio_sample_rate = self.audio_sample_rate.value
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update({})
+        if audio_format is not UNSET:
+            field_dict["audioFormat"] = audio_format
+        if audio_sample_rate is not UNSET:
+            field_dict["audioSampleRate"] = audio_sample_rate
+
+        return field_dict
+
+    @classmethod
+    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, PeerOptionsWebRTCSubscribeOptionsAudioFormat]
+        if isinstance(_audio_format, Unset):
+            audio_format = UNSET
+        else:
+            audio_format = PeerOptionsWebRTCSubscribeOptionsAudioFormat(_audio_format)
+
+        _audio_sample_rate = d.pop("audioSampleRate", UNSET)
+        audio_sample_rate: Union[
+            Unset, PeerOptionsWebRTCSubscribeOptionsAudioSampleRate
+        ]
+        if isinstance(_audio_sample_rate, Unset):
+            audio_sample_rate = UNSET
+        else:
+            audio_sample_rate = PeerOptionsWebRTCSubscribeOptionsAudioSampleRate(
+                _audio_sample_rate
+            )
+
+        peer_options_web_rtc_subscribe_options = cls(
+            audio_format=audio_format,
+            audio_sample_rate=audio_sample_rate,
+        )
+
+        return peer_options_web_rtc_subscribe_options

fishjam/_openapi_client/models/peer_options_web_rtc_subscribe_options_audio_format.py

@@ -0,0 +1,10 @@
+from enum import Enum
+
+
+class PeerOptionsWebRTCSubscribeOptionsAudioFormat(str, Enum):
+    """The format of the output audio"""
+
+    PCM16 = "pcm16"
+
+    def __str__(self) -> str:
+        return str(self.value)

fishjam/_openapi_client/models/peer_options_web_rtc_subscribe_options_audio_sample_rate.py

@@ -0,0 +1,9 @@
+from enum import IntEnum
+
+
+class PeerOptionsWebRTCSubscribeOptionsAudioSampleRate(IntEnum):
+    VALUE_16000 = 16000
+    VALUE_24000 = 24000
+
+    def __str__(self) -> str:
+        return str(self.value)

fishjam/api/_fishjam_client.py

@@ -25,6 +25,7 @@
     PeerOptionsAgent,
     PeerOptionsWebRTC,
     PeerOptionsWebRTCMetadata,
+    PeerOptionsWebRTCSubscribeOptions,
     PeerRefreshTokenResponse,
     PeerType,
     RoomConfig,
@@ -120,7 +121,7 @@ def create_peer(
         peer_options = PeerOptionsWebRTC(
             enable_simulcast=options.enable_simulcast,
             metadata=peer_metadata,
-            subscribe=options.subscribe,
+            subscribe=self.__parse_subscribe_options(options.subscribe),
         )
         json_body = AddPeerJsonBody(type=PeerType.WEBRTC, options=peer_options)
 
@@ -233,3 +234,11 @@ def __parse_peer_metadata(self, metadata: dict | None) -> PeerOptionsWebRTCMetad
             peer_metadata.additional_properties[key] = value
 
         return peer_metadata
+
+    def __parse_subscribe_options(
+        self,
+        options: SubscribeOptions | None,
+    ) -> PeerOptionsWebRTCSubscribeOptions | None:
+        if options is None:
+            return None
+        return PeerOptionsWebRTCSubscribeOptions.from_dict(options.to_dict())