Skip to content

Commit 8a7cb2f

Browse files
AHGIJMKLKKZNPJKQRAHGIJMKLKKZNPJKQR
committed
Update openapi
1 parent c26b1a3 commit 8a7cb2f

22 files changed

+118
-188
lines changed

‎examples/room_manager/arguments.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ def parse_arguments():
77
parser.add_argument("--port", type=int, default=5000)
88
parser.add_argument("--peerless_purge_timeout", type=int, default=None)
99
parser.add_argument("--webhook_url", type=str, default=None)
10-
parser.add_argument("--enable_simulcast", type=str, default=True)
1110
parser.add_argument("--max_peers", type=str, default=None)
1211
parser.add_argument("--fishjam_id", type=str, required=True)
1312
parser.add_argument("--management_token", type=str, default="development")

‎examples/room_manager/room_service.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import betterproto
77

88
from fishjam import FishjamClient, PeerOptions, Room, RoomOptions
9-
from fishjam._openapi_client.models import RoomConfigRoomType
9+
from fishjam._openapi_client.models import RoomType
1010
from fishjam.events import ServerMessagePeerCrashed as PeerCrashed
1111
from fishjam.events import ServerMessagePeerDeleted as PeerDeleted
1212
from fishjam.events import ServerMessageRoomCrashed as RoomCrashed
@@ -41,7 +41,7 @@ def get_peer_access(
4141
self,
4242
room_name: str,
4343
username: str,
44-
room_type: RoomConfigRoomType | None,
44+
room_type: RoomType | None,
4545
) -> PeerAccess:
4646
room = self.__find_or_create_room(room_name, room_type)
4747
peer_access = self.peer_name_to_access.get(username)
@@ -67,9 +67,7 @@ def handle_notification(self, notification: betterproto.Message):
6767
case _:
6868
pass
6969

70-
def __find_or_create_room(
71-
self, room_name: str, room_type: RoomConfigRoomType | None
72-
) -> Room:
70+
def __find_or_create_room(self, room_name: str, room_type: RoomType | None) -> Room:
7371
if room_name in self.room_name_to_room_id:
7472
self.logger.info("Room %s, already exists in the Fishjam", room_name)
7573

@@ -94,7 +92,6 @@ def __create_peer(self, room_name: str, peer_name: str) -> PeerAccess:
9492
room_id = self.room_name_to_room_id[room_name]
9593

9694
options = PeerOptions(
97-
enable_simulcast=self.config.enable_simulcast,
9895
metadata={"username": peer_name},
9996
)
10097
peer, token = self.fishjam_client.create_peer(room_id, options=options)

‎examples/room_manager/routes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from room_service import RoomService
55

66
from fishjam import receive_binary
7-
from fishjam.room import RoomConfigRoomType
7+
from fishjam.room import RoomType
88

99

1010
def setup_routes(app: Flask, room_service: RoomService):
@@ -23,7 +23,7 @@ def get_room_query():
2323
return abort(400)
2424

2525
try:
26-
room_type = RoomConfigRoomType(raw_room_type) if raw_room_type else None
26+
room_type = RoomType(raw_room_type) if raw_room_type else None
2727
except ValueError:
2828
return abort(400)
2929

‎fishjam/_openapi_client/models/__init__.py‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
"""Contains all the data models used in inputs/outputs"""
22

33
from .add_peer_body import AddPeerBody
4+
from .agent_output import AgentOutput
5+
from .audio_format import AudioFormat
6+
from .audio_sample_rate import AudioSampleRate
47
from .error import Error
58
from .peer import Peer
69
from .peer_details_response import PeerDetailsResponse
710
from .peer_details_response_data import PeerDetailsResponseData
811
from .peer_metadata import PeerMetadata
912
from .peer_options_agent import PeerOptionsAgent
10-
from .peer_options_agent_output import PeerOptionsAgentOutput
11-
from .peer_options_agent_output_audio_format import PeerOptionsAgentOutputAudioFormat
12-
from .peer_options_agent_output_audio_sample_rate import (
13-
PeerOptionsAgentOutputAudioSampleRate,
14-
)
15-
from .peer_options_agent_subscribe_mode import PeerOptionsAgentSubscribeMode
1613
from .peer_options_web_rtc import PeerOptionsWebRTC
17-
from .peer_options_web_rtc_metadata import PeerOptionsWebRTCMetadata
18-
from .peer_options_web_rtc_subscribe_mode import PeerOptionsWebRTCSubscribeMode
1914
from .peer_refresh_token_response import PeerRefreshTokenResponse
2015
from .peer_refresh_token_response_data import PeerRefreshTokenResponseData
2116
from .peer_status import PeerStatus
2217
from .peer_type import PeerType
2318
from .room import Room
2419
from .room_config import RoomConfig
25-
from .room_config_room_type import RoomConfigRoomType
26-
from .room_config_video_codec import RoomConfigVideoCodec
2720
from .room_create_details_response import RoomCreateDetailsResponse
2821
from .room_create_details_response_data import RoomCreateDetailsResponseData
2922
from .room_details_response import RoomDetailsResponse
23+
from .room_type import RoomType
3024
from .rooms_listing_response import RoomsListingResponse
3125
from .stream import Stream
3226
from .stream_config import StreamConfig
@@ -38,39 +32,37 @@
3832
from .subscribe_tracks_body import SubscribeTracksBody
3933
from .subscriptions import Subscriptions
4034
from .track import Track
41-
from .track_metadata_type_0 import TrackMetadataType0
35+
from .track_metadata import TrackMetadata
4236
from .track_type import TrackType
37+
from .video_codec import VideoCodec
4338
from .viewer import Viewer
4439
from .viewer_status import ViewerStatus
4540
from .viewer_token import ViewerToken
41+
from .web_rtc_metadata import WebRTCMetadata
4642

