streamlit-webrtc 0.49.4__tar.gz → 0.51.0__tar.gz

streamlit_webrtc-0.51.0/.gitignore

@@ -0,0 +1,148 @@
+### https://raw.github.com/github/gitignore/218a941be92679ce67d0484547e3e142b2f5f6f0/Python.gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+#.env # Not ignore this file because it contains Streamlit specific global settings.
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# Streamlit secrets
+.streamlit/secrets.toml
+
+# Demo data
+models/
+data/
+*.flv

{streamlit_webrtc-0.49.4 → streamlit_webrtc-0.51.0}/PKG-INFO

@@ -1,22 +1,15 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: streamlit-webrtc
-Version: 0.49.4
+Version: 0.51.0
 Summary: Real-time video and audio processing on Streamlit
-License: MIT
-Author: Yuichiro Tachibana (Tsuchiya)
-Author-email: t.yic.yt@gmail.com
-Requires-Python: >=3.9, !=2.7.*, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*, !=3.7.*, !=3.8.*
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: aiortc (>=1.9.0,<2.0.0)
-Requires-Dist: packaging (>=20.0)
-Requires-Dist: streamlit (>=0.84.1)
 Project-URL: Repository, https://github.com/whitphx/streamlit-webrtc
+Author-email: "Yuichiro Tachibana (Tsuchiya)" <t.yic.yt@gmail.com>
+License-Expression: MIT
+License-File: LICENSE
+Requires-Python: !=3.9.7,>=3.9
+Requires-Dist: aiortc>=1.9.0
+Requires-Dist: packaging>=20.0
+Requires-Dist: streamlit>=0.84.1
 Description-Content-Type: text/markdown
 
 # streamlit-webrtc
@@ -353,4 +346,3 @@ See the samples in [app.py](./app.py) for their usage.
 <a href="https://www.buymeacoffee.com/whitphx" target="_blank" rel="noreferrer"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" width="180" height="50" ></a>
 
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/whitphx?label=Sponsor%20me%20on%20GitHub%20Sponsors&style=social)](https://github.com/sponsors/whitphx)
-

streamlit_webrtc-0.51.0/pyproject.toml

@@ -0,0 +1,77 @@
+[project]
+name = "streamlit-webrtc"
+version = "0.51.0"
+description = "Real-time video and audio processing on Streamlit"
+authors = [{ name = "Yuichiro Tachibana (Tsuchiya)", email = "t.yic.yt@gmail.com" }]
+requires-python = ">=3.9,!=3.9.7"  # 3.9.7 is excluded due to https://github.com/streamlit/streamlit/pull/5168
+readme = "README.md"
+license = "MIT"
+dependencies = [
+    # For allow-same-origin, >=0.73.0 is required. See https://blog.streamlit.io/streamlit-components-security-and-a-five-month-quest-to-ship-a-single-line-of-code/
+    # 0.84.0 has an error at marshalling component values.
+    "streamlit>=0.84.1",
+    "aiortc>=1.9.0",  # aiortc<1.4.0 causes an error with cryptography>=39.0.0. See https://github.com/whitphx/streamlit-webrtc/issues/1164. The fix was introduced into aiortc in https://github.com/aiortc/aiortc/commit/08b0a7e9f5030a9f7e5617382e92560d4ae763a2 that 1.4.0 included.
+    "packaging>=20.0",
+]
+
+[project.urls]
+Repository = "https://github.com/whitphx/streamlit-webrtc"
+
+[dependency-groups]
+dev = [
+    "click>=7.0",
+    "ruff>=0.9.10",
+    "mypy[faster-cache]>=1.15.0",
+    "pydub>=0.25.1",
+    "matplotlib>=3.5.1",
+    "streamlit-server-state>=0.17.1",
+    "pytest>=7.1.2",
+    "opencv-python-headless>=4.5.4.58,<5",
+    "numpy>=1.21.0",
+    "numpy>=2.1.0 ; python_version >= '3.13'",
+    "pandas>=2.0.3",
+    "streamlit>=1.13.0",
+    "twilio>=8.1",
+    "bump-my-version>=1.0.2",
+]
+
+[tool.hatch.build.targets.sdist]
+include = ["/streamlit_webrtc"]
+exclude = ["/streamlit_webrtc/frontend", "!/streamlit_webrtc/frontend/dist"]
+
+[tool.hatch.build.targets.wheel]
+include = ["/streamlit_webrtc"]
+exclude = ["/streamlit_webrtc/frontend", "!/streamlit_webrtc/frontend/dist"]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.ruff.lint]
+extend-select = ["I"]
+
+[tool.bumpversion]
+version = "0.51.0"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
+serialize = ["{major}.{minor}.{patch}"]
+search = "{current_version}"
+replace = "{new_version}"
+regex = false
+ignore_missing_version = false
+ignore_missing_files = false
+tag = true
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "Bump version: {current_version} → {new_version}"
+allow_dirty = false
+commit = true
+message = "Bump version: {current_version} → {new_version}"
+commit_args = ""
+setup_hooks = []
+pre_commit_hooks = []
+post_commit_hooks = []
+
+[[tool.bumpversion.files]]
+filename = "pyproject.toml"
+search = 'version = "{current_version}"'
+replace = 'version = "{new_version}"'

