sora-sdk 2025.3.0.dev1__tar.gz → 2025.3.0.dev3__tar.gz

{sora_sdk-2025.3.0.dev1/src/sora_sdk.egg-info → sora_sdk-2025.3.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sora_sdk
-Version: 2025.3.0.dev1
+Version: 2025.3.0.dev3
 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.3.0.dev3/VERSION

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

{sora_sdk-2025.3.0.dev1 → sora_sdk-2025.3.0.dev3}/pyproject.toml

@@ -20,26 +20,26 @@ Documentation = "https://sora-python-sdk.shiguredo.jp"
 Discord = "https://discord.gg/shiguredo"
 
 [build-system]
-requires = ["setuptools==80.0", "wheel==0.45.1"]
+requires = ["setuptools==80.8", "wheel==0.45.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.uv]
 python-preference = "only-managed"
 dev-dependencies = [
     "nanobind==2.7.0",
-    "setuptools==80.0",
+    "setuptools==80.8",
     "build==1.2.2.post1",
     "wheel==0.45.1",
     "typing-extensions",
-    "python-dotenv",
     "numpy",
     "httpx",
     "pytest",
     "ruff",
-    "mypy",
     "pyjwt",
     "pytest-repeat",
-    "psutil",
+    # "ty",
+    "pydantic-settings",
+    "pyright",
 ]
 
 [tool.ruff]

{sora_sdk-2025.3.0.dev1 → sora_sdk-2025.3.0.dev3}/run.py

@@ -267,8 +267,8 @@ def main():
             if platform.build.arch == "armv8":
                 # ビルド環境が armv8 の場合は libwebrtc のバイナリが使えないのでローカルの clang を利用する
                 cmake_args += [
-                    "-DCMAKE_C_COMPILER=clang-18",
-                    "-DCMAKE_CXX_COMPILER=clang++-18",
+                    "-DCMAKE_C_COMPILER=clang-19",
+                    "-DCMAKE_CXX_COMPILER=clang++-19",
                 ]
             else:
                 cmake_args += [

{sora_sdk-2025.3.0.dev1 → sora_sdk-2025.3.0.dev3}/src/sora_sdk/sora_sdk_ext.pyi

@@ -226,6 +226,12 @@ class SoraConnection:
     @on_message.setter
     def on_message(self, arg: Callable[[str, bytes], None], /) -> None: ...
 
+    @property
+    def on_rpc(self) -> Callable[[bytes], None]: ...
+
+    @on_rpc.setter
+    def on_rpc(self, arg: Callable[[bytes], None], /) -> None: ...
+
     @property
     def on_switched(self) -> Callable[[str], None]: ...
 

{sora_sdk-2025.3.0.dev1 → sora_sdk-2025.3.0.dev3/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sora_sdk
-Version: 2025.3.0.dev1
+Version: 2025.3.0.dev3
 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.3.0.dev1 → sora_sdk-2025.3.0.dev3}/tests/test_amd_amf.py

@@ -1,7 +1,5 @@
 import os
-import sys
 import time
-import uuid
 
 import pytest
 from client import (
@@ -21,7 +19,7 @@ from sora_sdk import (
 
 
 @pytest.mark.skipif(os.environ.get("AMD_AMF") is None, reason="AMD AMF でのみ実行する")
-def test_amd_amf_available(setup):
+def test_amd_amf_available(settings):
     capability = get_video_codec_capability()
 
     amd_amf_available = False
@@ -68,26 +66,18 @@ def test_amd_amf_available(setup):
         "H265",
     ],
 )
-def test_amd_amf_sendonly_recvonly(setup, video_codec_type):
+def test_amd_amf_sendonly_recvonly(settings, video_codec_type):
     if not is_codec_supported(video_codec_type, SoraVideoCodecImplementation.AMD_AMF):
         pytest.skip(
             f"このチップでは {video_codec_type} のエンコード/デコードの両方がサポートされていません"
         )
 
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    metadata = setup.get("metadata")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=False,
         video=True,
         video_codec_type=video_codec_type,
-        metadata=metadata,
         video_codec_preference=SoraVideoCodecPreference(
             codecs=[
                 SoraVideoCodecPreference.Codec(
@@ -100,10 +90,8 @@ def test_amd_amf_sendonly_recvonly(setup, video_codec_type):
     sendonly.connect(fake_video=True)
 
     recvonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.RECVONLY,
-        channel_id,
-        metadata=metadata,
         video_codec_preference=SoraVideoCodecPreference(
             codecs=[
                 SoraVideoCodecPreference.Codec(
@@ -197,7 +185,7 @@ def test_amd_amf_sendonly_recvonly(setup, video_codec_type):
     ],
 )
 def test_amd_amf_simulcast(
-    setup,
+    settings,
     video_codec_type,
     expected_implementation,
     video_width,
@@ -207,24 +195,16 @@ def test_amd_amf_simulcast(
     if not is_codec_supported(video_codec_type, SoraVideoCodecImplementation.AMD_AMF):
         pytest.skip(f"このチップでは {video_codec_type} のエンコードがサポートされていません")
 
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    metadata = setup.get("metadata")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
     video_bit_rate = default_video_bit_rate(video_codec_type, video_width, video_height)
 
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         simulcast=True,
         audio=False,
         video=True,
         video_codec_type=video_codec_type,
         video_bit_rate=video_bit_rate,
-        metadata=metadata,
         video_width=video_width,
         video_height=video_height,
         video_codec_preference=SoraVideoCodecPreference(

{sora_sdk-2025.3.0.dev1 → sora_sdk-2025.3.0.dev3}/tests/test_apple_video_toolbox.py

@@ -1,9 +1,6 @@
 import os
-import sys
 import time
-import uuid
 
-import jwt
 import pytest
 from client import SoraClient, SoraRole
 from simulcast import default_video_bit_rate, expect_target_bitrate
@@ -16,28 +13,20 @@ from simulcast import default_video_bit_rate, expect_target_bitrate
     "video_codec_type",
     ["H264", "H265"],
 )
-def test_apple_video_toolbox_sendonly(setup, video_codec_type):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    metadata = setup.get("metadata")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
+def test_apple_video_toolbox_sendonly(settings, video_codec_type):
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=False,
         video=True,
         video_codec_type=video_codec_type,
-        metadata=metadata,
     )
     sendonly.connect(fake_video=True)
 
     time.sleep(5)
 
     assert sendonly.connect_message is not None
-    assert sendonly.connect_message["channel_id"] == channel_id
+    assert sendonly.connect_message["channel_id"] == settings.channel_id
     assert "video" in sendonly.connect_message
     assert sendonly.connect_message["video"]["codec_type"] == video_codec_type
 
@@ -64,29 +53,19 @@ def test_apple_video_toolbox_sendonly(setup, video_codec_type):
     "video_codec_type",
     ["H264", "H265"],
 )
-def test_apple_video_toolbox_sendonly_recvonly(setup, video_codec_type):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    metadata = setup.get("metadata")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
+def test_apple_video_toolbox_sendonly_recvonly(settings, video_codec_type):
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=False,
         video=True,
         video_codec_type=video_codec_type,
-        metadata=metadata,
     )
     sendonly.connect(fake_video=True)
 
     recvonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.RECVONLY,
-        channel_id,
-        metadata=metadata,
     )
     recvonly.connect()
 
@@ -156,31 +135,23 @@ def test_apple_video_toolbox_sendonly_recvonly(setup, video_codec_type):
     ],
 )
 def test_apple_video_toolbox_simulcast(
-    setup,
+    settings,
     video_codec_type,
     expected_implementation,
     video_width,
     video_height,
     simulcast_count,
 ):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    metadata = setup.get("metadata")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
     video_bit_rate = default_video_bit_rate(video_codec_type, video_width, video_height)
 
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         simulcast=True,
         audio=False,
         video=True,
         video_codec_type=video_codec_type,
         video_bit_rate=video_bit_rate,
-        metadata=metadata,
         video_width=video_width,
         video_height=video_height,
     )
@@ -281,19 +252,13 @@ def test_apple_video_toolbox_simulcast(
     ],
 )
 def test_apple_video_toolbox_simulcast_authz_scale_resolution_to(
-    setup,
+    settings,
     video_codec_type,
     encoder_implementation,
     video_bit_rate,
     video_width,
     video_height,
 ):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    secret = setup.get("secret")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
     simulcast_encodings = [
         {
             "rid": "r0",
@@ -315,30 +280,20 @@ def test_apple_video_toolbox_simulcast_authz_scale_resolution_to(
         },
     ]
 
-    access_token = jwt.encode(
-        {
-            "channel_id": channel_id,
-            "video": True,
-            "video_codec_type": video_codec_type,
-            "video_bit_rate": video_bit_rate,
-            "simulcast": True,
-            "simulcast_encodings": simulcast_encodings,
-            # 現在時刻 + 300 秒 (5分)
-            "exp": int(time.time()) + 300,
-        },
-        secret,
-        algorithm="HS256",
-    )
-
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=False,
         video=True,
         video_codec_type=video_codec_type,
         video_bit_rate=video_bit_rate,
-        metadata={"access_token": access_token},
+        jwt_private_claims={
+            "video": True,
+            "video_codec_type": video_codec_type,
+            "video_bit_rate": video_bit_rate,
+            "simulcast": True,
+            "simulcast_encodings": simulcast_encodings,
+        },
         video_width=video_width,
         video_height=video_height,
     )

{sora_sdk-2025.3.0.dev1 → sora_sdk-2025.3.0.dev3}/tests/test_authz.py

@@ -1,43 +1,25 @@
-import sys
 import time
-import uuid
 
-import jwt
 import pytest
 from client import SoraClient, SoraRole
 
 
 @pytest.mark.skipif(reason="Sora C++ SDK 側の対応が必要")
-def test_sendonly_authz_video_true(setup):
+def test_sendonly_authz_video_true(settings):
     """
     - type: connect で audio: true / video: false で繫ぐ
     - 認証成功時の払い出しで audio: false / video: true を払い出す
     """
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    secret = setup.get("secret")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
-    access_token = jwt.encode(
-        {
-            "channel_id": channel_id,
-            "audio": False,
-            "video": True,
-            # 現在時刻 + 300 秒 (5分)
-            "exp": int(time.time()) + 300,
-        },
-        secret,
-        algorithm="HS256",
-    )
 
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=True,
         video=False,
-        metadata={"access_token": access_token},
+        jwt_private_claims={
+            "audio": True,
+            "video": False,
+        },
     )
     sendonly.connect(fake_video=False, fake_audio=True)
 
@@ -64,42 +46,24 @@ def test_sendonly_authz_video_true(setup):
 
 
 @pytest.mark.parametrize(
-    "video_codec_params",
+    ("video_codec_type", "expected_implementation"),
     [
-        # video_codec, encoder_implementation, decoder_implementation
+        # video_codec, expected_implementation
         ("VP8", "libvpx"),
         ("VP9", "libvpx"),
         ("AV1", "libaom"),
     ],
 )
-def test_sendonly_authz_video_codec_type(setup, video_codec_params):
-    video_codec_type, encoder_implementation = video_codec_params
-
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    secret = setup.get("secret")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
-    access_token = jwt.encode(
-        {
-            "channel_id": channel_id,
-            "video": True,
-            "video_codec_type": video_codec_type,
-            # 現在時刻 + 300 秒 (5分)
-            "exp": int(time.time()) + 300,
-        },
-        secret,
-        algorithm="HS256",
-    )
-
+def test_sendonly_authz_video_codec_type(settings, video_codec_type, expected_implementation):
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=False,
         video=True,
-        metadata={"access_token": access_token},
+        jwt_private_claims={
+            "video": True,
+            "video_codec_type": video_codec_type,
+        },
     )
     sendonly.connect(fake_video=True)
 
@@ -120,6 +84,6 @@ def test_sendonly_authz_video_codec_type(setup, video_codec_params):
 
     # outbound-rtp が無かったら StopIteration 例外が上がる
     outbound_rtp_stats = next(s for s in sendonly_stats if s.get("type") == "outbound-rtp")
