Skip to content

Commit 229bbe6

Browse files
fix: update protos and allow ListUpdate.{add,remove} in SIP cmds (#496)
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent a255bc0 commit 229bbe6

File tree

7 files changed

+196
-154
lines changed

7 files changed

+196
-154
lines changed

livekit-api/livekit/api/sip_service.py

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,17 +168,23 @@ async def update_inbound_trunk_fields(
168168
)
169169
if numbers is not None:
170170
if isinstance(numbers, ListUpdate):
171-
update.numbers = numbers
171+
update.numbers.set.extend(numbers.set)
172+
update.numbers.add.extend(numbers.add)
173+
update.numbers.remove.extend(numbers.remove)
172174
else:
173175
update.numbers.set.extend(numbers)
174176
if allowed_addresses is not None:
175177
if isinstance(allowed_addresses, ListUpdate):
176-
update.allowed_addresses = allowed_addresses
178+
update.allowed_addresses.set.extend(allowed_addresses.set)
179+
update.allowed_addresses.add.extend(allowed_addresses.add)
180+
update.allowed_addresses.remove.extend(allowed_addresses.remove)
177181
else:
178182
update.allowed_addresses.set.extend(allowed_addresses)
179183
if allowed_numbers is not None:
180184
if isinstance(allowed_numbers, ListUpdate):
181-
update.allowed_numbers = allowed_numbers
185+
update.allowed_numbers.set.extend(allowed_numbers.set)
186+
update.allowed_numbers.add.extend(allowed_numbers.add)
187+
update.allowed_numbers.remove.extend(allowed_numbers.remove)
182188
else:
183189
update.allowed_numbers.set.extend(allowed_numbers)
184190

@@ -343,7 +349,9 @@ async def update_outbound_trunk_fields(
343349
)
344350
if numbers is not None:
345351
if isinstance(numbers, ListUpdate):
346-
update.numbers = numbers
352+
update.numbers.set.extend(numbers.set)
353+
update.numbers.add.extend(numbers.add)
354+
update.numbers.remove.extend(numbers.remove)
347355
else:
348356
update.numbers.set.extend(numbers)
349357

@@ -599,7 +607,7 @@ async def update_dispatch_rule_fields(
599607
self,
600608
rule_id: str,
601609
*,
602-
trunk_ids: Optional[list[str]] = None,
610+
trunk_ids: Optional[ListUpdate | list[str]] = None,
603611
rule: Optional[SIPDispatchRule] = None,
604612
name: Optional[str] = None,
605613
metadata: Optional[str] = None,
@@ -614,8 +622,15 @@ async def update_dispatch_rule_fields(
614622
metadata=metadata,
615623
rule=rule,
616624
attributes=attributes,
617-
trunk_ids=ListUpdate(set=trunk_ids) if trunk_ids else None,
618625
)
626+
if trunk_ids is not None:
627+
if isinstance(trunk_ids, ListUpdate):
628+
update.trunk_ids.set.extend(trunk_ids.set)
629+
update.trunk_ids.add.extend(trunk_ids.add)
630+
update.trunk_ids.remove.extend(trunk_ids.remove)
631+
else:
632+
update.trunk_ids.set.extend(trunk_ids)
633+
619634
return await self._client.request(
620635
SVC,
621636
"UpdateSIPDispatchRule",

livekit-api/livekit/api/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.0.5"
1+
__version__ = "1.0.6"

livekit-protocol/livekit/protocol/models.py

Lines changed: 140 additions & 140 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

livekit-protocol/livekit/protocol/models.pyi

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

livekit-protocol/livekit/protocol/room.py

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

livekit-protocol/livekit/protocol/room.pyi

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

livekit-protocol/protocol

0 commit comments

Comments
 (0)