{streamlit_webrtc-0.49.4 → streamlit_webrtc-0.51.0}/streamlit_webrtc/__init__.py

@@ -22,8 +22,12 @@ from .config import (
     Translations,
     VideoHTMLAttributes,
 )
+from .credentials import (
+    get_hf_ice_servers,
+    get_twilio_ice_servers,
+)
 from .factory import create_mix_track, create_process_track, create_video_source_track
-from .mix import MixerCallback
+from .mix import MediaStreamMixTrack, MixerCallback
 from .source import VideoSourceCallback, VideoSourceTrack
 from .webrtc import (
     AudioProcessorBase,
@@ -77,9 +81,12 @@ __all__ = [
     "create_process_track",
     "create_mix_track",
     "MixerCallback",
+    "MediaStreamMixTrack",
     "WebRtcStreamerContext",
     "WebRtcStreamerState",
     "DEFAULT_AUDIO_HTML_ATTRS",
     "DEFAULT_MEDIA_STREAM_CONSTRAINTS",
     "DEFAULT_VIDEO_HTML_ATTRS",
+    "get_hf_ice_servers",
+    "get_twilio_ice_servers",
 ]

{streamlit_webrtc-0.49.4 → streamlit_webrtc-0.51.0}/streamlit_webrtc/component.py

@@ -1,3 +1,4 @@
+import copy
 import json
 import logging
 import os
@@ -40,6 +41,7 @@ from .config import (
     Translations,
     VideoHTMLAttributes,
 )
+from .credentials import get_hf_ice_servers, get_twilio_ice_servers
 from .session_info import get_script_run_count, get_this_session_info
 from .webrtc import (
     AudioProcessorFactory,
@@ -91,6 +93,7 @@ class WebRtcStreamerContext(Generic[VideoProcessorT, AudioProcessorT]):
     _worker_ref: "Optional[weakref.ReferenceType[WebRtcWorker[VideoProcessorT, AudioProcessorT]]]"  # noqa
 
     _component_value_snapshot: Union[ComponentValueSnapshot, None]
+    _rtc_configuration: Optional[Union[Dict[str, Any], RTCConfiguration]]
 
     def __init__(
         self,
@@ -100,6 +103,7 @@ class WebRtcStreamerContext(Generic[VideoProcessorT, AudioProcessorT]):
         self._set_worker(worker)
         self._set_state(state)
         self._component_value_snapshot = None
+        self._rtc_configuration = None
 
     def _set_worker(
         self, worker: Optional[WebRtcWorker[VideoProcessorT, AudioProcessorT]]
@@ -216,7 +220,7 @@ def compile_state(component_value) -> WebRtcStreamerState:
 def webrtc_streamer(
     key: str,
     mode: WebRtcMode = WebRtcMode.SENDRECV,
-    rtc_configuration: Optional[Union[Dict, RTCConfiguration]] = None,
+    rtc_configuration: Optional[Union[Dict[str, Any], RTCConfiguration]] = None,
     media_stream_constraints: Optional[Union[Dict, MediaStreamConstraints]] = None,
     desired_playing_state: Optional[bool] = None,
     player_factory: Optional[MediaPlayerFactory] = None,
@@ -257,7 +261,7 @@ def webrtc_streamer(
 def webrtc_streamer(
     key: str,
     mode: WebRtcMode = WebRtcMode.SENDRECV,
-    rtc_configuration: Optional[Union[Dict, RTCConfiguration]] = None,
+    rtc_configuration: Optional[Union[Dict[str, Any], RTCConfiguration]] = None,
     media_stream_constraints: Optional[Union[Dict, MediaStreamConstraints]] = None,
     desired_playing_state: Optional[bool] = None,
     player_factory: Optional[MediaPlayerFactory] = None,
@@ -294,7 +298,7 @@ def webrtc_streamer(
 def webrtc_streamer(
     key: str,
     mode: WebRtcMode = WebRtcMode.SENDRECV,
-    rtc_configuration: Optional[Union[Dict, RTCConfiguration]] = None,
+    rtc_configuration: Optional[Union[Dict[str, Any], RTCConfiguration]] = None,
     media_stream_constraints: Optional[Union[Dict, MediaStreamConstraints]] = None,
     desired_playing_state: Optional[bool] = None,
     player_factory: Optional[MediaPlayerFactory] = None,
@@ -331,7 +335,7 @@ def webrtc_streamer(
 def webrtc_streamer(
     key: str,
     mode: WebRtcMode = WebRtcMode.SENDRECV,
-    rtc_configuration: Optional[Union[Dict, RTCConfiguration]] = None,
+    rtc_configuration: Optional[Union[Dict[str, Any], RTCConfiguration]] = None,
     media_stream_constraints: Optional[Union[Dict, MediaStreamConstraints]] = None,
     desired_playing_state: Optional[bool] = None,
     player_factory: Optional[MediaPlayerFactory] = None,
@@ -367,7 +371,7 @@ def webrtc_streamer(
 def webrtc_streamer(
     key: str,
     mode: WebRtcMode = WebRtcMode.SENDRECV,
-    rtc_configuration: Optional[Union[Dict, RTCConfiguration]] = None,
+    rtc_configuration: Optional[Union[Dict[str, Any], RTCConfiguration]] = None,
     media_stream_constraints: Optional[Union[Dict, MediaStreamConstraints]] = None,
     desired_playing_state: Optional[bool] = None,
     player_factory: Optional[MediaPlayerFactory] = None,
@@ -456,6 +460,49 @@ def webrtc_streamer(
         )
         st.session_state[key] = context
 
+    if context._rtc_configuration is None:
+        context._rtc_configuration = copy.deepcopy(rtc_configuration)
+    if context._rtc_configuration is None or (
+        isinstance(context._rtc_configuration, dict)
+        and context._rtc_configuration.get("iceServers") is None
+    ):
+        LOGGER.info(
+            "rtc_configuration.iceServers is not set. Try to set it automatically."
+        )
+        if hf_token := os.getenv("HF_TOKEN"):
+            LOGGER.info("Try to use TURN server from Hugging Face.")
+            try:
+                ice_servers = get_hf_ice_servers(hf_token)
+                if context._rtc_configuration is None:
+                    context._rtc_configuration = {}
+                LOGGER.info("Successfully got TURN credentials from Hugging Face.")
+                context._rtc_configuration["iceServers"] = ice_servers
+            except Exception as e:
+                LOGGER.error("Failed to get TURN credentials from Hugging Face: %s", e)
+        elif os.getenv("TWILIO_ACCOUNT_SID") and os.getenv("TWILIO_AUTH_TOKEN"):
+            LOGGER.info("Try to use TURN server from Twilio.")
+            twilio_sid = os.getenv("TWILIO_ACCOUNT_SID")
+            twilio_token = os.getenv("TWILIO_AUTH_TOKEN")
+            try:
+                ice_servers = get_twilio_ice_servers(twilio_sid, twilio_token)
+                if context._rtc_configuration is None:
+                    context._rtc_configuration = {}
+                LOGGER.info("Successfully got TURN credentials from Twilio.")
+                context._rtc_configuration["iceServers"] = ice_servers
+            except Exception as e:
+                LOGGER.error("Failed to get TURN credentials from Twilio: %s", e)
+        else:
+            LOGGER.info("Use STUN server from Google.")
+            # TODO: Check network reachability and unset ice_servers if failed
+            ice_servers = [{"urls": "stun:stun.l.google.com:19302"}]
+            if ice_servers:
+                if context._rtc_configuration is None:
+                    context._rtc_configuration = {}
+                LOGGER.info("Successfully got STUN server from Google.")
+                context._rtc_configuration["iceServers"] = [
+                    {"urls": "stun:stun.l.google.com:19302"}
+                ]
+
     webrtc_worker = context._get_worker()
 
     sdp_answer_json = None
@@ -493,7 +540,7 @@ def webrtc_streamer(
         sdp_answer_json=sdp_answer_json,
         mode=mode.name,
         settings=client_settings,
-        rtc_configuration=rtc_configuration,
+        rtc_configuration=context._rtc_configuration,
         media_stream_constraints=media_stream_constraints,
         video_html_attrs=video_html_attrs,
         audio_html_attrs=audio_html_attrs,
@@ -549,6 +596,9 @@ def webrtc_streamer(
         webrtc_worker.stop()
         context._set_worker(None)
         webrtc_worker = None
+
+        context._rtc_configuration = None
+
         # Rerun to unset the SDP answer from the frontend args
         rerun()
 

streamlit_webrtc-0.51.0/streamlit_webrtc/credentials.py

@@ -0,0 +1,75 @@
+"""
+MIT License
+
+Copyright (c) 2024 Freddy Boulton
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+# Original: https://github.com/freddyaboulton/fastrtc/blob/66f0a81b76684c5d58761464fb67642891066f93/LICENSE
+
+import json
+import os
+import urllib.error
+import urllib.request
+from typing import Optional
+
+
+def get_hf_ice_servers(token: Optional[str] = None):
+    if token is None:
+        token = os.getenv("HF_TOKEN")
+
+    if token is None:
+        raise ValueError("HF_TOKEN is not set")
+
+    req = urllib.request.Request(
+        "https://fastrtc-turn-server-login.hf.space/credentials",
+        headers={"X-HF-Access-Token": token},
+    )
+    try:
+        with urllib.request.urlopen(req) as response:
+            if response.status != 200:
+                raise ValueError("Failed to get credentials from HF turn server")
+            credentials = json.loads(response.read())
+            [
+                {
+                    "urls": "turn:gradio-turn.com:80",
+                    **credentials,
+                },
+            ]
+    except urllib.error.URLError:
+        raise ValueError("Failed to get credentials from HF turn server")
+
+
+def get_twilio_ice_servers(
+    twilio_sid: Optional[str] = None, twilio_token: Optional[str] = None
+):
+    try:
+        from twilio.rest import Client
+    except ImportError:
+        raise ImportError("Please install twilio with `pip install twilio`")
+
+    if not twilio_sid and not twilio_token:
+        twilio_sid = os.environ.get("TWILIO_ACCOUNT_SID")
+        twilio_token = os.environ.get("TWILIO_AUTH_TOKEN")
+
+    client = Client(twilio_sid, twilio_token)
+
+    token = client.tokens.create()
+
+    return token.ice_servers

{streamlit_webrtc-0.49.4 → streamlit_webrtc-0.51.0}/streamlit_webrtc/factory.py

@@ -1,7 +1,6 @@
-from typing import Literal, Optional, Union, overload
+from typing import Literal, Optional, Type, Union, overload
 
 import streamlit as st
-from aiortc import MediaStreamTrack
 
 from .eventloop import get_global_event_loop, loop_context
 from .mix import MediaStreamMixTrack, MixerCallback
@@ -33,7 +32,7 @@ _PROCESSOR_TRACK_CACHE_KEY_PREFIX = "__PROCESSOR_TRACK_CACHE__"
 
 def _get_track_class(
     kind: Literal["video", "audio"], async_processing: bool
-) -> MediaStreamTrack:
+) -> Union[Type[MediaProcessTrack], Type[AsyncMediaProcessTrack]]:
     if kind == "video":
         if async_processing:
             return AsyncVideoProcessTrack

{streamlit_webrtc-0.49.4 → streamlit_webrtc-0.51.0}/streamlit_webrtc/mix.py

@@ -8,12 +8,14 @@ import time
 import traceback
 import weakref
 from collections import OrderedDict
-from typing import Callable, Generic, List, NamedTuple, Optional, Union
+from typing import Callable, Generic, List, NamedTuple, Optional, Union, cast
 
 import av
 from aiortc import MediaStreamTrack
 from aiortc.contrib.media import RelayStreamTrack
 from aiortc.mediastreams import MediaStreamError
+from av.frame import Frame
+from av.packet import Packet
 
 from .eventloop import get_global_event_loop, loop_context
 from .models import FrameT
@@ -37,12 +39,11 @@ VIDEO_TIME_BASE = fractions.Fraction(1, VIDEO_CLOCK_RATE)
 
 
 MixerCallback = Callable[[List[FrameT]], FrameT]
-Frame = Union[av.VideoFrame, av.AudioFrame]
 
 
 class InputQueueItem(NamedTuple):
-    source_track_id: int
-    frame: Optional[Frame]
+    source_track_id: str
+    frame: Optional[Union[Frame, Packet]]
 
 
 async def input_track_coro(
@@ -99,10 +100,10 @@ async def mix_coro(mix_track: "MediaStreamMixTrack"):
             if output_frame.pts is None and output_frame.time_base is None:
                 timestamp = time.monotonic() - started_at
                 if isinstance(output_frame, av.VideoFrame):
-                    output_frame.pts = timestamp * VIDEO_CLOCK_RATE
+                    output_frame.pts = int(timestamp * VIDEO_CLOCK_RATE)
                     output_frame.time_base = VIDEO_TIME_BASE
                 elif isinstance(output_frame, av.AudioFrame):
-                    output_frame.pts = timestamp * AUDIO_SAMPLE_RATE
+                    output_frame.pts = int(timestamp * AUDIO_SAMPLE_RATE)
                     output_frame.time_base = AUDIO_TIME_BASE
 
         except Exception:
@@ -128,7 +129,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
     _input_queue: asyncio.Queue
     _queue: "asyncio.Queue[Optional[Frame]]"
     _latest_frames_map: (
-        "weakref.WeakKeyDictionary[RelayStreamTrack, Union[Frame, None]]"
+        "weakref.WeakKeyDictionary[RelayStreamTrack, Union[Frame, Packet, None]]"
     )
     _latest_frames_updated_event: asyncio.Event
 
@@ -146,7 +147,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
         mixer_output_interval: float = 1 / 30,
     ) -> None:
         self.kind = kind
-        self._mixer_callback = mixer_callback
+        self._mixer_callback: MixerCallback[FrameT] = mixer_callback
         self._mixer_callback_lock = threading.Lock()
 
         self.mixer_output_interval = mixer_output_interval
@@ -210,7 +211,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
 
             relay = get_global_relay()
             with loop_context(self._loop):
-                input_proxy = relay.subscribe(input_track)
+                input_proxy = cast(RelayStreamTrack, relay.subscribe(input_track))
 
             self._input_proxies[input_track] = input_proxy
 
@@ -223,7 +224,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
         )
         self._input_tasks[input_proxy] = task
 
-        input_proxy.on("ended")(functools.partial(self.remove_input_proxy, input_proxy))
+        input_proxy.on("ended", functools.partial(self.remove_input_proxy, input_proxy))
 
     def remove_input_proxy(self, input_proxy: RelayStreamTrack) -> None:
         LOGGER.debug("Remove a relay track %s from %s", input_proxy, self)
@@ -241,13 +242,13 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
         task.cancel()
 
     def _set_latest_frame(
-        self, input_proxy: RelayStreamTrack, frame: Union[Frame, None]
+        self, input_proxy: RelayStreamTrack, frame: Union[Frame, Packet, None]
     ):
         # TODO: Lock here to make these 2 lines atomic
         self._latest_frames_map[input_proxy] = frame
         self._latest_frames_updated_event.set()
 
-    async def _get_latest_frames(self) -> List[Frame]:
+    async def _get_latest_frames(self) -> List[Union[Frame, Packet]]:
         # TODO: Lock here to make these 2 lines atomic
         await self._latest_frames_updated_event.wait()
         self._latest_frames_updated_event.clear()
@@ -257,8 +258,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
                 self._latest_frames_map.get(proxy)
                 for proxy in self._input_proxies.values()
             ]
-        latest_frames = [f for f in latest_frames if f is not None]
-        return latest_frames
+        return [f for f in latest_frames if f is not None]
 
     async def recv(self):
         if self.readyState != "live":

{streamlit_webrtc-0.49.4 → streamlit_webrtc-0.51.0}/streamlit_webrtc/process.py

@@ -25,11 +25,12 @@ class MediaProcessTrack(MediaStreamTrack, Generic[ProcessorT, FrameT]):
         self.track = track
         self.processor: ProcessorT = processor
 
-        @self.track.on("ended")
         def on_input_track_ended():
             logger.debug("Input track %s ended. Stop self %s", self.track, self)
             self.stop()
 
+        self.track.on("ended", on_input_track_ended)
+
     async def recv(self):
         if self.readyState != "live":
             raise MediaStreamError
@@ -98,11 +99,12 @@ class AsyncMediaProcessTrack(MediaStreamTrack, Generic[ProcessorT, FrameT]):
         )
         self._thread.start()
 
-        @self.track.on("ended")
         def on_input_track_ended():
             logger.debug("Input track %s ended. Stop self %s", self.track, self)
             self.stop()
 
+        self.track.on("ended", on_input_track_ended)
+
     def _run_worker_thread(self):
         try:
             self._worker_thread()
@@ -114,7 +116,7 @@ class AsyncMediaProcessTrack(MediaStreamTrack, Generic[ProcessorT, FrameT]):
                 for tbline in tb.rstrip().splitlines():
                     logger.error(tbline.rstrip())
 
-    async def _fallback_recv_queued(self, frames: List[FrameT]) -> FrameT:
+    async def _fallback_recv_queued(self, frames: List[FrameT]) -> List[FrameT]:
         """
         Used as a fallback when the processor does not have its own `recv_queued`.
         """
@@ -126,7 +128,7 @@ class AsyncMediaProcessTrack(MediaStreamTrack, Generic[ProcessorT, FrameT]):
         if self.processor.recv:
             return [self.processor.recv(frames[-1])]
 
-        return frames[-1]
+        return [frames[-1]]
 
     def _worker_thread(self) -> None:
         loop = asyncio.new_event_loop()

{streamlit_webrtc-0.49.4 → streamlit_webrtc-0.51.0}/streamlit_webrtc/webrtc.py

@@ -93,7 +93,7 @@ async def _process_offer_coro(
 
     if mode == WebRtcMode.SENDRECV:
 
-        @pc.on("track")
+        @pc.on("track")  # type: ignore
         def on_track(input_track: MediaStreamTrack):
             logger.info("Track %s received", input_track.kind)
 
@@ -164,7 +164,7 @@ async def _process_offer_coro(
             elif output_track.kind == "audio":
                 on_track_created("output:audio", output_track)
 
-            @input_track.on("ended")
+            @input_track.on("ended")  # type: ignore
             async def on_ended():
                 logger.info("Track %s ended", input_track.kind)
                 if in_recorder:
@@ -174,7 +174,7 @@ async def _process_offer_coro(
 
     elif mode == WebRtcMode.SENDONLY:
 
-        @pc.on("track")
+        @pc.on("track")  # type: ignore
         def on_track(input_track: MediaStreamTrack):
             logger.info("Track %s received", input_track.kind)
 
@@ -183,6 +183,8 @@ async def _process_offer_coro(
             elif input_track.kind == "audio":
                 on_track_created("input:audio", input_track)
 
+            output_track: MediaStreamTrack
+
             if input_track.kind == "audio":
                 if audio_receiver:
                     if audio_processor:
@@ -224,7 +226,7 @@ async def _process_offer_coro(
                 logger.info("Track %s is added to in_recorder", input_track.kind)
                 in_recorder.addTrack(relay.subscribe(input_track))
 
-            @input_track.on("ended")
+            @input_track.on("ended")  # type: ignore
             async def on_ended():
                 logger.info("Track %s ended", input_track.kind)
                 if video_receiver:
@@ -237,7 +239,7 @@ async def _process_offer_coro(
     await pc.setRemoteDescription(offer)
     if mode == WebRtcMode.RECVONLY:
         for t in pc.getTransceivers():
-            output_track = None
+            output_track: Optional[MediaStreamTrack] = None
             if t.kind == "audio":
                 if source_audio_track:
                     if audio_processor:
@@ -393,8 +395,8 @@ class WebRtcWorker(Generic[VideoProcessorT, AudioProcessorT]):
         self._output_video_track: Optional[MediaStreamTrack] = None
         self._output_audio_track: Optional[MediaStreamTrack] = None
         self._player: Optional[MediaPlayer] = None
-        self._relayed_source_video_track: Optional[MediaRelay] = None
-        self._relayed_source_audio_track: Optional[MediaRelay] = None
+        self._relayed_source_video_track: Optional[MediaStreamTrack] = None
+        self._relayed_source_audio_track: Optional[MediaStreamTrack] = None
 
         self._session_shutdown_observer = SessionShutdownObserver(self.stop)
 
@@ -510,7 +512,7 @@ class WebRtcWorker(Generic[VideoProcessorT, AudioProcessorT]):
                 )
                 source_video_track = self._relayed_source_video_track
 
-        @self.pc.on("iceconnectionstatechange")
+        @self.pc.on("iceconnectionstatechange")  # type: ignore
         async def on_iceconnectionstatechange():
             logger.info("ICE connection state is %s", self.pc.iceConnectionState)
             iceConnectionState = self.pc.iceConnectionState

streamlit_webrtc-0.49.4/pyproject.toml

@@ -1,45 +0,0 @@
-[tool.poetry]
-name = "streamlit-webrtc"
-version = "0.49.4"
-description = "Real-time video and audio processing on Streamlit"
-authors = ["Yuichiro Tachibana (Tsuchiya) <t.yic.yt@gmail.com>"]
-license = "MIT"
-readme = "README.md"
-repository = "https://github.com/whitphx/streamlit-webrtc"
-include = [
-    { path = "./streamlit_webrtc/frontend/dist/**/*", format = ["sdist", "wheel"] }
-]
-exclude = [
-    "./streamlit_webrtc/frontend/*",
-]
-
-[tool.poetry.dependencies]
-python = ">=3.9,<4,!=3.9.7"  # 3.9.7 is excluded due to https://github.com/streamlit/streamlit/pull/5168
-# For allow-same-origin, >=0.73.0 is required. See https://blog.streamlit.io/streamlit-components-security-and-a-five-month-quest-to-ship-a-single-line-of-code/
-# 0.84.0 has an error at marshalling component values.
-streamlit = ">=0.84.1"
-aiortc = "^1.9.0"  # aiortc<1.4.0 causes an error with cryptography>=39.0.0. See https://github.com/whitphx/streamlit-webrtc/issues/1164. The fix was introduced into aiortc in https://github.com/aiortc/aiortc/commit/08b0a7e9f5030a9f7e5617382e92560d4ae763a2 that 1.4.0 included.
-packaging = ">=20.0"
-
-[tool.poetry.group.dev.dependencies]
-click = ">=7.0,<9.0"  # We must specify the click version because we install older versions of Streamlit in the CI process and their depending click version is different from the newer releases.
-ruff = "^0.9.10"
-mypy = {extras = ["faster-cache"], version = "^1.15.0"}
-pydub = "^0.25.1"
-matplotlib = "^3.5.1"
-deepspeech = { version = "^0.9.3", python = ">=3.5,<=3.9" }  # DeepSpeech 0.9.3 supports Python version 3.5, 3.6, 3.7, 3.8 and 3.9; https://github.com/mozilla/DeepSpeech/releases/tag/v0.9.3
-streamlit-server-state = ">=0.17.1,<0.19.0"
-pytest = ">=7.1.2,<9.0.0"
-opencv-python-headless = "^4.5.4.58"
-# It is necessary to specify numpy and pandas versions for Poetry to resolve the package versions correctly and avoid errors.
-numpy = "^1.21.0"
-pandas = "^2.0.3"
-streamlit = "^1.13.0"
-twilio = ">=8.1,<10.0"
-
-[tool.ruff.lint]
-extend-select = ["I"]
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"