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

allow specifying frame processor names

Browse Source
This commit is contained in:
Aleix Conchillo Flaqué
2024-06-12 11:32:33 -07:00
parent f65f566829
commit 83f69e02fd
9 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- Allow specifying frame processors' name through a new `name` constructor
argument.
### Changed
- `daily_rest.DailyRoomProperties` now allows extra unknown parameters.

4
src/pipecat/processors/frame_processor.py
View File

@@ -22,9 +22,9 @@ class FrameDirection(Enum):
class FrameProcessor:
def __init__(self, loop: asyncio.AbstractEventLoop | None = None):
def __init__(self, name: str | None = None, loop: asyncio.AbstractEventLoop | None = None):
self.id: int = obj_id()
self.name = f"{self.__class__.__name__}#{obj_count(self)}"
self.name = name or f"{self.__class__.__name__}#{obj_count(self)}"
self._prev: "FrameProcessor" | None = None
self._next: "FrameProcessor" | None = None
self._loop: asyncio.AbstractEventLoop = loop or asyncio.get_running_loop()

25
src/pipecat/services/ai_services.py
View File

@@ -28,8 +28,8 @@ from pipecat.utils.utils import exp_smoothing
class AIService(FrameProcessor):
def __init__(self):
super().__init__()
def __init__(self, **kwargs):
super().__init__(**kwargs)
async def start(self, frame: StartFrame):
pass
@@ -61,8 +61,8 @@ class AIService(FrameProcessor):
class LLMService(AIService):
"""This class is a no-op but serves as a base class for LLM services."""
def __init__(self):
super().__init__()
def __init__(self, **kwargs):
super().__init__(**kwargs)
self._callbacks = {}
self._start_callbacks = {}
@@ -91,8 +91,8 @@ class LLMService(AIService):
class TTSService(AIService):
def __init__(self, aggregate_sentences: bool = True):
super().__init__()
def __init__(self, aggregate_sentences: bool = True, **kwargs):
super().__init__(**kwargs)
self._aggregate_sentences: bool = aggregate_sentences
self._current_sentence: str = ""
@@ -146,8 +146,9 @@ class STTService(AIService):
max_silence_secs: float = 0.3,
max_buffer_secs: float = 1.5,
sample_rate: int = 16000,
num_channels: int = 1):
super().__init__()
num_channels: int = 1,
**kwargs):
super().__init__(**kwargs)
self._min_volume = min_volume
self._max_silence_secs = max_silence_secs
self._max_buffer_secs = max_buffer_secs
@@ -216,8 +217,8 @@ class STTService(AIService):
class ImageGenService(AIService):
def __init__(self):
super().__init__()
def __init__(self, **kwargs):
super().__init__(**kwargs)
# Renders the image. Returns an Image object.
@abstractmethod
@@ -237,8 +238,8 @@ class ImageGenService(AIService):
class VisionService(AIService):
"""VisionService is a base class for vision services."""
def __init__(self):
super().__init__()
def __init__(self, **kwargs):
super().__init__(**kwargs)
self._describe_text = None
@abstractmethod

5
src/pipecat/services/openai.py
View File

