sora-sdk 2025.4.0.dev3__tar.gz → 2025.4.0.dev6__tar.gz

{sora_sdk-2025.4.0.dev3/src/sora_sdk.egg-info → sora_sdk-2025.4.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sora_sdk
-Version: 2025.4.0.dev3
+Version: 2025.4.0.dev6
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>

sora_sdk-2025.4.0.dev6/VERSION

@@ -0,0 +1 @@
+2025.4.0.dev6

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6}/pyproject.toml

@@ -26,16 +26,15 @@ build-backend = "setuptools.build_meta"
 [tool.uv]
 python-preference = "only-managed"
 dev-dependencies = [
-    "nanobind==2.8.0",
-    "setuptools==80.9",
-    "build==1.3.0",
-    "wheel==0.45.1",
+    "nanobind==2.9.2",
+    "setuptools==80.9.0",
+    "pytest",
+    "pytest-repeat",
+    "pytest-xdist",
     "numpy",
     "httpx",
-    "pytest",
-    "ruff",
     "pyjwt",
-    "pytest-repeat",
+    "ruff",
     "ty",
 ]
 
@@ -43,6 +42,8 @@ dev-dependencies = [
 target-version = "py311"
 line-length = 100
 
+[tool.ty.src]
+include = ["src", "tests"]
 
 [tool.pytest.ini_options]
 xfail_strict = true

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6}/run.py

@@ -1,4 +1,5 @@
 import argparse
+import glob
 import hashlib
 import importlib.metadata
 import multiprocessing
@@ -180,35 +181,48 @@ AVAILABLE_TARGETS = [
 ]
 
 
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--debug", action="store_true")
-    parser.add_argument("--relwithdebinfo", action="store_true")
-    parser.add_argument("--local-webrtc-build-dir", type=os.path.abspath)
-    parser.add_argument("--local-webrtc-build-args", default="", type=shlex.split)
-    parser.add_argument("--local-sora-cpp-sdk-dir", type=os.path.abspath)
-    parser.add_argument("--local-sora-cpp-sdk-args", default="", type=shlex.split)
-    parser.add_argument("target", choices=AVAILABLE_TARGETS)
+def _find_clang_binary(name: str) -> Optional[str]:
+    if shutil.which(name) is not None:
+        return name
+    else:
+        for n in range(50, 14, -1):
+            if shutil.which(f"{name}-{n}") is not None:
+                return f"{name}-{n}"
+    return None
 
-    args = parser.parse_args()
-    if args.target == "windows_x86_64":
+
+def _get_platform(target: str) -> Platform:
+    if target == "windows_x86_64":
         platform = Platform("windows", get_windows_osver(), "x86_64")
-    elif args.target == "macos_x86_64":
+    elif target == "macos_x86_64":
         platform = Platform("macos", get_macos_osver(), "x86_64")
-    elif args.target == "macos_arm64":
+    elif target == "macos_arm64":
         platform = Platform("macos", get_macos_osver(), "arm64")
-    elif args.target == "ubuntu-22.04_x86_64":
+    elif target == "ubuntu-22.04_x86_64":
         platform = Platform("ubuntu", "22.04", "x86_64")
-    elif args.target == "ubuntu-24.04_x86_64":
+    elif target == "ubuntu-24.04_x86_64":
         platform = Platform("ubuntu", "24.04", "x86_64")
-    elif args.target == "ubuntu-22.04_armv8":
+    elif target == "ubuntu-22.04_armv8":
         platform = Platform("ubuntu", "22.04", "armv8")
-    elif args.target == "ubuntu-24.04_armv8":
+    elif target == "ubuntu-24.04_armv8":
         platform = Platform("ubuntu", "24.04", "armv8")
-    elif args.target == "ubuntu-22.04_armv8_jetson":
+    elif target == "ubuntu-22.04_armv8_jetson":
         platform = Platform("jetson", None, "armv8", "ubuntu-22.04")
     else:
-        raise Exception(f"Unknown target {args.target}")
+        raise Exception(f"Unknown target {target}")
+    return platform
+
+
+def _build(
+    target: str,
+    debug: bool,
+    relwithdebinfo: bool,
+    local_webrtc_build_dir: Optional[str],
+    local_webrtc_build_args: List[str],
+    local_sora_cpp_sdk_dir: Optional[str],
+    local_sora_cpp_sdk_args: List[str],
+):
+    platform = _get_platform(target)
 
     source_dir = os.path.join(BASE_DIR, "_source", platform.target.package_name)
     build_dir = os.path.join(BASE_DIR, "_build", platform.target.package_name)
