Compare commits

...

3 Commits

Author SHA1 Message Date
Jon Taylor
a8b90592a5 updated changelog and ruffed up 2025-10-20 23:22:47 +01:00
Jon Taylor
f234180b24 classmethod to normalizing requestData casing 2025-10-20 23:12:24 +01:00
Jon Taylor
e0e2b6ac6b draft patch: pass request data through to bot module 2025-10-20 22:45:40 +01:00
5 changed files with 36 additions and 19 deletions

View File

@@ -85,6 +85,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Runner: `body` property moved to `RunnerArguments` base class as all transports
should support arbitrary body data as part of a request.
- `CartesiaSTTService` now inherits from `WebsocketSTTService`.
- Package upgrades:
@@ -106,6 +109,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fixed an issue where the `SmallWebRTCRequest` dataclass in runner would scrub
arbitrary request data from client due to camelCase typing. This fixes data
passthrough for JS clients where `APIRequest` is used.
- Fixed an issue in `RivaSegmentedSTTService` where a runtime error occurred due
to a mismatch in the _handle_transcription method's signature.

View File

@@ -260,7 +260,9 @@ def _setup_webrtc_routes(
# Prepare runner arguments with the callback to run your bot
async def webrtc_connection_callback(connection):
bot_module = _get_bot_module()
runner_args = SmallWebRTCRunnerArguments(webrtc_connection=connection)
runner_args = SmallWebRTCRunnerArguments(
webrtc_connection=connection, body=request.request_data
)
background_tasks.add_task(bot_module.bot, runner_args)
# Delegate handling to SmallWebRTCRequestHandler

View File

@@ -24,10 +24,13 @@ class RunnerArguments:
handle_sigterm: bool = field(init=False)
pipeline_idle_timeout_secs: int = field(init=False)
body: Optional[Any] = field(default_factory=dict)
def __post_init__(self):
self.handle_sigint = False
self.handle_sigterm = False
self.pipeline_idle_timeout_secs = 300
self.body = self.body or {}
@dataclass
@@ -42,7 +45,6 @@ class DailyRunnerArguments(RunnerArguments):
room_url: str
token: Optional[str] = None
body: Optional[Any] = field(default_factory=dict)
@dataclass
@@ -55,7 +57,6 @@ class WebSocketRunnerArguments(RunnerArguments):
"""
websocket: WebSocket
body: Optional[Any] = field(default_factory=dict)
@dataclass

View File

@@ -627,7 +627,7 @@ class AWSNovaSonicLLMService(LLMService):
else ""
)
prompt_start = f'''
prompt_start = f"""
{{
"event": {{
"promptStart": {{
@@ -647,14 +647,14 @@ class AWSNovaSonicLLMService(LLMService):
}}
}}
}}
'''
"""
await self._send_client_event(prompt_start)
async def _send_audio_input_start_event(self):
if not self._prompt_name:
return
audio_content_start = f'''
audio_content_start = f"""
{{
"event": {{
"contentStart": {{
@@ -674,7 +674,7 @@ class AWSNovaSonicLLMService(LLMService):
}}
}}
}}
'''
"""
await self._send_client_event(audio_content_start)
async def _send_text_event(self, text: str, role: Role):
@@ -683,7 +683,7 @@ class AWSNovaSonicLLMService(LLMService):
content_name = str(uuid.uuid4())
text_content_start = f'''
text_content_start = f"""
{{
"event": {{
"contentStart": {{
@@ -698,11 +698,11 @@ class AWSNovaSonicLLMService(LLMService):
}}
}}
}}
'''
"""
await self._send_client_event(text_content_start)
escaped_text = json.dumps(text) # includes quotes
text_input = f'''
text_input = f"""
{{
"event": {{
"textInput": {{
@@ -712,10 +712,10 @@ class AWSNovaSonicLLMService(LLMService):
}}
}}
}}
'''
"""
await self._send_client_event(text_input)
text_content_end = f'''
text_content_end = f"""
{{
"event": {{
"contentEnd": {{
@@ -724,7 +724,7 @@ class AWSNovaSonicLLMService(LLMService):
}}
}}
}}
'''
"""
await self._send_client_event(text_content_end)
async def _send_user_audio_event(self, audio: bytes):
@@ -732,7 +732,7 @@ class AWSNovaSonicLLMService(LLMService):
return
blob = base64.b64encode(audio)
audio_event = f'''
audio_event = f"""
{{
"event": {{
"audioInput": {{
@@ -742,14 +742,14 @@ class AWSNovaSonicLLMService(LLMService):
}}
}}
}}
'''
"""
await self._send_client_event(audio_event)
async def _send_session_end_events(self):
if not self._stream or not self._prompt_name:
return
prompt_end = f'''
prompt_end = f"""
{{
"event": {{
"promptEnd": {{
@@ -757,7 +757,7 @@ class AWSNovaSonicLLMService(LLMService):
}}
}}
}}
'''
"""
await self._send_client_event(prompt_end)
session_end = """
@@ -775,7 +775,7 @@ class AWSNovaSonicLLMService(LLMService):
content_name = str(uuid.uuid4())
result_content_start = f'''
result_content_start = f"""
{{
"event": {{
"contentStart": {{
@@ -794,7 +794,7 @@ class AWSNovaSonicLLMService(LLMService):
}}
}}
}}
'''
"""
await self._send_client_event(result_content_start)
result_content = json.dumps(

View File

@@ -39,6 +39,13 @@ class SmallWebRTCRequest:
restart_pc: Optional[bool] = None
request_data: Optional[Any] = None
@classmethod
def from_dict(cls, data: dict):
"""Accept both snake_case and camelCase for the request_data field."""
if "requestData" in data and "request_data" not in data:
data["request_data"] = data.pop("requestData")
return cls(**data)
@dataclass
class IceCandidate: