Merge branch 'main' into dc/media_devices

Author: chenosaurus

livekit-api/livekit/api/__init__.py

@@ -36,7 +36,14 @@
 
 from .twirp_client import TwirpError, TwirpErrorCode
 from .livekit_api import LiveKitAPI
-from .access_token import VideoGrants, SIPGrants, AccessToken, TokenVerifier
+from .access_token import (
+    InferenceGrants,
+    ObservabilityGrants,
+    VideoGrants,
+    SIPGrants,
+    AccessToken,
+    TokenVerifier,
+)
 from .webhook import WebhookReceiver
 from .version import __version__
 
@@ -47,6 +54,8 @@
     "ingress_service",
     "sip_service",
     "agent_dispatch_service",
+    "InferenceGrants",
+    "ObservabilityGrants",
     "VideoGrants",
     "SIPGrants",
     "AccessToken",

livekit-api/livekit/api/access_token.py

@@ -13,11 +13,12 @@
 # limitations under the License.
 
 import calendar
-import dataclasses
 import re
 import datetime
 import os
 import jwt
+import dataclasses
+from dataclasses import dataclass
 from typing import Optional, List, Literal
 from google.protobuf.json_format import MessageToDict, ParseDict
 
@@ -27,7 +28,7 @@
 DEFAULT_LEEWAY = datetime.timedelta(minutes=1)
 
 
-@dataclasses.dataclass
+@dataclass
 class VideoGrants:
     # actions on rooms
     room_create: Optional[bool] = None
@@ -68,21 +69,27 @@ class VideoGrants:
     agent: Optional[bool] = None
 
 
-@dataclasses.dataclass
+@dataclass
 class SIPGrants:
     # manage sip resources
     admin: bool = False
     # make outbound calls
     call: bool = False
 
 
-@dataclasses.dataclass
+@dataclass
 class InferenceGrants:
     # perform inference
     perform: bool = False
 
 
-@dataclasses.dataclass
+@dataclass
+class ObservabilityGrants:
+    # write grants to publish observability data
+    write: bool = False
+
+
+@dataclass
 class Claims:
     identity: str = ""
     name: str = ""
@@ -91,13 +98,14 @@ class Claims:
     video: Optional[VideoGrants] = None
     sip: Optional[SIPGrants] = None
     inference: Optional[InferenceGrants] = None
+    observability: Optional[ObservabilityGrants] = None
     attributes: Optional[dict[str, str]] = None
     sha256: Optional[str] = None
     room_preset: Optional[str] = None
     room_config: Optional[RoomConfiguration] = None
 
     def asdict(self) -> dict:
-        # in order to produce minimal JWT size, exclude None or empty values
+        # in order to produce minimal jwt size, exclude None or empty values
         claims = dataclasses.asdict(
             self,
             dict_factory=lambda items: {
@@ -143,6 +151,10 @@ def with_sip_grants(self, grants: SIPGrants) -> "AccessToken":
         self.claims.sip = grants
         return self
 
+    def with_observability_grants(self, grants: ObservabilityGrants) -> "AccessToken":
+        self.claims.observability = grants
+        return self
+
     def with_inference_grants(self, grants: InferenceGrants) -> "AccessToken":
         self.claims.inference = grants
         return self

livekit-api/livekit/api/sip_service.py

@@ -148,9 +148,9 @@ async def update_inbound_trunk_fields(
         self,
         trunk_id: str,
         *,
-        numbers: Optional[list[str]] = None,
-        allowed_addresses: Optional[list[str]] = None,
-        allowed_numbers: Optional[list[str]] = None,
+        numbers: Optional[ListUpdate | list[str]] = None,
+        allowed_addresses: Optional[ListUpdate | list[str]] = None,
+        allowed_numbers: Optional[ListUpdate | list[str]] = None,
         auth_username: Optional[str] = None,
         auth_password: Optional[str] = None,
         name: Optional[str] = None,
@@ -167,11 +167,26 @@ async def update_inbound_trunk_fields(
             metadata=metadata,
         )
         if numbers is not None:
-            update.numbers.set.extend(numbers)
+            if isinstance(numbers, ListUpdate):
+                update.numbers.set.extend(numbers.set)
+                update.numbers.add.extend(numbers.add)
+                update.numbers.remove.extend(numbers.remove)
+            else:
+                update.numbers.set.extend(numbers)
         if allowed_addresses is not None:
-            update.allowed_addresses.set.extend(allowed_addresses)
+            if isinstance(allowed_addresses, ListUpdate):
+                update.allowed_addresses.set.extend(allowed_addresses.set)
+                update.allowed_addresses.add.extend(allowed_addresses.add)
+                update.allowed_addresses.remove.extend(allowed_addresses.remove)
+            else:
+                update.allowed_addresses.set.extend(allowed_addresses)
         if allowed_numbers is not None:
-            update.allowed_numbers.set.extend(allowed_numbers)
+            if isinstance(allowed_numbers, ListUpdate):
+                update.allowed_numbers.set.extend(allowed_numbers.set)
+                update.allowed_numbers.add.extend(allowed_numbers.add)
+                update.allowed_numbers.remove.extend(allowed_numbers.remove)
+            else:
+                update.allowed_numbers.set.extend(allowed_numbers)
 
         return await self._client.request(
             SVC,
@@ -314,7 +329,7 @@ async def update_outbound_trunk_fields(
         *,
         address: str | None = None,
         transport: SIPTransport | None = None,
-        numbers: list[str] | None = None,
+        numbers: Optional[ListUpdate | list[str]] = None,
         auth_username: str | None = None,
         auth_password: str | None = None,
         name: str | None = None,
@@ -333,7 +348,13 @@ async def update_outbound_trunk_fields(
             metadata=metadata,
         )
         if numbers is not None:
-            update.numbers.set.extend(numbers)
+            if isinstance(numbers, ListUpdate):
+                update.numbers.set.extend(numbers.set)
+                update.numbers.add.extend(numbers.add)
+                update.numbers.remove.extend(numbers.remove)
+            else:
+                update.numbers.set.extend(numbers)
+
         return await self._client.request(
             SVC,
             "UpdateSIPOutboundTrunk",
@@ -586,7 +607,7 @@ async def update_dispatch_rule_fields(
         self,
         rule_id: str,
         *,
-        trunk_ids: Optional[list[str]] = None,
+        trunk_ids: Optional[ListUpdate | list[str]] = None,
         rule: Optional[SIPDispatchRule] = None,
         name: Optional[str] = None,
         metadata: Optional[str] = None,
@@ -601,8 +622,15 @@ async def update_dispatch_rule_fields(
             metadata=metadata,
             rule=rule,
             attributes=attributes,
-            trunk_ids=ListUpdate(set=trunk_ids) if trunk_ids else None,
         )
+        if trunk_ids is not None:
+            if isinstance(trunk_ids, ListUpdate):
+                update.trunk_ids.set.extend(trunk_ids.set)
+                update.trunk_ids.add.extend(trunk_ids.add)
+                update.trunk_ids.remove.extend(trunk_ids.remove)
+            else:
+                update.trunk_ids.set.extend(trunk_ids)
+
         return await self._client.request(
             SVC,
             "UpdateSIPDispatchRule",

livekit-api/livekit/api/version.py

@@ -1 +1 @@
-__version__ = "1.0.5"
+__version__ = "1.0.7"

livekit-protocol/generate_proto.sh

@@ -34,7 +34,8 @@ protoc \
     $API_PROTOCOL/livekit_agent_dispatch.proto \
     $API_PROTOCOL/livekit_metrics.proto \
     $API_PROTOCOL/livekit_sip.proto \
-    $API_PROTOCOL/livekit_analytics.proto
+    $API_PROTOCOL/livekit_analytics.proto \
+    $API_PROTOCOL/agent/livekit_agent_session.proto
 
 
 touch -a "$API_OUT_PYTHON/__init__.py"
@@ -69,6 +70,10 @@ mv "$API_OUT_PYTHON/livekit_sip_pb2.pyi" "$API_OUT_PYTHON/sip.pyi"
 mv "$API_OUT_PYTHON/livekit_metrics_pb2.py" "$API_OUT_PYTHON/metrics.py"
 mv "$API_OUT_PYTHON/livekit_metrics_pb2.pyi" "$API_OUT_PYTHON/metrics.pyi"
 
-perl -i -pe 's|^(import (livekit_egress_pb2\|livekit_room_pb2\|livekit_webhook_pb2\|livekit_ingress_pb2\|livekit_models_pb2\|livekit_agent_pb2\|livekit_agent_dispatch_pb2\|livekit_analytics_pb2\|livekit_sip_pb2\|livekit_metrics_pb2))|from . $1|g' "$API_OUT_PYTHON"/*.py "$API_OUT_PYTHON"/*.pyi
+mkdir -p "$API_OUT_PYTHON/agent_pb"
+mv "$API_OUT_PYTHON/agent/livekit_agent_session_pb2.py" "$API_OUT_PYTHON/agent_pb/agent_session.py"
+mv "$API_OUT_PYTHON/agent/livekit_agent_session_pb2.pyi" "$API_OUT_PYTHON/agent_pb/agent_session.pyi"
 
-perl -i -pe 's|livekit_(\w+)_pb2|${1}|g' "$API_OUT_PYTHON"/*.py "$API_OUT_PYTHON"/*.pyi
+perl -i -pe 's|^(import (livekit_egress_pb2\|livekit_room_pb2\|livekit_webhook_pb2\|livekit_ingress_pb2\|livekit_models_pb2\|livekit_agent_pb2\|livekit_agent_dispatch_pb2\|livekit_analytics_pb2\|livekit_sip_pb2\|livekit_metrics_pb2\|livekit_agent_session_pb2))|from . $1|g' "$API_OUT_PYTHON"/**.py "$API_OUT_PYTHON"/**.pyi
+
+perl -i -pe 's|livekit_(\w+)_pb2|${1}|g' "$API_OUT_PYTHON"/**.py "$API_OUT_PYTHON"/**.pyi