Merge remote-tracking branch 'origin/main' into genseric/tel-912-transfer-response

Author: genseric-ghiro

livekit-api/livekit/api/twirp_client.py

@@ -14,6 +14,7 @@
 
 import asyncio
 import logging
+import uuid
 from typing import Dict, List, Optional, Type, TypeVar
 
 import aiohttp
@@ -37,6 +38,11 @@
 # Identifies the SDK and version to the server on every request.
 _USER_AGENT = f"livekit-server-sdk-python/{__version__}"
 
+# Carries a per-request idempotency key. The SDK's auto-retries (see _failover)
+# keep the same key across attempts, so the server can identify and deduplicate
+# repeated requests.
+REQUEST_ID_HEADER = "X-Livekit-Request-Id"
+
 # Shared across all clients in the process so the region list is fetched once.
 _REGION_CACHE = RegionCache()
 
@@ -207,6 +213,7 @@ async def request(
         headers["User-Agent"] = _USER_AGENT
         forward_headers = dict(headers)  # for the discovery fetch (no content-type yet)
         headers["Content-Type"] = "application/protobuf"
+        headers[REQUEST_ID_HEADER] = str(uuid.uuid4())
         serialized_data = data.SerializeToString()
 
         # The effective per-attempt timeout is the per-call override, or the

livekit-rtc/livekit/rtc/__init__.py

@@ -66,6 +66,7 @@
 from .room import (
     ConnectError,
     DataPacket,
+    DataStreamOptions,
     Room,
     RoomOptions,
     RtcConfiguration,
@@ -123,6 +124,7 @@
     TextStreamWriter,
     ByteStreamWriter,
     ByteStreamReader,
+    StreamError,
 )
 from .data_track import (
     LocalDataTrack,
@@ -172,6 +174,7 @@
     "ConnectError",
     "Room",
     "RoomOptions",
+    "DataStreamOptions",
     "RtcConfiguration",
     "SimulateScenarioKind",
     "SipDTMF",
@@ -217,6 +220,7 @@
     "TextStreamWriter",
     "ByteStreamReader",
     "ByteStreamWriter",
+    "StreamError",
     "AudioProcessingModule",
     "PlatformAudio",
     "PlatformAudioSource",

livekit-rtc/livekit/rtc/_ffi_client.py

@@ -80,6 +80,15 @@ def __del__(self) -> None:
     def disposed(self) -> bool:
         return self._disposed
 
+    def mark_consumed(self) -> None:
+        """Marks the handle as already released on the native side.
+
+        Some requests take ownership of their handle (``take_handle``) rather
+        than borrowing it. After issuing one, the handle must not be dropped
+        again, so this suppresses the drop that dispose/GC would otherwise do.
+        """
+        self._disposed = True
+
     def dispose(self) -> None:
         if self.handle != INVALID_HANDLE and not self._disposed:
             self._disposed = True