-    assert outbound_rtp_stats["encoderImplementation"] == encoder_implementation
+    assert outbound_rtp_stats["encoderImplementation"] == expected_implementation
     assert outbound_rtp_stats["bytesSent"] > 0
     assert outbound_rtp_stats["packetsSent"] > 0

{sora_sdk-2025.3.0.dev1 → sora_sdk-2025.3.0.dev3}/tests/test_authz_simulcast.py

@@ -1,8 +1,6 @@
 import sys
 import time
-import uuid
 
-import jwt
 import pytest
 from client import SoraClient, SoraRole
 from simulcast import default_video_bit_rate, expect_target_bitrate
@@ -27,18 +25,12 @@ from simulcast import default_video_bit_rate, expect_target_bitrate
     ],
 )
 def test_authz_simulcast_r2_active_false(
-    setup,
+    settings,
     video_codec_type,
     encoder_implementation,
     video_width,
     video_height,
 ):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    secret = setup.get("secret")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
     video_bit_rate = default_video_bit_rate(video_codec_type, video_width, video_height)
 
     simulcast_encodings = [
@@ -60,28 +52,18 @@ def test_authz_simulcast_r2_active_false(
         },
     ]
 
-    access_token = jwt.encode(
-        {
-            "channel_id": channel_id,
+    sendonly = SoraClient(
+        settings,
+        SoraRole.SENDONLY,
+        audio=False,
+        video=True,
+        jwt_private_claims={
             "video": True,
             "video_codec_type": video_codec_type,
             "video_bit_rate": video_bit_rate,
             "simulcast": True,
             "simulcast_encodings": simulcast_encodings,
-            # 現在時刻 + 300 秒 (5分)
-            "exp": int(time.time()) + 300,
         },
-        secret,
-        algorithm="HS256",
-    )
-
-    sendonly = SoraClient(
-        signaling_urls,
-        SoraRole.SENDONLY,
-        channel_id,
-        audio=False,
-        video=True,
-        metadata={"access_token": access_token},
         video_width=video_width,
         video_height=video_height,
     )
@@ -208,17 +190,12 @@ def test_authz_simulcast_r2_active_false(
     ],
 )
 def test_authz_simulcast_r2_and_r1_active_false(
-    setup,
+    settings,
     video_codec_type,
     encoder_implementation,
     video_width,
     video_height,
 ):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    secret = setup.get("secret")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
     video_bit_rate = default_video_bit_rate(video_codec_type, video_width, video_height)
 
     simulcast_encodings = [
@@ -238,28 +215,18 @@ def test_authz_simulcast_r2_and_r1_active_false(
         },
     ]
 
-    access_token = jwt.encode(
-        {
-            "channel_id": channel_id,
+    sendonly = SoraClient(
+        settings,
+        SoraRole.SENDONLY,
+        audio=False,
+        video=True,
+        jwt_private_claims={
             "video": True,
             "video_codec_type": video_codec_type,
             "video_bit_rate": video_bit_rate,
             "simulcast": True,
             "simulcast_encodings": simulcast_encodings,
-            # 現在時刻 + 300 秒 (5分)
-            "exp": int(time.time()) + 300,
         },
-        secret,
-        algorithm="HS256",
-    )
-
-    sendonly = SoraClient(
-        signaling_urls,
-        SoraRole.SENDONLY,
-        channel_id,
-        audio=False,
-        video=True,
-        metadata={"access_token": access_token},
         video_width=video_width,
         video_height=video_height,
     )
@@ -368,19 +335,13 @@ def test_authz_simulcast_r2_and_r1_active_false(
     ],
 )
 def test_authz_simulcast_scale_resolution_down_to(
-    setup,
+    settings,
     video_codec_type,
     encoder_implementation,
     video_bit_rate,
     video_width,
     video_height,
 ):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    secret = setup.get("secret")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
     simulcast_encodings = [
         {
             "rid": "r0",
@@ -402,28 +363,18 @@ def test_authz_simulcast_scale_resolution_down_to(
         },
     ]
 
-    access_token = jwt.encode(
-        {
-            "channel_id": channel_id,
+    sendonly = SoraClient(
+        settings,
+        SoraRole.SENDONLY,
+        audio=False,
+        video=True,
+        jwt_private_claims={
             "video": True,
             "video_codec_type": video_codec_type,
             "video_bit_rate": video_bit_rate,
             "simulcast": True,
             "simulcast_encodings": simulcast_encodings,
-            # 現在時刻 + 300 秒 (5分)
-            "exp": int(time.time()) + 300,
         },
-        secret,
-        algorithm="HS256",
-    )
-
-    sendonly = SoraClient(
-        signaling_urls,
-        SoraRole.SENDONLY,
-        channel_id,
-        audio=False,
-        video=True,
-        metadata={"access_token": access_token},
         video_width=video_width,
         video_height=video_height,
     )

{sora_sdk-2025.3.0.dev1 → sora_sdk-2025.3.0.dev3}/tests/test_ca_cert.py

@@ -1,6 +1,4 @@
-import sys
 import time
-import uuid
 
 import pytest
 from client import SoraClient, SoraRole
@@ -66,40 +64,24 @@ p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh4rsUecrNIdSUtUlD
 """
 
 
-def test_ca_cert(setup):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    metadata = setup.get("metadata")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
+def test_ca_cert(settings):
     with SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=True,
         video=True,
-        metadata=metadata,
         ca_cert=letsencrypt_org_ca_cert,
     ):
         time.sleep(5)
 
 
 @pytest.mark.xfail(reason="Invalid CA certificate")
-def test_ca_cert_invalid(setup):
-    signaling_urls = setup.get("signaling_urls")
-    channel_id_prefix = setup.get("channel_id_prefix")
-    metadata = setup.get("metadata")
-
-    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
-
+def test_ca_cert_invalid(settings):
     with SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=True,
         video=True,
-        metadata=metadata,
         ca_cert=pki_goog_ca_cert,
     ):
         pass