4743
__all__ = (
4844
"AddPeerBody",
45+
"AgentOutput",
46+
"AudioFormat",
47+
"AudioSampleRate",
4948
"Error",
5049
"Peer",
5150
"PeerDetailsResponse",
5251
"PeerDetailsResponseData",
5352
"PeerMetadata",
5453
"PeerOptionsAgent",
55-
"PeerOptionsAgentOutput",
56-
"PeerOptionsAgentOutputAudioFormat",
57-
"PeerOptionsAgentOutputAudioSampleRate",
58-
"PeerOptionsAgentSubscribeMode",
5954
"PeerOptionsWebRTC",
60-
"PeerOptionsWebRTCMetadata",
61-
"PeerOptionsWebRTCSubscribeMode",
6255
"PeerRefreshTokenResponse",
6356
"PeerRefreshTokenResponseData",
6457
"PeerStatus",
6558
"PeerType",
6659
"Room",
6760
"RoomConfig",
68-
"RoomConfigRoomType",
69-
"RoomConfigVideoCodec",
7061
"RoomCreateDetailsResponse",
7162
"RoomCreateDetailsResponseData",
7263
"RoomDetailsResponse",
7364
"RoomsListingResponse",
65+
"RoomType",
7466
"Stream",
7567
"StreamConfig",
7668
"Streamer",
@@ -81,9 +73,11 @@
8173
"SubscribeTracksBody",
8274
"Subscriptions",
8375
"Track",
84-
"TrackMetadataType0",
76+
"TrackMetadata",
8577
"TrackType",
78+
"VideoCodec",
8679
"Viewer",
8780
"ViewerStatus",
8881
"ViewerToken",
82+
"WebRTCMetadata",
8983
)

fishjam/_openapi_client/models/peer_options_agent_output.py renamed to fishjam/_openapi_client/models/agent_output.py

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,24 @@
88
from attrs import define as _attrs_define
99
from attrs import field as _attrs_field
1010

11-
from ..models.peer_options_agent_output_audio_format import (
12-
PeerOptionsAgentOutputAudioFormat,
13-
)
14-
from ..models.peer_options_agent_output_audio_sample_rate import (
15-
PeerOptionsAgentOutputAudioSampleRate,
16-
)
11+
from ..models.audio_format import AudioFormat
12+
from ..models.audio_sample_rate import AudioSampleRate
1713
from ..types import UNSET, Unset
1814

19-
T = TypeVar("T", bound="PeerOptionsAgentOutput")
15+
T = TypeVar("T", bound="AgentOutput")
2016

2117

2218
@_attrs_define
23-
class PeerOptionsAgentOutput:
19+
class AgentOutput:
2420
"""Output audio options
2521
2622
Attributes:
27-
audio_format (Union[Unset, PeerOptionsAgentOutputAudioFormat]): The format of the output audio Default:
28-
PeerOptionsAgentOutputAudioFormat.PCM16. Example: pcm16.
29-
audio_sample_rate (Union[Unset, PeerOptionsAgentOutputAudioSampleRate]): The sample rate of the output audio
30-
Default: PeerOptionsAgentOutputAudioSampleRate.VALUE_16000. Example: 16000.
23+
audio_format (Union[Unset, AudioFormat]): The format of the output audio Example: pcm16.
24+
audio_sample_rate (Union[Unset, AudioSampleRate]): The sample rate of the output audio Example: 16000.
3125
"""
3226

33-
audio_format: Union[Unset, PeerOptionsAgentOutputAudioFormat] = (
34-
PeerOptionsAgentOutputAudioFormat.PCM16
35-
)
36-
audio_sample_rate: Union[Unset, PeerOptionsAgentOutputAudioSampleRate] = (
37-
PeerOptionsAgentOutputAudioSampleRate.VALUE_16000
38-
)
27+
audio_format: Union[Unset, AudioFormat] = UNSET
28+
audio_sample_rate: Union[Unset, AudioSampleRate] = UNSET
3929
additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
4030

4131
def to_dict(self) -> dict[str, Any]:
@@ -61,28 +51,26 @@ def to_dict(self) -> dict[str, Any]:
6151
def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
6252
d = dict(src_dict)
6353
_audio_format = d.pop("audioFormat", UNSET)
64-
audio_format: Union[Unset, PeerOptionsAgentOutputAudioFormat]
54+
audio_format: Union[Unset, AudioFormat]
6555
if isinstance(_audio_format, Unset):
6656
audio_format = UNSET
6757
else:
68-
audio_format = PeerOptionsAgentOutputAudioFormat(_audio_format)
58+
audio_format = AudioFormat(_audio_format)
6959

