sora-sdk 2024.4.0.dev10__tar.gz → 2024.4.0.dev11__tar.gz

{sora_sdk-2024.4.0.dev10/src/sora_sdk.egg-info → sora_sdk-2024.4.0.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sora_sdk
-Version: 2024.4.0.dev10
+Version: 2024.4.0.dev11
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -277,7 +277,7 @@ pip install sora_sdk
 PyPI 経由ではインストールできません。
 パッケージバイナリを配布しておりますので、そちらをご利用ください。
 
-https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpack-6.0.0.0
+<https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpack-6.0.0.0>
 
 ## システム条件
 
@@ -288,6 +288,7 @@ https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpac
 
 - Windows 11 x86_64
 - Windows Server 2022 x86_64
+- macOS Sequoia 15 arm64
 - macOS Ventura 14 arm64
 - macOS Sonoma 13 arm64
 - Ubuntu 24.04 LTS x86_64

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/README.md

@@ -80,7 +80,7 @@ pip install sora_sdk
 PyPI 経由ではインストールできません。
 パッケージバイナリを配布しておりますので、そちらをご利用ください。
 
-https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpack-6.0.0.0
+<https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpack-6.0.0.0>
 
 ## システム条件
 
@@ -91,6 +91,7 @@ https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpac
 
 - Windows 11 x86_64
 - Windows Server 2022 x86_64
+- macOS Sequoia 15 arm64
 - macOS Ventura 14 arm64
 - macOS Sonoma 13 arm64
 - Ubuntu 24.04 LTS x86_64

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sora_sdk"
 authors = [{ name = "Shiguredo Inc.", email = "contact+pypi@shiguredo.jp" }]
-version = "2024.4.0.dev10"
+version = "2024.4.0.dev11"
 description = "WebRTC SFU Sora Python SDK"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -67,6 +67,7 @@ dev-dependencies = [
     "python-dotenv>=1.0",
     "numpy>=2.1",
     "mypy>=1.11",
+    "httpx>=0.27",
 ]
 
 [tool.ruff]

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sora_sdk
-Version: 2024.4.0.dev10
+Version: 2024.4.0.dev11
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -277,7 +277,7 @@ pip install sora_sdk
 PyPI 経由ではインストールできません。
 パッケージバイナリを配布しておりますので、そちらをご利用ください。
 
-https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpack-6.0.0.0
+<https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpack-6.0.0.0>
 
 ## システム条件
 
@@ -288,6 +288,7 @@ https://github.com/shiguredo/sora-python-sdk/releases/tag/2024.3.0-jetson-jetpac
 
 - Windows 11 x86_64
 - Windows Server 2022 x86_64
+- macOS Sequoia 15 arm64
 - macOS Ventura 14 arm64
 - macOS Sonoma 13 arm64
 - Ubuntu 24.04 LTS x86_64

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/src/sora_sdk.egg-info/SOURCES.txt

@@ -23,4 +23,5 @@ tests/test_re_offer_re_answer_sdp.py
 tests/test_sendonly_recvonly.py
 tests/test_signaling_message.py
 tests/test_simulcast.py
+tests/test_sora_disconnect.py
 tests/test_vad.py

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_ca_cert.py

@@ -3,7 +3,7 @@ import time
 import uuid
 
 import pytest
-from client import Sendonly
+from client import SoraClient, SoraRole
 
 """
 このテストは、Sora の CA 証明書が有効かどうかを確認するためのものです。
@@ -73,19 +73,16 @@ def test_ca_cert(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    with SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=True,
         video=True,
         metadata=metadata,
         ca_cert=letsencrypt_org_ca_cert,
-    )
-    sendonly.connect(fake_audio=True, fake_video=True)
-
-    time.sleep(5)
-
-    sendonly.disconnect()
+    ):
+        time.sleep(5)
 
 
 @pytest.mark.xfail(reason="Invalid CA certificate")
@@ -96,12 +93,13 @@ def test_ca_cert_invalid(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    with SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=True,
         video=True,
         metadata=metadata,
         ca_cert=pki_goog_ca_cert,
-    )
-    sendonly.connect(fake_audio=True, fake_video=True)
+    ):
+        pass

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_macos.py

@@ -3,7 +3,7 @@ import time
 import uuid
 
 import pytest
-from client import Recvonly, Sendonly
+from client import SoraClient, SoraRole
 
 """
 GitHub Actions で Video Toolbox を送受信で利用しようとするとエラーになるので、
@@ -23,8 +23,9 @@ def test_macos_video_hwa_sendonly(setup, video_codec_type):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=False,
         video=True,
@@ -65,8 +66,9 @@ def test_macos_h264_sendonly_recvonly(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=False,
         video=True,
@@ -76,8 +78,9 @@ def test_macos_h264_sendonly_recvonly(setup):
     )
     sendonly.connect()
 
-    recvonly = Recvonly(
+    recvonly = SoraClient(
         signaling_urls,
+        SoraRole.RECVONLY,
         channel_id,
         metadata=metadata,
         use_hwa=True,
@@ -123,8 +126,9 @@ def test_macos_h265_sendonly_recvonly(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=False,
         video=True,
@@ -134,8 +138,9 @@ def test_macos_h265_sendonly_recvonly(setup):
     )
     sendonly.connect()
 
-    recvonly = Recvonly(
+    recvonly = SoraClient(
         signaling_urls,
+        SoraRole.RECVONLY,
         channel_id,
         metadata=metadata,
         use_hwa=True,

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_messaging.py

@@ -2,7 +2,7 @@ import sys
 import time
 import uuid
 
-from client import Messaging
+from client import SoraClient, SoraRole
 
 
 def test_messaging(setup):
@@ -14,17 +14,21 @@ def test_messaging(setup):
 
     metadata = setup.get("metadata")
 
-    messaging_sendonly = Messaging(
+    messaging_sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
-        [{"label": messaging_label, "direction": "sendonly"}],
+        data_channel_signaling=True,
+        data_channels=[{"label": messaging_label, "direction": "sendonly"}],
         metadata=metadata,
     )
 
-    messaging_recvonly = Messaging(
+    messaging_recvonly = SoraClient(
         signaling_urls,
+        SoraRole.RECVONLY,
         channel_id,
-        [{"label": messaging_label, "direction": "recvonly"}],
+        data_channel_signaling=True,
+        data_channels=[{"label": messaging_label, "direction": "recvonly"}],
         metadata=metadata,
     )
 
@@ -42,8 +46,8 @@ def test_messaging(setup):
     message1 = "spam".encode("utf-8")
     message2 = "はむ".encode("utf-8")
 
-    messaging_sendonly.send(message1)
-    messaging_sendonly.send(message2)
+    messaging_sendonly.send(messaging_label, message1)
+    messaging_sendonly.send(messaging_label, message2)
 
     time.sleep(3)
 

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_openh264.py

@@ -3,7 +3,7 @@ import time
 import uuid
 
 import pytest
-from client import Recvonly, Sendonly
+from client import SoraClient, SoraRole
 
 
 @pytest.mark.skipif(sys.platform not in ["darwin", "linux"], reason="macOSとLinuxでのみ実行する")
@@ -16,8 +16,9 @@ def test_openh264_sendonly_recvonly(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         metadata=metadata,
         audio=False,
@@ -28,8 +29,9 @@ def test_openh264_sendonly_recvonly(setup):
     )
     sendonly.connect(fake_video=True)
 
-    recvonly = Recvonly(
+    recvonly = SoraClient(
         signaling_urls,
+        SoraRole.RECVONLY,
         channel_id,
         metadata=metadata,
         openh264_path=openh264_path,
@@ -82,8 +84,9 @@ def test_openh264_simulcast(setup, video_codec_type, expected_implementation):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         simulcast=True,
         audio=False,

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_re_offer_re_answer_sdp.py

@@ -1,7 +1,7 @@
 import sys
 import uuid
 
-from client import Recvonly, Sendonly
+from client import SoraClient, SoraRole
 
 
 def test_re_offer_re_answer_sdp(setup):
@@ -11,15 +11,17 @@ def test_re_offer_re_answer_sdp(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    recvonly = Recvonly(
+    recvonly = SoraClient(
         signaling_urls,
+        SoraRole.RECVONLY,
         channel_id,
         metadata=metadata,
     )
     recvonly.connect()
 
-    sendonly1 = Sendonly(
+    sendonly1 = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=True,
         video=True,
@@ -28,8 +30,9 @@ def test_re_offer_re_answer_sdp(setup):
     sendonly1.connect(fake_audio=True, fake_video=True)
     sendonly1.disconnect()
 
-    sendonly2 = Sendonly(
+    sendonly2 = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=True,
         video=True,
@@ -37,8 +40,9 @@ def test_re_offer_re_answer_sdp(setup):
     )
     sendonly2.connect(fake_audio=True, fake_video=True)
 
-    sendonly3 = Sendonly(
+    sendonly3 = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=True,
         video=True,

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_sendonly_recvonly.py

@@ -3,7 +3,7 @@ import time
 import uuid
 
 import pytest
-from client import Recvonly, Sendonly
+from client import SoraClient, SoraRole
 
 
 def test_sendonly_recvonly_audio(setup):
@@ -13,8 +13,9 @@ def test_sendonly_recvonly_audio(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=True,
         video=False,
@@ -22,8 +23,9 @@ def test_sendonly_recvonly_audio(setup):
     )
     sendonly.connect(fake_audio=True)
 
-    recvonly = Recvonly(
+    recvonly = SoraClient(
         signaling_urls,
+        SoraRole.RECVONLY,
         channel_id,
         metadata=metadata,
     )
@@ -79,8 +81,9 @@ def test_sendonly_recvonly_video(setup, video_codec_params):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=False,
         video=True,
@@ -89,8 +92,9 @@ def test_sendonly_recvonly_video(setup, video_codec_params):
     )
     sendonly.connect(fake_video=True)
 
-    recvonly = Recvonly(
+    recvonly = SoraClient(
         signaling_urls,
+        SoraRole.RECVONLY,
         channel_id,
         metadata=metadata,
     )

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_signaling_message.py

@@ -2,7 +2,7 @@ import sys
 import time
 import uuid
 
-from client import Sendonly
+from client import SoraClient, SoraRole
 
 
 def test_signaling_message(setup):
@@ -12,8 +12,9 @@ def test_signaling_message(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         audio=True,
         video=True,

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_simulcast.py

@@ -3,7 +3,7 @@ import time
 import uuid
 
 import pytest
-from client import Sendonly
+from client import SoraClient, SoraRole
 
 
 @pytest.mark.parametrize(
@@ -21,8 +21,9 @@ def test_simulcast(setup, video_codec_type, expected_implementation):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(
+    sendonly = SoraClient(
         signaling_urls,
+        SoraRole.SENDONLY,
         channel_id,
         simulcast=True,
         audio=False,

sora_sdk-2024.4.0.dev11/tests/test_sora_disconnect.py

@@ -0,0 +1,115 @@
+import sys
+import time
+import uuid
+
+import pytest
+from api import disconnect_connection_api
+from client import SoraClient, SoraRole
+
+
+@pytest.mark.skipif(sys.platform != "linux", reason="linux でのみ実行する")
+def test_websocket_signaling_only_disconnect_api(setup):
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+    api_url = setup.get("api_url")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    with SoraClient(
+        signaling_urls,
+        SoraRole.RECVONLY,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        data_channel_signaling=False,
+        ignore_disconnect_websocket=False,
+    ) as conn:
+        time.sleep(3)
+
+        if conn.connection_id is None:
+            raise ValueError("connection_id is None")
+        response = disconnect_connection_api(api_url, channel_id, conn.connection_id)
+        assert response.status_code == 200
+
+        assert conn.ws_close is True
+        assert conn.ws_close_code == 1000
+        assert conn.ws_close_reason == "DISCONNECTED-API"
+
+    # TODO: LIFETIME-EXPIRED のテスト
+
+
+@pytest.mark.skipif(sys.platform != "linux", reason="linux でのみ実行する")
+def test_websocket_datachannel_signaling_disconnect_api(setup):
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+    api_url = setup.get("api_url")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    with SoraClient(
+        signaling_urls,
+        SoraRole.RECVONLY,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        data_channel_signaling=True,
+        ignore_disconnect_websocket=False,
+    ) as conn:
+        time.sleep(3)
+
+        if conn.connection_id is None:
+            raise ValueError("connection_id is None")
+        response = disconnect_connection_api(api_url, channel_id, conn.connection_id)
+        assert response.status_code == 200
+
+        assert conn.ws_close is True
+        assert conn.ws_close_code == 1000
+        assert conn.ws_close_reason == "DISCONNECTED-API"
+
+    # TODO: LIFETIME-EXPIRED のテスト
+
+
+@pytest.mark.skipif(sys.platform != "linux", reason="linux でのみ実行する")
+def test_datachannel_only_signaling_disconnect_api(setup):
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+    api_url = setup.get("api_url")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    with SoraClient(
+        signaling_urls,
+        SoraRole.RECVONLY,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        data_channel_signaling=True,
+        ignore_disconnect_websocket=True,
+    ) as conn:
+        time.sleep(3)
+
+        assert conn.switched is True
+        assert conn.ignore_disconnect_websocket is True
+
+        assert conn.ws_close_code == 1000
+        assert conn.ws_close_reason == "SELF-CLOSED"
+
+        if conn.connection_id is None:
+            raise ValueError("connection_id is None")
+        response = disconnect_connection_api(api_url, channel_id, conn.connection_id)
+        assert response.status_code == 200
+
+        time.sleep(3)
+
+        assert conn.close_message is not None
+        assert conn.close_message["type"] == "close"
+        assert conn.close_message["code"] == 1000
+        assert conn.close_message["reason"] == "DISCONNECTED-API"
+
+    # TODO: LIFETIME-EXPIRED のテスト

{sora_sdk-2024.4.0.dev10 → sora_sdk-2024.4.0.dev11}/tests/test_vad.py

@@ -5,7 +5,7 @@ import uuid
 from threading import Event
 from typing import Any, Optional
 
-from client import Sendonly
+from client import SoraClient, SoraRole
 
 from sora_sdk import (
     Sora,
@@ -113,7 +113,14 @@ def test_vad(setup):
 
     channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
 
-    sendonly = Sendonly(signaling_urls, channel_id, metadata=metadata)
+    sendonly = SoraClient(
+        signaling_urls,
+        SoraRole.SENDONLY,
+        channel_id,
+        audio=True,
+        video=False,
+        metadata=metadata,
+    )
     sendonly.connect(fake_audio=True)
 
     vad = VAD(signaling_urls, channel_id, metadata=metadata)