streamlit-webrtc 0.61.2__py3-none-any.whl → 0.61.3__py3-none-any.whl

streamlit_webrtc/component.py

@@ -2,6 +2,7 @@ import copy
 import json
 import logging
 import os
+import threading
 import warnings
 import weakref
 from typing import (
@@ -92,6 +93,7 @@ class WebRtcStreamerContext(Generic[VideoProcessorT, AudioProcessorT]):
     _worker_ref: "Optional[weakref.ReferenceType[WebRtcWorker[VideoProcessorT, AudioProcessorT]]]"  # noqa
 
     _component_value_snapshot: Union[ComponentValueSnapshot, None]
+    _worker_creation_lock: threading.Lock
     _frontend_rtc_configuration: Optional[Union[Dict[str, Any], RTCConfiguration]]
 
     def __init__(
@@ -102,6 +104,7 @@ class WebRtcStreamerContext(Generic[VideoProcessorT, AudioProcessorT]):
         self._set_worker(worker)
         self._set_state(state)
         self._component_value_snapshot = None
+        self._worker_creation_lock = threading.Lock()
         self._frontend_rtc_configuration = None
 
     def _set_worker(
@@ -594,65 +597,66 @@ def webrtc_streamer(
                 on_ended=on_audio_ended,
             )
 
-    if not webrtc_worker and sdp_offer:
-        LOGGER.debug(
-            "No worker exists though the offer SDP is set. "
-            'Create a new worker (key="%s").',
-            key,
-        )
+    worker_created_in_this_run = None
+    with context._worker_creation_lock:  # This point can be reached in parallel so we need to use a lock to make the worker creation process atomic.
+        should_create_worker_in_this_run = not context._get_worker() and sdp_offer
 
-        aiortc_rtc_configuration = (
-            compile_rtc_configuration(server_rtc_configuration)
-            if server_rtc_configuration and isinstance(server_rtc_configuration, dict)
-            else AiortcRTCConfiguration()
-        )
-        if aiortc_rtc_configuration.iceServers is None:
-            LOGGER.info(
-                "rtc_configuration.iceServers is not set. Try to set it automatically."
+        if should_create_worker_in_this_run:
+            LOGGER.debug(
+                "No worker exists though the offer SDP is set. "
+                'Create a new worker (key="%s").',
+                key,
             )
-            ice_servers = get_available_ice_servers()
-            aiortc_rtc_configuration.iceServers = compile_ice_servers(ice_servers)
-
-        webrtc_worker = WebRtcWorker(
-            mode=mode,
-            rtc_configuration=aiortc_rtc_configuration,
-            player_factory=player_factory,
-            in_recorder_factory=in_recorder_factory,
-            out_recorder_factory=out_recorder_factory,
-            video_frame_callback=video_frame_callback,
-            audio_frame_callback=audio_frame_callback,
-            queued_video_frames_callback=queued_video_frames_callback,
-            queued_audio_frames_callback=queued_audio_frames_callback,
-            on_video_ended=on_video_ended,
-            on_audio_ended=on_audio_ended,
-            video_processor_factory=video_processor_factory,
-            audio_processor_factory=audio_processor_factory,
-            async_processing=async_processing,
-            video_receiver_size=video_receiver_size,
-            audio_receiver_size=audio_receiver_size,
-            source_video_track=source_video_track,
-            source_audio_track=source_audio_track,
-            sendback_video=sendback_video,
-            sendback_audio=sendback_audio,
-        )
 
-        # Setting the worker here before calling `webrtc_worker.process_offer()` is important.
-        # `webrtc_worker.process_offer()` waits for processing the offer in another thread and
-        # a new script run can be triggered during it.
-        # so, if the worker is not set here, `context._get_worker()` will return None in the next run
-        # and it leads to creating a worker in the next run again.
-        context._set_worker(webrtc_worker)
+            aiortc_rtc_configuration = (
+                compile_rtc_configuration(server_rtc_configuration)
+                if server_rtc_configuration
+                and isinstance(server_rtc_configuration, dict)
+                else AiortcRTCConfiguration()
+            )
+            if aiortc_rtc_configuration.iceServers is None:
+                LOGGER.info(
+                    "rtc_configuration.iceServers is not set. Try to set it automatically."
+                )
+                ice_servers = get_available_ice_servers()  # NOTE: This may include a yield point where Streamlit's script runner interrupts the execution and may stop the current run.
+                aiortc_rtc_configuration.iceServers = compile_ice_servers(ice_servers)
+
+            worker_created_in_this_run = WebRtcWorker(
+                mode=mode,
+                rtc_configuration=aiortc_rtc_configuration,
+                player_factory=player_factory,
+                in_recorder_factory=in_recorder_factory,
+                out_recorder_factory=out_recorder_factory,
+                video_frame_callback=video_frame_callback,
+                audio_frame_callback=audio_frame_callback,
+                queued_video_frames_callback=queued_video_frames_callback,
+                queued_audio_frames_callback=queued_audio_frames_callback,
+                on_video_ended=on_video_ended,
+                on_audio_ended=on_audio_ended,
+                video_processor_factory=video_processor_factory,
+                audio_processor_factory=audio_processor_factory,
+                async_processing=async_processing,
+                video_receiver_size=video_receiver_size,
+                audio_receiver_size=audio_receiver_size,
+                source_video_track=source_video_track,
+                source_audio_track=source_audio_track,
+                sendback_video=sendback_video,
+                sendback_audio=sendback_audio,
+            )
 
-        webrtc_worker.process_offer(sdp_offer["sdp"], sdp_offer["type"], timeout=None)
+            # Set the worker here within the lock.
+            context._set_worker(worker_created_in_this_run)
 
-        if ice_candidates:
-            webrtc_worker.set_ice_candidates_from_offerer(ice_candidates)
+    webrtc_worker = context._get_worker()
+    if webrtc_worker and ice_candidates:
+        webrtc_worker.set_ice_candidates_from_offerer(ice_candidates)
+
+    if worker_created_in_this_run:
+        worker_created_in_this_run.process_offer(
+            sdp_offer["sdp"], sdp_offer["type"], timeout=None
+        )
 
         # Rerun to send the SDP answer to frontend
         rerun()
 
-    if webrtc_worker and ice_candidates:
-        webrtc_worker.set_ice_candidates_from_offerer(ice_candidates)
-
-    context._set_worker(webrtc_worker)
     return context

streamlit_webrtc/webrtc.py

@@ -662,7 +662,8 @@ class WebRtcWorker(Generic[VideoProcessorT, AudioProcessorT]):
         self.on_video_ended = on_ended
 
         if not self.video_processor:
-            raise TypeError("video_processor is None")
+            # `update_video_callbacks` can be called before `process_offer` is called that sets up the video processor.
+            return
         if type(self.video_processor).__name__ != CallbackAttachableProcessor.__name__:
             raise TypeError(
                 f"video_processor has an invalid type: {type(self.video_processor)}"
@@ -686,7 +687,8 @@ class WebRtcWorker(Generic[VideoProcessorT, AudioProcessorT]):
         self.on_audio_ended = on_ended
 
         if not self.audio_processor:
-            raise TypeError("audio_processor is None")
+            # `update_audio_callbacks` can be called before `process_offer` is called that sets up the audio processor.
+            return
         if type(self.audio_processor).__name__ != CallbackAttachableProcessor.__name__:
             raise TypeError(
                 f"audio_processor has an invalid type: {type(self.audio_processor)}"

{streamlit_webrtc-0.61.2.dist-info → streamlit_webrtc-0.61.3.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: streamlit-webrtc
-Version: 0.61.2
+Version: 0.61.3
 Summary: Real-time video and audio processing on Streamlit
 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: aioice>=0.9.0
+Requires-Dist: aioice>=0.10.0
 Requires-Dist: aiortc>=1.11.0
 Requires-Dist: packaging>=20.0
 Requires-Dist: streamlit>=0.89.0

{streamlit_webrtc-0.61.2.dist-info → streamlit_webrtc-0.61.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 streamlit_webrtc/__init__.py,sha256=jMWwXoQ9hVyYXPD4Vrps7MyiR9goyC-n7LtkZNFBOxU,2273
 streamlit_webrtc/_compat.py,sha256=AVRcUGdgWDQcCE7-ufhGr6Hb5P6EHLgejUAA72ArJmg,4384
-streamlit_webrtc/component.py,sha256=uNmy3kLxhT6vlIp61uMgAjqeS4PaaPMy9choGIHvENE,26832
+streamlit_webrtc/component.py,sha256=Imoz2xuLRvgjy2Lxi9VVXgCMdvf-nUriTim2AjdFfC0,27155
 streamlit_webrtc/components_callbacks.py,sha256=tdrj2TlV8qcexFEdjm4PVkz8JwHffo4A8imoXOtjNHA,2401
 streamlit_webrtc/config.py,sha256=yKFIVjIoX2F62_G2qcDrNYm2Qe_qx1E9E0YqAnAibMo,5544
 streamlit_webrtc/credentials.py,sha256=3IOk7w1JLQ2Qs6XFP9dxsF81lpjLL2kdRe2ZIhHvaj4,4562
@@ -16,10 +16,10 @@ streamlit_webrtc/server.py,sha256=5o9E2MRIPoS18lfGPJkyhbd23RWyTwblNVVuAA2kKrA,14
 streamlit_webrtc/session_info.py,sha256=V1EdzD2I8dWANXdC84EKSz8XgPM-zugtkYsb4hJm8Qo,2313
 streamlit_webrtc/shutdown.py,sha256=PUjMoNZcTRGzZCooCmjWARpeVs5EG_9JXAf1Iay7dBM,2353
 streamlit_webrtc/source.py,sha256=haPqMZ50Xh8tg7Z1yN8Frfk8v7D3oOuKteaD59asbzs,2263
-streamlit_webrtc/webrtc.py,sha256=CC6Z55e2aikhF1r_C6p08xmIYqbYZGFTpsmgBd1lo_A,29732
+streamlit_webrtc/webrtc.py,sha256=WzgydYm3Xhoi5c1QHNLc_GiF_E0aGC5ynzmxeAbtJCw,29900
 streamlit_webrtc/frontend/dist/index.html,sha256=ZY_Iflaf7wRUHHNpw7JMlSMraE3ewM9T_tZA94NIPRs,527
 streamlit_webrtc/frontend/dist/assets/index-Cz1nSw2-.js,sha256=j126AA3NGo8BLgQSjjMyQR6QwpDRq_jILP9woihrncI,589799
-streamlit_webrtc-0.61.2.dist-info/METADATA,sha256=cKoOJcEhOc6G7jFgywtCTY20omtR-SDS2Ouc5MSPn6s,18287
-streamlit_webrtc-0.61.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-streamlit_webrtc-0.61.2.dist-info/licenses/LICENSE,sha256=pwccNHVA7r4rYofGlMU10aKEU90GLUlQr8uY80PR0NQ,1081
-streamlit_webrtc-0.61.2.dist-info/RECORD,,
+streamlit_webrtc-0.61.3.dist-info/METADATA,sha256=nUJ6oMZtfpG5E0l5dQw_E0UfXX3XrQ1gTxkYEwalntA,18288
+streamlit_webrtc-0.61.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+streamlit_webrtc-0.61.3.dist-info/licenses/LICENSE,sha256=pwccNHVA7r4rYofGlMU10aKEU90GLUlQr8uY80PR0NQ,1081
+streamlit_webrtc-0.61.3.dist-info/RECORD,,