@@ -223,27 +237,23 @@ def main():
             source_dir,
             build_dir,
             install_dir,
-            args.debug,
-            args.local_webrtc_build_dir,
-            args.local_webrtc_build_args,
-            args.local_sora_cpp_sdk_dir,
-            args.local_sora_cpp_sdk_args,
+            debug,
+            local_webrtc_build_dir,
+            local_webrtc_build_args,
+            local_sora_cpp_sdk_dir,
+            local_sora_cpp_sdk_args,
         )
 
         configuration = "Release"
-        if args.debug:
+        if debug:
             configuration = "Debug"
-        if args.relwithdebinfo:
+        if relwithdebinfo:
             configuration = "RelWithDebInfo"
 
         webrtc_platform = get_webrtc_platform(platform)
-        webrtc_info = get_webrtc_info(
-            webrtc_platform, args.local_webrtc_build_dir, install_dir, args.debug
-        )
+        webrtc_info = get_webrtc_info(webrtc_platform, local_webrtc_build_dir, install_dir, debug)
 
-        sora_info = get_sora_info(
-            webrtc_platform, args.local_sora_cpp_sdk_dir, install_dir, args.debug
-        )
+        sora_info = get_sora_info(webrtc_platform, local_sora_cpp_sdk_dir, install_dir, debug)
 
         cmake_args = []
         cmake_args.append(f"-DCMAKE_BUILD_TYPE={configuration}")
@@ -373,5 +383,80 @@ def main():
                 )
 
 
+def _format(
+    clang_format_path: Optional[str] = None,
+    skip_clang_format: bool = False,
+    skip_ruff: bool = False,
+):
+    # C++ ファイルのフォーマット
+    if not skip_clang_format:
+        if clang_format_path is None:
+            clang_format_path = _find_clang_binary("clang-format")
+        if clang_format_path is None:
+            print("Warning: clang-format not found. Skipping C++ formatting.")
+        else:
+            patterns = [
+                "src/**/*.h",
+                "src/**/*.cpp",
+            ]
+            target_files = []
+            for pattern in patterns:
+                files = glob.glob(pattern, recursive=True)
+                target_files.extend(files)
+            if target_files:
+                print(f"Formatting {len(target_files)} C++ files...")
+                cmd([clang_format_path, "-i"] + target_files)
+
+    # Python ファイルのフォーマット
+    if not skip_ruff:
+        print("Running Python formatting with ruff...")
+        try:
+            cmd(["uv", "run", "ruff", "format"])
+        except Exception as e:
+            print(f"Formatting failed: {e}")
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    sp = parser.add_subparsers(dest="command", required=True)
+
+    # build サブコマンド
+    bp = sp.add_parser("build")
+    bp.add_argument("target", choices=AVAILABLE_TARGETS)
+    bp.add_argument("--debug", action="store_true")
+    bp.add_argument("--relwithdebinfo", action="store_true")
+    bp.add_argument("--local-webrtc-build-dir", type=os.path.abspath)
+    bp.add_argument("--local-webrtc-build-args", default="", type=shlex.split)
+    bp.add_argument("--local-sora-cpp-sdk-dir", type=os.path.abspath)
+    bp.add_argument("--local-sora-cpp-sdk-args", default="", type=shlex.split)
+
+    # format サブコマンド
+    fp = sp.add_parser("format")
+    fp.add_argument("--clang-format-path", type=str, default=None)
+    fp.add_argument(
+        "--skip-clang-format", action="store_true", help="Skip C++ formatting with clang-format"
+    )
+    fp.add_argument("--skip-ruff", action="store_true", help="Skip Python formatting with ruff")
+
+    args = parser.parse_args()
+
+    if args.command == "build":
+        _build(
+            target=args.target,
+            debug=args.debug,
+            relwithdebinfo=args.relwithdebinfo,
+            local_webrtc_build_dir=args.local_webrtc_build_dir,
+            local_webrtc_build_args=args.local_webrtc_build_args,
+            local_sora_cpp_sdk_dir=args.local_sora_cpp_sdk_dir,
+            local_sora_cpp_sdk_args=args.local_sora_cpp_sdk_args,
+        )
+    elif args.command == "format":
+        _format(
+            clang_format_path=args.clang_format_path,
+            skip_clang_format=args.skip_clang_format,
+            skip_ruff=args.skip_ruff,
+        )
+
+
 if __name__ == "__main__":
     main()

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6}/src/sora_sdk/__init__.py

