wx44wx/pipecat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

processors(filters): allow passing EndFrame

Browse Source
This commit is contained in:
Aleix Conchillo Flaqué
2024-12-17 16:12:49 -08:00
parent fb9f72d38b
commit 2dfdceb9e6
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pipecat/processors/filters/frame_filter.py
View File

@@ -6,7 +6,7 @@
from typing import Tuple, Type from typing import Tuple, Type
from pipecat.frames.frames import ControlFrame, Frame, SystemFrame from pipecat.frames.frames import EndFrame, Frame, SystemFrame
from pipecat.processors.frame_processor import FrameDirection, FrameProcessor from pipecat.processors.frame_processor import FrameDirection, FrameProcessor
@@ -23,7 +23,7 @@ class FrameFilter(FrameProcessor):
if isinstance(frame, self._types): if isinstance(frame, self._types):
return True return True
return isinstance(frame, ControlFrame) or isinstance(frame, SystemFrame) return isinstance(frame, (EndFrame, SystemFrame))
async def process_frame(self, frame: Frame, direction: FrameDirection): async def process_frame(self, frame: Frame, direction: FrameDirection):
await super().process_frame(frame, direction) await super().process_frame(frame, direction)

7
src/pipecat/processors/filters/function_filter.py
View File

@@ -6,7 +6,7 @@
from typing import Awaitable, Callable from typing import Awaitable, Callable
from pipecat.frames.frames import Frame, SystemFrame from pipecat.frames.frames import EndFrame, Frame, SystemFrame
from pipecat.processors.frame_processor import FrameDirection, FrameProcessor from pipecat.processors.frame_processor import FrameDirection, FrameProcessor
@@ -24,9 +24,10 @@ class FunctionFilter(FrameProcessor):
# Frame processor # Frame processor
# #
# Ignore system frames and frames that are not following the direction of this gate # Ignore system frames, end frames and frames that are not following the
# direction of this gate
def _should_passthrough_frame(self, frame, direction): def _should_passthrough_frame(self, frame, direction):
return isinstance(frame, SystemFrame) or direction != self._direction return isinstance(frame, (SystemFrame, EndFrame)) or direction != self._direction
async def process_frame(self, frame: Frame, direction: FrameDirection): async def process_frame(self, frame: Frame, direction: FrameDirection):
await super().process_frame(frame, direction) await super().process_frame(frame, direction)

13
src/pipecat/processors/filters/null_filter.py
View File

@@ -4,7 +4,8 @@
# SPDX-License-Identifier: BSD 2-Clause License # SPDX-License-Identifier: BSD 2-Clause License
# #
from pipecat.processors.frame_processor import FrameProcessor from pipecat.frames.frames import EndFrame, Frame, SystemFrame
from pipecat.processors.frame_processor import FrameDirection, FrameProcessor
class NullFilter(FrameProcessor): class NullFilter(FrameProcessor):
@@ -12,3 +13,13 @@ class NullFilter(FrameProcessor):
def __init__(self, **kwargs): def __init__(self, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)
#
# Frame processor
#
async def process_frame(self, frame: Frame, direction: FrameDirection):
await super().process_frame(frame, direction)
if isinstance(frame, (SystemFrame, EndFrame)):
await self.push_frame(frame, direction)