Skip to content

Commit a646447

Browse files
plutolessplutoless
committed
Merge remote-tracking branch 'origin' into feat/heygen-agora
2 parents fa848d8 + bef2c9f commit a646447

File tree

79 files changed

+1561
-768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1561
-768
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ten_framework",
3-
"image": "docker.theten.ai/ten-framework/ten_agent_build:0.6.1",
3+
"image": "docker.theten.ai/ten-framework/ten_agent_build:0.6.4",
44
"customizations": {
55
"vscode": {
66
"extensions": [

‎.github/workflows/ai_agents.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
ci:
3636
runs-on: ubuntu-latest
3737
container:
38-
image: ghcr.io/ten-framework/ten_agent_build:0.6.1
38+
image: ghcr.io/ten-framework/ten_agent_build:0.6.4
3939
strategy:
4040
matrix:
4141
agent:

‎.github/workflows/codeql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches: ["main"]
66
pull_request:
77
branches: ["main"]
8+
paths-ignore:
9+
- "ai_agents/**"
810
schedule:
911
- cron: "35 3 * * 1"
1012

‎ai_agents/Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ten-framework/ten_agent_build:0.6.1 AS builder
1+
FROM ghcr.io/ten-framework/ten_agent_build:0.6.4 AS builder
22

33
ARG SESSION_CONTROL_CONF=session_control.conf
44
# Add a new argument for USE_AGENT (defaulting to 'agents/examples/default')
@@ -10,23 +10,23 @@ COPY . .
1010
COPY agents/${SESSION_CONTROL_CONF} agents/session_control.conf
1111

1212
RUN task clean && task use AGENT=${USE_AGENT} && \
13-
cd agents && ./scripts/package.sh
13+
cd agents && ./scripts/package.sh
1414

1515
FROM ubuntu:22.04
1616

1717
RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommends \
18-
libasound2 \
19-
libgstreamer1.0-dev \
20-
libunwind-dev \
21-
libc++1 \
22-
libssl-dev \
23-
python3 \
24-
python3-venv \
25-
python3-pip \
26-
python3-dev \
27-
jq vim \
28-
ca-certificates \
29-
&& apt-get clean && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
18+
libasound2 \
19+
libgstreamer1.0-dev \
20+
libunwind-dev \
21+
libc++1 \
22+
libssl-dev \
23+
python3 \
24+
python3-venv \
25+
python3-pip \
26+
python3-dev \
27+
jq vim \
28+
ca-certificates \
29+
&& apt-get clean && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
3030

3131
WORKDIR /app
3232

‎ai_agents/agents/examples/default/property.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"extension_group": "default",
1313
"property": {
1414
"app_id": "${env:AGORA_APP_ID}",
15-
"token": "<agora_token>",
15+
"app_certificate": "${env:AGORA_APP_CERTIFICATE|}",
1616
"channel": "ten_agent_test",
1717
"stream_id": 1234,
1818
"remote_stream_id": 123,
@@ -267,28 +267,28 @@
267267
},
268268
{
269269
"name": "voice_assistant_integrated_stt",
270-
"auto_start": true,
270+
"auto_start": false,
271271
"nodes": [
272272
{
273273
"type": "extension",
274274
"name": "agora_rtc",
275275
"addon": "agora_rtc",
276276
"extension_group": "default",
277277
"property": {
278-
"app_id": "${env:AGORA_APP_ID}",
279-
"token": "<agora_token>",
278+
"enable_agora_asr": true,
279+
"agora_asr_vendor_name": "microsoft",
280280
"channel": "ten_agent_test",
281-
"stream_id": 1234,
282-
"remote_stream_id": 123,
283281
"subscribe_audio": true,
284-
"publish_audio": true,
285282
"publish_data": true,
286-
"enable_agora_asr": true,
287-
"agora_asr_vendor_name": "microsoft",
288283
"agora_asr_language": "en-US",
289-
"agora_asr_vendor_key": "${env:AZURE_STT_KEY|}",
284+
"remote_stream_id": 123,
290285
"agora_asr_vendor_region": "${env:AZURE_STT_REGION|}",
291-
"agora_asr_session_control_file_path": "session_control.conf"
286+
"publish_audio": true,
287+
"app_certificate": "${env:AGORA_APP_CERTIFICATE|}",
288+
"agora_asr_session_control_file_path": "session_control.conf",
289+
"app_id": "${env:AGORA_APP_ID}",
290+
"agora_asr_vendor_key": "${env:AZURE_STT_KEY|}",
291+
"stream_id": 1234
292292
}
293293
},
294294
{
@@ -517,7 +517,7 @@
517517
},
518518
{
519519
"name": "voice_assistant_realtime",
520-
"auto_start": true,
520+
"auto_start": false,
521521
"nodes": [
522522
{
523523
"type": "extension",
@@ -526,7 +526,7 @@
526526
"extension_group": "rtc",
527527
"property": {
528528
"app_id": "${env:AGORA_APP_ID}",
529-
"token": "",
529+
"app_certificate": "${env:AGORA_APP_CERTIFICATE|}",
530530
"channel": "ten_agent_test",
531531
"stream_id": 1234,
532532
"remote_stream_id": 123,
@@ -691,7 +691,7 @@
691691
},
692692
{
693693
"name": "story_teller",
694-
"auto_start": true,
694+
"auto_start": false,
695695
"nodes": [
696696
{
697697
"type": "extension",
@@ -700,7 +700,7 @@
700700
"extension_group": "default",
701701
"property": {
702702
"app_id": "${env:AGORA_APP_ID}",
703-
"token": "<agora_token>",
703+
"app_certificate": "${env:AGORA_APP_CERTIFICATE|}",
704704
"channel": "ten_agent_test",
705705
"stream_id": 1234,
706706
"remote_stream_id": 123,
@@ -952,7 +952,7 @@
952952
},
953953
{
954954
"name": "story_teller_stt_integrated",
955-
"auto_start": true,
955+
"auto_start": false,
956956
"nodes": [
957957
{
958958
"type": "extension",
@@ -961,7 +961,7 @@
961961
"extension_group": "default",
962962
"property": {
963963
"app_id": "${env:AGORA_APP_ID}",
964-
"token": "<agora_token>",
964+
"app_certificate": "${env:AGORA_APP_CERTIFICATE|}",
965965
"channel": "ten_agent_test",
966966
"stream_id": 1234,
967967
"remote_stream_id": 123,
@@ -1193,7 +1193,7 @@
11931193
},
11941194
{
11951195
"name": "story_teller_realtime",
1196-
"auto_start": true,
1196+
"auto_start": false,
11971197
"nodes": [
11981198
{
11991199
"type": "extension",
@@ -1202,7 +1202,7 @@
12021202
"extension_group": "rtc",
12031203
"property": {
12041204
"app_id": "${env:AGORA_APP_ID}",
1205-
"token": "",
1205+
"app_certificate": "${env:AGORA_APP_CERTIFICATE|}",
12061206
"channel": "ten_agent_test",
12071207
"stream_id": 1234,
12081208
"remote_stream_id": 123,

‎ai_agents/agents/ten_packages/extension/neuphonic_tts/neuphonic_tts.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ def __init__(self, config: NeuphonicTTSConfig) -> None:
3333
def text_to_speech_stream(
3434
self, text: str
3535
) -> AsyncIterator[APIResponse[TTSResponse]]:
36-
sse_client = self.client.tts.AsyncSSEClient(
37-
timeout=self.config.request_timeout_seconds
38-
)
36+
sse_client = self.client.tts.AsyncSSEClient()
3937
tts_config = TTSConfig(
4038
lang_code=self.config.lang_code,
4139
sampling_rate=self.config.sample_rate,

‎ai_agents/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
ten_agent_dev:
3-
image: docker.theten.ai/ten-framework/ten_agent_build:0.6.1
4-
#image: ghcr.io/ten-framework/ten_agent_build:0.6.1
3+
image: docker.theten.ai/ten-framework/ten_agent_build:0.6.4
4+
#image: ghcr.io/ten-framework/ten_agent_build:0.6.4
55
container_name: ten_agent_dev
66
platform: linux/amd64
77
tty: true

0 commit comments

Comments
 (0)