@@ -4,12 +4,16 @@ from .sora_sdk_ext import *  # noqa: F401,F403
 # 開発環境の場合は VERSION ファイルから取得
 try:
     from importlib.metadata import version, PackageNotFoundError
+
     try:
         __version__ = version("sora_sdk")
     except PackageNotFoundError:
         # パッケージがインストールされていない場合（開発環境）
         import os
-        _version_file = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "VERSION")
+
+        _version_file = os.path.join(
+            os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "VERSION"
+        )
         if os.path.exists(_version_file):
             with open(_version_file, "r") as f:
                 __version__ = f.read().strip()

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6}/src/sora_sdk/sora_sdk_ext.pyi

@@ -2,7 +2,8 @@ from collections.abc import Callable, Sequence
 import enum
 from typing import Annotated, overload
 
-from numpy.typing import ArrayLike
+import numpy
+from numpy.typing import NDArray
 
 
 class SoraSignalingErrorCode(enum.IntEnum):
@@ -92,20 +93,20 @@ class SoraAudioSource(SoraTrackInterface):
     def on_data(self, data: int, samples_per_channel: int) -> None: ...
 
     @overload
-    def on_data(self, ndarray: Annotated[ArrayLike, dict(dtype='int16', shape=(None, None), order='C', device='cpu')], timestamp: float) -> None: ...
+    def on_data(self, ndarray: Annotated[NDArray[numpy.int16], dict(shape=(None, None), order='C', device='cpu')], timestamp: float) -> None: ...
 
     @overload
-    def on_data(self, ndarray: Annotated[ArrayLike, dict(dtype='int16', shape=(None, None), order='C', device='cpu')]) -> None: ...
+    def on_data(self, ndarray: Annotated[NDArray[numpy.int16], dict(shape=(None, None), order='C', device='cpu')]) -> None: ...
 
 class SoraVideoSource(SoraTrackInterface):
     @overload
-    def on_captured(self, ndarray: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None, 3), order='C', device='cpu')]) -> None: ...
+    def on_captured(self, ndarray: Annotated[NDArray[numpy.uint8], dict(shape=(None, None, 3), order='C', device='cpu')]) -> None: ...
 
     @overload
-    def on_captured(self, ndarray: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None, 3), order='C', device='cpu')], timestamp: float) -> None: ...
+    def on_captured(self, ndarray: Annotated[NDArray[numpy.uint8], dict(shape=(None, None, 3), order='C', device='cpu')], timestamp: float) -> None: ...
 
     @overload
-    def on_captured(self, ndarray: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None, 3), order='C', device='cpu')], timestamp_us: int) -> None: ...
+    def on_captured(self, ndarray: Annotated[NDArray[numpy.uint8], dict(shape=(None, None, 3), order='C', device='cpu')], timestamp_us: int) -> None: ...
 
 class SoraAudioSinkImpl:
     def __init__(self, track: SoraTrackInterface, output_frequency: int = -1, output_channels: int = 0) -> None: ...
@@ -115,10 +116,10 @@ class SoraAudioSinkImpl:
     def read(self, frames: int = 0, timeout: float = 1) -> tuple: ...
 
     @property
-    def on_data(self) -> Callable[[Annotated[ArrayLike, dict(dtype='int16', shape=(None, None))]], None]: ...
+    def on_data(self) -> Callable[[Annotated[NDArray[numpy.int16], dict(shape=(None, None))]], None]: ...
 
     @on_data.setter
-    def on_data(self, arg: Callable[[Annotated[ArrayLike, dict(dtype='int16', shape=(None, None))]], None], /) -> None: ...
+    def on_data(self, arg: Callable[[Annotated[NDArray[numpy.int16], dict(shape=(None, None))]], None], /) -> None: ...
 
     @property
     def on_format(self) -> Callable[[int, int], None]: ...
@@ -143,7 +144,7 @@ class SoraAudioFrame:
     @property
     def absolute_capture_timestamp_ms(self) -> int | None: ...
 
-    def data(self) -> Annotated[ArrayLike, dict(dtype='int16', shape=(None, None))]: ...
+    def data(self) -> Annotated[NDArray[numpy.int16], dict(shape=(None, None))]: ...
 
 class SoraAudioStreamSinkImpl:
     def __init__(self, track: SoraTrackInterface, output_frequency: int = -1, output_channels: int = 0) -> None: ...
