livekit 0.7.0.dev1__tar.gz → 0.7.1.dev1__tar.gz

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livekit
-Version: 0.7.0.dev1
+Version: 0.7.1.dev1
 Summary: Python Real-time SDK for LiveKit
 Home-page: https://github.com/livekit/python-sdks
 License: Apache-2.0
@@ -19,8 +19,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
-Requires-Dist: protobuf>=3.1.0
-Requires-Dist: types-protobuf>=3.1.0
+Requires-Dist: protobuf>=4
+Requires-Dist: types-protobuf>=4
 
 # LiveKit Real-time Python SDK
 

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/__init__.py

@@ -15,7 +15,6 @@
 """LiveKit RTC SDK
 """
 
-# flake8: noqa
 from ._proto.room_pb2 import (
     ConnectionQuality,
     ConnectionState,
@@ -33,7 +32,7 @@ from .audio_frame import AudioFrame
 from .audio_source import AudioSource
 from .audio_stream import AudioStream
 from .participant import LocalParticipant, Participant, RemoteParticipant
-from .room import ConnectError, Room, RoomOptions, RtcConfiguration
+from .room import ConnectError, Room, RoomOptions, RtcConfiguration, DataPacket
 from .track import (
     LocalAudioTrack,
     LocalVideoTrack,
@@ -75,3 +74,65 @@ from .video_source import VideoSource
 from .video_stream import VideoStream
 
 from .version import __version__
+
+__all__ = [
+    "ConnectionQuality",
+    "ConnectionState",
+    "DataPacketKind",
+    "TrackPublishOptions",
+    "IceTransportType",
+    "ContinualGatheringPolicy",
+    "IceServer",
+    "EncryptionType",
+    "EncryptionState",
+    "StreamState",
+    "TrackKind",
+    "TrackSource",
+    "VideoFormatType",
+    "VideoFrameBufferType",
+    "VideoRotation",
+    "stats",
+    "AudioFrame",
+    "AudioSource",
+    "AudioStream",
+    "LocalParticipant",
+    "Participant",
+    "RemoteParticipant",
+    "ConnectError",
+    "Room",
+    "RoomOptions",
+    "RtcConfiguration",
+    "DataPacket",
+    "LocalAudioTrack",
+    "LocalVideoTrack",
+    "RemoteAudioTrack",
+    "RemoteVideoTrack",
+    "Track",
+    "LocalTrack",
+    "RemoteTrack",
+    "AudioTrack",
+    "VideoTrack",
+    "E2EEManager",
+    "E2EEOptions",
+    "KeyProviderOptions",
+    "KeyProvider",
+    "FrameCryptor",
+    "LocalTrackPublication",
+    "RemoteTrackPublication",
+    "TrackPublication",
+    "ArgbFrame",
+    "I010Buffer",
+    "I420ABuffer",
+    "I420Buffer",
+    "I422Buffer",
+    "NativeVideoBuffer",
+    "NV12Buffer",
+    "PlanarYuv8Buffer",
+    "PlanarYuv16Buffer",
+    "PlanarYuvBuffer",
+    "VideoFrame",
+    "VideoFrameBuffer",
+    "VideoSource",
+    "VideoStream",
+    "__version__",
+]

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/_ffi_client.py

@@ -13,22 +13,26 @@
 # limitations under the License.
 
 import asyncio
-import logging
+from contextlib import ExitStack
 import ctypes
+import importlib.resources
+import logging
 import os
 import platform
+import atexit
 import threading
 from typing import Generic, List, Optional, TypeVar
 
-import pkg_resources
-
 from ._proto import ffi_pb2 as proto_ffi
-from ._utils import Queue
+from ._utils import Queue, classproperty
 
 logger = logging.getLogger("livekit")
 
+_resource_files = ExitStack()
+atexit.register(_resource_files.close)
+
 
-def get_ffi_lib_path():
+def get_ffi_lib():
     # allow to override the lib path using an env var
     libpath = os.environ.get("LIVEKIT_LIB_PATH", "").strip()
     if libpath:
@@ -46,13 +50,13 @@ def get_ffi_lib_path():
                 Set LIVEKIT_LIB_PATH to specify a the lib path"
         )
 
-    libpath = pkg_resources.resource_filename(
-        "livekit.rtc", os.path.join("resources", libname)
-    )
-    return libpath
+    res = importlib.resources.files("livekit.rtc.resources") / libname
+    ctx = importlib.resources.as_file(res)
+    path = _resource_files.enter_context(ctx)
+    return ctypes.CDLL(str(path))
 
 
-ffi_lib = ctypes.CDLL(get_ffi_lib_path())
+ffi_lib = get_ffi_lib()
 ffi_cb_fnc = ctypes.CFUNCTYPE(None, ctypes.POINTER(ctypes.c_uint8), ctypes.c_size_t)
 
 # C function types
@@ -142,7 +146,7 @@ def ffi_event_callback(
 
         return  # no need to queue the logs
 
-    ffi_client.queue.put(event)
+    FfiClient.instance.queue.put(event)
 
 
 def to_python_level(level: proto_ffi.LogLevel.ValueType) -> int:
@@ -161,6 +165,14 @@ def to_python_level(level: proto_ffi.LogLevel.ValueType) -> int:
 
 
 class FfiClient:
+    _instance: Optional["FfiClient"] = None
+
+    @classproperty
+    def instance(self):
+        if self._instance is None:
+            self._instance = FfiClient()
+        return self._instance
+
     def __init__(self) -> None:
         self._lock = threading.RLock()
         self._queue = FfiQueue[proto_ffi.FfiEvent]()
@@ -188,6 +200,3 @@ class FfiClient:
 
         FfiHandle(handle)
         return resp
-
-
-ffi_client = FfiClient()

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/_utils.py

@@ -1,8 +1,29 @@
 import asyncio
+import logging
 from collections import deque
 import ctypes
 from typing import Callable, Generic, List, TypeVar
 
+logger = logging.getLogger("livekit")
+
+
+class classproperty(object):
+    def __init__(self, f):
+        self.f = classmethod(f)
+
+    def __get__(self, *a):
+        return self.f.__get__(*a)()
+
+
+def task_done_logger(task: asyncio.Task) -> None:
+    if task.cancelled():
+        logger.info("task cancelled: %s", task)
+        return
+
+    if task.exception():
+        logger.error("task exception: %s", task, exc_info=task.exception())
+        return
+
 
 def get_address(data: memoryview) -> int:
     """Get the address of a buffer using ctypes"""

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/audio_frame.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import ctypes
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import audio_frame_pb2 as proto_audio
 from ._proto import ffi_pb2 as proto_ffi
 from ._utils import get_address
@@ -65,7 +65,7 @@ class AudioFrame:
         req = proto_ffi.FfiRequest()
         req.new_audio_resampler.CopyFrom(proto_audio.NewAudioResamplerRequest())
 
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         resampler_handle = FfiHandle(resp.new_audio_resampler.resampler.handle.id)
 
         resample_req = proto_ffi.FfiRequest()
@@ -74,7 +74,7 @@ class AudioFrame:
         resample_req.remix_and_resample.sample_rate = sample_rate
         resample_req.remix_and_resample.num_channels = num_channels
 
-        resp = ffi_client.request(resample_req)
+        resp = FfiClient.instance.request(resample_req)
         return AudioFrame._from_owned_info(resp.remix_and_resample.buffer)
 
     def _proto_info(self) -> proto_audio.AudioFrameBufferInfo:

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/audio_source.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import audio_frame_pb2 as proto_audio_frame
 from ._proto import ffi_pb2 as proto_ffi
 from .audio_frame import AudioFrame
@@ -27,7 +27,7 @@ class AudioSource:
         req.new_audio_source.sample_rate = sample_rate
         req.new_audio_source.num_channels = num_channels
 
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         self._info = resp.new_audio_source.source
         self._ffi_handle = FfiHandle(self._info.handle.id)
 
@@ -37,15 +37,15 @@ class AudioSource:
         req.capture_audio_frame.source_handle = self._ffi_handle.handle
         req.capture_audio_frame.buffer.CopyFrom(frame._proto_info())
 
-        queue = ffi_client.queue.subscribe()
+        queue = FfiClient.instance.queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             cb = await queue.wait_for(
                 lambda e: e.capture_audio_frame.async_id
                 == resp.capture_audio_frame.async_id
             )
         finally:
-            ffi_client.queue.unsubscribe(queue)
+            FfiClient.instance.queue.unsubscribe(queue)
 
         if cb.capture_audio_frame.error:
             raise Exception(cb.capture_audio_frame.error)

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/audio_stream.py

@@ -15,10 +15,10 @@
 import asyncio
 from typing import Optional
 
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import audio_frame_pb2 as proto_audio_frame
 from ._proto import ffi_pb2 as proto_ffi
-from ._utils import RingQueue
+from ._utils import RingQueue, task_done_logger
 from .audio_frame import AudioFrame
 from .track import Track
 
@@ -32,23 +32,24 @@ class AudioStream:
     ) -> None:
         self._track = track
         self._loop = loop or asyncio.get_event_loop()
-        self._ffi_queue = ffi_client.queue.subscribe(self._loop)
+        self._ffi_queue = FfiClient.instance.queue.subscribe(self._loop)
         self._queue: RingQueue[AudioFrame] = RingQueue(capacity)
 
         req = proto_ffi.FfiRequest()
         new_audio_stream = req.new_audio_stream
         new_audio_stream.track_handle = track._ffi_handle.handle
         new_audio_stream.type = proto_audio_frame.AudioStreamType.AUDIO_STREAM_NATIVE
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
 
         stream_info = resp.new_audio_stream.stream
         self._ffi_handle = FfiHandle(stream_info.handle.id)
         self._info = stream_info
 
         self._task = self._loop.create_task(self._run())
+        self._task.add_done_callback(task_done_logger)
 
     def __del__(self) -> None:
-        ffi_client.queue.unsubscribe(self._ffi_queue)
+        FfiClient.instance.queue.unsubscribe(self._ffi_queue)
 
     async def _run(self):
         while True:
@@ -62,7 +63,7 @@ class AudioStream:
             elif audio_event.HasField("eos"):
                 break
 
-        ffi_client.queue.unsubscribe(self._ffi_queue)
+        FfiClient.instance.queue.unsubscribe(self._ffi_queue)
 
     async def aclose(self):
         self._ffi_handle.dispose()

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/e2ee.py

@@ -15,7 +15,7 @@
 from dataclasses import dataclass, field
 from typing import List, Optional
 
-from ._ffi_client import ffi_client
+from ._ffi_client import FfiClient
 from ._proto import e2ee_pb2 as proto_e2ee
 from ._proto import ffi_pb2 as proto_ffi
 
@@ -52,13 +52,13 @@ class KeyProvider:
         req.e2ee.room_handle = self._room_handle
         req.e2ee.set_shared_key.key_index = key_index
         req.e2ee.set_shared_key.shared_key = key
-        ffi_client.request(req)
+        FfiClient.instance.request(req)
 
     def export_shared_key(self, key_index: int) -> bytes:
         req = proto_ffi.FfiRequest()
         req.e2ee.room_handle = self._room_handle
         req.e2ee.get_shared_key.key_index = key_index
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         key = resp.e2ee.get_shared_key.key
         return key
 
@@ -67,7 +67,7 @@ class KeyProvider:
         req.e2ee.room_handle = self._room_handle
         req.e2ee.ratchet_shared_key.key_index = key_index
 
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
 
         new_key = resp.e2ee.ratchet_shared_key.new_key
         return new_key
@@ -80,14 +80,14 @@ class KeyProvider:
         req.e2ee.set_key.key = key
 
         self.key_index = key_index
-        ffi_client.request(req)
+        FfiClient.instance.request(req)
 
     def export_key(self, participant_identity: str, key_index: int) -> bytes:
         req = proto_ffi.FfiRequest()
         req.e2ee.room_handle = self._room_handle
         req.e2ee.get_key.participant_identity = participant_identity
         req.e2ee.get_key.key_index = key_index
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         key = resp.e2ee.get_key.key
         return key
 
@@ -97,7 +97,7 @@ class KeyProvider:
         req.e2ee.ratchet_key.participant_identity = participant_identity
         req.e2ee.ratchet_key.key_index = key_index
 
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         new_key = resp.e2ee.ratchet_key.new_key
         return new_key
 
@@ -129,7 +129,7 @@ class FrameCryptor:
         req.e2ee.room_handle = self._room_handle
         req.e2ee.cryptor_set_enabled.participant_identity = self._participant_identity
         req.e2ee.cryptor_set_enabled.enabled = enabled
-        ffi_client.request(req)
+        FfiClient.instance.request(req)
 
     def set_key_index(self, key_index: int) -> None:
         self._key_index = key_index
@@ -137,7 +137,7 @@ class FrameCryptor:
         req.e2ee.room_handle = self._room_handle
         req.e2ee.cryptor_set_key_index.participant_identity = self._participant_identity
         req.e2ee.cryptor_set_key_index.key_index = key_index
-        ffi_client.request(req)
+        FfiClient.instance.request(req)
 
 
 class E2EEManager:
@@ -164,13 +164,13 @@ class E2EEManager:
         req = proto_ffi.FfiRequest()
         req.e2ee.room_handle = self._room_handle
         req.e2ee.manager_set_enabled.enabled = enabled
-        ffi_client.request(req)
+        FfiClient.instance.request(req)
 
     def frame_cryptors(self) -> List[FrameCryptor]:
         req = proto_ffi.FfiRequest()
         req.e2ee.room_handle = self._room_handle
 
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         frame_cryptors = []
         for frame_cryptor in resp.e2ee.manager_get_frame_cryptors.frame_cryptors:
             frame_cryptors.append(

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/participant.py

@@ -15,7 +15,7 @@
 import ctypes
 from typing import List, Union
 
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import ffi_pb2 as proto_ffi
 from ._proto import participant_pb2 as proto_participant
 from ._proto.room_pb2 import DataPacketKind, TrackPublishOptions
@@ -105,14 +105,14 @@ class LocalParticipant(Participant):
 
         req.publish_data.destination_sids.extend(sids)
 
-        queue = ffi_client.queue.subscribe()
+        queue = FfiClient.instance.queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             cb = await queue.wait_for(
                 lambda e: e.publish_data.async_id == resp.publish_data.async_id
             )
         finally:
-            ffi_client.queue.unsubscribe(queue)
+            FfiClient.instance.queue.unsubscribe(queue)
 
         if cb.publish_data.error:
             raise PublishDataError(cb.publish_data.error)
@@ -122,30 +122,30 @@ class LocalParticipant(Participant):
         req.update_local_metadata.local_participant_handle = self._ffi_handle.handle
         req.update_local_metadata.metadata = metadata
 
-        queue = ffi_client.queue.subscribe()
+        queue = FfiClient.instance.queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             await queue.wait_for(
                 lambda e: e.update_local_metadata.async_id
                 == resp.update_local_metadata.async_id
             )
         finally:
-            ffi_client.queue.unsubscribe(queue)
+            FfiClient.instance.queue.unsubscribe(queue)
 
     async def update_name(self, name: str) -> None:
         req = proto_ffi.FfiRequest()
         req.update_local_name.local_participant_handle = self._ffi_handle.handle
         req.update_local_name.name = name
 
-        queue = ffi_client.queue.subscribe()
+        queue = FfiClient.instance.queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             await queue.wait_for(
                 lambda e: e.update_local_name.async_id
                 == resp.update_local_name.async_id
             )
         finally:
-            ffi_client.queue.unsubscribe(queue)
+            FfiClient.instance.queue.unsubscribe(queue)
 
     async def publish_track(
         self, track: LocalTrack, options: TrackPublishOptions
@@ -157,7 +157,7 @@ class LocalParticipant(Participant):
 
         queue = self._room_queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             cb = await queue.wait_for(
                 lambda e: e.publish_track.async_id == resp.publish_track.async_id
             )
@@ -167,6 +167,7 @@ class LocalParticipant(Participant):
 
             track_publication = LocalTrackPublication(cb.publish_track.publication)
             track_publication.track = track
+            track._info.sid = track_publication.sid
             self.tracks[track_publication.sid] = track_publication
 
             queue.task_done()
@@ -181,7 +182,7 @@ class LocalParticipant(Participant):
 
         queue = self._room_queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             cb = await queue.wait_for(
                 lambda e: e.unpublish_track.async_id == resp.unpublish_track.async_id
             )

livekit-0.7.1.dev1/livekit/rtc/resources/__init__.py

@@ -0,0 +1 @@
+""" Used by importlib.resources and setuptools """

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/room.py

@@ -17,7 +17,7 @@ import ctypes
 import logging
 from dataclasses import dataclass, field
 from typing import Dict, Optional, Literal
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import ffi_pb2 as proto_ffi
 from ._proto import participant_pb2 as proto_participant
 from ._proto import room_pb2 as proto_room
@@ -76,6 +76,16 @@ class RoomOptions:
     rtc_config: Optional[RtcConfiguration] = None
 
 
+@dataclass
+class DataPacket:
+    data: bytes
+    kind: proto_room.DataPacketKind.ValueType
+    participant: Optional[
+        RemoteParticipant
+    ] = None  # None when the data has been sent by a server SDK
+    topic: Optional[str] = None
+
+
 class ConnectError(Exception):
     def __init__(self, message: str):
         self.message = message
@@ -95,7 +105,7 @@ class Room(EventEmitter[EventTypes]):
 
     def __del__(self) -> None:
         if self._ffi_handle is not None:
-            ffi_client.queue.unsubscribe(self._ffi_queue)
+            FfiClient.instance.queue.unsubscribe(self._ffi_queue)
 
     @property
     def sid(self) -> str:
@@ -157,19 +167,19 @@ class Room(EventEmitter[EventTypes]):
             )
 
         # subscribe before connecting so we don't miss any events
-        self._ffi_queue = ffi_client.queue.subscribe(self._loop)
+        self._ffi_queue = FfiClient.instance.queue.subscribe(self._loop)
 
-        queue = ffi_client.queue.subscribe()
+        queue = FfiClient.instance.queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             cb = await queue.wait_for(
                 lambda e: e.connect.async_id == resp.connect.async_id
             )
         finally:
-            ffi_client.queue.unsubscribe(queue)
+            FfiClient.instance.queue.unsubscribe(queue)
 
         if cb.connect.error:
-            ffi_client.queue.unsubscribe(self._ffi_queue)
+            FfiClient.instance.queue.unsubscribe(self._ffi_queue)
             raise ConnectError(cb.connect.error)
 
         self._ffi_handle = FfiHandle(cb.connect.room.handle.id)
@@ -201,17 +211,17 @@ class Room(EventEmitter[EventTypes]):
         req = proto_ffi.FfiRequest()
         req.disconnect.room_handle = self._ffi_handle.handle  # type: ignore
 
-        queue = ffi_client.queue.subscribe()
+        queue = FfiClient.instance.queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             await queue.wait_for(
                 lambda e: e.disconnect.async_id == resp.disconnect.async_id
             )
         finally:
-            ffi_client.queue.unsubscribe(queue)
+            FfiClient.instance.queue.unsubscribe(queue)
 
         await self._task
-        ffi_client.queue.unsubscribe(self._ffi_queue)
+        FfiClient.instance.queue.unsubscribe(self._ffi_queue)
 
     async def _listen_task(self) -> None:
         # listen to incoming room events
@@ -372,10 +382,12 @@ class Room(EventEmitter[EventTypes]):
                 rparticipant = self.participants[event.data_received.participant_sid]
             self.emit(
                 "data_received",
-                data,
-                event.data_received.kind,
-                rparticipant,
-                event.data_received.topic,
+                DataPacket(
+                    data=data,
+                    kind=event.data_received.kind,
+                    participant=rparticipant,
+                    topic=event.data_received.topic,
+                ),
             )
         elif which == "e2ee_state_changed":
             sid = event.e2ee_state_changed.participant_sid

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/track.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from typing import TYPE_CHECKING, List, Union
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import ffi_pb2 as proto_ffi
 from ._proto import track_pb2 as proto_track
 from ._proto import stats_pb2 as proto_stats
@@ -52,14 +52,14 @@ class Track:
         req = proto_ffi.FfiRequest()
         req.get_stats.track_handle = self._ffi_handle.handle
 
-        queue = ffi_client.queue.subscribe()
+        queue = FfiClient.instance.queue.subscribe()
         try:
-            resp = ffi_client.request(req)
+            resp = FfiClient.instance.request(req)
             cb = await queue.wait_for(
                 lambda e: e.get_stats.async_id == resp.get_stats.async_id
             )
         finally:
-            ffi_client.queue.unsubscribe(queue)
+            FfiClient.instance.queue.unsubscribe(queue)
 
         if cb.get_stats.error:
             raise Exception(cb.get_stats.error)
@@ -77,7 +77,7 @@ class LocalAudioTrack(Track):
         req.create_audio_track.name = name
         req.create_audio_track.source_handle = source._ffi_handle.handle
 
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         return LocalAudioTrack(resp.create_audio_track.track)
 
 
@@ -91,7 +91,7 @@ class LocalVideoTrack(Track):
         req.create_video_track.name = name
         req.create_video_track.source_handle = source._ffi_handle.handle
 
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         return LocalVideoTrack(resp.create_video_track.track)
 
 

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/track_publication.py

@@ -14,7 +14,7 @@
 
 from typing import Optional
 
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import e2ee_pb2 as proto_e2ee
 from ._proto import ffi_pb2 as proto_ffi
 from ._proto import track_pb2 as proto_track
@@ -82,4 +82,4 @@ class RemoteTrackPublication(TrackPublication):
         req = proto_ffi.FfiRequest()
         req.set_subscribed.subscribe = subscribed
         req.set_subscribed.publication_handle = self._ffi_handle.handle
-        ffi_client.request(req)
+        FfiClient.instance.request(req)

livekit-0.7.1.dev1/livekit/rtc/version.py

@@ -0,0 +1 @@
+__version__ = "0.7.1.dev1"

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/video_frame.py

@@ -15,7 +15,7 @@
 import ctypes
 from typing import Union
 
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import ffi_pb2 as proto_ffi
 from ._utils import get_address
 from ._proto import video_frame_pb2 as proto_video_frame
@@ -75,7 +75,7 @@ class VideoFrameBuffer(ABC):
     def to_i420(self) -> "I420Buffer":
         req = proto_ffi.FfiRequest()
         req.to_i420.buffer.CopyFrom(self._proto_info())
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         return I420Buffer._from_owned_info(resp.to_i420.buffer)
 
     def to_argb(self, dst: "ArgbFrame") -> None:
@@ -86,7 +86,7 @@ class VideoFrameBuffer(ABC):
         req.to_argb.dst_stride = dst.stride
         req.to_argb.dst_width = dst.width
         req.to_argb.dst_height = dst.height
-        ffi_client.request(req)
+        FfiClient.instance.request(req)
 
     @staticmethod
     def _from_owned_info(
@@ -139,7 +139,7 @@ class NativeVideoBuffer(VideoFrameBuffer):
     def to_i420(self) -> "I420Buffer":
         req = proto_ffi.FfiRequest()
         req.to_i420.handle = self._ffi_handle.handle
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         return I420Buffer._from_owned_info(resp.to_i420.buffer)
 
     def to_argb(self, dst: "ArgbFrame") -> None:
@@ -768,7 +768,7 @@ class ArgbFrame:
         req.to_i420.argb.height = self.height
         req.to_i420.argb.stride = self.stride
         req.to_i420.argb.ptr = get_address(memoryview(self._data))
-        res = ffi_client.request(req)
+        res = FfiClient.instance.request(req)
         return I420Buffer._from_owned_info(res.to_i420.buffer)
 
     @property

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/video_source.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import ffi_pb2 as proto_ffi
 from ._proto import video_frame_pb2 as proto_video_frame
 from .video_frame import VideoFrame
@@ -27,7 +27,7 @@ class VideoSource:
         req.new_video_source.resolution.width = width
         req.new_video_source.resolution.height = height
 
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
         self._info = resp.new_video_source.source
         self._ffi_handle = FfiHandle(self._info.handle.id)
 
@@ -37,4 +37,4 @@ class VideoSource:
         req.capture_video_frame.info.CopyFrom(frame.buffer._proto_info())
         req.capture_video_frame.frame.rotation = frame.rotation
         req.capture_video_frame.frame.timestamp_us = frame.timestamp_us
-        ffi_client.request(req)
+        FfiClient.instance.request(req)

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit/rtc/video_stream.py

@@ -15,10 +15,10 @@
 import asyncio
 from typing import Optional
 
-from ._ffi_client import FfiHandle, ffi_client
+from ._ffi_client import FfiHandle, FfiClient
 from ._proto import ffi_pb2 as proto_ffi
 from ._proto import video_frame_pb2 as proto_video_frame
-from ._utils import RingQueue
+from ._utils import RingQueue, task_done_logger
 from .track import Track
 from .video_frame import VideoFrame, VideoFrameBuffer
 
@@ -32,22 +32,23 @@ class VideoStream:
     ) -> None:
         self._track = track
         self._loop = loop or asyncio.get_event_loop()
-        self._ffi_queue = ffi_client.queue.subscribe(self._loop)
+        self._ffi_queue = FfiClient.instance.queue.subscribe(self._loop)
         self._queue: RingQueue[VideoFrame] = RingQueue(capacity)
 
         req = proto_ffi.FfiRequest()
         new_video_stream = req.new_video_stream
         new_video_stream.track_handle = track._ffi_handle.handle
         new_video_stream.type = proto_video_frame.VideoStreamType.VIDEO_STREAM_NATIVE
-        resp = ffi_client.request(req)
+        resp = FfiClient.instance.request(req)
 
         stream_info = resp.new_video_stream.stream
         self._ffi_handle = FfiHandle(stream_info.handle.id)
         self._info = stream_info.info
         self._task = self._loop.create_task(self._run())
+        self._task.add_done_callback(task_done_logger)
 
     def __del__(self) -> None:
-        ffi_client.queue.unsubscribe(self._ffi_queue)
+        FfiClient.instance.queue.unsubscribe(self._ffi_queue)
 
     async def _run(self):
         while True:
@@ -67,7 +68,7 @@ class VideoStream:
             elif video_event.HasField("eos"):
                 break
 
-        ffi_client.queue.unsubscribe(self._ffi_queue)
+        FfiClient.instance.queue.unsubscribe(self._ffi_queue)
 
     async def aclose(self):
         self._ffi_handle.dispose()

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livekit
-Version: 0.7.0.dev1
+Version: 0.7.1.dev1
 Summary: Python Real-time SDK for LiveKit
 Home-page: https://github.com/livekit/python-sdks
 License: Apache-2.0
@@ -19,8 +19,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
-Requires-Dist: protobuf>=3.1.0
-Requires-Dist: types-protobuf>=3.1.0
+Requires-Dist: protobuf>=4
+Requires-Dist: types-protobuf>=4
 
 # LiveKit Real-time Python SDK
 

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/livekit.egg-info/SOURCES.txt

@@ -40,4 +40,5 @@ livekit/rtc/_proto/stats_pb2.pyi
 livekit/rtc/_proto/track_pb2.py
 livekit/rtc/_proto/track_pb2.pyi
 livekit/rtc/_proto/video_frame_pb2.py
-livekit/rtc/_proto/video_frame_pb2.pyi
+livekit/rtc/_proto/video_frame_pb2.pyi
+livekit/rtc/resources/__init__.py

livekit-0.7.1.dev1/livekit.egg-info/requires.txt

@@ -0,0 +1,2 @@
+protobuf>=4
+types-protobuf>=4

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/pyproject.toml

@@ -10,6 +10,8 @@ build-backend = "setuptools.build_meta"
 build = "cp39-*"
 skip = "*-musllinux_*" # not supported (libwebrtc is using glibc)
 
+before-build = "pip install requests && python rust-sdks/download_ffi.py --output livekit/rtc/resources"
+
 manylinux-x86_64-image = "manylinux_2_28"
 manylinux-i686-image = "manylinux_2_28"
 manylinux-aarch64-image = "manylinux_2_28"

{livekit-0.7.0.dev1 → livekit-0.7.1.dev1}/setup.py

@@ -14,8 +14,6 @@
 
 import os
 import pathlib
-import subprocess
-
 import setuptools
 import setuptools.command.build_py
 from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
@@ -33,30 +31,6 @@ class bdist_wheel(_bdist_wheel):
         _bdist_wheel.finalize_options(self)
 
 
-class BuildPyCommand(setuptools.command.build_py.build_py):
-    """Download a prebuilt version of livekit_ffi"""
-
-    def run(self):
-        download_script = here / "rust-sdks" / "download_ffi.py"
-        output = here / "livekit" / "rtc" / "resources"
-        cmd = [
-            "python3",
-            str(download_script.absolute()),
-            "--output",
-            str(output.absolute()),
-        ]
-
-        # cibuildwheel is crosscompiling to arm64 on macos, make sure we download the
-        # right binary (kind of a hack here...)
-        if os.environ.get("CIBUILDWHEEL") == "1" and "arm64" in os.environ.get(
-            "ARCHFLAGS", ""
-        ):
-            cmd += ["--arch", "arm64"]
-
-        subprocess.run(cmd, check=True)
-        setuptools.command.build_py.build_py.run(self)
-
-
 setuptools.setup(
     name="livekit",
     version=about["__version__"],
@@ -66,7 +40,6 @@ setuptools.setup(
     url="https://github.com/livekit/python-sdks",
     cmdclass={
         "bdist_wheel": bdist_wheel,
-        "build_py": BuildPyCommand,
     },
     classifiers=[
         "Intended Audience :: Developers",
@@ -83,9 +56,10 @@ setuptools.setup(
     license="Apache-2.0",
     packages=setuptools.find_namespace_packages(include=["livekit.*"]),
     python_requires=">=3.9.0",
-    install_requires=["protobuf>=3.1.0", "types-protobuf>=3.1.0"],
+    install_requires=["protobuf>=4", "types-protobuf>=4"],
     package_data={
-        "livekit.rtc": ["resources/*", "_proto/*.py", "py.typed", "*.pyi", "**/*.pyi"],
+        "livekit.rtc": ["_proto/*.py", "py.typed", "*.pyi", "**/*.pyi"],
+        "livekit.rtc.resources": ["*.so", "*.dylib", "*.dll", "LICENSE.md", "*.h"],
     },
     project_urls={
         "Documentation": "https://docs.livekit.io",

livekit-0.7.0.dev1/livekit/rtc/version.py

@@ -1 +0,0 @@
-__version__ = "0.7.0.dev1"

livekit-0.7.0.dev1/livekit.egg-info/requires.txt

@@ -1,2 +0,0 @@
-protobuf>=3.1.0
-types-protobuf>=3.1.0