v0.7.1.dev0, fix #136 & don't run builds outside of cibuildwheel (#138)

Author: theomonnom

livekit-rtc/livekit/rtc/_ffi_client.py

@@ -13,11 +13,13 @@
 # limitations under the License.
 
 import asyncio
+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
 
@@ -26,6 +28,9 @@
 
 logger = logging.getLogger("livekit")
 
+_resource_files = ExitStack()
+atexit.register(_resource_files.close)
+
 
 def get_ffi_lib():
     # allow to override the lib path using an env var
@@ -45,12 +50,10 @@ def get_ffi_lib():
                 Set LIVEKIT_LIB_PATH to specify a the lib path"
         )
 
-    with importlib.resources.files("livekit.rtc.resources").joinpath(
-        libname
-    ) as lib_path:
-        # Convert the Traversable object to a string path for ctypes
-        ffi_lib = ctypes.CDLL(str(lib_path))
-        return ffi_lib
+    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 = get_ffi_lib()

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

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

livekit-rtc/livekit/rtc/version.py

@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.7.1.dev0"

livekit-rtc/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-rtc/rust-sdks

@@ -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 @@ def finalize_options(self):
         _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 @@ def run(self):
     url="https://github.com/livekit/python-sdks",
     cmdclass={
         "bdist_wheel": bdist_wheel,
-        "build_py": BuildPyCommand,
     },
     classifiers=[
         "Intended Audience :: Developers",