@@ -162,7 +163,7 @@ class SoraVAD:
     def analyze(self, frame: SoraAudioFrame) -> float: ...
 
 class SoraVideoFrame:
-    def data(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None, 3))]: ...
+    def data(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None, None, 3))]: ...
 
 class SoraVideoSinkImpl:
     def __init__(self, arg: SoraTrackInterface, /) -> None: ...
@@ -258,9 +259,9 @@ class SoraTransformableFrameDirection(enum.IntEnum):
     SENDER = 2
 
 class SoraTransformableFrame:
-    def get_data(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None), writable=False)]: ...
+    def get_data(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None,), writable=False)]: ...
 
-    def set_data(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None), order='C', device='cpu', writable=False)], /) -> None: ...
+    def set_data(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None,), order='C', device='cpu', writable=False)], /) -> None: ...
 
     @property
     def payload_type(self) -> int: ...
@@ -289,7 +290,7 @@ class SoraTransformableAudioFrameType(enum.IntEnum):
 
 class SoraTransformableAudioFrame(SoraTransformableFrame):
     @property
-    def contributing_sources(self) -> Annotated[ArrayLike, dict(dtype='uint32', shape=(None), writable=False)]: ...
+    def contributing_sources(self) -> Annotated[NDArray[numpy.uint32], dict(shape=(None,), writable=False)]: ...
 
     @property
     def sequence_number(self) -> int | None: ...
@@ -314,7 +315,7 @@ class SoraTransformableVideoFrame(SoraTransformableFrame):
     def frame_id(self) -> int | None: ...
 
     @property
-    def frame_dependencies(self) -> Annotated[ArrayLike, dict(dtype='int64', shape=(None), writable=False)]: ...
+    def frame_dependencies(self) -> Annotated[NDArray[numpy.int64], dict(shape=(None,), writable=False)]: ...
 
     @property
     def width(self) -> int: ...
@@ -329,7 +330,7 @@ class SoraTransformableVideoFrame(SoraTransformableFrame):
     def temporal_index(self) -> int: ...
 
     @property
-    def contributing_sources(self) -> Annotated[ArrayLike, dict(dtype='uint32', shape=(None), writable=False)]: ...
+    def contributing_sources(self) -> Annotated[NDArray[numpy.uint32], dict(shape=(None,), writable=False)]: ...
 
 class SoraFrameTransformer:
     def enqueue(self, arg: SoraTransformableFrame, /) -> None: ...

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sora_sdk
-Version: 2025.4.0.dev3
+Version: 2025.4.0.dev6
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>

sora_sdk-2025.4.0.dev6/tests/test_capability.py

@@ -0,0 +1,50 @@
+import time
+
+from client import SoraClient, SoraRole
+
+from sora_sdk import (
+    SoraVideoCodecImplementation,
+    SoraVideoCodecPreference,
+    SoraVideoCodecType,
+)
+
+# def test_preference_invalid(settings):
+#     # opneh264 のパスを設定してないのに H264 エンコーダを使おうとしているので Sora 生成時にエラーになる
+#     with pytest.raises(RuntimeError):
+#         SoraClient(
+#             settings,
+#             SoraRole.SENDONLY,
+#             audio=False,
+#             video=True,
+#             video_codec_type="H264",
+#             video_codec_preference=SoraVideoCodecPreference(
+#                 codecs=[
+#                     SoraVideoCodecPreference.Codec(
+#                         type=SoraVideoCodecType.H264,
+#                         encoder=SoraVideoCodecImplementation.CISCO_OPENH264,
+#                     )
+#                 ]
+#             ),
+#         )
+
+
+def test_preference_vp8(settings):
+    sendonly = SoraClient(
+        settings,
+        SoraRole.SENDONLY,
+        audio=False,
+        video=True,
+        video_codec_type="VP8",
+        video_codec_preference=SoraVideoCodecPreference(
+            codecs=[
+                SoraVideoCodecPreference.Codec(
+                    type=SoraVideoCodecType.VP8, encoder=SoraVideoCodecImplementation.INTERNAL
+                )
+            ]
+        ),
+    )
+    sendonly.connect(fake_video=True)
+
+    time.sleep(5)
+
+    sendonly.disconnect()

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6}/tests/test_intel_vpl.py

