Merge pull request #2060 from pipecat-ai/aleix/watchdog-timeout-secs

FrameProcessor: use watchdog_timeout_secs
This commit is contained in:
Aleix Conchillo Flaqué
2025-06-24 13:36:39 -07:00
committed by GitHub

View File

@@ -52,7 +52,7 @@ class FrameProcessor(BaseObject):
name: Optional[str] = None, name: Optional[str] = None,
metrics: Optional[FrameProcessorMetrics] = None, metrics: Optional[FrameProcessorMetrics] = None,
enable_watchdog_logging: Optional[bool] = None, enable_watchdog_logging: Optional[bool] = None,
watchdog_timeout: Optional[bool] = None, watchdog_timeout_secs: Optional[float] = None,
**kwargs, **kwargs,
): ):
super().__init__(name=name) super().__init__(name=name)
@@ -64,7 +64,7 @@ class FrameProcessor(BaseObject):
self._enable_watchdog_logging = enable_watchdog_logging self._enable_watchdog_logging = enable_watchdog_logging
# Allow this frame processor to control their tasks timeout. # Allow this frame processor to control their tasks timeout.
self._watchdog_timeout = watchdog_timeout self._watchdog_timeout = watchdog_timeout_secs
# Clock # Clock
self._clock: Optional[BaseClock] = None self._clock: Optional[BaseClock] = None
@@ -185,7 +185,7 @@ class FrameProcessor(BaseObject):
name: Optional[str] = None, name: Optional[str] = None,
*, *,
enable_watchdog_logging: Optional[bool] = None, enable_watchdog_logging: Optional[bool] = None,
watchdog_timeout: Optional[float] = None, watchdog_timeout_secs: Optional[float] = None,
) -> asyncio.Task: ) -> asyncio.Task:
if name: if name:
name = f"{self}::{name}" name = f"{self}::{name}"
@@ -199,7 +199,9 @@ class FrameProcessor(BaseObject):
if enable_watchdog_logging if enable_watchdog_logging
else self._enable_watchdog_logging else self._enable_watchdog_logging
), ),
watchdog_timeout=watchdog_timeout if watchdog_timeout else self._watchdog_timeout, watchdog_timeout=(
watchdog_timeout_secs if watchdog_timeout_secs else self._watchdog_timeout
),
) )
async def cancel_task(self, task: asyncio.Task, timeout: Optional[float] = None): async def cancel_task(self, task: asyncio.Task, timeout: Optional[float] = None):