7060
_audio_sample_rate = d.pop("audioSampleRate", UNSET)
71-
audio_sample_rate: Union[Unset, PeerOptionsAgentOutputAudioSampleRate]
61+
audio_sample_rate: Union[Unset, AudioSampleRate]
7262
if isinstance(_audio_sample_rate, Unset):
7363
audio_sample_rate = UNSET
7464
else:
75-
audio_sample_rate = PeerOptionsAgentOutputAudioSampleRate(
76-
_audio_sample_rate
77-
)
65+
audio_sample_rate = AudioSampleRate(_audio_sample_rate)
7866

79-
peer_options_agent_output = cls(
67+
agent_output = cls(
8068
audio_format=audio_format,
8169
audio_sample_rate=audio_sample_rate,
8270
)
8371

84-
peer_options_agent_output.additional_properties = d
85-
return peer_options_agent_output
72+
agent_output.additional_properties = d
73+
return agent_output
8674

8775
@property
8876
def additional_keys(self) -> list[str]:

fishjam/_openapi_client/models/peer_options_agent_output_audio_format.py renamed to fishjam/_openapi_client/models/audio_format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from enum import Enum
22

33

4-
class PeerOptionsAgentOutputAudioFormat(str, Enum):
4+
class AudioFormat(str, Enum):
55
"""The format of the output audio"""
66

77
PCM16 = "pcm16"

fishjam/_openapi_client/models/peer_options_agent_output_audio_sample_rate.py renamed to fishjam/_openapi_client/models/audio_sample_rate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from enum import IntEnum
22

33

4-
class PeerOptionsAgentOutputAudioSampleRate(IntEnum):
4+
class AudioSampleRate(IntEnum):
55
VALUE_16000 = 16000
66
VALUE_24000 = 24000
77

‎fishjam/_openapi_client/models/peer_options_agent.py‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
from attrs import define as _attrs_define
1010
from attrs import field as _attrs_field
1111

12-
from ..models.peer_options_agent_subscribe_mode import PeerOptionsAgentSubscribeMode
12+
from ..models.subscribe_mode import SubscribeMode
1313
from ..types import UNSET, Unset
1414

1515
if TYPE_CHECKING:
16-
from ..models.peer_options_agent_output import PeerOptionsAgentOutput
16+
from ..models.agent_output import AgentOutput
1717

1818

1919
T = TypeVar("T", bound="PeerOptionsAgent")
@@ -24,15 +24,12 @@ class PeerOptionsAgent:
2424
"""Options specific to the Agent peer
2525
2626
Attributes:
27-
output (Union[Unset, PeerOptionsAgentOutput]): Output audio options
28-
subscribe_mode (Union[Unset, PeerOptionsAgentSubscribeMode]): Configuration of peer's subscribing policy
29-
Default: PeerOptionsAgentSubscribeMode.AUTO.
27+
output (Union[Unset, AgentOutput]): Output audio options
28+
subscribe_mode (Union[Unset, SubscribeMode]): Configuration of peer's subscribing policy
3029
"""
3130

32-
output: Union[Unset, "PeerOptionsAgentOutput"] = UNSET
33-
subscribe_mode: Union[Unset, PeerOptionsAgentSubscribeMode] = (
34-
PeerOptionsAgentSubscribeMode.AUTO
35-
)
31+
output: Union[Unset, "AgentOutput"] = UNSET
32+
subscribe_mode: Union[Unset, SubscribeMode] = UNSET
3633
additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
3734

3835
def to_dict(self) -> dict[str, Any]:
@@ -56,22 +53,22 @@ def to_dict(self) -> dict[str, Any]:
5653

5754
@classmethod
5855
def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
59-
from ..models.peer_options_agent_output import PeerOptionsAgentOutput
56+
from ..models.agent_output import AgentOutput
6057

6158
d = dict(src_dict)
6259
_output = d.pop("output", UNSET)
63-
output: Union[Unset, PeerOptionsAgentOutput]
60+
output: Union[Unset, AgentOutput]
6461
if isinstance(_output, Unset):
6562
output = UNSET
6663
else:
67-
output = PeerOptionsAgentOutput.from_dict(_output)
64+
output = AgentOutput.from_dict(_output)
6865

6966
_subscribe_mode = d.pop("subscribeMode", UNSET)
70-
subscribe_mode: Union[Unset, PeerOptionsAgentSubscribeMode]
67+
subscribe_mode: Union[Unset, SubscribeMode]
7168
if isinstance(_subscribe_mode, Unset):
7269
subscribe_mode = UNSET
7370
else:
74-
subscribe_mode = PeerOptionsAgentSubscribeMode(_subscribe_mode)
71+
subscribe_mode = SubscribeMode(_subscribe_mode)
7572

7673
peer_options_agent = cls(
7774
output=output,

‎fishjam/_openapi_client/models/peer_options_agent_subscribe_mode.py‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)