@@ -19,7 +19,9 @@ from sora_sdk import (
     get_video_codec_capability,
 )
 
-pytestmark = pytest.mark.skipif(os.environ.get("INTEL_VPL") is None, reason="Intel VPL でのみ実行する")
+pytestmark = pytest.mark.skipif(
+    os.environ.get("INTEL_VPL") is None, reason="Intel VPL でのみ実行する"
+)
 
 
 def test_intel_vpl_available():
@@ -600,6 +602,6 @@ def test_intel_vpl_av1_rtp_hdr_ext(settings):
     sendonly.disconnect()
 
     # AV1 の RTP ヘッダー拡張が送られてきていることを確認
-    assert stats["rtp_hdrext"]["total_received_rtp_hdrext_av1_rtp_sepc"] > 0, (
-        "Dependency Descriptor RTP Header Extension が Python SDK から送られてきていません"
-    )
+    assert (
+        stats["rtp_hdrext"]["total_received_rtp_hdrext_av1_rtp_sepc"] > 0
+    ), "Dependency Descriptor RTP Header Extension が Python SDK から送られてきていません"

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6}/tests/test_openh264.py

@@ -15,7 +15,7 @@ from sora_sdk import (
 )
 
 pytestmark = pytest.mark.skipif(
-    os.environ.get("OPENH264_VERSION") is None,
+    os.environ.get("OPENH264_PATH") is None,
     reason="OpenH264 のときだけ実行する",
 )
 

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6}/tests/test_openh264_simulcast.py

@@ -12,7 +12,7 @@ from sora_sdk import (
 )
 
 pytestmark = pytest.mark.skipif(
-    os.environ.get("OPENH264_VERSION") is None,
+    os.environ.get("OPENH264_PATH") is None,
     reason="OpenH264 のときだけ実行する",
 )
 

{sora_sdk-2025.4.0.dev3 → sora_sdk-2025.4.0.dev6}/tests/test_version.py

@@ -7,11 +7,11 @@ def test_version():
     assert hasattr(sora_sdk, "__version__")
     assert isinstance(sora_sdk.__version__, str)
     assert sora_sdk.__version__ != "unknown"
-    
+
     # VERSION ファイルの内容と一致することを確認
     version_file = os.path.join(os.path.dirname(os.path.dirname(__file__)), "VERSION")
     with open(version_file, "r") as f:
         expected_version = f.read().strip()
-    
+
     assert sora_sdk.__version__ == expected_version
-    print(f"sora_sdk.__version__ = {sora_sdk.__version__}")
+    print(f"sora_sdk.__version__ = {sora_sdk.__version__}")

sora_sdk-2025.4.0.dev3/VERSION

@@ -1 +0,0 @@
-2025.4.0.dev3

sora_sdk-2025.4.0.dev3/tests/test_capability.py

@@ -1,52 +0,0 @@
-import time
-
-import pytest
-from client import SoraClient, SoraRole
-
-from sora_sdk import (
-    SoraVideoCodecImplementation,
-    SoraVideoCodecPreference,
-    SoraVideoCodecType,
-)
-
-
-def test_preference_invalid(settings):
-    # opneh264 のパスを設定してないのに H264 エンコーダを使おうとしているので Sora 生成時にエラーになる
-    with pytest.raises(RuntimeError):
-        SoraClient(
-            settings,
-            SoraRole.SENDONLY,
-            audio=False,
-            video=True,
-            video_codec_type="H264",
-            video_codec_preference=SoraVideoCodecPreference(
-                codecs=[
-                    SoraVideoCodecPreference.Codec(
-                        type=SoraVideoCodecType.H264,
-                        encoder=SoraVideoCodecImplementation.CISCO_OPENH264,
-                    )
-                ]
-            ),
-        )
-
-
-def test_preference_vp8(settings):
-    sendonly = SoraClient(
-        settings,
-        SoraRole.SENDONLY,
-        audio=False,
-        video=True,
-        video_codec_type="VP8",
-        video_codec_preference=SoraVideoCodecPreference(
-            codecs=[
-                SoraVideoCodecPreference.Codec(
-                    type=SoraVideoCodecType.VP8, encoder=SoraVideoCodecImplementation.INTERNAL
-                )
-            ]
-        ),
-    )
-    sendonly.connect(fake_video=True)
-
-    time.sleep(5)
-
-    sendonly.disconnect()