@@ -41,7 +41,6 @@ from pipecat.services.ai_services import (
try:
from openai import AsyncOpenAI, AsyncStream, BadRequestError
from openai.types.chat import (
ChatCompletion,
ChatCompletionChunk,
ChatCompletionFunctionMessageParam,
ChatCompletionMessageParam,
@@ -68,8 +67,8 @@ class BaseOpenAILLMService(LLMService):
calls from the LLM.
"""
def __init__(self, model: str, api_key=None, base_url=None):
super().__init__()
def __init__(self, model: str, api_key=None, base_url=None, **kwargs):
super().__init__(**kwargs)
self._model: str = model
self._client = self.create_client(api_key=api_key, base_url=base_url)

4
src/pipecat/transports/base_input.py
View File

@@ -28,8 +28,8 @@ from loguru import logger
class BaseInputTransport(FrameProcessor):
def __init__(self, params: TransportParams):
super().__init__()
def __init__(self, params: TransportParams, **kwargs):
super().__init__(**kwargs)
self._params = params

4
src/pipecat/transports/base_output.py
View File

@@ -37,8 +37,8 @@ from loguru import logger
class BaseOutputTransport(FrameProcessor):
def __init__(self, params: TransportParams):
super().__init__()
def __init__(self, params: TransportParams, **kwargs):
super().__init__(**kwargs)
self._params = params

7
src/pipecat/transports/base_transport.py
View File

@@ -41,7 +41,12 @@ class TransportParams(BaseModel):
class BaseTransport(ABC):
def __init__(self, loop: asyncio.AbstractEventLoop | None):
def __init__(self,
input_name: str | None = None,
output_name: str | None = None,
loop: asyncio.AbstractEventLoop | None = None):
self._input_name = input_name
self._output_name = output_name
self._loop = loop or asyncio.get_running_loop()
self._event_handlers: dict = {}

17
src/pipecat/transports/network/websocket_server.py
View File

@@ -42,8 +42,9 @@ class WebsocketServerInputTransport(BaseInputTransport):
host: str,
port: int,
params: WebsocketServerParams,
callbacks: WebsocketServerCallbacks):
super().__init__(params)
callbacks: WebsocketServerCallbacks,
**kwargs):
super().__init__(params, **kwargs)
self._host = host
self._port = port
@@ -98,8 +99,8 @@ class WebsocketServerInputTransport(BaseInputTransport):
class WebsocketServerOutputTransport(BaseOutputTransport):
def __init__(self, params: WebsocketServerParams):
super().__init__(params)
def __init__(self, params: WebsocketServerParams, **kwargs):
super().__init__(params, **kwargs)
self._params = params
@@ -153,8 +154,10 @@ class WebsocketServerTransport(BaseTransport):
host: str = "localhost",
port: int = 8765,
params: WebsocketServerParams = WebsocketServerParams(),
input_name: str | None = None,
output_name: str | None = None,
loop: asyncio.AbstractEventLoop | None = None):
super().__init__(loop)
super().__init__(input_name=input_name, output_name=output_name, loop=loop)
self._host = host
self._port = port
self._params = params
@@ -175,12 +178,12 @@ class WebsocketServerTransport(BaseTransport):
def input(self) -> FrameProcessor:
if not self._input:
self._input = WebsocketServerInputTransport(
self._host, self._port, self._params, self._callbacks)
self._host, self._port, self._params, self._callbacks, name=self._input_name)
return self._input
def output(self) -> FrameProcessor:
if not self._output:
self._output = WebsocketServerOutputTransport(self._params)
self._output = WebsocketServerOutputTransport(self._params, name=self._output_name)
return self._output
async def _on_client_connected(self, websocket):

16
src/pipecat/transports/services/daily.py
View File

@@ -473,8 +473,8 @@ class DailyTransportClient(EventHandler):
class DailyInputTransport(BaseInputTransport):
def __init__(self, client: DailyTransportClient, params: DailyParams):
super().__init__(params)
def __init__(self, client: DailyTransportClient, params: DailyParams, **kwargs):
super().__init__(params, **kwargs)
self._client = client
@@ -609,8 +609,8 @@ class DailyInputTransport(BaseInputTransport):
class DailyOutputTransport(BaseOutputTransport):
def __init__(self, client: DailyTransportClient, params: DailyParams):
super().__init__(params)
def __init__(self, client: DailyTransportClient, params: DailyParams, **kwargs):
super().__init__(params, **kwargs)
self._client = client
@@ -662,8 +662,10 @@ class DailyTransport(BaseTransport):
token: str | None,
bot_name: str,
params: DailyParams,
input_name: str | None = None,
output_name: str | None = None,
loop: asyncio.AbstractEventLoop | None = None):
super().__init__(loop)
super().__init__(input_name=input_name, output_name=output_name, loop=loop)
callbacks = DailyCallbacks(
on_joined=self._on_joined,
@@ -708,12 +710,12 @@ class DailyTransport(BaseTransport):
def input(self) -> FrameProcessor:
if not self._input:
self._input = DailyInputTransport(self._client, self._params)
self._input = DailyInputTransport(self._client, self._params, name=self._input_name)
return self._input
def output(self) -> FrameProcessor:
if not self._output:
self._output = DailyOutputTransport(self._client, self._params)
self._output = DailyOutputTransport(self._client, self._params, name=self._output_name)
return self._output
#