From 31cb2beb65113a130ee659ecfa2db134f650fdb1 Mon Sep 17 00:00:00 2001 From: Zhang Qianze Date: Thu, 5 Sep 2024 02:11:46 +0800 Subject: [PATCH 01/55] feat: doc update --- playground/src/common/request.ts | 7 ++++--- playground/src/components/pdfSelect/upload/index.tsx | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/playground/src/common/request.ts b/playground/src/common/request.ts index 7e6e094f..160cc065 100644 --- a/playground/src/common/request.ts +++ b/playground/src/common/request.ts @@ -58,7 +58,7 @@ export const apiStartService = async (config: StartRequestConfig): Promise } export const apiStopService = async (channel: string) => { - // the request will be rewrite at next.config.mjs to send to $AGENT_SERVER_URL + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL const url = `/api/agents/stop` const data = { request_id: genUUID(), @@ -76,6 +76,7 @@ export const apiStopService = async (channel: string) => { } export const apiGetDocumentList = async () => { + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL const url = `/api/vector/document/preset/list` let resp: any = await fetch(url, { method: "GET", @@ -91,7 +92,7 @@ export const apiGetDocumentList = async () => { } export const apiUpdateDocument = async (options: { channel: string, collection: string, fileName: string }) => { - // the request will be rewrite at next.config.mjs to send to $AGENT_SERVER_URL + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL const url = `/api/vector/document/update` const { channel, collection, fileName } = options const data = { @@ -114,7 +115,7 @@ export const apiUpdateDocument = async (options: { channel: string, collection: // ping/pong export const apiPing = async (channel: string) => { - // the request will be rewrite at next.config.mjs to send to $AGENT_SERVER_URL + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL const url = `/api/agents/ping` const data = { request_id: genUUID(), diff --git a/playground/src/components/pdfSelect/upload/index.tsx b/playground/src/components/pdfSelect/upload/index.tsx index 734b4a07..4eab9684 100644 --- a/playground/src/components/pdfSelect/upload/index.tsx +++ b/playground/src/components/pdfSelect/upload/index.tsx @@ -22,6 +22,7 @@ const PdfUpload = (props: PdfSelectProps) => { accept: "application/pdf", maxCount: 1, showUploadList: false, + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL action: `/api/vector/document/upload`, data: { channel_name: channel, From fa411b49f749c88651c15ac20c815d3b8b2da814 Mon Sep 17 00:00:00 2001 From: Ethan Zhang Date: Mon, 9 Sep 2024 10:02:17 +0800 Subject: [PATCH 02/55] Feature/debugging (#271) * feat: upgrade to ten 0.2 * feat: disable auto_start * feat: allow customize build type * feat: add debugging tools * feat: add debugging and build configs * fix: go debugging launch * feat: update image * feat: update version * fix: greeting missed * test: build docker * Revert "test: build docker" This reverts commit 06a426946c621f33f0dcb9fcb3337acae0fe009f. --------- Co-authored-by: Jay Zhang --- .devcontainer/devcontainer.json | 8 ++- .vscode/launch.json | 47 ++++++++++++++ .vscode/tasks.json | 22 +++++++ Dockerfile | 2 +- agents/main.go | 1 - agents/manifest-lock.json | 62 +++++++++---------- agents/manifest.json | 13 ++-- agents/property.json | 6 +- agents/scripts/install_deps_and_build.sh | 7 ++- .../manifest.json | 2 +- .../aliyun_text_embedding/manifest.json | 2 +- .../extension/azure_tts/manifest.json | 2 +- .../bedrock_llm_python/manifest.json | 2 +- .../extension/chat_transcriber/manifest.json | 2 +- .../chat_transcriber_python/manifest.json | 2 +- .../extension/cosy_tts/manifest.json | 2 +- .../extension/elevenlabs_tts/manifest.json | 2 +- .../elevenlabs_tts_python/manifest.json | 2 +- .../extension/file_chunker/manifest.json | 2 +- .../extension/gemini_llm_python/manifest.json | 2 +- .../http_server_python/manifest.json | 4 +- .../interrupt_detector/manifest.json | 2 +- .../interrupt_detector_python/manifest.json | 2 +- .../llama_index_chat_engine/manifest.json | 2 +- .../extension/message_collector/manifest.json | 2 +- .../extension/openai_chatgpt/manifest.json | 2 +- .../openai_chatgpt_python/manifest.json | 2 +- .../extension/polly_tts/manifest.json | 2 +- .../extension/qwen_llm_python/manifest.json | 2 +- .../transcribe_asr_python/manifest.json | 2 +- docker-compose.yml | 2 +- 31 files changed, 145 insertions(+), 69 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e899eb94..3e445b9d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,11 +2,12 @@ // README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile { "name": "astra", - "image": "ghcr.io/ten-framework/astra_agents_build:0.4.0", + "image": "ghcr.io/ten-framework/astra_agents_build:0.5.2", "customizations": { "vscode": { "extensions": [ - "golang.go" + "golang.go", + "ms-vscode.cpptools" ] } }, @@ -19,6 +20,7 @@ ], // Features to add to the dev container. More info: https://containers.dev/features. "features": { - "ghcr.io/devcontainers/features/git:1": {} + "ghcr.io/devcontainers/features/git:1": {}, + "ghcr.io/devcontainers/features/python:1": {} } } \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..8795a5f2 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,47 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "debug go", + "type": "go", + "request": "launch", + "mode": "exec", + "cwd": "${workspaceFolder}", + "program": "${workspaceFolder}/agents/bin/worker", + "env": { + "LD_LIBRARY_PATH": "${workspaceFolder}/agents/ten_packages/system/ten_runtime_go/lib:${workspaceFolder}/agents/ten_packages/system/agora_rtc_sdk/lib:${workspaceFolder}/agents/ten_packages/system/azure_speech_sdk/lib", + "TEN_APP_BASE_DIR": "${workspaceFolder}/agents" + } + }, + { + "name": "debug python", + "type": "debugpy", + "request": "attach", + "connect": { + "host": "localhost", + "port": 5678 + }, + "preLaunchTask": "start app" + }, + { + "name": "debug cpp", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/agents/bin/worker", + "cwd": "${workspaceFolder}", + "environment": [ + { + "name": "LD_LIBRARY_PATH", + "value": "${workspaceFolder}/agents/ten_packages/system/agora_rtc_sdk/lib:${workspaceFolder}/agents/ten_packages/system/azure_speech_sdk/lib" + }, + { + "name": "CGO_LDFLAGS", + "value": "-L${workspaceFolder}/agents/ten_packages/system/ten_runtime_go/lib -lten_runtime_go -Wl,-rpath,@loader_path/lib -Wl,-rpath,@loader_path/../lib" + } + ] + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..da11248b --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,22 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "build", + "command": "make build", + "args": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "start app", + "type": "shell", + "command": "export TEN_ENABLE_PYTHON_DEBUG=true; export TEN_PYTHON_DEBUG_PORT=5678; ./agents/bin/start", + "group": "none", + "isBackground": true + }, + ] +} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 77792a4c..ba9dc57a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/ten-framework/astra_agents_build:0.4.0 AS builder +FROM ghcr.io/ten-framework/astra_agents_build:0.5.2 AS builder ARG SESSION_CONTROL_CONF=session_control.conf diff --git a/agents/main.go b/agents/main.go index 61107505..b42101f5 100644 --- a/agents/main.go +++ b/agents/main.go @@ -50,7 +50,6 @@ func startAppBlocking(cfg *appConfig) { appInstance.Run(true) appInstance.Wait() - ten.UnloadAllAddons() ten.EnsureCleanupWhenProcessExit() } diff --git a/agents/manifest-lock.json b/agents/manifest-lock.json index 09b454c8..c4921982 100644 --- a/agents/manifest-lock.json +++ b/agents/manifest-lock.json @@ -1,10 +1,11 @@ { + "version": 1, "packages": [ { "type": "system", "name": "ten_runtime_go", - "version": "0.1.0", - "hash": "ab66a8ed40c744a52cce36f26a233e669d989d9f620876156e3cc7187f214977", + "version": "0.2.0", + "hash": "8b582de5dfaa38983104143fbb6c530b3aeb463ad9e9ef51f2c72fba9862b8cc", "dependencies": [ { "type": "system", @@ -21,8 +22,8 @@ { "type": "extension", "name": "py_init_extension_cpp", - "version": "0.1.0", - "hash": "b39c4dddbec58e1a756b7e71f41ab0ec419ab0043525ba94e6ed98b7ef634697", + "version": "0.2.0", + "hash": "e1858dfd83d18a69901cefb2edfd52e57ee326a3d306e799ff1d661f3195bb6b", "dependencies": [ { "type": "system", @@ -43,8 +44,8 @@ { "type": "extension_group", "name": "default_extension_group", - "version": "0.1.0", - "hash": "cfadaf8f951de42965e92becc67a597501196bc3bd6f17f39a64260836393c64", + "version": "0.2.0", + "hash": "117ed3e747654fc1282129a160eaecc2cd16548e70aa22128efee21f10e185c8", "dependencies": [ { "type": "system", @@ -61,8 +62,8 @@ { "type": "extension", "name": "agora_rtc", - "version": "0.5.1", - "hash": "de8bb179155f6a329072be87ccd624177e9bbe795956a9a275e7886a3dc31cb7", + "version": "0.7.0-rc2", + "hash": "89d7af8f84d06afbd79901e0057182280f3f430227ad6fae98ec154067ffa82c", "dependencies": [ { "type": "system", @@ -72,10 +73,6 @@ "type": "system", "name": "agora_rtc_sdk" }, - { - "type": "system", - "name": "azure_speech_sdk" - }, { "type": "system", "name": "nlohmann_json" @@ -88,11 +85,23 @@ } ] }, + { + "type": "system", + "name": "azure_speech_sdk", + "version": "1.38.0", + "hash": "66a50ef361f8190fa0595d8298c135e13b73796d57174a0802631263a8f15806", + "supports": [ + { + "os": "linux", + "arch": "x64" + } + ] + }, { "type": "extension", "name": "azure_tts", "version": "0.4.0", - "hash": "4f25e8c2a9c82f2a699a4e8378d11d2fbb31c90ec5df1718271ebfe6377a5389", + "hash": "c8f838754aaae7ed4598e99fb94b6e251382ade08fa23dbf85e91e9864d018ef", "dependencies": [ { "type": "system", @@ -107,20 +116,8 @@ { "type": "system", "name": "ten_runtime", - "version": "0.1.0", - "hash": "b630f52ef9787132dc854fb4e90f962336be3f836baba137ca3b6dc132df0b86", - "supports": [ - { - "os": "linux", - "arch": "x64" - } - ] - }, - { - "type": "system", - "name": "azure_speech_sdk", - "version": "1.38.0", - "hash": "66a50ef361f8190fa0595d8298c135e13b73796d57174a0802631263a8f15806", + "version": "0.2.0", + "hash": "7effdb036d5bf91894060a9230775ff8ec2598f202b8238578f99a14dbf11632", "supports": [ { "os": "linux", @@ -131,8 +128,8 @@ { "type": "system", "name": "agora_rtc_sdk", - "version": "4.1.35+build328115", - "hash": "fd33989f9913d77e05970eb2b265fa5e08322141b7e0f8f9fd3e521f87929b3b", + "version": "4.1.36+build331418", + "hash": "74115dd35822dc3b09fbadb577b31146af704d60435ca401c0b305cce80b2ba4", "supports": [ { "os": "linux", @@ -144,13 +141,14 @@ "type": "system", "name": "nlohmann_json", "version": "3.11.2", - "hash": "72b15822c7ea9deef5e7ad96216ac55e93f11b00466dd1943afd5ee276e99d19" + "hash": "72b15822c7ea9deef5e7ad96216ac55e93f11b00466dd1943afd5ee276e99d19", + "supports": [] }, { "type": "system", "name": "ten_runtime_python", - "version": "0.1.0", - "hash": "a8980c39ba0cf1f21b38490c3167950f750403b1b29d756cfbacc5c5147becd7", + "version": "0.2.0", + "hash": "b44d3767f364583f8bb8e8995f6f7f49e3af27b3c9a8ddf62fa319f1fc39910e", "dependencies": [ { "type": "system", diff --git a/agents/manifest.json b/agents/manifest.json index 4dfb524e..4ba7b513 100644 --- a/agents/manifest.json +++ b/agents/manifest.json @@ -6,22 +6,27 @@ { "type": "system", "name": "ten_runtime_go", - "version": "0.1" + "version": "0.2" }, { "type": "extension", "name": "py_init_extension_cpp", - "version": "0.1" + "version": "0.2" }, { "type": "extension_group", "name": "default_extension_group", - "version": "0.1" + "version": "0.2" }, { "type": "extension", "name": "agora_rtc", - "version": "=0.5.1" + "version": "=0.7.0-rc2" + }, + { + "type": "system", + "name": "azure_speech_sdk", + "version": "1.38.0" }, { "type": "extension", diff --git a/agents/property.json b/agents/property.json index d4ad6639..714af5df 100644 --- a/agents/property.json +++ b/agents/property.json @@ -4,7 +4,7 @@ "predefined_graphs": [ { "name": "va.openai.azure", - "auto_start": true, + "auto_start": false, "nodes": [ { "type": "extension", @@ -1587,7 +1587,7 @@ }, { "name": "va.gemini.azure", - "auto_start": true, + "auto_start": false, "nodes": [ { "type": "extension", @@ -1786,7 +1786,7 @@ }, { "name": "va.qwen.rag", - "auto_start": true, + "auto_start": false, "nodes": [ { "type": "extension", diff --git a/agents/scripts/install_deps_and_build.sh b/agents/scripts/install_deps_and_build.sh index 4d1538ff..9c5977cd 100755 --- a/agents/scripts/install_deps_and_build.sh +++ b/agents/scripts/install_deps_and_build.sh @@ -6,6 +6,9 @@ OS="linux" # x64, arm64 CPU="x64" +# debug, release +BUILD_TYPE="release" + build_cxx_extensions() { local app_dir=$1 @@ -16,8 +19,8 @@ build_cxx_extensions() { cp $app_dir/scripts/BUILD.gn $app_dir - tgn gen $OS $CPU release -- is_clang=false - tgn build $OS $CPU release + tgn gen $OS $CPU $BUILD_TYPE -- is_clang=false enable_sanitizer=false + tgn build $OS $CPU $BUILD_TYPE local ret=$? diff --git a/agents/ten_packages/extension/aliyun_analyticdb_vector_storage/manifest.json b/agents/ten_packages/extension/aliyun_analyticdb_vector_storage/manifest.json index 4137a8f2..d5dd00f9 100644 --- a/agents/ten_packages/extension/aliyun_analyticdb_vector_storage/manifest.json +++ b/agents/ten_packages/extension/aliyun_analyticdb_vector_storage/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/aliyun_text_embedding/manifest.json b/agents/ten_packages/extension/aliyun_text_embedding/manifest.json index 627c044f..ea02f9e0 100644 --- a/agents/ten_packages/extension/aliyun_text_embedding/manifest.json +++ b/agents/ten_packages/extension/aliyun_text_embedding/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/azure_tts/manifest.json b/agents/ten_packages/extension/azure_tts/manifest.json index 4f9fdfe1..8c7b8e31 100644 --- a/agents/ten_packages/extension/azure_tts/manifest.json +++ b/agents/ten_packages/extension/azure_tts/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime", - "version": "0.1" + "version": "0.2" }, { "type": "system", diff --git a/agents/ten_packages/extension/bedrock_llm_python/manifest.json b/agents/ten_packages/extension/bedrock_llm_python/manifest.json index 602e5a84..7a122b9e 100644 --- a/agents/ten_packages/extension/bedrock_llm_python/manifest.json +++ b/agents/ten_packages/extension/bedrock_llm_python/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/chat_transcriber/manifest.json b/agents/ten_packages/extension/chat_transcriber/manifest.json index 0d03a858..c318eba2 100644 --- a/agents/ten_packages/extension/chat_transcriber/manifest.json +++ b/agents/ten_packages/extension/chat_transcriber/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_go", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/chat_transcriber_python/manifest.json b/agents/ten_packages/extension/chat_transcriber_python/manifest.json index ad8c8bde..f56247ba 100644 --- a/agents/ten_packages/extension/chat_transcriber_python/manifest.json +++ b/agents/ten_packages/extension/chat_transcriber_python/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/cosy_tts/manifest.json b/agents/ten_packages/extension/cosy_tts/manifest.json index 4b1c55bc..24ac6b09 100644 --- a/agents/ten_packages/extension/cosy_tts/manifest.json +++ b/agents/ten_packages/extension/cosy_tts/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/elevenlabs_tts/manifest.json b/agents/ten_packages/extension/elevenlabs_tts/manifest.json index 25fa61e3..b3fcc92f 100644 --- a/agents/ten_packages/extension/elevenlabs_tts/manifest.json +++ b/agents/ten_packages/extension/elevenlabs_tts/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_go", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/elevenlabs_tts_python/manifest.json b/agents/ten_packages/extension/elevenlabs_tts_python/manifest.json index 48a956b1..7c0cc442 100644 --- a/agents/ten_packages/extension/elevenlabs_tts_python/manifest.json +++ b/agents/ten_packages/extension/elevenlabs_tts_python/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/file_chunker/manifest.json b/agents/ten_packages/extension/file_chunker/manifest.json index 02e91d2f..1416c357 100644 --- a/agents/ten_packages/extension/file_chunker/manifest.json +++ b/agents/ten_packages/extension/file_chunker/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/gemini_llm_python/manifest.json b/agents/ten_packages/extension/gemini_llm_python/manifest.json index d652b105..10f8f6ad 100644 --- a/agents/ten_packages/extension/gemini_llm_python/manifest.json +++ b/agents/ten_packages/extension/gemini_llm_python/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/http_server_python/manifest.json b/agents/ten_packages/extension/http_server_python/manifest.json index 05f62097..e770edda 100644 --- a/agents/ten_packages/extension/http_server_python/manifest.json +++ b/agents/ten_packages/extension/http_server_python/manifest.json @@ -1,12 +1,12 @@ { "type": "extension", "name": "http_server_python", - "version": "0.4.0", + "version": "0.5.0", "dependencies": [ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "package": { diff --git a/agents/ten_packages/extension/interrupt_detector/manifest.json b/agents/ten_packages/extension/interrupt_detector/manifest.json index 7e4beda6..feb17b2c 100644 --- a/agents/ten_packages/extension/interrupt_detector/manifest.json +++ b/agents/ten_packages/extension/interrupt_detector/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_go", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/interrupt_detector_python/manifest.json b/agents/ten_packages/extension/interrupt_detector_python/manifest.json index bf872358..97e540ad 100644 --- a/agents/ten_packages/extension/interrupt_detector_python/manifest.json +++ b/agents/ten_packages/extension/interrupt_detector_python/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/llama_index_chat_engine/manifest.json b/agents/ten_packages/extension/llama_index_chat_engine/manifest.json index 0feacf83..622d24fa 100644 --- a/agents/ten_packages/extension/llama_index_chat_engine/manifest.json +++ b/agents/ten_packages/extension/llama_index_chat_engine/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/message_collector/manifest.json b/agents/ten_packages/extension/message_collector/manifest.json index c4004695..655a37a3 100644 --- a/agents/ten_packages/extension/message_collector/manifest.json +++ b/agents/ten_packages/extension/message_collector/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1.0" + "version": "0.2" } ], "package": { diff --git a/agents/ten_packages/extension/openai_chatgpt/manifest.json b/agents/ten_packages/extension/openai_chatgpt/manifest.json index 4bc6783e..a0f97290 100644 --- a/agents/ten_packages/extension/openai_chatgpt/manifest.json +++ b/agents/ten_packages/extension/openai_chatgpt/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_go", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/openai_chatgpt_python/manifest.json b/agents/ten_packages/extension/openai_chatgpt_python/manifest.json index b23cb9d8..ce872dfe 100644 --- a/agents/ten_packages/extension/openai_chatgpt_python/manifest.json +++ b/agents/ten_packages/extension/openai_chatgpt_python/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/polly_tts/manifest.json b/agents/ten_packages/extension/polly_tts/manifest.json index dfbc94ea..932c3b47 100644 --- a/agents/ten_packages/extension/polly_tts/manifest.json +++ b/agents/ten_packages/extension/polly_tts/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/qwen_llm_python/manifest.json b/agents/ten_packages/extension/qwen_llm_python/manifest.json index a05290af..bdad7d87 100644 --- a/agents/ten_packages/extension/qwen_llm_python/manifest.json +++ b/agents/ten_packages/extension/qwen_llm_python/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/agents/ten_packages/extension/transcribe_asr_python/manifest.json b/agents/ten_packages/extension/transcribe_asr_python/manifest.json index 69386329..5950e3f7 100644 --- a/agents/ten_packages/extension/transcribe_asr_python/manifest.json +++ b/agents/ten_packages/extension/transcribe_asr_python/manifest.json @@ -6,7 +6,7 @@ { "type": "system", "name": "ten_runtime_python", - "version": "0.1" + "version": "0.2" } ], "api": { diff --git a/docker-compose.yml b/docker-compose.yml index c2a90aee..7bdcac35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: astra_agents_dev: - image: ghcr.io/ten-framework/astra_agents_build:0.4.0 + image: ghcr.io/ten-framework/astra_agents_build:0.5.2 container_name: astra_agents_dev platform: linux/amd64 tty: true From 681d29ec9fa7cda8ed8946c22aecdfb3e33baf6f Mon Sep 17 00:00:00 2001 From: zhangqianze Date: Mon, 9 Sep 2024 13:39:23 +0000 Subject: [PATCH 03/55] feat: switch to native env --- agents/property.json | 152 ++++++++++++++++----------------- server/internal/http_server.go | 40 ++++----- 2 files changed, 91 insertions(+), 101 deletions(-) diff --git a/agents/property.json b/agents/property.json index 714af5df..3c89e1fc 100644 --- a/agents/property.json +++ b/agents/property.json @@ -12,7 +12,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -23,8 +23,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -41,12 +41,12 @@ "name": "openai_chatgpt", "property": { "base_url": "", - "api_key": "$OPENAI_API_KEY", + "api_key": "${env:OPENAI_API_KEY}", "frequency_penalty": 0.9, "model": "gpt-4o-mini", "max_tokens": 512, "prompt": "", - "proxy_url": "$OPENAI_PROXY_URL", + "proxy_url": "${env:OPENAI_PROXY_URL}", "greeting": "ASTRA agent connected. How can i help you today?", "max_memory_length": 10 } @@ -57,8 +57,8 @@ "addon": "azure_tts", "name": "azure_tts", "property": { - "azure_subscription_key": "$AZURE_TTS_KEY", - "azure_subscription_region": "$AZURE_TTS_REGION", + "azure_subscription_key": "${env:AZURE_TTS_KEY}", + "azure_subscription_region": "${env:AZURE_TTS_REGION}", "azure_synthesis_voice_name": "en-US-JaneNeural" } }, @@ -211,7 +211,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -222,8 +222,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -240,12 +240,12 @@ "name": "openai_chatgpt", "property": { "base_url": "", - "api_key": "$OPENAI_API_KEY", + "api_key": "${env:OPENAI_API_KEY}", "frequency_penalty": 0.9, "model": "gpt-4o-mini", "max_tokens": 512, "prompt": "", - "proxy_url": "$OPENAI_PROXY_URL", + "proxy_url": "${env:OPENAI_PROXY_URL}", "greeting": "ASTRA agent connected. How can i help you today?", "max_memory_length": 10 } @@ -256,7 +256,7 @@ "addon": "elevenlabs_tts", "name": "elevenlabs_tts", "property": { - "api_key": "$ELEVENLABS_TTS_KEY", + "api_key": "${env:ELEVENLABS_TTS_KEY}", "model_id": "eleven_multilingual_v2", "optimize_streaming_latency": 0, "request_timeout_seconds": 30, @@ -416,7 +416,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -427,8 +427,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -439,8 +439,8 @@ "name": "bedrock_llm", "property": { "region": "us-east-1", - "access_key": "$AWS_ACCESS_KEY_ID", - "secret_key": "$AWS_SECRET_ACCESS_KEY", + "access_key": "${env:AWS_ACCESS_KEY_ID}", + "secret_key": "${env:AWS_SECRET_ACCESS_KEY}", "model": "anthropic.claude-3-5-sonnet-20240620-v1:0", "max_tokens": 512, "prompt": "", @@ -454,8 +454,8 @@ "addon": "azure_tts", "name": "azure_tts", "property": { - "azure_subscription_key": "$AZURE_TTS_KEY", - "azure_subscription_region": "$AZURE_TTS_REGION", + "azure_subscription_key": "${env:AZURE_TTS_KEY}", + "azure_subscription_region": "${env:AZURE_TTS_REGION}", "azure_synthesis_voice_name": "en-US-JaneNeural" } }, @@ -580,7 +580,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -591,8 +591,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -603,12 +603,12 @@ "name": "openai_chatgpt", "property": { "base_url": "", - "api_key": "$OPENAI_API_KEY", + "api_key": "${env:OPENAI_API_KEY}", "frequency_penalty": 0.9, "model": "gpt-4o-mini", "max_tokens": 512, "prompt": "", - "proxy_url": "$OPENAI_PROXY_URL", + "proxy_url": "${env:OPENAI_PROXY_URL}", "greeting": "ASTRA agent connected. How can i help you today?", "max_memory_length": 10 } @@ -619,7 +619,7 @@ "addon": "cosy_tts", "name": "cosy_tts", "property": { - "api_key": "$QWEN_API_KEY", + "api_key": "${env:QWEN_API_KEY}", "model": "cosyvoice-v1", "voice": "longxiaochun", "sample_rate": 16000 @@ -780,7 +780,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -791,8 +791,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -802,7 +802,7 @@ "addon": "qwen_llm_python", "name": "qwen_llm", "property": { - "api_key": "$QWEN_API_KEY", + "api_key": "${env:QWEN_API_KEY}", "model": "qwen-max", "max_tokens": 512, "prompt": "", @@ -815,7 +815,7 @@ "addon": "cosy_tts", "name": "cosy_tts", "property": { - "api_key": "$QWEN_API_KEY", + "api_key": "${env:QWEN_API_KEY}", "model": "cosyvoice-v1", "voice": "longxiaochun", "sample_rate": 16000 @@ -983,7 +983,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -994,8 +994,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -1006,8 +1006,8 @@ "name": "bedrock_llm", "property": { "region": "us-east-1", - "access_key": "$AWS_ACCESS_KEY_ID", - "secret_key": "$AWS_SECRET_ACCESS_KEY", + "access_key": "${env:AWS_ACCESS_KEY_ID}", + "secret_key": "${env:AWS_SECRET_ACCESS_KEY}", "model": "anthropic.claude-3-5-sonnet-20240620-v1:0", "max_tokens": 512, "prompt": "", @@ -1022,8 +1022,8 @@ "name": "polly_tts", "property": { "region": "us-east-1", - "access_key": "$AWS_ACCESS_KEY_ID", - "secret_key": "$AWS_SECRET_ACCESS_KEY", + "access_key": "${env:AWS_ACCESS_KEY_ID}", + "secret_key": "${env:AWS_SECRET_ACCESS_KEY}", "engine": "generative", "voice": "Ruth", "sample_rate": "16000", @@ -1151,7 +1151,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -1162,8 +1162,8 @@ "enable_agora_asr": false, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -1174,8 +1174,8 @@ "name": "transcribe_asr", "property": { "region": "us-east-1", - "access_key": "$AWS_ACCESS_KEY_ID", - "secret_key": "$AWS_SECRET_ACCESS_KEY", + "access_key": "${env:AWS_ACCESS_KEY_ID}", + "secret_key": "${env:AWS_SECRET_ACCESS_KEY}", "sample_rate": "16000", "lang_code": "en-US" } @@ -1187,8 +1187,8 @@ "name": "bedrock_llm", "property": { "region": "us-east-1", - "access_key": "$AWS_ACCESS_KEY_ID", - "secret_key": "$AWS_SECRET_ACCESS_KEY", + "access_key": "${env:AWS_ACCESS_KEY_ID}", + "secret_key": "${env:AWS_SECRET_ACCESS_KEY}", "model": "anthropic.claude-3-5-sonnet-20240620-v1:0", "max_tokens": 512, "prompt": "", @@ -1203,8 +1203,8 @@ "name": "polly_tts", "property": { "region": "us-east-1", - "access_key": "$AWS_ACCESS_KEY_ID", - "secret_key": "$AWS_SECRET_ACCESS_KEY", + "access_key": "${env:AWS_ACCESS_KEY_ID}", + "secret_key": "${env:AWS_SECRET_ACCESS_KEY}", "engine": "generative", "voice": "Ruth", "sample_rate": "16000", @@ -1381,7 +1381,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -1393,8 +1393,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf", "subscribe_video_pix_fmt": 4 } @@ -1412,12 +1412,12 @@ "name": "openai_chatgpt", "property": { "base_url": "", - "api_key": "$OPENAI_API_KEY", + "api_key": "${env:OPENAI_API_KEY}", "frequency_penalty": 0.9, "model": "gpt-4o", "max_tokens": 512, "prompt": "", - "proxy_url": "$OPENAI_PROXY_URL", + "proxy_url": "${env:OPENAI_PROXY_URL}", "greeting": "ASTRA agent connected. How can i help you today?", "checking_vision_text_items": "[\"Let me take a look...\",\"Let me check your camera...\",\"Please wait for a second...\"]", "max_memory_length": 10, @@ -1430,8 +1430,8 @@ "addon": "azure_tts", "name": "azure_tts", "property": { - "azure_subscription_key": "$AZURE_TTS_KEY", - "azure_subscription_region": "$AZURE_TTS_REGION", + "azure_subscription_key": "${env:AZURE_TTS_KEY}", + "azure_subscription_region": "${env:AZURE_TTS_REGION}", "azure_synthesis_voice_name": "en-US-JaneNeural" } }, @@ -1595,7 +1595,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -1606,8 +1606,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -1623,7 +1623,7 @@ "addon": "gemini_llm_python", "name": "gemini_llm", "property": { - "api_key": "$GEMINI_API_KEY", + "api_key": "${env:GEMINI_API_KEY}", "greeting": "ASTRA agent connected. How can i help you today?", "max_memory_length": 10, "max_output_tokens": 512, @@ -1640,8 +1640,8 @@ "addon": "azure_tts", "name": "azure_tts", "property": { - "azure_subscription_key": "$AZURE_TTS_KEY", - "azure_subscription_region": "$AZURE_TTS_REGION", + "azure_subscription_key": "${env:AZURE_TTS_KEY}", + "azure_subscription_region": "${env:AZURE_TTS_REGION}", "azure_synthesis_voice_name": "en-US-JaneNeural" } }, @@ -1794,7 +1794,7 @@ "addon": "agora_rtc", "name": "agora_rtc", "property": { - "app_id": "$AGORA_APP_ID", + "app_id": "${env:AGORA_APP_ID}", "token": "", "channel": "astra_agents_test", "stream_id": 1234, @@ -1805,8 +1805,8 @@ "enable_agora_asr": true, "agora_asr_vendor_name": "microsoft", "agora_asr_language": "en-US", - "agora_asr_vendor_key": "$AZURE_STT_KEY", - "agora_asr_vendor_region": "$AZURE_STT_REGION", + "agora_asr_vendor_key": "${env:AZURE_STT_KEY}", + "agora_asr_vendor_region": "${env:AZURE_STT_REGION}", "agora_asr_session_control_file_path": "session_control.conf" } }, @@ -1816,7 +1816,7 @@ "addon": "qwen_llm_python", "name": "qwen_llm", "property": { - "api_key": "$QWEN_API_KEY", + "api_key": "${env:QWEN_API_KEY}", "model": "qwen-max", "max_tokens": 512, "prompt": "", @@ -1829,7 +1829,7 @@ "addon": "cosy_tts", "name": "cosy_tts", "property": { - "api_key": "$QWEN_API_KEY", + "api_key": "${env:QWEN_API_KEY}", "model": "cosyvoice-v1", "voice": "longxiaochun", "sample_rate": 16000 @@ -1841,8 +1841,8 @@ "addon": "azure_tts", "name": "azure_tts", "property": { - "azure_subscription_key": "$AZURE_TTS_KEY", - "azure_subscription_region": "$AZURE_TTS_REGION", + "azure_subscription_key": "${env:AZURE_TTS_KEY}", + "azure_subscription_region": "${env:AZURE_TTS_REGION}", "azure_synthesis_voice_name": "en-US-JaneNeural" } }, @@ -1874,7 +1874,7 @@ "addon": "aliyun_text_embedding", "name": "aliyun_text_embedding", "property": { - "api_key": "$ALIYUN_TEXT_EMBEDDING_API_KEY", + "api_key": "${env:ALIYUN_TEXT_EMBEDDING_API_KEY}", "model": "text-embedding-v3" } }, @@ -1884,14 +1884,14 @@ "addon": "aliyun_analyticdb_vector_storage", "name": "aliyun_analyticdb_vector_storage", "property": { - "alibaba_cloud_access_key_id": "$ALIBABA_CLOUD_ACCESS_KEY_ID", - "alibaba_cloud_access_key_secret": "$ALIBABA_CLOUD_ACCESS_KEY_SECRET", - "adbpg_instance_id": "$ALIYUN_ANALYTICDB_INSTANCE_ID", - "adbpg_instance_region": "$ALIYUN_ANALYTICDB_INSTANCE_REGION", - "adbpg_account": "$ALIYUN_ANALYTICDB_ACCOUNT", - "adbpg_account_password": "$ALIYUN_ANALYTICDB_ACCOUNT_PASSWORD", - "adbpg_namespace": "$ALIYUN_ANALYTICDB_NAMESPACE", - "adbpg_namespace_password": "$ALIYUN_ANALYTICDB_NAMESPACE_PASSWORD" + "alibaba_cloud_access_key_id": "${env:ALIBABA_CLOUD_ACCESS_KEY_ID}", + "alibaba_cloud_access_key_secret": "${env:ALIBABA_CLOUD_ACCESS_KEY_SECRET}", + "adbpg_instance_id": "${env:ALIYUN_ANALYTICDB_INSTANCE_ID}", + "adbpg_instance_region": "${env:ALIYUN_ANALYTICDB_INSTANCE_REGION}", + "adbpg_account": "${env:ALIYUN_ANALYTICDB_ACCOUNT}", + "adbpg_account_password": "${env:ALIYUN_ANALYTICDB_ACCOUNT_PASSWORD}", + "adbpg_namespace": "${env:ALIYUN_ANALYTICDB_NAMESPACE}", + "adbpg_namespace_password": "${env:ALIYUN_ANALYTICDB_NAMESPACE_PASSWORD}" } }, { diff --git a/server/internal/http_server.go b/server/internal/http_server.go index f3fea8b2..d7c41915 100644 --- a/server/internal/http_server.go +++ b/server/internal/http_server.go @@ -15,7 +15,6 @@ import ( "net/http" "os" "path/filepath" - "regexp" "strings" "time" @@ -381,23 +380,6 @@ func (s *HttpServer) output(c *gin.Context, code *Code, data any, httpStatus ... c.JSON(httpStatus[0], gin.H{"code": code.code, "msg": code.msg, "data": data}) } -func replaceEnvVarsInJSON(jsonData string) string { - // Regex to find all occurrences of $VAR_NAME - re := regexp.MustCompile(`"\$(\w+)"`) - - // Function to replace the match with the environment variable value - result := re.ReplaceAllStringFunc(jsonData, func(match string) string { - // Extract the variable name (removing the leading $ and surrounding quotes) - envVar := strings.Trim(match, "\"$") - // Get the environment variable value - value := os.Getenv(envVar) - // Replace with the value (keeping it quoted) - return fmt.Sprintf("\"%s\"", value) - }) - - return result -} - func (s *HttpServer) processProperty(req *StartReq) (propertyJsonFile string, logFile string, err error) { content, err := os.ReadFile(PropertyJsonFile) if err != nil { @@ -430,10 +412,10 @@ func (s *HttpServer) processProperty(req *StartReq) (propertyJsonFile string, lo graphs := gjson.Get(propertyJson, "_ten.predefined_graphs").Array() // Create a new array for graphs that match the name - var newGraphs []string + var newGraphs []gjson.Result for _, graph := range graphs { if graph.Get("name").String() == graphName { - newGraphs = append(newGraphs, graph.Raw) + newGraphs = append(newGraphs, graph) } } @@ -443,20 +425,28 @@ func (s *HttpServer) processProperty(req *StartReq) (propertyJsonFile string, lo return } + // Set the array of graphs directly using sjson.Set + graphData := make([]interface{}, len(newGraphs)) + for i, graph := range newGraphs { + graphData[i] = graph.Value() // Convert gjson.Result to interface{} + } + // Replace the predefined_graphs array with the filtered array - propertyJson, _ = sjson.SetRaw(propertyJson, "_ten.predefined_graphs", fmt.Sprintf("[%s]", strings.Join(newGraphs, ","))) + propertyJson, _ = sjson.Set(propertyJson, "_ten.predefined_graphs", graphData) // Automatically start on launch propertyJson, _ = sjson.Set(propertyJson, fmt.Sprintf(`%s.auto_start`, graph), true) - // Set environment variable values to property.json - propertyJson = replaceEnvVarsInJSON(propertyJson) - // Set additional properties to property.json for extensionName, props := range req.Properties { if extKey := extensionName; extKey != "" { for prop, val := range props { - propertyJson, _ = sjson.Set(propertyJson, fmt.Sprintf(`%s.nodes.#(name=="%s").property.%s`, graph, extKey, prop), val) + // Construct the path + path := fmt.Sprintf(`%s.nodes.#(name=="%s").property.%s`, graph, extKey, prop) + propertyJson, err = sjson.Set(propertyJson, path, val) + if err != nil { + slog.Error("handlerStart set property failed", "err", err, "graph", graphName, "extensionName", extensionName, "prop", prop, "val", val, "requestId", req.RequestId, logTag) + } } } } From e5d8f040cf2755963b6e0c3dbac80794d6f3422b Mon Sep 17 00:00:00 2001 From: Ethan Zhang Date: Tue, 17 Sep 2024 14:23:58 +0800 Subject: [PATCH 04/55] Feat/refactor exts (#276) * feat: openai extension refactoring * feat: adding refactor code / async.io * feat: fix refactoring bugs * fix: add manifest.json * feat: add queue logic * fix: fix issues - remove test code - prevent sending full content again - add queue logic * feat: fix parseSentence * fix: fix end_segment bug * feat: add chatflow abstraction - chatflow - refactor to simplify flow run - added event emitter for intermedium execution * feat: refactor openai, support multi data-stream data pack * feat: finalize openai extension refactoring - change asyncio.queue to AsyncQueue - change the way we abstract chatflow - use eventEmitter for easier tool notification - use queue to ensure task are processed one by one and cancellable * feat: add docs * feat: don't use private api --- agents/manifest-lock.json | 3 +- .../bak/openai_chatgpt_python/__init__.py | 4 + .../bak/openai_chatgpt_python/log.py | 13 + .../bak/openai_chatgpt_python/manifest.json | 93 +++++ .../openai_chatgpt_python/openai_chatgpt.py | 0 .../openai_chatgpt_addon.py | 0 .../openai_chatgpt_extension.py | 0 .../bak/openai_chatgpt_python/property.json | 1 + .../openai_chatgpt_python/requirements.txt | 5 + .../message_collector/src/extension.py | 79 ++++- .../extension/openai_chatgpt_python/BUILD.gn | 21 ++ .../extension/openai_chatgpt_python/README.md | 60 ++++ .../openai_chatgpt_python/__init__.py | 9 +- .../extension/openai_chatgpt_python/addon.py | 22 ++ .../openai_chatgpt_python/extension.py | 318 ++++++++++++++++++ .../extension/openai_chatgpt_python/helper.py | 187 ++++++++++ .../extension/openai_chatgpt_python/log.py | 13 +- .../openai_chatgpt_python/manifest.json | 12 +- .../extension/openai_chatgpt_python/openai.py | 125 +++++++ .../openai_chatgpt_python/requirements.txt | 4 +- playground/src/manager/rtc/rtc.ts | 121 ++++--- 21 files changed, 1020 insertions(+), 70 deletions(-) create mode 100644 agents/ten_packages/bak/openai_chatgpt_python/__init__.py create mode 100644 agents/ten_packages/bak/openai_chatgpt_python/log.py create mode 100644 agents/ten_packages/bak/openai_chatgpt_python/manifest.json rename agents/ten_packages/{extension => bak}/openai_chatgpt_python/openai_chatgpt.py (100%) rename agents/ten_packages/{extension => bak}/openai_chatgpt_python/openai_chatgpt_addon.py (100%) rename agents/ten_packages/{extension => bak}/openai_chatgpt_python/openai_chatgpt_extension.py (100%) create mode 100644 agents/ten_packages/bak/openai_chatgpt_python/property.json create mode 100644 agents/ten_packages/bak/openai_chatgpt_python/requirements.txt create mode 100644 agents/ten_packages/extension/openai_chatgpt_python/BUILD.gn create mode 100644 agents/ten_packages/extension/openai_chatgpt_python/README.md create mode 100644 agents/ten_packages/extension/openai_chatgpt_python/addon.py create mode 100644 agents/ten_packages/extension/openai_chatgpt_python/extension.py create mode 100644 agents/ten_packages/extension/openai_chatgpt_python/helper.py create mode 100644 agents/ten_packages/extension/openai_chatgpt_python/openai.py diff --git a/agents/manifest-lock.json b/agents/manifest-lock.json index c4921982..902dca63 100644 --- a/agents/manifest-lock.json +++ b/agents/manifest-lock.json @@ -141,8 +141,7 @@ "type": "system", "name": "nlohmann_json", "version": "3.11.2", - "hash": "72b15822c7ea9deef5e7ad96216ac55e93f11b00466dd1943afd5ee276e99d19", - "supports": [] + "hash": "72b15822c7ea9deef5e7ad96216ac55e93f11b00466dd1943afd5ee276e99d19" }, { "type": "system", diff --git a/agents/ten_packages/bak/openai_chatgpt_python/__init__.py b/agents/ten_packages/bak/openai_chatgpt_python/__init__.py new file mode 100644 index 00000000..42c4cd12 --- /dev/null +++ b/agents/ten_packages/bak/openai_chatgpt_python/__init__.py @@ -0,0 +1,4 @@ +from . import openai_chatgpt_addon +from .log import logger + +logger.info("openai_chatgpt_python extension loaded") diff --git a/agents/ten_packages/bak/openai_chatgpt_python/log.py b/agents/ten_packages/bak/openai_chatgpt_python/log.py new file mode 100644 index 00000000..fa2202da --- /dev/null +++ b/agents/ten_packages/bak/openai_chatgpt_python/log.py @@ -0,0 +1,13 @@ +import logging + +logger = logging.getLogger("openai_chatgpt_python") +logger.setLevel(logging.INFO) + +formatter = logging.Formatter( + "%(asctime)s - %(name)s - %(levelname)s - %(process)d - [%(filename)s:%(lineno)d] - %(message)s" +) + +console_handler = logging.StreamHandler() +console_handler.setFormatter(formatter) + +logger.addHandler(console_handler) diff --git a/agents/ten_packages/bak/openai_chatgpt_python/manifest.json b/agents/ten_packages/bak/openai_chatgpt_python/manifest.json new file mode 100644 index 00000000..ce872dfe --- /dev/null +++ b/agents/ten_packages/bak/openai_chatgpt_python/manifest.json @@ -0,0 +1,93 @@ +{ + "type": "extension", + "name": "openai_chatgpt_python", + "version": "0.4.0", + "dependencies": [ + { + "type": "system", + "name": "ten_runtime_python", + "version": "0.2" + } + ], + "api": { + "property": { + "api_key": { + "type": "string" + }, + "frequency_penalty": { + "type": "float64" + }, + "presence_penalty": { + "type": "float64" + }, + "temperature": { + "type": "float64" + }, + "top_p": { + "type": "float64" + }, + "model": { + "type": "string" + }, + "max_tokens": { + "type": "int64" + }, + "base_url": { + "type": "string" + }, + "prompt": { + "type": "string" + }, + "greeting": { + "type": "string" + }, + "checking_vision_text_items": { + "type": "string" + }, + "proxy_url": { + "type": "string" + }, + "max_memory_length": { + "type": "int64" + }, + "enable_tools": { + "type": "bool" + } + }, + "data_in": [ + { + "name": "text_data", + "property": { + "text": { + "type": "string" + } + } + } + ], + "data_out": [ + { + "name": "text_data", + "property": { + "text": { + "type": "string" + } + } + } + ], + "cmd_in": [ + { + "name": "flush" + } + ], + "cmd_out": [ + { + "name": "flush" + } + ], + "video_frame_in": [ + { + "name": "video_frame" + } + ] + } +} \ No newline at end of file diff --git a/agents/ten_packages/extension/openai_chatgpt_python/openai_chatgpt.py b/agents/ten_packages/bak/openai_chatgpt_python/openai_chatgpt.py similarity index 100% rename from agents/ten_packages/extension/openai_chatgpt_python/openai_chatgpt.py rename to agents/ten_packages/bak/openai_chatgpt_python/openai_chatgpt.py diff --git a/agents/ten_packages/extension/openai_chatgpt_python/openai_chatgpt_addon.py b/agents/ten_packages/bak/openai_chatgpt_python/openai_chatgpt_addon.py similarity index 100% rename from agents/ten_packages/extension/openai_chatgpt_python/openai_chatgpt_addon.py rename to agents/ten_packages/bak/openai_chatgpt_python/openai_chatgpt_addon.py diff --git a/agents/ten_packages/extension/openai_chatgpt_python/openai_chatgpt_extension.py b/agents/ten_packages/bak/openai_chatgpt_python/openai_chatgpt_extension.py similarity index 100% rename from agents/ten_packages/extension/openai_chatgpt_python/openai_chatgpt_extension.py rename to agents/ten_packages/bak/openai_chatgpt_python/openai_chatgpt_extension.py diff --git a/agents/ten_packages/bak/openai_chatgpt_python/property.json b/agents/ten_packages/bak/openai_chatgpt_python/property.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/agents/ten_packages/bak/openai_chatgpt_python/property.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/agents/ten_packages/bak/openai_chatgpt_python/requirements.txt b/agents/ten_packages/bak/openai_chatgpt_python/requirements.txt new file mode 100644 index 00000000..5ddef5be --- /dev/null +++ b/agents/ten_packages/bak/openai_chatgpt_python/requirements.txt @@ -0,0 +1,5 @@ +openai +numpy +requests +pillow +asyncio \ No newline at end of file diff --git a/agents/ten_packages/extension/message_collector/src/extension.py b/agents/ten_packages/extension/message_collector/src/extension.py index 39206a13..7013c432 100644 --- a/agents/ten_packages/extension/message_collector/src/extension.py +++ b/agents/ten_packages/extension/message_collector/src/extension.py @@ -7,6 +7,7 @@ # import json import time +import uuid from ten import ( AudioFrame, VideoFrame, @@ -19,7 +20,8 @@ ) from .log import logger - +MAX_SIZE = 800 # 1 KB limit +OVERHEAD_ESTIMATE = 200 # Estimate for the overhead of metadata in the JSON CMD_NAME_FLUSH = "flush" @@ -89,16 +91,12 @@ def on_data(self, ten_env: TenEnv, data: Data) -> None: try: final = data.get_property_bool(TEXT_DATA_FINAL_FIELD) except Exception as e: - logger.warning( - f"on_data get_property_bool {TEXT_DATA_FINAL_FIELD} error: {e}" - ) + pass try: stream_id = data.get_property_int(TEXT_DATA_STREAM_ID_FIELD) except Exception as e: - logger.warning( - f"on_data get_property_int {TEXT_DATA_STREAM_ID_FIELD} error: {e}" - ) + pass try: end_of_segment = data.get_property_bool(TEXT_DATA_END_OF_SEGMENT_FIELD) @@ -124,19 +122,72 @@ def on_data(self, ten_env: TenEnv, data: Data) -> None: cached_text_map[stream_id] = text - msg_data = json.dumps({ - "text": text, + # Generate a unique message ID for this batch of parts + message_id = str(uuid.uuid4()) + + # Prepare the main JSON structure without the text field + base_msg_data = { "is_final": end_of_segment, "stream_id": stream_id, + "message_id": message_id, # Add message_id to identify the split message "data_type": "transcribe", "text_ts": int(time.time() * 1000), # Convert to milliseconds - }) + } try: - # convert the origin text data to the protobuf data and send it to the graph. - ten_data = Data.create("data") - ten_data.set_property_buf("data", msg_data.encode()) - ten_env.send_data(ten_data) + # Convert the text to UTF-8 bytes + text_bytes = text.encode('utf-8') + + # If the text + metadata fits within the size limit, send it directly + if len(text_bytes) + OVERHEAD_ESTIMATE <= MAX_SIZE: + base_msg_data["text"] = text + msg_data = json.dumps(base_msg_data) + ten_data = Data.create("data") + ten_data.set_property_buf("data", msg_data.encode()) + ten_env.send_data(ten_data) + else: + # Split the text bytes into smaller chunks, ensuring safe UTF-8 splitting + max_text_size = MAX_SIZE - OVERHEAD_ESTIMATE + total_length = len(text_bytes) + total_parts = (total_length + max_text_size - 1) // max_text_size # Calculate number of parts + + def get_valid_utf8_chunk(start, end): + """Helper function to ensure valid UTF-8 chunks.""" + while end > start: + try: + # Decode to check if this chunk is valid UTF-8 + text_part = text_bytes[start:end].decode('utf-8') + return text_part, end + except UnicodeDecodeError: + # Reduce the end point to avoid splitting in the middle of a character + end -= 1 + # If no valid chunk is found (shouldn't happen with valid UTF-8 input), return an empty string + return "", start + + part_number = 0 + start_index = 0 + while start_index < total_length: + part_number += 1 + # Get a valid UTF-8 chunk + text_part, end_index = get_valid_utf8_chunk(start_index, min(start_index + max_text_size, total_length)) + + # Prepare the part data with metadata + part_data = base_msg_data.copy() + part_data.update({ + "text": text_part, + "part_number": part_number, + "total_parts": total_parts, + }) + + # Send each part + part_msg_data = json.dumps(part_data) + ten_data = Data.create("data") + ten_data.set_property_buf("data", part_msg_data.encode()) + ten_env.send_data(ten_data) + + # Move to the next chunk + start_index = end_index + except Exception as e: logger.warning(f"on_data new_data error: {e}") return diff --git a/agents/ten_packages/extension/openai_chatgpt_python/BUILD.gn b/agents/ten_packages/extension/openai_chatgpt_python/BUILD.gn new file mode 100644 index 00000000..23f06108 --- /dev/null +++ b/agents/ten_packages/extension/openai_chatgpt_python/BUILD.gn @@ -0,0 +1,21 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2022-11. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +import("//build/feature/ten_package.gni") + +ten_package("openai_chatgpt_python") { + package_kind = "extension" + + resources = [ + "__init__.py", + "addon.py", + "extension.py", + "log.py", + "manifest.json", + "property.json", + ] +} diff --git a/agents/ten_packages/extension/openai_chatgpt_python/README.md b/agents/ten_packages/extension/openai_chatgpt_python/README.md new file mode 100644 index 00000000..2a9b1c82 --- /dev/null +++ b/agents/ten_packages/extension/openai_chatgpt_python/README.md @@ -0,0 +1,60 @@ +# openai_chatgpt_python + +An extension for integrating OpenAI's GPT models (e.g., GPT-4) into your application, providing configurable AI-driven features such as conversational agents, task automation, and tool integration. + +## Features + + + +- OpenAI GPT Integration: Leverage GPT models for text processing and conversational tasks. +- Configurable: Easily customize API keys, model settings, prompts, temperature, etc. +- Async Queue Processing: Supports real-time message processing with task cancellation and prioritization. +- Tool Support: Integrate external tools like image recognition via OpenAI's API. + +## API + +Refer to `api` definition in [manifest.json] and default values in [property.json](property.json). + + + +| **Property** | **Type** | **Description** | +|----------------------------|------------|-------------------------------------------| +| `api_key` | `string` | API key for authenticating with OpenAI | +| `frequency_penalty` | `float64` | Controls how much to penalize new tokens based on their existing frequency in the text so far | +| `presence_penalty` | `float64` | Controls how much to penalize new tokens based on whether they appear in the text so far | +| `temperature` | `float64` | Sampling temperature, higher values mean more randomness | +| `top_p` | `float64` | Nucleus sampling, chooses tokens with cumulative probability `p` | +| `model` | `string` | Model identifier (e.g., GPT-3.5, GPT-4) | +| `max_tokens` | `int64` | Maximum number of tokens to generate | +| `base_url` | `string` | API base URL | +| `prompt` | `string` | Default prompt to send to the model | +| `greeting` | `string` | Greeting message to be used | +| `checking_vision_text_items`| `string` | Items for checking vision-based text responses | +| `proxy_url` | `string` | URL of the proxy server | +| `max_memory_length` | `int64` | Maximum memory length for processing | +| `enable_tools` | `bool` | Flag to enable or disable external tools | + +### Data In: +| **Name** | **Property** | **Type** | **Description** | +|----------------|--------------|------------|-------------------------------| +| `text_data` | `text` | `string` | Incoming text data | + +### Data Out: +| **Name** | **Property** | **Type** | **Description** | +|----------------|--------------|------------|-------------------------------| +| `text_data` | `text` | `string` | Outgoing text data | + +### Command In: +| **Name** | **Description** | +|----------------|---------------------------------------------| +| `flush` | Command to flush the current processing state | + +### Command Out: +| **Name** | **Description** | +|----------------|---------------------------------------------| +| `flush` | Response after flushing the current state | + +### Video Frame In: +| **Name** | **Description** | +|------------------|-------------------------------------------| +| `video_frame` | Video frame input for vision processing | diff --git a/agents/ten_packages/extension/openai_chatgpt_python/__init__.py b/agents/ten_packages/extension/openai_chatgpt_python/__init__.py index 42c4cd12..09a409ff 100644 --- a/agents/ten_packages/extension/openai_chatgpt_python/__init__.py +++ b/agents/ten_packages/extension/openai_chatgpt_python/__init__.py @@ -1,4 +1,11 @@ -from . import openai_chatgpt_addon +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +from . import addon from .log import logger logger.info("openai_chatgpt_python extension loaded") diff --git a/agents/ten_packages/extension/openai_chatgpt_python/addon.py b/agents/ten_packages/extension/openai_chatgpt_python/addon.py new file mode 100644 index 00000000..ee13b156 --- /dev/null +++ b/agents/ten_packages/extension/openai_chatgpt_python/addon.py @@ -0,0 +1,22 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +from ten import ( + Addon, + register_addon_as_extension, + TenEnv, +) +from .extension import OpenAIChatGPTExtension +from .log import logger + + +@register_addon_as_extension("openai_chatgpt_python") +class OpenAIChatGPTExtensionAddon(Addon): + + def on_create_instance(self, ten_env: TenEnv, name: str, context) -> None: + logger.info("OpenAIChatGPTExtensionAddon on_create_instance") + ten_env.on_create_instance_done(OpenAIChatGPTExtension(name), context) diff --git a/agents/ten_packages/extension/openai_chatgpt_python/extension.py b/agents/ten_packages/extension/openai_chatgpt_python/extension.py new file mode 100644 index 00000000..5d027267 --- /dev/null +++ b/agents/ten_packages/extension/openai_chatgpt_python/extension.py @@ -0,0 +1,318 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +import asyncio +import json +import random +import threading +import traceback + +from .helper import AsyncEventEmitter, AsyncQueue, get_current_time, get_property_bool, get_property_float, get_property_int, get_property_string, parse_sentences, rgb2base64jpeg +from .openai import OpenAIChatGPT, OpenAIChatGPTConfig +from ten import ( + AudioFrame, + VideoFrame, + Extension, + TenEnv, + Cmd, + StatusCode, + CmdResult, + Data, +) +from .log import logger + +CMD_IN_FLUSH = "flush" +CMD_OUT_FLUSH = "flush" +DATA_IN_TEXT_DATA_PROPERTY_TEXT = "text" +DATA_IN_TEXT_DATA_PROPERTY_IS_FINAL = "is_final" +DATA_OUT_TEXT_DATA_PROPERTY_TEXT = "text" +DATA_OUT_TEXT_DATA_PROPERTY_TEXT_END_OF_SEGMENT = "end_of_segment" + +PROPERTY_BASE_URL = "base_url" # Optional +PROPERTY_API_KEY = "api_key" # Required +PROPERTY_MODEL = "model" # Optional +PROPERTY_PROMPT = "prompt" # Optional +PROPERTY_FREQUENCY_PENALTY = "frequency_penalty" # Optional +PROPERTY_PRESENCE_PENALTY = "presence_penalty" # Optional +PROPERTY_TEMPERATURE = "temperature" # Optional +PROPERTY_TOP_P = "top_p" # Optional +PROPERTY_MAX_TOKENS = "max_tokens" # Optional +PROPERTY_GREETING = "greeting" # Optional +PROPERTY_ENABLE_TOOLS = "enable_tools" # Optional +PROPERTY_PROXY_URL = "proxy_url" # Optional +PROPERTY_MAX_MEMORY_LENGTH = "max_memory_length" # Optional +PROPERTY_CHECKING_VISION_TEXT_ITEMS = "checking_vision_text_items" # Optional + + +TASK_TYPE_CHAT_COMPLETION = "chat_completion" +TASK_TYPE_CHAT_COMPLETION_WITH_VISION = "chat_completion_with_vision" + +class OpenAIChatGPTExtension(Extension): + memory = [] + max_memory_length = 10 + openai_chatgpt = None + enable_tools = False + image_data = None + image_width = 0 + image_height = 0 + checking_vision_text_items = [] + loop = None + sentence_fragment = "" + + # Create the queue for message processing + queue = AsyncQueue() + + available_tools = [ + { + "type": "function", + "function": { + # ensure you use gpt-4o or later model if you need image recognition, gpt-4o-mini does not work quite well in this case + "name": "get_vision_image", + "description": "Get the image from camera. Call this whenever you need to understand the input camera image like you have vision capability, for example when user asks 'What can you see?' or 'Can you see me?'", + }, + "strict": True, + } + ] + + def on_init(self, ten_env: TenEnv) -> None: + logger.info("on_init") + ten_env.on_init_done() + + def on_start(self, ten_env: TenEnv) -> None: + logger.info("on_start") + + self.loop = asyncio.new_event_loop() + def start_loop(): + asyncio.set_event_loop(self.loop) + self.loop.run_forever() + threading.Thread(target=start_loop, args=[]).start() + + self.loop.create_task(self._process_queue(ten_env)) + + # Prepare configuration + openai_chatgpt_config = OpenAIChatGPTConfig.default_config() + + # Mandatory properties + openai_chatgpt_config.base_url = get_property_string(ten_env, PROPERTY_BASE_URL) or openai_chatgpt_config.base_url + openai_chatgpt_config.api_key = get_property_string(ten_env, PROPERTY_API_KEY) + if not openai_chatgpt_config.api_key: + logger.info(f"API key is missing, exiting on_start") + return + + # Optional properties + openai_chatgpt_config.model = get_property_string(ten_env, PROPERTY_MODEL) or openai_chatgpt_config.model + openai_chatgpt_config.prompt = get_property_string(ten_env, PROPERTY_PROMPT) or openai_chatgpt_config.prompt + openai_chatgpt_config.frequency_penalty = get_property_float(ten_env, PROPERTY_FREQUENCY_PENALTY) or openai_chatgpt_config.frequency_penalty + openai_chatgpt_config.presence_penalty = get_property_float(ten_env, PROPERTY_PRESENCE_PENALTY) or openai_chatgpt_config.presence_penalty + openai_chatgpt_config.temperature = get_property_float(ten_env, PROPERTY_TEMPERATURE) or openai_chatgpt_config.temperature + openai_chatgpt_config.top_p = get_property_float(ten_env, PROPERTY_TOP_P) or openai_chatgpt_config.top_p + openai_chatgpt_config.max_tokens = get_property_int(ten_env, PROPERTY_MAX_TOKENS) or openai_chatgpt_config.max_tokens + openai_chatgpt_config.proxy_url = get_property_string(ten_env, PROPERTY_PROXY_URL) or openai_chatgpt_config.proxy_url + + # Properties that don't affect openai_chatgpt_config + greeting = get_property_string(ten_env, PROPERTY_GREETING) + self.enable_tools = get_property_bool(ten_env, PROPERTY_ENABLE_TOOLS) + self.max_memory_length = get_property_int(ten_env, PROPERTY_MAX_MEMORY_LENGTH) + checking_vision_text_items_str = get_property_string(ten_env, PROPERTY_CHECKING_VISION_TEXT_ITEMS) + if checking_vision_text_items_str: + try: + self.checking_vision_text_items = json.loads(checking_vision_text_items_str) + except Exception as err: + logger.info(f"Error parsing {PROPERTY_CHECKING_VISION_TEXT_ITEMS}: {err}") + + # Create instance + try: + self.openai_chatgpt = OpenAIChatGPT(openai_chatgpt_config) + logger.info(f"initialized with max_tokens: {openai_chatgpt_config.max_tokens}, model: {openai_chatgpt_config.model}") + except Exception as err: + logger.info(f"Failed to initialize OpenAIChatGPT: {err}") + + # Send greeting if available + if greeting: + try: + output_data = Data.create("text_data") + output_data.set_property_string(DATA_OUT_TEXT_DATA_PROPERTY_TEXT, greeting) + output_data.set_property_bool(DATA_OUT_TEXT_DATA_PROPERTY_TEXT_END_OF_SEGMENT, True) + ten_env.send_data(output_data) + logger.info(f"Greeting [{greeting}] sent") + except Exception as err: + logger.info(f"Failed to send greeting [{greeting}]: {err}") + ten_env.on_start_done() + + def on_stop(self, ten_env: TenEnv) -> None: + logger.info("on_stop") + + # TODO: clean up resources + + ten_env.on_stop_done() + + def on_deinit(self, ten_env: TenEnv) -> None: + logger.info("on_deinit") + ten_env.on_deinit_done() + + def on_cmd(self, ten_env: TenEnv, cmd: Cmd) -> None: + logger.info(f"on_cmd json: {cmd.to_json()}") + + cmd_name = cmd.get_name() + + if cmd_name == CMD_IN_FLUSH: + asyncio.run_coroutine_threadsafe(self._flush_queue(), self.loop) + ten_env.send_cmd(Cmd.create(CMD_OUT_FLUSH), None) + logger.info("on_cmd sent flush") + status_code, detail = StatusCode.OK, "success" + else: + logger.info(f"on_cmd unknown cmd: {cmd_name}") + status_code, detail = StatusCode.ERROR, "unknown cmd" + + cmd_result = CmdResult.create(status_code) + cmd_result.set_property_string("detail", detail) + ten_env.return_result(cmd_result, cmd) + + def on_data(self, ten_env: TenEnv, data: Data) -> None: + # Get the necessary properties + is_final = get_property_bool(data, DATA_IN_TEXT_DATA_PROPERTY_IS_FINAL) + input_text = get_property_string(data, DATA_IN_TEXT_DATA_PROPERTY_TEXT) + + if not is_final: + logger.info("ignore non-final input") + return + if not input_text: + logger.info("ignore empty text") + return + + logger.info(f"OnData input text: [{input_text}]") + + # Start an asynchronous task for handling chat completion + asyncio.run_coroutine_threadsafe(self.queue.put([TASK_TYPE_CHAT_COMPLETION, input_text]), self.loop) + + def on_audio_frame(self, ten_env: TenEnv, audio_frame: AudioFrame) -> None: + # TODO: process pcm frame + pass + + def on_video_frame(self, ten_env: TenEnv, video_frame: VideoFrame) -> None: + # logger.info(f"OpenAIChatGPTExtension on_video_frame {frame.get_width()} {frame.get_height()}") + self.image_data = video_frame.get_buf() + self.image_width = video_frame.get_width() + self.image_height = video_frame.get_height() + return + + async def _process_queue(self, ten_env: TenEnv): + """Asynchronously process queue items one by one.""" + while True: + # Wait for an item to be available in the queue + [task_type, message] = await self.queue.get() + try: + # Create a new task for the new message + self.current_task = asyncio.create_task(self._run_chatflow(ten_env, task_type, message, self.memory)) + await self.current_task # Wait for the current task to finish or be cancelled + except asyncio.CancelledError: + logger.info(f"Task cancelled: {message}") + + async def _flush_queue(self): + """Flushes the self.queue and cancels the current task.""" + # Flush the queue using the new flush method + await self.queue.flush() + + # Cancel the current task if one is running + if self.current_task: + logger.info("Cancelling the current task during flush.") + self.current_task.cancel() + + async def _run_chatflow(self, ten_env: TenEnv, task_type:str, input_text: str, memory): + """Run the chatflow asynchronously.""" + memory_cache = [] + try: + logger.info(f"for input text: [{input_text}] memory: {memory}") + message = None + tools = None + + # Prepare the message and tools based on the task type + if task_type == TASK_TYPE_CHAT_COMPLETION: + message = {"role": "user", "content": input_text} + memory_cache = memory_cache + [message, {"role": "assistant", "content": ""}] + tools = self.available_tools if self.enable_tools else None + elif task_type == TASK_TYPE_CHAT_COMPLETION_WITH_VISION: + message = {"role": "user", "content": input_text} + memory_cache = memory_cache + [message, {"role": "assistant", "content": ""}] + tools = self.available_tools if self.enable_tools else None + if self.image_data is not None: + url = rgb2base64jpeg(self.image_data, self.image_width, self.image_height) + message = { + "role": "user", + "content": [ + {"type": "text", "text": input_text}, + {"type": "image_url", "image_url": {"url": url}}, + ], + } + logger.info(f"msg with vision data: {message}") + + + self.sentence_fragment = "" + + # Create an asyncio.Event to signal when content is finished + content_finished_event = asyncio.Event() + + # Create an async listener to handle tool calls and content updates + async def handle_tool_call(tool_call): + logger.info(f"tool_call: {tool_call}") + if tool_call.function.name == "get_vision_image": + # Append the vision image to the last assistant message + await self.queue.put([TASK_TYPE_CHAT_COMPLETION_WITH_VISION, input_text], True) + + async def handle_content_update(content:str): + # Append the content to the last assistant message + for item in reversed(memory_cache): + if item.get('role') == 'assistant': + item['content'] = item['content'] + content + break + sentences, self.sentence_fragment = parse_sentences(self.sentence_fragment, content) + for s in sentences: + self._send_data(ten_env, s, False) + + async def handle_content_finished(full_content:str): + content_finished_event.set() + + listener = AsyncEventEmitter() + listener.on("tool_call", handle_tool_call) + listener.on("content_update", handle_content_update) + listener.on("content_finished", handle_content_finished) + + # Make an async API call to get chat completions + await self.openai_chatgpt.get_chat_completions_stream(memory + [message], tools, listener) + + # Wait for the content to be finished + await content_finished_event.wait() + except asyncio.CancelledError: + logger.info(f"Task cancelled: {input_text}") + except Exception as e: + logger.error(f"Error in chat_completion: {traceback.format_exc()} for input text: {input_text}") + finally: + self._send_data(ten_env, "", True) + # always append the memory + for m in memory_cache: + self._append_memory(m) + + def _append_memory(self, message:str): + if len(self.memory) > self.max_memory_length: + self.memory.pop(0) + self.memory.append(message) + + def _send_data(self, ten_env: TenEnv, sentence: str, end_of_segment: bool): + try: + output_data = Data.create("text_data") + output_data.set_property_string(DATA_OUT_TEXT_DATA_PROPERTY_TEXT, sentence) + output_data.set_property_bool( + DATA_OUT_TEXT_DATA_PROPERTY_TEXT_END_OF_SEGMENT, end_of_segment + ) + ten_env.send_data(output_data) + logger.info( + f"{'end of segment ' if end_of_segment else ''}sent sentence [{sentence}]" + ) + except Exception as err: + logger.info( + f"send sentence [{sentence}] failed, err: {err}" + ) \ No newline at end of file diff --git a/agents/ten_packages/extension/openai_chatgpt_python/helper.py b/agents/ten_packages/extension/openai_chatgpt_python/helper.py new file mode 100644 index 00000000..28c28f19 --- /dev/null +++ b/agents/ten_packages/extension/openai_chatgpt_python/helper.py @@ -0,0 +1,187 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +import asyncio +from collections import deque +from ten.data import Data +from .log import logger +from PIL import Image +from datetime import datetime +from io import BytesIO +from base64 import b64encode + + +def get_property_bool(data: Data, property_name: str) -> bool: + """Helper to get boolean property from data with error handling.""" + try: + return data.get_property_bool(property_name) + except Exception as err: + logger.warn(f"GetProperty {property_name} failed: {err}") + return False + +def get_property_string(data: Data, property_name: str) -> str: + """Helper to get string property from data with error handling.""" + try: + return data.get_property_string(property_name) + except Exception as err: + logger.warn(f"GetProperty {property_name} failed: {err}") + return "" + +def get_property_int(data: Data, property_name: str) -> int: + """Helper to get int property from data with error handling.""" + try: + return data.get_property_int(property_name) + except Exception as err: + logger.warn(f"GetProperty {property_name} failed: {err}") + return 0 + +def get_property_float(data: Data, property_name: str) -> float: + """Helper to get float property from data with error handling.""" + try: + return data.get_property_float(property_name) + except Exception as err: + logger.warn(f"GetProperty {property_name} failed: {err}") + return 0.0 + + +def get_current_time(): + # Get the current time + start_time = datetime.now() + # Get the number of microseconds since the Unix epoch + unix_microseconds = int(start_time.timestamp() * 1_000_000) + return unix_microseconds + + +def is_punctuation(char): + if char in [",", "，", ".", "。", "?", "？", "!", "！"]: + return True + return False + + +def parse_sentences(sentence_fragment, content): + sentences = [] + current_sentence = sentence_fragment + for char in content: + current_sentence += char + if is_punctuation(char): + # Check if the current sentence contains non-punctuation characters + stripped_sentence = current_sentence + if any(c.isalnum() for c in stripped_sentence): + sentences.append(stripped_sentence) + current_sentence = "" # Reset for the next sentence + + remain = current_sentence # Any remaining characters form the incomplete sentence + return sentences, remain + + + +def rgb2base64jpeg(rgb_data, width, height): + # Convert the RGB image to a PIL Image + pil_image = Image.frombytes("RGBA", (width, height), bytes(rgb_data)) + pil_image = pil_image.convert("RGB") + + # Resize the image while maintaining its aspect ratio + pil_image = resize_image_keep_aspect(pil_image, 320) + + # Save the image to a BytesIO object in JPEG format + buffered = BytesIO() + pil_image.save(buffered, format="JPEG") + # pil_image.save("test.jpg", format="JPEG") + + # Get the byte data of the JPEG image + jpeg_image_data = buffered.getvalue() + + # Convert the JPEG byte data to a Base64 encoded string + base64_encoded_image = b64encode(jpeg_image_data).decode("utf-8") + + # Create the data URL + mime_type = "image/jpeg" + base64_url = f"data:{mime_type};base64,{base64_encoded_image}" + return base64_url + + +def resize_image_keep_aspect(image, max_size=512): + """ + Resize an image while maintaining its aspect ratio, ensuring the larger dimension is max_size. + If both dimensions are smaller than max_size, the image is not resized. + + :param image: A PIL Image object + :param max_size: The maximum size for the larger dimension (width or height) + :return: A PIL Image object (resized or original) + """ + # Get current width and height + width, height = image.size + + # If both dimensions are already smaller than max_size, return the original image + if width <= max_size and height <= max_size: + return image + + # Calculate the aspect ratio + aspect_ratio = width / height + + # Determine the new dimensions + if width > height: + new_width = max_size + new_height = int(max_size / aspect_ratio) + else: + new_height = max_size + new_width = int(max_size * aspect_ratio) + + # Resize the image with the new dimensions + resized_image = image.resize((new_width, new_height)) + + return resized_image + + +class AsyncEventEmitter: + def __init__(self): + self.listeners = {} + + def on(self, event_name, listener): + """Register an event listener.""" + if event_name not in self.listeners: + self.listeners[event_name] = [] + self.listeners[event_name].append(listener) + + def emit(self, event_name, *args, **kwargs): + """Fire the event without waiting for listeners to finish.""" + if event_name in self.listeners: + for listener in self.listeners[event_name]: + asyncio.create_task(listener(*args, **kwargs)) + + +class AsyncQueue: + def __init__(self): + self._queue = deque() # Use deque for efficient prepend and append + self._condition = asyncio.Condition() # Use Condition to manage access + + async def put(self, item, prepend=False): + """Add an item to the queue (prepend if specified).""" + async with self._condition: + if prepend: + self._queue.appendleft(item) # Prepend item to the front + else: + self._queue.append(item) # Append item to the back + self._condition.notify() + + async def get(self): + """Remove and return an item from the queue.""" + async with self._condition: + while not self._queue: + await self._condition.wait() # Wait until an item is available + return self._queue.popleft() # Pop from the front of the deque + + async def flush(self): + """Flush all items from the queue.""" + async with self._condition: + while self._queue: + self._queue.popleft() # Clear the queue + self._condition.notify_all() # Notify all consumers that the queue is empty + + def __len__(self): + """Return the current size of the queue.""" + return len(self._queue) \ No newline at end of file diff --git a/agents/ten_packages/extension/openai_chatgpt_python/log.py b/agents/ten_packages/extension/openai_chatgpt_python/log.py index fa2202da..1813e965 100644 --- a/agents/ten_packages/extension/openai_chatgpt_python/log.py +++ b/agents/ten_packages/extension/openai_chatgpt_python/log.py @@ -1,11 +1,20 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# import logging logger = logging.getLogger("openai_chatgpt_python") logger.setLevel(logging.INFO) -formatter = logging.Formatter( - "%(asctime)s - %(name)s - %(levelname)s - %(process)d - [%(filename)s:%(lineno)d] - %(message)s" +formatter_str = ( + "%(asctime)s - %(name)s - %(levelname)s - %(process)d - " + "[%(filename)s:%(lineno)d] - %(message)s" ) +formatter = logging.Formatter(formatter_str) console_handler = logging.StreamHandler() console_handler.setFormatter(formatter) diff --git a/agents/ten_packages/extension/openai_chatgpt_python/manifest.json b/agents/ten_packages/extension/openai_chatgpt_python/manifest.json index ce872dfe..4a74e306 100644 --- a/agents/ten_packages/extension/openai_chatgpt_python/manifest.json +++ b/agents/ten_packages/extension/openai_chatgpt_python/manifest.json @@ -1,7 +1,7 @@ { "type": "extension", "name": "openai_chatgpt_python", - "version": "0.4.0", + "version": "0.1.0", "dependencies": [ { "type": "system", @@ -9,6 +9,16 @@ "version": "0.2" } ], + "package": { + "include": [ + "manifest.json", + "property.json", + "BUILD.gn", + "**.tent", + "**.py", + "README.md" + ] + }, "api": { "property": { "api_key": { diff --git a/agents/ten_packages/extension/openai_chatgpt_python/openai.py b/agents/ten_packages/extension/openai_chatgpt_python/openai.py new file mode 100644 index 00000000..3449126d --- /dev/null +++ b/agents/ten_packages/extension/openai_chatgpt_python/openai.py @@ -0,0 +1,125 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +import random +import requests +from openai import AsyncOpenAI +from typing import List, Dict, Any, Optional +from .log import logger + + +class OpenAIChatGPTConfig: + def __init__(self, + base_url: str, + api_key: str, + model: str, + prompt: str, + frequency_penalty: float, + presence_penalty: float, + top_p: float, + temperature: float, + max_tokens: int, + seed: Optional[int] = None, + proxy_url: Optional[str] = None): + self.base_url = base_url + self.api_key = api_key + self.model = model + self.prompt = prompt + self.frequency_penalty = frequency_penalty + self.presence_penalty = presence_penalty + self.top_p = top_p + self.temperature = temperature + self.max_tokens = max_tokens + self.seed = seed if seed is not None else random.randint(0, 10000) + self.proxy_url = proxy_url + + @classmethod + def default_config(cls): + return cls( + base_url="https://api.openai.com/v1", + api_key="", + model="gpt-4", # Adjust this to match the equivalent of `openai.GPT4o` in the Python library + prompt="You are a voice assistant who talks in a conversational way and can chat with me like my friends. I will speak to you in English or Chinese, and you will answer in the corrected and improved version of my text with the language I use. Don’t talk like a robot, instead I would like you to talk like a real human with emotions. I will use your answer for text-to-speech, so don’t return me any meaningless characters. I want you to be helpful, when I’m asking you for advice, give me precise, practical and useful advice instead of being vague. When giving me a list of options, express the options in a narrative way instead of bullet points.", + frequency_penalty=0.9, + presence_penalty=0.9, + top_p=1.0, + temperature=0.1, + max_tokens=512, + seed=random.randint(0, 10000), + proxy_url="" + ) + + +class OpenAIChatGPT: + client = None + def __init__(self, config: OpenAIChatGPTConfig): + self.config = config + logger.info(f"OpenAIChatGPT initialized with config: {config.api_key}") + self.client = AsyncOpenAI( + api_key=config.api_key, + base_url=config.base_url + ) + self.session = requests.Session() + if config.proxy_url: + proxies = { + "http": config.proxy_url, + "https": config.proxy_url, + } + self.session.proxies.update(proxies) + self.client.session = self.session + + async def get_chat_completions_stream(self, messages, tools = None, listener = None): + req = { + "model": self.config.model, + "messages": [ + { + "role": "system", + "content": self.config.prompt, + }, + *messages, + ], + "tools": tools, + "temperature": self.config.temperature, + "top_p": self.config.top_p, + "presence_penalty": self.config.presence_penalty, + "frequency_penalty": self.config.frequency_penalty, + "max_tokens": self.config.max_tokens, + "seed": self.config.seed, + "stream": True, + } + + try: + response = await self.client.chat.completions.create(**req) + except Exception as e: + raise Exception(f"CreateChatCompletionStream failed, err: {e}") + + full_content = "" + + async for chat_completion in response: + choice = chat_completion.choices[0] + delta = choice.delta + + content = delta.content if delta and delta.content else "" + + # Emit content update event (fire-and-forget) + if listener and content: + listener.emit('content_update', content) + + full_content += content + + # Check for tool calls + if delta.tool_calls: + for tool_call in delta.tool_calls: + logger.info(f"tool_call: {tool_call}") + + # Emit tool call event (fire-and-forget) + if listener: + listener.emit('tool_call', tool_call) + + # Emit content finished event after the loop completes + if listener: + listener.emit('content_finished', full_content) diff --git a/agents/ten_packages/extension/openai_chatgpt_python/requirements.txt b/agents/ten_packages/extension/openai_chatgpt_python/requirements.txt index ca4978c3..51cdd053 100644 --- a/agents/ten_packages/extension/openai_chatgpt_python/requirements.txt +++ b/agents/ten_packages/extension/openai_chatgpt_python/requirements.txt @@ -1,4 +1,4 @@ openai numpy -requests==2.32.3 -pillow==10.4.0 \ No newline at end of file +requests +pillow \ No newline at end of file diff --git a/playground/src/manager/rtc/rtc.ts b/playground/src/manager/rtc/rtc.ts index 0439be78..4139d89e 100644 --- a/playground/src/manager/rtc/rtc.ts +++ b/playground/src/manager/rtc/rtc.ts @@ -103,57 +103,82 @@ export class RtcManager extends AGEventEmitter { }) }) this.client.on("stream-message", (uid: UID, stream: any) => { - this._praseData(stream) + this._parseData(stream) }) } - private _praseData(data: any): ITextItem | void { - // @ts-ignore - // const textstream = protoRoot.Agora.SpeechToText.lookup("Text").decode(data) - // if (!textstream) { - // return console.warn("Prase data failed.") - // } - let decoder = new TextDecoder('utf-8') - let decodedMessage = decoder.decode(data) - - const textstream = JSON.parse(decodedMessage) - - console.log("[test] textstream raw data", JSON.stringify(textstream)) - const { stream_id, is_final, text, text_ts, data_type } = textstream - let textStr: string = "" - let isFinal = false - const textItem: ITextItem = {} as ITextItem - textItem.uid = stream_id - textItem.time = text_ts - // switch (dataType) { - // case "transcribe": - // words.forEach((word: any) => { - // textStr += word.text - // if (word.isFinal) { - // isFinal = true - // } - // }) - textItem.dataType = "transcribe" - // textItem.language = culture - textItem.text = text - textItem.isFinal = is_final - this.emit("textChanged", textItem) - // break - // case "translate": - // if (!trans?.length) { - // return - // } - // trans.forEach((transItem: any) => { - // textStr = transItem.texts.join("") - // isFinal = !!transItem.isFinal - // textItem.dataType = "translate" - // textItem.language = transItem.lang - // textItem.isFinal = isFinal - // textItem.text = textStr - // this.emit("textChanged", textItem) - // }) - // break - // } + private _parseData(data: any): ITextItem | void { + let decoder = new TextDecoder('utf-8'); + let decodedMessage = decoder.decode(data); + const textstream = JSON.parse(decodedMessage); + + console.log("[test] textstream raw data", JSON.stringify(textstream)); + + const { stream_id, is_final, text, text_ts, data_type, message_id, part_number, total_parts } = textstream; + + if (total_parts > 0) { + // If message is split, handle it accordingly + this._handleSplitMessage(message_id, part_number, total_parts, stream_id, is_final, text, text_ts); + } else { + // If there is no message_id, treat it as a complete message + this._handleCompleteMessage(stream_id, is_final, text, text_ts); + } + } + + private messageCache: { [key: string]: { parts: string[], totalParts: number } } = {}; + + /** + * Handle complete messages (not split). + */ + private _handleCompleteMessage(stream_id: number, is_final: boolean, text: string, text_ts: number): void { + const textItem: ITextItem = { + uid: `${stream_id}`, + time: text_ts, + dataType: "transcribe", + text: text, + isFinal: is_final + }; + + if (text.trim().length > 0) { + this.emit("textChanged", textItem); + } + } + + /** + * Handle split messages, track parts, and reassemble once all parts are received. + */ + private _handleSplitMessage( + message_id: string, + part_number: number, + total_parts: number, + stream_id: number, + is_final: boolean, + text: string, + text_ts: number + ): void { + // Ensure the messageCache entry exists for this message_id + if (!this.messageCache[message_id]) { + this.messageCache[message_id] = { parts: [], totalParts: total_parts }; + } + + const cache = this.messageCache[message_id]; + + // Store the received part at the correct index (part_number starts from 1, so we use part_number - 1) + cache.parts[part_number - 1] = text; + + // Check if all parts have been received + const receivedPartsCount = cache.parts.filter(part => part !== undefined).length; + + if (receivedPartsCount === total_parts) { + // All parts have been received, reassemble the message + const fullText = cache.parts.join(''); + + // Now that the message is reassembled, handle it like a complete message + this._handleCompleteMessage(stream_id, is_final, fullText, text_ts); + + // Remove the cached message since it is now fully processed + delete this.messageCache[message_id]; + } } From 55475c941481882881e3e9659deec98ec7e35c10 Mon Sep 17 00:00:00 2001 From: Zhang Qianze Date: Tue, 17 Sep 2024 14:27:00 +0800 Subject: [PATCH 05/55] feat: support on-demand build --- .github/workflows/build-docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index bbd6ec0e..df45ecc6 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -13,6 +13,7 @@ on: - '**.md' pull_request: branches: [ "main" ] + workflow_dispatch: env: SERVER_IMAGE_NAME: astra_agents_server From 32b7fac3f8b176d53c9dd5c72dd93b9ce9fb1ef8 Mon Sep 17 00:00:00 2001 From: Zhang Qianze Date: Tue, 17 Sep 2024 16:15:37 +0800 Subject: [PATCH 06/55] fix: fix type failures --- playground/src/types/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/playground/src/types/index.ts b/playground/src/types/index.ts index 02c6bd70..f5492003 100644 --- a/playground/src/types/index.ts +++ b/playground/src/types/index.ts @@ -27,7 +27,6 @@ export interface IChatItem { export interface ITextItem { dataType: "transcribe" | "translate" uid: string - language: string time: number text: string isFinal: boolean From d9edb7896d625c9fcb4a66282e52e87dc8cf7e20 Mon Sep 17 00:00:00 2001 From: Zhang Qianze Date: Tue, 17 Sep 2024 16:23:33 +0800 Subject: [PATCH 07/55] feat: update playground image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7bdcac35..6ad1a0ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: networks: - astra_network astra_playground: - image: ghcr.io/ten-framework/astra_playground:v0.4.0-43-g20dffe8 + image: ghcr.io/ten-framework/astra_playground:v0.4.1-6-g32b7fac container_name: astra_playground restart: always ports: From df668a69c62d2229c7fa73e30d5c3e1d2eca14d0 Mon Sep 17 00:00:00 2001 From: Ethan Zhang Date: Wed, 18 Sep 2024 01:23:46 +0800 Subject: [PATCH 08/55] feat: separate playground and demo (#282) - support graph reading for playground - support property adjusting --- .github/workflows/build-docker.yaml | 84 ++++---- demo/.dockerignore | 3 + demo/.env | 1 + demo/.gitignore | 135 ++++++++++++ demo/Dockerfile | 27 +++ demo/LICENSE | 21 ++ demo/next-env.d.ts | 5 + demo/next.config.mjs | 37 ++++ demo/package.json | 41 ++++ demo/postcss.config.js | 10 + .../src/app/api/agents/start/graph.tsx | 0 demo/src/app/api/agents/start/route.tsx | 56 +++++ demo/src/app/favicon.ico | Bin 0 -> 15406 bytes demo/src/app/global.css | 66 ++++++ {playground => demo}/src/app/home/page.tsx | 0 demo/src/app/index.module.scss | 93 ++++++++ demo/src/app/layout.tsx | 53 +++++ demo/src/app/page.tsx | 14 ++ demo/src/assets/background.jpg | Bin 0 -> 95856 bytes demo/src/assets/cam_mute.svg | 3 + demo/src/assets/cam_unmute.svg | 3 + demo/src/assets/color_picker.svg | 17 ++ demo/src/assets/github.svg | 3 + demo/src/assets/info.svg | 3 + demo/src/assets/logo.svg | 46 ++++ demo/src/assets/logo_small.svg | 33 +++ demo/src/assets/mic_mute.svg | 3 + demo/src/assets/mic_unmute.svg | 3 + demo/src/assets/network/average.svg | 7 + demo/src/assets/network/disconnected.svg | 9 + demo/src/assets/network/excellent.svg | 6 + demo/src/assets/network/good.svg | 7 + demo/src/assets/network/poor.svg | 7 + demo/src/assets/pdf.svg | 3 + demo/src/assets/transcription.svg | 5 + demo/src/assets/voice.svg | 3 + demo/src/common/constant.ts | 88 ++++++++ demo/src/common/hooks.ts | 131 ++++++++++++ demo/src/common/index.ts | 6 + demo/src/common/mock.ts | 41 ++++ demo/src/common/request.ts | 133 ++++++++++++ demo/src/common/storage.ts | 21 ++ demo/src/common/utils.ts | 59 ++++++ demo/src/components/authInitializer/index.tsx | 29 +++ .../components/customSelect/index.module.scss | 22 ++ demo/src/components/customSelect/index.tsx | 19 ++ demo/src/components/icons/cam/index.tsx | 17 ++ .../components/icons/colorPicker/index.tsx | 6 + demo/src/components/icons/github/index.tsx | 6 + demo/src/components/icons/index.tsx | 10 + demo/src/components/icons/info/index.tsx | 6 + demo/src/components/icons/logo/index.tsx | 8 + demo/src/components/icons/mic/index.tsx | 23 ++ demo/src/components/icons/network/index.tsx | 33 +++ demo/src/components/icons/pdf/index.tsx | 6 + .../components/icons/transcription/index.tsx | 6 + demo/src/components/icons/types.ts | 10 + demo/src/components/icons/voice/index.tsx | 6 + .../components/loginCard/index.module.scss | 112 ++++++++++ demo/src/components/loginCard/index.tsx | 77 +++++++ .../components/pdfSelect/index.module.scss | 8 + demo/src/components/pdfSelect/index.tsx | 88 ++++++++ .../pdfSelect/upload/index.module.scss | 7 + .../src/components/pdfSelect/upload/index.tsx | 75 +++++++ demo/src/manager/events.ts | 51 +++++ demo/src/manager/index.ts | 1 + demo/src/manager/rtc/index.ts | 2 + demo/src/manager/rtc/rtc.ts | 199 ++++++++++++++++++ demo/src/manager/rtc/types.ts | 25 +++ demo/src/manager/types.ts | 1 + demo/src/middleware.tsx | 44 ++++ .../mobile/chat/chatItem/index.module.scss | 86 ++++++++ .../platform/mobile/chat/chatItem/index.tsx | 50 +++++ .../platform/mobile/chat/index.module.scss | 78 +++++++ demo/src/platform/mobile/chat/index.tsx | 65 ++++++ .../mobile/description/index.module.scss | 71 +++++++ .../src/platform/mobile/description/index.tsx | 100 +++++++++ .../platform/mobile/entry/index.module.scss | 18 ++ demo/src/platform/mobile/entry/index.tsx | 30 +++ .../platform/mobile/header/index.module.scss | 57 +++++ demo/src/platform/mobile/header/index.tsx | 48 +++++ .../header/infoPopover/index.module.scss | 43 ++++ .../mobile/header/infoPopover/index.tsx | 57 +++++ .../mobile/header/network/index.module.scss | 0 .../platform/mobile/header/network/index.tsx | 37 ++++ .../colorPicker/index.module.scss | 24 +++ .../header/stylePopover/colorPicker/index.tsx | 22 ++ .../header/stylePopover/index.module.scss | 51 +++++ .../mobile/header/stylePopover/index.tsx | 54 +++++ demo/src/platform/mobile/menu/context.ts | 9 + .../platform/mobile/menu/index.module.scss | 69 ++++++ demo/src/platform/mobile/menu/index.tsx | 76 +++++++ .../mobile/rtc/agent/index.module.scss | 31 +++ demo/src/platform/mobile/rtc/agent/index.tsx | 34 +++ .../rtc/audioVisualizer/index.module.scss | 17 ++ .../mobile/rtc/audioVisualizer/index.tsx | 48 +++++ .../camSection/camSelect/index.module.scss | 4 + .../mobile/rtc/camSection/camSelect/index.tsx | 57 +++++ .../mobile/rtc/camSection/index.module.scss | 54 +++++ .../platform/mobile/rtc/camSection/index.tsx | 42 ++++ .../src/platform/mobile/rtc/index.module.scss | 55 +++++ demo/src/platform/mobile/rtc/index.tsx | 128 +++++++++++ .../mobile/rtc/micSection/index.module.scss | 58 +++++ .../platform/mobile/rtc/micSection/index.tsx | 70 ++++++ .../micSection/micSelect/index.module.scss | 4 + .../mobile/rtc/micSection/micSelect/index.tsx | 58 +++++ .../mobile/rtc/streamPlayer/index.module.scss | 6 + .../mobile/rtc/streamPlayer/index.tsx | 1 + .../rtc/streamPlayer/localStreamPlayer.tsx | 46 ++++ .../pc/chat/chatItem/index.module.scss | 90 ++++++++ demo/src/platform/pc/chat/chatItem/index.tsx | 51 +++++ demo/src/platform/pc/chat/index.module.scss | 79 +++++++ demo/src/platform/pc/chat/index.tsx | 66 ++++++ .../platform/pc/description/index.module.scss | 73 +++++++ demo/src/platform/pc/description/index.tsx | 101 +++++++++ demo/src/platform/pc/entry/index.module.scss | 17 ++ demo/src/platform/pc/entry/index.tsx | 22 ++ demo/src/platform/pc/header/index.module.scss | 58 +++++ demo/src/platform/pc/header/index.tsx | 48 +++++ .../pc/header/infoPopover/index.module.scss | 43 ++++ .../platform/pc/header/infoPopover/index.tsx | 57 +++++ .../pc/header/network/index.module.scss | 0 demo/src/platform/pc/header/network/index.tsx | 37 ++++ .../colorPicker/index.module.scss | 24 +++ .../header/stylePopover/colorPicker/index.tsx | 22 ++ .../pc/header/stylePopover/index.module.scss | 51 +++++ .../platform/pc/header/stylePopover/index.tsx | 54 +++++ .../platform/pc/rtc/agent/index.module.scss | 31 +++ demo/src/platform/pc/rtc/agent/index.tsx | 34 +++ .../pc/rtc/audioVisualizer/index.module.scss | 17 ++ .../platform/pc/rtc/audioVisualizer/index.tsx | 48 +++++ .../camSection/camSelect/index.module.scss | 4 + .../pc/rtc/camSection/camSelect/index.tsx | 57 +++++ .../pc/rtc/camSection/index.module.scss | 54 +++++ demo/src/platform/pc/rtc/camSection/index.tsx | 47 +++++ demo/src/platform/pc/rtc/index.module.scss | 55 +++++ demo/src/platform/pc/rtc/index.tsx | 128 +++++++++++ .../pc/rtc/micSection/index.module.scss | 56 +++++ demo/src/platform/pc/rtc/micSection/index.tsx | 73 +++++++ .../micSection/micSelect/index.module.scss | 4 + .../pc/rtc/micSection/micSelect/index.tsx | 58 +++++ .../pc/rtc/streamPlayer/index.module.scss | 6 + .../platform/pc/rtc/streamPlayer/index.tsx | 1 + .../pc/rtc/streamPlayer/localStreamPlayer.tsx | 46 ++++ demo/src/protobuf/SttMessage.js | 0 demo/src/protobuf/SttMessage.proto | 40 ++++ demo/src/protobuf/SttMessage_es6.js | 134 ++++++++++++ demo/src/store/index.ts | 21 ++ demo/src/store/provider/index.tsx | 21 ++ demo/src/store/reducers/global.ts | 105 +++++++++ demo/src/types/index.ts | 62 ++++++ demo/tsconfig.json | 40 ++++ docker-compose.yml | 1 + playground/.env | 3 +- playground/src/app/api/agents/start/route.tsx | 4 +- playground/src/app/global.css | 1 + playground/src/app/page.tsx | 39 +++- playground/src/common/constant.ts | 1 - playground/src/common/hooks.ts | 13 ++ playground/src/common/request.ts | 47 ++++- .../src/components/authInitializer/index.tsx | 10 +- playground/src/middleware.tsx | 20 +- .../src/platform/mobile/description/index.tsx | 5 +- .../mobile/rtc/agent/index.module.scss | 2 - .../src/platform/mobile/rtc/agent/index.tsx | 1 - playground/src/platform/mobile/rtc/index.tsx | 1 - playground/src/platform/pc/chat/index.tsx | 90 ++++++-- .../src/platform/pc/chat/table/index.tsx | 168 +++++++++++++++ .../src/platform/pc/description/index.tsx | 16 +- .../src/platform/pc/entry/index.module.scss | 13 +- playground/src/platform/pc/entry/index.tsx | 8 +- .../platform/pc/rtc/agent/index.module.scss | 2 - .../src/platform/pc/rtc/agent/index.tsx | 1 - playground/src/platform/pc/rtc/index.tsx | 14 -- playground/src/store/reducers/global.ts | 22 +- 175 files changed, 6351 insertions(+), 107 deletions(-) create mode 100644 demo/.dockerignore create mode 100644 demo/.env create mode 100644 demo/.gitignore create mode 100644 demo/Dockerfile create mode 100644 demo/LICENSE create mode 100644 demo/next-env.d.ts create mode 100644 demo/next.config.mjs create mode 100644 demo/package.json create mode 100644 demo/postcss.config.js rename {playground => demo}/src/app/api/agents/start/graph.tsx (100%) create mode 100644 demo/src/app/api/agents/start/route.tsx create mode 100644 demo/src/app/favicon.ico create mode 100644 demo/src/app/global.css rename {playground => demo}/src/app/home/page.tsx (100%) create mode 100644 demo/src/app/index.module.scss create mode 100644 demo/src/app/layout.tsx create mode 100644 demo/src/app/page.tsx create mode 100644 demo/src/assets/background.jpg create mode 100644 demo/src/assets/cam_mute.svg create mode 100644 demo/src/assets/cam_unmute.svg create mode 100644 demo/src/assets/color_picker.svg create mode 100644 demo/src/assets/github.svg create mode 100644 demo/src/assets/info.svg create mode 100644 demo/src/assets/logo.svg create mode 100644 demo/src/assets/logo_small.svg create mode 100644 demo/src/assets/mic_mute.svg create mode 100644 demo/src/assets/mic_unmute.svg create mode 100644 demo/src/assets/network/average.svg create mode 100644 demo/src/assets/network/disconnected.svg create mode 100644 demo/src/assets/network/excellent.svg create mode 100644 demo/src/assets/network/good.svg create mode 100644 demo/src/assets/network/poor.svg create mode 100644 demo/src/assets/pdf.svg create mode 100644 demo/src/assets/transcription.svg create mode 100644 demo/src/assets/voice.svg create mode 100644 demo/src/common/constant.ts create mode 100644 demo/src/common/hooks.ts create mode 100644 demo/src/common/index.ts create mode 100644 demo/src/common/mock.ts create mode 100644 demo/src/common/request.ts create mode 100644 demo/src/common/storage.ts create mode 100644 demo/src/common/utils.ts create mode 100644 demo/src/components/authInitializer/index.tsx create mode 100644 demo/src/components/customSelect/index.module.scss create mode 100644 demo/src/components/customSelect/index.tsx create mode 100644 demo/src/components/icons/cam/index.tsx create mode 100644 demo/src/components/icons/colorPicker/index.tsx create mode 100644 demo/src/components/icons/github/index.tsx create mode 100644 demo/src/components/icons/index.tsx create mode 100644 demo/src/components/icons/info/index.tsx create mode 100644 demo/src/components/icons/logo/index.tsx create mode 100644 demo/src/components/icons/mic/index.tsx create mode 100644 demo/src/components/icons/network/index.tsx create mode 100644 demo/src/components/icons/pdf/index.tsx create mode 100644 demo/src/components/icons/transcription/index.tsx create mode 100644 demo/src/components/icons/types.ts create mode 100644 demo/src/components/icons/voice/index.tsx create mode 100644 demo/src/components/loginCard/index.module.scss create mode 100644 demo/src/components/loginCard/index.tsx create mode 100644 demo/src/components/pdfSelect/index.module.scss create mode 100644 demo/src/components/pdfSelect/index.tsx create mode 100644 demo/src/components/pdfSelect/upload/index.module.scss create mode 100644 demo/src/components/pdfSelect/upload/index.tsx create mode 100644 demo/src/manager/events.ts create mode 100644 demo/src/manager/index.ts create mode 100644 demo/src/manager/rtc/index.ts create mode 100644 demo/src/manager/rtc/rtc.ts create mode 100644 demo/src/manager/rtc/types.ts create mode 100644 demo/src/manager/types.ts create mode 100644 demo/src/middleware.tsx create mode 100644 demo/src/platform/mobile/chat/chatItem/index.module.scss create mode 100644 demo/src/platform/mobile/chat/chatItem/index.tsx create mode 100644 demo/src/platform/mobile/chat/index.module.scss create mode 100644 demo/src/platform/mobile/chat/index.tsx create mode 100644 demo/src/platform/mobile/description/index.module.scss create mode 100644 demo/src/platform/mobile/description/index.tsx create mode 100644 demo/src/platform/mobile/entry/index.module.scss create mode 100644 demo/src/platform/mobile/entry/index.tsx create mode 100644 demo/src/platform/mobile/header/index.module.scss create mode 100644 demo/src/platform/mobile/header/index.tsx create mode 100644 demo/src/platform/mobile/header/infoPopover/index.module.scss create mode 100644 demo/src/platform/mobile/header/infoPopover/index.tsx create mode 100644 demo/src/platform/mobile/header/network/index.module.scss create mode 100644 demo/src/platform/mobile/header/network/index.tsx create mode 100644 demo/src/platform/mobile/header/stylePopover/colorPicker/index.module.scss create mode 100644 demo/src/platform/mobile/header/stylePopover/colorPicker/index.tsx create mode 100644 demo/src/platform/mobile/header/stylePopover/index.module.scss create mode 100644 demo/src/platform/mobile/header/stylePopover/index.tsx create mode 100644 demo/src/platform/mobile/menu/context.ts create mode 100644 demo/src/platform/mobile/menu/index.module.scss create mode 100644 demo/src/platform/mobile/menu/index.tsx create mode 100644 demo/src/platform/mobile/rtc/agent/index.module.scss create mode 100644 demo/src/platform/mobile/rtc/agent/index.tsx create mode 100644 demo/src/platform/mobile/rtc/audioVisualizer/index.module.scss create mode 100644 demo/src/platform/mobile/rtc/audioVisualizer/index.tsx create mode 100644 demo/src/platform/mobile/rtc/camSection/camSelect/index.module.scss create mode 100644 demo/src/platform/mobile/rtc/camSection/camSelect/index.tsx create mode 100644 demo/src/platform/mobile/rtc/camSection/index.module.scss create mode 100644 demo/src/platform/mobile/rtc/camSection/index.tsx create mode 100644 demo/src/platform/mobile/rtc/index.module.scss create mode 100644 demo/src/platform/mobile/rtc/index.tsx create mode 100644 demo/src/platform/mobile/rtc/micSection/index.module.scss create mode 100644 demo/src/platform/mobile/rtc/micSection/index.tsx create mode 100644 demo/src/platform/mobile/rtc/micSection/micSelect/index.module.scss create mode 100644 demo/src/platform/mobile/rtc/micSection/micSelect/index.tsx create mode 100644 demo/src/platform/mobile/rtc/streamPlayer/index.module.scss create mode 100644 demo/src/platform/mobile/rtc/streamPlayer/index.tsx create mode 100644 demo/src/platform/mobile/rtc/streamPlayer/localStreamPlayer.tsx create mode 100644 demo/src/platform/pc/chat/chatItem/index.module.scss create mode 100644 demo/src/platform/pc/chat/chatItem/index.tsx create mode 100644 demo/src/platform/pc/chat/index.module.scss create mode 100644 demo/src/platform/pc/chat/index.tsx create mode 100644 demo/src/platform/pc/description/index.module.scss create mode 100644 demo/src/platform/pc/description/index.tsx create mode 100644 demo/src/platform/pc/entry/index.module.scss create mode 100644 demo/src/platform/pc/entry/index.tsx create mode 100644 demo/src/platform/pc/header/index.module.scss create mode 100644 demo/src/platform/pc/header/index.tsx create mode 100644 demo/src/platform/pc/header/infoPopover/index.module.scss create mode 100644 demo/src/platform/pc/header/infoPopover/index.tsx create mode 100644 demo/src/platform/pc/header/network/index.module.scss create mode 100644 demo/src/platform/pc/header/network/index.tsx create mode 100644 demo/src/platform/pc/header/stylePopover/colorPicker/index.module.scss create mode 100644 demo/src/platform/pc/header/stylePopover/colorPicker/index.tsx create mode 100644 demo/src/platform/pc/header/stylePopover/index.module.scss create mode 100644 demo/src/platform/pc/header/stylePopover/index.tsx create mode 100644 demo/src/platform/pc/rtc/agent/index.module.scss create mode 100644 demo/src/platform/pc/rtc/agent/index.tsx create mode 100644 demo/src/platform/pc/rtc/audioVisualizer/index.module.scss create mode 100644 demo/src/platform/pc/rtc/audioVisualizer/index.tsx create mode 100644 demo/src/platform/pc/rtc/camSection/camSelect/index.module.scss create mode 100644 demo/src/platform/pc/rtc/camSection/camSelect/index.tsx create mode 100644 demo/src/platform/pc/rtc/camSection/index.module.scss create mode 100644 demo/src/platform/pc/rtc/camSection/index.tsx create mode 100644 demo/src/platform/pc/rtc/index.module.scss create mode 100644 demo/src/platform/pc/rtc/index.tsx create mode 100644 demo/src/platform/pc/rtc/micSection/index.module.scss create mode 100644 demo/src/platform/pc/rtc/micSection/index.tsx create mode 100644 demo/src/platform/pc/rtc/micSection/micSelect/index.module.scss create mode 100644 demo/src/platform/pc/rtc/micSection/micSelect/index.tsx create mode 100644 demo/src/platform/pc/rtc/streamPlayer/index.module.scss create mode 100644 demo/src/platform/pc/rtc/streamPlayer/index.tsx create mode 100644 demo/src/platform/pc/rtc/streamPlayer/localStreamPlayer.tsx create mode 100644 demo/src/protobuf/SttMessage.js create mode 100644 demo/src/protobuf/SttMessage.proto create mode 100644 demo/src/protobuf/SttMessage_es6.js create mode 100644 demo/src/store/index.ts create mode 100644 demo/src/store/provider/index.tsx create mode 100644 demo/src/store/reducers/global.ts create mode 100644 demo/src/types/index.ts create mode 100644 demo/tsconfig.json create mode 100644 playground/src/platform/pc/chat/table/index.tsx diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index df45ecc6..8f401d9f 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -1,53 +1,63 @@ name: Build Docker -on: +on: push: - branches: [ "main" ] + branches: ["main"] # Publish semver tags as releases. - tags: [ 'v*.*.*' ] + tags: ["v*.*.*"] paths-ignore: - - '.devcontainer/**' - - '.github/ISSUE_TEMPLATE/**' - - 'images/**' - - 'playground/**' - - '**.md' + - ".devcontainer/**" + - ".github/ISSUE_TEMPLATE/**" + - "images/**" + - "playground/**" + - "**.md" pull_request: - branches: [ "main" ] + branches: ["main"] workflow_dispatch: env: SERVER_IMAGE_NAME: astra_agents_server PLAYGROUND_IMAGE_NAME: astra_playground + DEMO_IMAGE_NAME: agent_demo jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-tags: true - fetch-depth: '0' - - id: pre-step - shell: bash - run: echo "image-tag=$(git describe --tags --always)" >> $GITHUB_OUTPUT - - name: Build & Publish Docker Image for Agents Server - uses: elgohr/Publish-Docker-Github-Action@v5 - with: - name: ${{ github.repository_owner }}/${{ env.SERVER_IMAGE_NAME }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io - tags: "${{ github.ref == 'refs/heads/main' && 'latest,' || '' }}${{ steps.pre-step.outputs.image-tag }}" - no_push: ${{ github.event_name == 'pull_request' }} - - name: Build & Publish Docker Image for Playground - uses: elgohr/Publish-Docker-Github-Action@v5 - with: - name: ${{ github.repository_owner }}/${{ env.PLAYGROUND_IMAGE_NAME }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io - workdir: playground - tags: "${{ github.ref == 'refs/heads/main' && 'latest,' || '' }}${{ steps.pre-step.outputs.image-tag }}" - no_push: ${{ github.event_name == 'pull_request' }} - + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-tags: true + fetch-depth: "0" + - id: pre-step + shell: bash + run: echo "image-tag=$(git describe --tags --always)" >> $GITHUB_OUTPUT + - name: Build & Publish Docker Image for Agents Server + uses: elgohr/Publish-Docker-Github-Action@v5 + with: + name: ${{ github.repository_owner }}/${{ env.SERVER_IMAGE_NAME }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io + tags: "${{ github.ref == 'refs/heads/main' && 'latest,' || '' }}${{ steps.pre-step.outputs.image-tag }}" + no_push: ${{ github.event_name == 'pull_request' }} + - name: Build & Publish Docker Image for Playground + uses: elgohr/Publish-Docker-Github-Action@v5 + with: + name: ${{ github.repository_owner }}/${{ env.PLAYGROUND_IMAGE_NAME }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io + workdir: playground + tags: "${{ github.ref == 'refs/heads/main' && 'latest,' || '' }}${{ steps.pre-step.outputs.image-tag }}" + no_push: ${{ github.event_name == 'pull_request' }} + - name: Build & Publish Docker Image for demo + uses: elgohr/Publish-Docker-Github-Action@v5 + with: + name: ${{ github.repository_owner }}/${{ env.DEMO_IMAGE_NAME }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io + workdir: demo + tags: "${{ github.ref == 'refs/heads/main' && 'latest,' || '' }}${{ steps.pre-step.outputs.image-tag }}" + no_push: ${{ github.event_name == 'pull_request' }} diff --git a/demo/.dockerignore b/demo/.dockerignore new file mode 100644 index 00000000..80ae13ce --- /dev/null +++ b/demo/.dockerignore @@ -0,0 +1,3 @@ +.git +.next +node_modules diff --git a/demo/.env b/demo/.env new file mode 100644 index 00000000..5f92b324 --- /dev/null +++ b/demo/.env @@ -0,0 +1 @@ +AGENT_SERVER_URL=http://localhost:8080 \ No newline at end of file diff --git a/demo/.gitignore b/demo/.gitignore new file mode 100644 index 00000000..3bcf2bf5 --- /dev/null +++ b/demo/.gitignore @@ -0,0 +1,135 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional stylelint cache +.stylelintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variable files +# .env +!.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# vuepress v2.x temp and cache directory +.temp +.cache + +# Docusaurus cache and generated files +.docusaurus + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + +# lock +package-lock.json +yarn.lock diff --git a/demo/Dockerfile b/demo/Dockerfile new file mode 100644 index 00000000..63379d47 --- /dev/null +++ b/demo/Dockerfile @@ -0,0 +1,27 @@ +FROM node:20-alpine AS base + +FROM base AS builder + +WORKDIR /app + +# COPY .env.example .env +COPY . . + +RUN npm i --verbose && \ + npm run build + + +FROM base AS runner + +WORKDIR /app + +ENV NODE_ENV production + +RUN mkdir .next + +COPY --from=builder /app/.next/standalone ./ +COPY --from=builder /app/.next/static ./.next/static + +EXPOSE 3000 + +CMD HOSTNAME="0.0.0.0" node server.js \ No newline at end of file diff --git a/demo/LICENSE b/demo/LICENSE new file mode 100644 index 00000000..e4589a2b --- /dev/null +++ b/demo/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 Agora Community + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/demo/next-env.d.ts b/demo/next-env.d.ts new file mode 100644 index 00000000..4f11a03d --- /dev/null +++ b/demo/next-env.d.ts @@ -0,0 +1,5 @@ +/// +/// + +// NOTE: This file should not be edited +// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/demo/next.config.mjs b/demo/next.config.mjs new file mode 100644 index 00000000..132f5fc1 --- /dev/null +++ b/demo/next.config.mjs @@ -0,0 +1,37 @@ +/** @type {import('next').NextConfig} */ + +const nextConfig = { + // basePath: '/ai-agent', + // output: 'export', + output: 'standalone', + reactStrictMode: false, + webpack(config) { + // Grab the existing rule that handles SVG imports + const fileLoaderRule = config.module.rules.find((rule) => + rule.test?.test?.('.svg'), + ) + + config.module.rules.push( + // Reapply the existing rule, but only for svg imports ending in ?url + { + ...fileLoaderRule, + test: /\.svg$/i, + resourceQuery: /url/, // *.svg?url + }, + // Convert all other *.svg imports to React components + { + test: /\.svg$/i, + issuer: fileLoaderRule.issuer, + resourceQuery: { not: [...fileLoaderRule.resourceQuery.not, /url/] }, // exclude if *.svg?url + use: ['@svgr/webpack'], + }, + ) + + // Modify the file loader rule to ignore *.svg, since we have it handled now. + fileLoaderRule.exclude = /\.svg$/i + + return config + } +}; + +export default nextConfig; diff --git a/demo/package.json b/demo/package.json new file mode 100644 index 00000000..4342a11d --- /dev/null +++ b/demo/package.json @@ -0,0 +1,41 @@ +{ + "name": "astra.ai-playground", + "version": "0.4.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint", + "proto": "pbjs -t json-module -w commonjs -o src/protobuf/SttMessage.js src/protobuf/SttMessage.proto" + }, + "dependencies": { + "react": "^18", + "react-dom": "^18", + "next": "14.2.4", + "redux": "^5.0.1", + "protobufjs": "^7.2.5", + "react-redux": "^9.1.0", + "@reduxjs/toolkit": "^2.2.3", + "antd": "^5.15.3", + "@ant-design/icons": "^5.3.7", + "agora-rtc-sdk-ng": "^4.21.0", + "react-colorful": "^5.6.1" + }, + "devDependencies": { + "@minko-fe/postcss-pxtoviewport": "^1.3.2", + "typescript": "^5", + "@types/node": "^20", + "@types/react": "^18", + "@types/react-dom": "^18", + "@types/react-redux": "^7.1.22", + "eslint": "^8", + "eslint-config-next": "14.2.4", + "autoprefixer": "^10.4.16", + "postcss": "^8.4.31", + "sass": "^1.77.5", + "@svgr/webpack": "^8.1.0", + "protobufjs-cli": "^1.1.2" + }, + "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610" +} \ No newline at end of file diff --git a/demo/postcss.config.js b/demo/postcss.config.js new file mode 100644 index 00000000..ea748d4d --- /dev/null +++ b/demo/postcss.config.js @@ -0,0 +1,10 @@ +module.exports = { + plugins: { + autoprefixer: {}, + "@minko-fe/postcss-pxtoviewport": { + viewportWidth: 375, + exclude: /node_modules/, + include: /\/src\/platform\/mobile\//, + } + }, +} diff --git a/playground/src/app/api/agents/start/graph.tsx b/demo/src/app/api/agents/start/graph.tsx similarity index 100% rename from playground/src/app/api/agents/start/graph.tsx rename to demo/src/app/api/agents/start/graph.tsx diff --git a/demo/src/app/api/agents/start/route.tsx b/demo/src/app/api/agents/start/route.tsx new file mode 100644 index 00000000..5a7b4440 --- /dev/null +++ b/demo/src/app/api/agents/start/route.tsx @@ -0,0 +1,56 @@ +import { NextRequest, NextResponse } from 'next/server'; +import { getGraphProperties } from './graph'; + +/** + * Handles the POST request to start an agent. + * + * @param request - The NextRequest object representing the incoming request. + * @returns A NextResponse object representing the response to be sent back to the client. + */ +export async function POST(request: NextRequest) { + try { + const { AGENT_SERVER_URL } = process.env; + + // Check if environment variables are available + if (!AGENT_SERVER_URL) { + throw "Environment variables are not available"; + } + + const body = await request.json(); + const { + request_id, + channel_name, + user_uid, + graph_name, + language, + voice_type, + } = body; + + // Send a POST request to start the agent + const response = await fetch(`${AGENT_SERVER_URL}/start`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + request_id, + channel_name, + user_uid, + graph_name, + // Get the graph properties based on the graph name, language, and voice type + properties: getGraphProperties(graph_name, language, voice_type), + }), + }); + + const responseData = await response.json(); + + return NextResponse.json(responseData, { status: response.status }); + } catch (error) { + if (error instanceof Response) { + const errorData = await error.json(); + return NextResponse.json(errorData, { status: error.status }); + } else { + return NextResponse.json({ code: "1", data: null, msg: "Internal Server Error" }, { status: 500 }); + } + } +} \ No newline at end of file diff --git a/demo/src/app/favicon.ico b/demo/src/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..21b38b9698bfbc530683c5ca32c676d7afee53f1 GIT binary patch literal 15406 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 literal 0 HcmV?d00001 diff --git a/demo/src/app/global.css b/demo/src/app/global.css new file mode 100644 index 00000000..f7007287 --- /dev/null +++ b/demo/src/app/global.css @@ -0,0 +1,66 @@ +* { + box-sizing: border-box; + padding: 0; + margin: 0; +} + +html, +body { + background-color: #0F0F11; + font-family: "PingFang SC"; +} + +a { + color: inherit; + text-decoration: none; +} + +@media (prefers-color-scheme: dark) { + html { + color-scheme: dark; + } +} + +.ant-select-arrow { + color: #667085 !important; +} + + +.ant-select-selection-item { + color: #667085 !important; +} + +.ant-select-selector { + border: 1px solid #272A2F !important; + background-color: #272A2F !important; +} + +.ant-select-dropdown { + background-color: #1E2024 !important; +} + +.ant-select-item { + background: #1E2024 !important; + color: var(--Grey-600, #667085) !important; +} + +.ant-select-item-option-selected { + background: #272A2F !important; + color: var(--Grey-300, #EAECF0) !important; +} + + +.ant-popover-inner { + /* width: 260px !important; */ + background: #1E2025 !important; +} + + +.ant-select-selection-placeholder { + color: var(--Grey-600, #667085) !important; +} + + +.ant-empty-description { + color: var(--Grey-600, #667085) !important; +} diff --git a/playground/src/app/home/page.tsx b/demo/src/app/home/page.tsx similarity index 100% rename from playground/src/app/home/page.tsx rename to demo/src/app/home/page.tsx diff --git a/demo/src/app/index.module.scss b/demo/src/app/index.module.scss new file mode 100644 index 00000000..78585596 --- /dev/null +++ b/demo/src/app/index.module.scss @@ -0,0 +1,93 @@ +@function multiple-box-shadow($n) { + $value: '#{random(2000)}px #{random(2000)}px #FFF'; + + @for $i from 2 through $n { + $value: '#{$value}, #{random(2000)}px #{random(2000)}px #FFF'; + } + + @return unquote($value); +} + +$shadows-small: multiple-box-shadow(700); +$shadows-medium: multiple-box-shadow(200); +$shadows-big: multiple-box-shadow(100); + + +.login { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: hidden; + // background: radial-gradient(ellipse at bottom, #1B2735 0%, #090A0F 100%); + background: url("../assets/background.jpg") no-repeat center center; + background-size: cover; + box-sizing: border-box; + + .starts { + width: 1px; + height: 1px; + background: transparent; + box-shadow: $shadows-small; + animation: animStar 50s linear infinite; + + &:after { + content: " "; + position: absolute; + top: 2000px; + width: 1px; + height: 1px; + background: transparent; + box-shadow: $shadows-small + } + } + + .starts2 { + width: 2px; + height: 2px; + box-shadow: $shadows-medium; + animation: animStar 100s linear infinite; + + &:after { + content: " "; + position: absolute; + top: 2000px; + width: 2px; + height: 2px; + background: transparent; + box-shadow: $shadows-medium; + } + } + + .starts3 { + width: 3px; + height: 3px; + background: transparent; + box-shadow: $shadows-big; + animation: animStar 150s linear infinite; + + &:after { + content: " "; + position: absolute; + top: 2000px; + width: 3px; + height: 3px; + background: transparent; + box-shadow: $shadows-big; + } + + } + +} + + +@keyframes animStar { + from { + transform: translateY(0px) + } + + to { + transform: translateY(-2000px) + } +} diff --git a/demo/src/app/layout.tsx b/demo/src/app/layout.tsx new file mode 100644 index 00000000..b6153573 --- /dev/null +++ b/demo/src/app/layout.tsx @@ -0,0 +1,53 @@ +import { ConfigProvider } from "antd" +import { StoreProvider } from "@/store"; +import type { Metadata, Viewport } from "next"; + +import './global.css' + + +export const metadata: Metadata = { + title: "Astra.ai", + description: "A multimodal agent powered by TEN", + appleWebApp: { + capable: true, + statusBarStyle: "black", + } +}; + +export const viewport: Viewport = { + width: "device-width", + initialScale: 1, + minimumScale: 1, + maximumScale: 1, + userScalable: false, + viewportFit: "cover", +} + + + + +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + return ( + + + + + {children} + + + + + ); +} diff --git a/demo/src/app/page.tsx b/demo/src/app/page.tsx new file mode 100644 index 00000000..1bdcdeda --- /dev/null +++ b/demo/src/app/page.tsx @@ -0,0 +1,14 @@ +import LoginCard from "@/components/loginCard" +import styles from "./index.module.scss" + +export default function Login() { + + return ( +
+
+
+
+ +
+ ); +} diff --git a/demo/src/assets/background.jpg b/demo/src/assets/background.jpg new file mode 100644 index 0000000000000000000000000000000000000000..027623438677ced6d9c14ca92075cc8c6486158e GIT binary patch literal 95856 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�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 jgW4Gv%HDF>#`k<@6t9! + + diff --git a/demo/src/assets/cam_unmute.svg b/demo/src/assets/cam_unmute.svg new file mode 100644 index 00000000..1eebfaa6 --- /dev/null +++ b/demo/src/assets/cam_unmute.svg @@ -0,0 +1,3 @@ + + + diff --git a/demo/src/assets/color_picker.svg b/demo/src/assets/color_picker.svg new file mode 100644 index 00000000..fb9bb33e --- /dev/null +++ b/demo/src/assets/color_picker.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/demo/src/assets/github.svg b/demo/src/assets/github.svg new file mode 100644 index 00000000..e6566c41 --- /dev/null +++ b/demo/src/assets/github.svg @@ -0,0 +1,3 @@ + + + diff --git a/demo/src/assets/info.svg b/demo/src/assets/info.svg new file mode 100644 index 00000000..8ca99511 --- /dev/null +++ b/demo/src/assets/info.svg @@ -0,0 +1,3 @@ + + + diff --git a/demo/src/assets/logo.svg b/demo/src/assets/logo.svg new file mode 100644 index 00000000..af99893a --- /dev/null +++ b/demo/src/assets/logo.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo/src/assets/logo_small.svg b/demo/src/assets/logo_small.svg new file mode 100644 index 00000000..34e755bd --- /dev/null +++ b/demo/src/assets/logo_small.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo/src/assets/mic_mute.svg b/demo/src/assets/mic_mute.svg new file mode 100644 index 00000000..dd4a17dd --- /dev/null +++ b/demo/src/assets/mic_mute.svg @@ -0,0 +1,3 @@ + + + diff --git a/demo/src/assets/mic_unmute.svg b/demo/src/assets/mic_unmute.svg new file mode 100644 index 00000000..18e78236 --- /dev/null +++ b/demo/src/assets/mic_unmute.svg @@ -0,0 +1,3 @@ + + + diff --git a/demo/src/assets/network/average.svg b/demo/src/assets/network/average.svg new file mode 100644 index 00000000..9a27072f --- /dev/null +++ b/demo/src/assets/network/average.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/demo/src/assets/network/disconnected.svg b/demo/src/assets/network/disconnected.svg new file mode 100644 index 00000000..b7db1d71 --- /dev/null +++ b/demo/src/assets/network/disconnected.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/demo/src/assets/network/excellent.svg b/demo/src/assets/network/excellent.svg new file mode 100644 index 00000000..55b9fc9e --- /dev/null +++ b/demo/src/assets/network/excellent.svg @@ -0,0 +1,6 @@ + + + + diff --git a/demo/src/assets/network/good.svg b/demo/src/assets/network/good.svg new file mode 100644 index 00000000..8c36a7e7 --- /dev/null +++ b/demo/src/assets/network/good.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/demo/src/assets/network/poor.svg b/demo/src/assets/network/poor.svg new file mode 100644 index 00000000..d9df0238 --- /dev/null +++ b/demo/src/assets/network/poor.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/demo/src/assets/pdf.svg b/demo/src/assets/pdf.svg new file mode 100644 index 00000000..dc67f4d5 --- /dev/null +++ b/demo/src/assets/pdf.svg @@ -0,0 +1,3 @@ + + + diff --git a/demo/src/assets/transcription.svg b/demo/src/assets/transcription.svg new file mode 100644 index 00000000..8b887a6f --- /dev/null +++ b/demo/src/assets/transcription.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/demo/src/assets/voice.svg b/demo/src/assets/voice.svg new file mode 100644 index 00000000..86a880b0 --- /dev/null +++ b/demo/src/assets/voice.svg @@ -0,0 +1,3 @@ + + + diff --git a/demo/src/common/constant.ts b/demo/src/common/constant.ts new file mode 100644 index 00000000..fee0c18e --- /dev/null +++ b/demo/src/common/constant.ts @@ -0,0 +1,88 @@ +import { IOptions, ColorItem, LanguageOptionItem, VoiceOptionItem, GraphOptionItem } from "@/types" +export const GITHUB_URL = "https://github.com/TEN-framework/ASTRA.ai" +export const OPTIONS_KEY = "__options__" +export const DEFAULT_OPTIONS: IOptions = { + channel: "", + userName: "", + userId: 0 +} +export const DESCRIPTION = "This is an AI voice assistant powered by ASTRA.ai framework, Agora, Azure and ChatGPT." +export const LANGUAGE_OPTIONS: LanguageOptionItem[] = [ + { + label: "English", + value: "en-US" + }, + { + label: "Chinese", + value: "zh-CN" + }, + { + label: "Korean", + value: "ko-KR" + }, + { + label: "Japanese", + value: "ja-JP" + } +] +export const GRAPH_OPTIONS: GraphOptionItem[] = [ + { + label: "Voice Agent - OpenAI LLM + Azure TTS", + value: "va.openai.azure" + }, + { + label: "Voice Agent with Vision - OpenAI LLM + Azure TTS", + value: "camera.va.openai.azure" + }, + { + label: "Voice Agent with Knowledge - RAG + Qwen LLM + Cosy TTS", + value: "va.qwen.rag" + }, +] + +export const isRagGraph = (graphName: string) => { + return graphName === "va.qwen.rag" +} + +export const VOICE_OPTIONS: VoiceOptionItem[] = [ + { + label: "Male", + value: "male" + }, + { + label: "Female", + value: "female" + } +] +export const COLOR_LIST: ColorItem[] = [{ + active: "#0888FF", + default: "#143354" +}, { + active: "#563FD8", + default: "#2C2553" +}, +{ + active: "#18A957", + default: "#173526" +}, { + active: "#FFAB08", + default: "#423115" +}, { + active: "#FD5C63", + default: "#462629" +}, { + active: "#E225B2", + default: "#481C3F" +}] + +export type VoiceTypeMap = { + [voiceType: string]: string; +}; + +export type VendorNameMap = { + [vendorName: string]: VoiceTypeMap; +}; + +export type LanguageMap = { + [language: string]: VendorNameMap; +}; \ No newline at end of file diff --git a/demo/src/common/hooks.ts b/demo/src/common/hooks.ts new file mode 100644 index 00000000..9759fa29 --- /dev/null +++ b/demo/src/common/hooks.ts @@ -0,0 +1,131 @@ +"use client" + +import { IMicrophoneAudioTrack } from "agora-rtc-sdk-ng" +import { normalizeFrequencies } from "./utils" +import { useState, useEffect, useMemo, useRef } from "react" +import type { AppDispatch, AppStore, RootState } from "../store" +import { useDispatch, useSelector, useStore } from "react-redux" +import { Grid } from "antd" + +const { useBreakpoint } = Grid; + +export const useAppDispatch = useDispatch.withTypes() +export const useAppSelector = useSelector.withTypes() +export const useAppStore = useStore.withTypes() + +export const useMultibandTrackVolume = ( + track?: IMicrophoneAudioTrack | MediaStreamTrack, + bands: number = 5, + loPass: number = 100, + hiPass: number = 600 +) => { + const [frequencyBands, setFrequencyBands] = useState([]); + + useEffect(() => { + if (!track) { + return setFrequencyBands(new Array(bands).fill(new Float32Array(0))) + } + + const ctx = new AudioContext(); + let finTrack = track instanceof MediaStreamTrack ? track : track.getMediaStreamTrack() + const mediaStream = new MediaStream([finTrack]); + const source = ctx.createMediaStreamSource(mediaStream); + const analyser = ctx.createAnalyser(); + analyser.fftSize = 2048 + + source.connect(analyser); + + const bufferLength = analyser.frequencyBinCount; + const dataArray = new Float32Array(bufferLength); + + const updateVolume = () => { + analyser.getFloatFrequencyData(dataArray); + let frequencies: Float32Array = new Float32Array(dataArray.length); + for (let i = 0; i < dataArray.length; i++) { + frequencies[i] = dataArray[i]; + } + frequencies = frequencies.slice(loPass, hiPass); + + const normalizedFrequencies = normalizeFrequencies(frequencies); + const chunkSize = Math.ceil(normalizedFrequencies.length / bands); + const chunks: Float32Array[] = []; + for (let i = 0; i < bands; i++) { + chunks.push( + normalizedFrequencies.slice(i * chunkSize, (i + 1) * chunkSize) + ); + } + + setFrequencyBands(chunks); + }; + + const interval = setInterval(updateVolume, 10); + + return () => { + source.disconnect(); + clearInterval(interval); + }; + }, [track, loPass, hiPass, bands]); + + return frequencyBands; +}; + +export const useAutoScroll = (ref: React.RefObject) => { + + const callback: MutationCallback = (mutationList, observer) => { + mutationList.forEach((mutation) => { + switch (mutation.type) { + case "childList": + if (!ref.current) { + return + } + ref.current.scrollTop = ref.current.scrollHeight; + break; + } + }) + } + + useEffect(() => { + if (!ref.current) { + return; + } + const observer = new MutationObserver(callback); + observer.observe(ref.current, { + childList: true, + subtree: true + }); + + return () => { + observer.disconnect(); + }; + }, [ref]); +} + +export const useSmallScreen = () => { + const screens = useBreakpoint(); + + const xs = useMemo(() => { + return !screens.sm && screens.xs + }, [screens]) + + const sm = useMemo(() => { + return !screens.md && screens.sm + }, [screens]) + + return { + xs, + sm, + isSmallScreen: xs || sm + } +} + +export const usePrevious = (value: any) => { + const ref = useRef(); + + useEffect(() => { + ref.current = value; + }, [value]); + + return ref.current; +}; + + diff --git a/demo/src/common/index.ts b/demo/src/common/index.ts new file mode 100644 index 00000000..3c2b0300 --- /dev/null +++ b/demo/src/common/index.ts @@ -0,0 +1,6 @@ +export * from "./hooks" +export * from "./constant" +export * from "./utils" +export * from "./storage" +export * from "./request" +export * from "./mock" diff --git a/demo/src/common/mock.ts b/demo/src/common/mock.ts new file mode 100644 index 00000000..db1e2ff8 --- /dev/null +++ b/demo/src/common/mock.ts @@ -0,0 +1,41 @@ +import { getRandomUserId } from "./utils" +import { IChatItem } from "@/types" + + +const SENTENCES = [ + "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", + "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium.", + "Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit.", + "Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit.", + "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.", + "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", +] + + +export const genRandomParagraph = (num: number = 0): string => { + let paragraph = "" + for (let i = 0; i < num; i++) { + const randomIndex = Math.floor(Math.random() * SENTENCES.length) + paragraph += SENTENCES[randomIndex] + " " + } + + return paragraph.trim() +} + + +export const genRandomChatList = (num: number = 10): IChatItem[] => { + const arr: IChatItem[] = [] + for (let i = 0; i < num; i++) { + const type = Math.random() > 0.5 ? "agent" : "user" + arr.push({ + userId: getRandomUserId(), + userName: type == "agent" ? "Agent" : "You", + text: genRandomParagraph(3), + type, + time: Date.now(), + }) + } + + return arr +} diff --git a/demo/src/common/request.ts b/demo/src/common/request.ts new file mode 100644 index 00000000..160cc065 --- /dev/null +++ b/demo/src/common/request.ts @@ -0,0 +1,133 @@ +import { genUUID } from "./utils" +import { Language } from "@/types" + +interface StartRequestConfig { + channel: string + userId: number, + graphName: string, + language: Language, + voiceType: "male" | "female" +} + +interface GenAgoraDataConfig { + userId: string | number + channel: string +} + +export const apiGenAgoraData = async (config: GenAgoraDataConfig) => { + // the request will be rewrite at next.config.mjs to send to $AGENT_SERVER_URL + const url = `/api/token/generate` + const { userId, channel } = config + const data = { + request_id: genUUID(), + uid: userId, + channel_name: channel + } + let resp: any = await fetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(data), + }) + resp = (await resp.json()) || {} + return resp +} + +export const apiStartService = async (config: StartRequestConfig): Promise => { + // look at app/api/agents/start/route.tsx for the server-side implementation + const url = `/api/agents/start` + const { channel, userId, graphName, language, voiceType } = config + const data = { + request_id: genUUID(), + channel_name: channel, + user_uid: userId, + graph_name: graphName, + language, + voice_type: voiceType + } + let resp: any = await fetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(data), + }) + resp = (await resp.json()) || {} + return resp +} + +export const apiStopService = async (channel: string) => { + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL + const url = `/api/agents/stop` + const data = { + request_id: genUUID(), + channel_name: channel + } + let resp = await fetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(data), + }) + resp = (await resp.json()) || {} + return resp +} + +export const apiGetDocumentList = async () => { + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL + const url = `/api/vector/document/preset/list` + let resp: any = await fetch(url, { + method: "GET", + headers: { + "Content-Type": "application/json", + }, + }) + resp = (await resp.json()) || {} + if (resp.code !== "0") { + throw new Error(resp.msg) + } + return resp +} + +export const apiUpdateDocument = async (options: { channel: string, collection: string, fileName: string }) => { + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL + const url = `/api/vector/document/update` + const { channel, collection, fileName } = options + const data = { + request_id: genUUID(), + channel_name: channel, + collection: collection, + file_name: fileName + } + let resp: any = await fetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(data), + }) + resp = (await resp.json()) || {} + return resp +} + + +// ping/pong +export const apiPing = async (channel: string) => { + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL + const url = `/api/agents/ping` + const data = { + request_id: genUUID(), + channel_name: channel + } + let resp = await fetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(data), + }) + resp = (await resp.json()) || {} + return resp +} diff --git a/demo/src/common/storage.ts b/demo/src/common/storage.ts new file mode 100644 index 00000000..ed96083d --- /dev/null +++ b/demo/src/common/storage.ts @@ -0,0 +1,21 @@ +import { IOptions } from "@/types" +import { OPTIONS_KEY, DEFAULT_OPTIONS } from "./constant" + +export const getOptionsFromLocal = () => { + if (typeof window !== "undefined") { + const data = localStorage.getItem(OPTIONS_KEY) + if (data) { + return JSON.parse(data) + } + } + return DEFAULT_OPTIONS +} + + +export const setOptionsToLocal = (options: IOptions) => { + if (typeof window !== "undefined") { + localStorage.setItem(OPTIONS_KEY, JSON.stringify(options)) + } +} + + diff --git a/demo/src/common/utils.ts b/demo/src/common/utils.ts new file mode 100644 index 00000000..1d6f0d00 --- /dev/null +++ b/demo/src/common/utils.ts @@ -0,0 +1,59 @@ +export const genRandomString = (length: number = 10) => { + let result = ''; + const characters = 'abcdefghijklmnopqrstuvwxyz0123456789'; + const charactersLength = characters.length; + + for (let i = 0; i < length; i++) { + result += characters.charAt(Math.floor(Math.random() * charactersLength)); + } + + return result; +} + + +export const getRandomUserId = (): number => { + return Math.floor(Math.random() * 99999) + 100000 +} + +export const getRandomChannel = (number = 6) => { + return "agora_" + genRandomString(number) +} + + +export const sleep = (ms: number) => { + return new Promise(resolve => setTimeout(resolve, ms)); +} + + +export const normalizeFrequencies = (frequencies: Float32Array) => { + const normalizeDb = (value: number) => { + const minDb = -100; + const maxDb = -10; + let db = 1 - (Math.max(minDb, Math.min(maxDb, value)) * -1) / 100; + db = Math.sqrt(db); + + return db; + }; + + // Normalize all frequency values + return frequencies.map((value) => { + if (value === -Infinity) { + return 0; + } + return normalizeDb(value); + }); +}; + + +export const genUUID = () => { + return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) { + const r = (Math.random() * 16) | 0 + const v = c === "x" ? r : (r & 0x3) | 0x8 + return v.toString(16) + }) +} + + +export const isMobile = () => { + return /Mobile|iPhone|iPad|Android|Windows Phone/i.test(navigator.userAgent) +} \ No newline at end of file diff --git a/demo/src/components/authInitializer/index.tsx b/demo/src/components/authInitializer/index.tsx new file mode 100644 index 00000000..5ef763a1 --- /dev/null +++ b/demo/src/components/authInitializer/index.tsx @@ -0,0 +1,29 @@ +"use client" + +import { ReactNode, useEffect } from "react" +import { useAppDispatch, getOptionsFromLocal } from "@/common" +import { setOptions, reset } from "@/store/reducers/global" + +interface AuthInitializerProps { + children: ReactNode; +} + +const AuthInitializer = (props: AuthInitializerProps) => { + const { children } = props; + const dispatch = useAppDispatch() + + useEffect(() => { + if (typeof window !== "undefined") { + const options = getOptionsFromLocal() + if (options) { + dispatch(reset()) + dispatch(setOptions(options)) + } + } + }, [dispatch]) + + return children +} + + +export default AuthInitializer; diff --git a/demo/src/components/customSelect/index.module.scss b/demo/src/components/customSelect/index.module.scss new file mode 100644 index 00000000..0649e994 --- /dev/null +++ b/demo/src/components/customSelect/index.module.scss @@ -0,0 +1,22 @@ +.selectWrapper { + position: relative; + + .prefixIconWrapper { + position: absolute; + z-index: 1; + width: 3rem; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } + + :global(.customSelect) { + width: 100%; + + :global(.ant-select-selector) { + padding-left: calc(3rem - 8px) !important; + } + } + +} diff --git a/demo/src/components/customSelect/index.tsx b/demo/src/components/customSelect/index.tsx new file mode 100644 index 00000000..8dd1b188 --- /dev/null +++ b/demo/src/components/customSelect/index.tsx @@ -0,0 +1,19 @@ +import { Select, SelectProps } from "antd" +import styles from "./index.module.scss" + +type CustomSelectProps = SelectProps & { + prefixIcon?: React.ReactNode; +} + +const CustomSelect = (props: CustomSelectProps) => { + + const { prefixIcon, className, ...rest } = props; + + return
+ {prefixIcon &&
{prefixIcon}
} + +
+} + + +export default CustomSelect diff --git a/demo/src/components/icons/cam/index.tsx b/demo/src/components/icons/cam/index.tsx new file mode 100644 index 00000000..628e651c --- /dev/null +++ b/demo/src/components/icons/cam/index.tsx @@ -0,0 +1,17 @@ +import camMuteSvg from "@/assets/cam_mute.svg" +import camUnMuteSvg from "@/assets/cam_unmute.svg" +import { IconProps } from "../types" + +interface ICamIconProps extends IconProps { + active?: boolean +} + +export const CamIcon = (props: ICamIconProps) => { + const { active, ...rest } = props + + if (active) { + return camUnMuteSvg(rest) + } else { + return camMuteSvg(rest) + } +} diff --git a/demo/src/components/icons/colorPicker/index.tsx b/demo/src/components/icons/colorPicker/index.tsx new file mode 100644 index 00000000..81efcb12 --- /dev/null +++ b/demo/src/components/icons/colorPicker/index.tsx @@ -0,0 +1,6 @@ +import { IconProps } from "../types" +import ColorPickerSvg from "@/assets/color_picker.svg" + +export const ColorPickerIcon = (props: IconProps) => { + return +} diff --git a/demo/src/components/icons/github/index.tsx b/demo/src/components/icons/github/index.tsx new file mode 100644 index 00000000..cee01b8b --- /dev/null +++ b/demo/src/components/icons/github/index.tsx @@ -0,0 +1,6 @@ +import { IconProps } from "../types" +import GithubSvg from "@/assets/github.svg" + +export const GithubIcon = (props: IconProps) => { + return +} diff --git a/demo/src/components/icons/index.tsx b/demo/src/components/icons/index.tsx new file mode 100644 index 00000000..e303674a --- /dev/null +++ b/demo/src/components/icons/index.tsx @@ -0,0 +1,10 @@ +export * from "./mic" +export * from "./cam" +export * from "./network" +export * from "./github" +export * from "./transcription" +export * from "./logo" +export * from "./info" +export * from "./colorPicker" +export * from "./voice" +export * from "./pdf" diff --git a/demo/src/components/icons/info/index.tsx b/demo/src/components/icons/info/index.tsx new file mode 100644 index 00000000..cf783be9 --- /dev/null +++ b/demo/src/components/icons/info/index.tsx @@ -0,0 +1,6 @@ +import { IconProps } from "../types" +import InfoSvg from "@/assets/info.svg" + +export const InfoIcon = (props: IconProps) => { + return +} diff --git a/demo/src/components/icons/logo/index.tsx b/demo/src/components/icons/logo/index.tsx new file mode 100644 index 00000000..f86d5246 --- /dev/null +++ b/demo/src/components/icons/logo/index.tsx @@ -0,0 +1,8 @@ +import { IconProps } from "../types" +import LogoSvg from "@/assets/logo.svg" +import SmallLogoSvg from "@/assets/logo_small.svg" + +export const LogoIcon = (props: IconProps) => { + const { size = "default" } = props + return size == "small" ? : +} diff --git a/demo/src/components/icons/mic/index.tsx b/demo/src/components/icons/mic/index.tsx new file mode 100644 index 00000000..0a693033 --- /dev/null +++ b/demo/src/components/icons/mic/index.tsx @@ -0,0 +1,23 @@ +import { IconProps } from "../types" +import micMuteSvg from "@/assets/mic_mute.svg" +import micUnMuteSvg from "@/assets/mic_unmute.svg" + +interface IMicIconProps extends IconProps { + active?: boolean +} + +export const MicIcon = (props: IMicIconProps) => { + const { active, color, ...rest } = props + + if (active) { + return micUnMuteSvg({ + color: color || "#3D53F5", + ...rest, + }) + } else { + return micMuteSvg({ + color: color || "#667085", + ...rest, + }) + } +} diff --git a/demo/src/components/icons/network/index.tsx b/demo/src/components/icons/network/index.tsx new file mode 100644 index 00000000..1950cda7 --- /dev/null +++ b/demo/src/components/icons/network/index.tsx @@ -0,0 +1,33 @@ +import averageSvg from "@/assets/network/average.svg" +import goodSvg from "@/assets/network/good.svg" +import poorSvg from "@/assets/network/poor.svg" +import disconnectedSvg from "@/assets/network/disconnected.svg" +import excellentSvg from "@/assets/network/excellent.svg" + +import { IconProps } from "../types" + +interface INetworkIconProps extends IconProps { + level?: number +} + +export const NetworkIcon = (props: INetworkIconProps) => { + const { level, ...rest } = props + switch (level) { + case 0: + return disconnectedSvg(rest) + case 1: + return excellentSvg(rest) + case 2: + return goodSvg(rest) + case 3: + return averageSvg(rest) + case 4: + return averageSvg(rest) + case 5: + return poorSvg(rest) + case 6: + return disconnectedSvg(rest) + default: + return disconnectedSvg(rest) + } +} diff --git a/demo/src/components/icons/pdf/index.tsx b/demo/src/components/icons/pdf/index.tsx new file mode 100644 index 00000000..83de8b2d --- /dev/null +++ b/demo/src/components/icons/pdf/index.tsx @@ -0,0 +1,6 @@ +import { IconProps } from "../types" +import PdfSvg from "@/assets/pdf.svg" + +export const PdfIcon = (props: IconProps) => { + return +} diff --git a/demo/src/components/icons/transcription/index.tsx b/demo/src/components/icons/transcription/index.tsx new file mode 100644 index 00000000..757adbce --- /dev/null +++ b/demo/src/components/icons/transcription/index.tsx @@ -0,0 +1,6 @@ +import { IconProps } from "../types" +import TranscriptionSvg from "@/assets/transcription.svg" + +export const TranscriptionIcon = (props: IconProps) => { + return +} diff --git a/demo/src/components/icons/types.ts b/demo/src/components/icons/types.ts new file mode 100644 index 00000000..c37e8133 --- /dev/null +++ b/demo/src/components/icons/types.ts @@ -0,0 +1,10 @@ +export interface IconProps { + width?: number + height?: number + color?: string + viewBox?: string + size?: "small" | "default" + // style?: React.CSSProperties + transform?: string + onClick?: () => void +} diff --git a/demo/src/components/icons/voice/index.tsx b/demo/src/components/icons/voice/index.tsx new file mode 100644 index 00000000..87164cea --- /dev/null +++ b/demo/src/components/icons/voice/index.tsx @@ -0,0 +1,6 @@ +import { IconProps } from "../types" +import VoiceSvg from "@/assets/voice.svg" + +export const VoiceIcon = (props: IconProps) => { + return +} diff --git a/demo/src/components/loginCard/index.module.scss b/demo/src/components/loginCard/index.module.scss new file mode 100644 index 00000000..966ebc20 --- /dev/null +++ b/demo/src/components/loginCard/index.module.scss @@ -0,0 +1,112 @@ +.card { + position: absolute; + top: 45%; + left: 50%; + transform: translate(-50%, -50%); + display: flex; + width: 368px; + padding: 100px 24px 40px 24px; + flex-direction: column; + justify-content: center; + align-items: center; + border-radius: 20px; + border: 1px solid #20272D; + background: linear-gradient(154deg, rgba(31, 69, 141, 0.16) 0%, rgba(31, 69, 141, 0.00) 30%), linear-gradient(153deg, rgba(31, 54, 97, 0.00) 53.75%, #1F458D 100%), rgba(15, 15, 17, 0.10); + box-shadow: 0px 3.999px 48.988px 0px rgba(0, 7, 72, 0.12); + backdrop-filter: blur(8.8px); + + .top { + .github { + position: absolute; + right: 24px; + top: 24px; + display: flex; + padding: 4px 8px 4px 4px; + align-items: center; + gap: 4px; + border-radius: 100px; + border: 1px solid #2B2F36; + cursor: pointer; + + .text { + color: var(--Grey-300, #EAECF0); + font-size: 12px; + line-height: 150%; + } + } + } + + .content { + + .title { + margin-bottom: 32px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 12px; + + .text { + margin-top: 8px; + color: var(--Grey-300, #EAECF0); + text-align: center; + font-size: 18px; + font-weight: 500; + } + } + + .section { + + input { + display: flex; + width: 320px; + flex-direction: column; + align-items: flex-start; + gap: 6px; + display: flex; + height: 38px; + padding: 12px 8px; + align-items: center; + gap: 8px; + align-self: stretch; + border-radius: 6px; + border: 1px solid #2B2F36; + box-shadow: 0px 4.282px 52.456px 0px rgba(0, 7, 72, 0.12); + backdrop-filter: blur(13px); + box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.20); + } + + .btn { + display: flex; + padding: 10px 18px; + justify-content: center; + align-items: center; + gap: 8px; + align-self: stretch; + border-radius: 8px; + background: var(--primary-500-base, #0888FF); + box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05); + cursor: pointer; + + .btnText { + color: var(---white, #FFF); + font-size: 16px; + font-weight: 500; + line-height: 24px; + } + } + } + + .section+.section { + margin-top: 24px; + } + + .version { + text-align: center; + margin-top: 32px; + color: var(--Grey-600, #667085); + line-height: 22px; + } + + } +} diff --git a/demo/src/components/loginCard/index.tsx b/demo/src/components/loginCard/index.tsx new file mode 100644 index 00000000..56a78986 --- /dev/null +++ b/demo/src/components/loginCard/index.tsx @@ -0,0 +1,77 @@ +"use client" + +import packageData from "../../../package.json" +import { useRouter } from 'next/navigation' +import { message } from "antd" +import { useState } from "react" +import { GithubIcon, LogoIcon } from "../icons" +import { GITHUB_URL, getRandomUserId, useAppDispatch, getRandomChannel } from "@/common" +import { setOptions } from "@/store/reducers/global" +import styles from "./index.module.scss" + + +const { version } = packageData + +const LoginCard = () => { + const dispatch = useAppDispatch() + const router = useRouter() + const [userName, setUserName] = useState("") + + const onClickGithub = () => { + if (typeof window !== "undefined") { + window.open(GITHUB_URL, "_blank") + } + } + + const onUserNameChange = (e: any) => { + let value = e.target.value + value = value.replace(/\s/g, ""); + setUserName(value) + } + + + + const onClickJoin = () => { + if (!userName) { + message.error("please input user name") + return + } + const userId = getRandomUserId() + dispatch(setOptions({ + userName, + channel: getRandomChannel(), + userId + })) + router.push("/home") + } + + + return
+
+ + + GitHub + +
+
+
+ + Astra - a multimodal interactive agent +
+
+ +
+
+
+ Join +
+
+
Version {version}
+
+
+ + + return +} + +export default LoginCard diff --git a/demo/src/components/pdfSelect/index.module.scss b/demo/src/components/pdfSelect/index.module.scss new file mode 100644 index 00000000..adb93280 --- /dev/null +++ b/demo/src/components/pdfSelect/index.module.scss @@ -0,0 +1,8 @@ +// .pdfSelect { + // min-width: 200px; + // max-width: 300px; + // } +.dropdownRender { + display: flex; + justify-content: flex-end; +} diff --git a/demo/src/components/pdfSelect/index.tsx b/demo/src/components/pdfSelect/index.tsx new file mode 100644 index 00000000..f593bf1d --- /dev/null +++ b/demo/src/components/pdfSelect/index.tsx @@ -0,0 +1,88 @@ +import { ReactElement, useState } from "react" +import { PdfIcon } from "@/components/icons" +import CustomSelect from "@/components/customSelect" +import { Divider, message } from 'antd'; +import { useEffect } from 'react'; +import { apiGetDocumentList, apiUpdateDocument, useAppSelector } from "@/common" +import PdfUpload from "./upload" +import { OptionType, IPdfData } from "@/types" + +import styles from "./index.module.scss" + +const PdfSelect = () => { + const options = useAppSelector(state => state.global.options) + const { channel } = options + const [pdfOptions, setPdfOptions] = useState([]) + const [selectedPdf, setSelectedPdf] = useState('') + const agentConnected = useAppSelector(state => state.global.agentConnected) + + + useEffect(() => { + if(agentConnected) { + getPDFOptions() + } else { + setPdfOptions([{ + value: '', + label: 'Please select a PDF file' + }]) + } + }, [agentConnected]) + + + const getPDFOptions = async () => { + const res = await apiGetDocumentList() + setPdfOptions([{ + value: '', + label: 'Please select a PDF file' + }].concat(res.data.map((item: any) => { + return { + value: item.collection, + label: item.file_name + } + }))) + setSelectedPdf('') + } + + const onUploadSuccess = (data: IPdfData) => { + setPdfOptions([...pdfOptions, { + value: data.collection, + label: data.fileName + }]) + setSelectedPdf(data.collection) + } + + const pdfDropdownRender = (menu: ReactElement) => { + return <> + {menu} + +
+ +
+ + } + + + const onSelectPdf = async (val: string) => { + const item = pdfOptions.find(item => item.value === val) + if (!item) { + return message.error("Please select a PDF file") + } + setSelectedPdf(val) + await apiUpdateDocument({ + collection: val, + fileName: item.label, + channel + }) + } + + + return } + onChange={onSelectPdf} + value={selectedPdf} + options={pdfOptions} + dropdownRender={pdfDropdownRender} + className={styles.pdfSelect} placeholder="Select a PDF file"> +} + +export default PdfSelect diff --git a/demo/src/components/pdfSelect/upload/index.module.scss b/demo/src/components/pdfSelect/upload/index.module.scss new file mode 100644 index 00000000..fd559b5e --- /dev/null +++ b/demo/src/components/pdfSelect/upload/index.module.scss @@ -0,0 +1,7 @@ +.btn { + color: var(--theme-color, #EAECF0); + + &:hover { + color: var(--theme-color, #EAECF0) !important; + } +} diff --git a/demo/src/components/pdfSelect/upload/index.tsx b/demo/src/components/pdfSelect/upload/index.tsx new file mode 100644 index 00000000..4eab9684 --- /dev/null +++ b/demo/src/components/pdfSelect/upload/index.tsx @@ -0,0 +1,75 @@ +import { Select, Button, message, Upload, UploadProps } from "antd" +import { useState } from "react" +import { PlusOutlined, LoadingOutlined } from '@ant-design/icons'; +import { useAppSelector, genUUID } from "@/common" +import { IPdfData } from "@/types" + +import styles from "./index.module.scss" + +interface PdfSelectProps { + onSuccess?: (data: IPdfData) => void +} + +const PdfUpload = (props: PdfSelectProps) => { + const { onSuccess } = props + const agentConnected = useAppSelector(state => state.global.agentConnected) + const options = useAppSelector(state => state.global.options) + const { channel, userId } = options + + const [uploading, setUploading] = useState(false) + + const uploadProps: UploadProps = { + accept: "application/pdf", + maxCount: 1, + showUploadList: false, + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL + action: `/api/vector/document/upload`, + data: { + channel_name: channel, + uid: String(userId), + request_id: genUUID() + }, + onChange: (info) => { + const { file } = info + const { status, name } = file + if (status == "uploading") { + setUploading(true) + } else if (status == 'done') { + setUploading(false) + const { response } = file + if (response.code == "0") { + message.success(`Upload ${name} success`) + const { collection, file_name } = response.data + onSuccess && onSuccess({ + fileName: file_name, + collection + }) + } else { + message.error(response.msg) + } + } else if (status == 'error') { + setUploading(false) + message.error(`Upload ${name} failed`) + } + } + } + + const onClickUploadPDF = (e: any) => { + if (!agentConnected) { + message.error("Please connect to agent first") + e.stopPropagation() + } + } + + + return + + +} + + +export default PdfUpload diff --git a/demo/src/manager/events.ts b/demo/src/manager/events.ts new file mode 100644 index 00000000..055c6d87 --- /dev/null +++ b/demo/src/manager/events.ts @@ -0,0 +1,51 @@ +import { EventHandler } from "./types" + +export class AGEventEmitter { + private readonly _eventMap: Map[]> = new Map() + + once(evt: Key, cb: T[Key]) { + const wrapper = (...args: any[]) => { + this.off(evt, wrapper as any) + ;(cb as any)(...args) + } + this.on(evt, wrapper as any) + return this + } + + on(evt: Key, cb: T[Key]) { + const cbs = this._eventMap.get(evt) ?? [] + cbs.push(cb as any) + this._eventMap.set(evt, cbs) + return this + } + + off(evt: Key, cb: T[Key]) { + const cbs = this._eventMap.get(evt) + if (cbs) { + this._eventMap.set( + evt, + cbs.filter((it) => it !== cb), + ) + } + return this + } + + removeAllEventListeners(): void { + this._eventMap.clear() + } + + emit(evt: Key, ...args: any[]) { + const cbs = this._eventMap.get(evt) ?? [] + for (const cb of cbs) { + try { + cb && cb(...args) + } catch (e) { + // cb exception should not affect other callbacks + const error = e as Error + const details = error.stack || error.message + console.error(`[event] handling event ${evt.toString()} fail: ${details}`) + } + } + return this + } +} diff --git a/demo/src/manager/index.ts b/demo/src/manager/index.ts new file mode 100644 index 00000000..fa9dfbf2 --- /dev/null +++ b/demo/src/manager/index.ts @@ -0,0 +1 @@ +export * from "./rtc" diff --git a/demo/src/manager/rtc/index.ts b/demo/src/manager/rtc/index.ts new file mode 100644 index 00000000..e9fd6272 --- /dev/null +++ b/demo/src/manager/rtc/index.ts @@ -0,0 +1,2 @@ +export * from "./rtc" +export * from "./types" diff --git a/demo/src/manager/rtc/rtc.ts b/demo/src/manager/rtc/rtc.ts new file mode 100644 index 00000000..4139d89e --- /dev/null +++ b/demo/src/manager/rtc/rtc.ts @@ -0,0 +1,199 @@ +"use client" + +import protoRoot from "@/protobuf/SttMessage_es6.js" +import AgoraRTC, { + IAgoraRTCClient, + IMicrophoneAudioTrack, + IRemoteAudioTrack, + UID, +} from "agora-rtc-sdk-ng" +import { ITextItem } from "@/types" +import { AGEventEmitter } from "../events" +import { RtcEvents, IUserTracks } from "./types" +import { apiGenAgoraData } from "@/common" + +export class RtcManager extends AGEventEmitter { + private _joined + client: IAgoraRTCClient + localTracks: IUserTracks + + constructor() { + super() + this._joined = false + this.localTracks = {} + this.client = AgoraRTC.createClient({ mode: "rtc", codec: "vp8" }) + this._listenRtcEvents() + } + + async join({ channel, userId }: { channel: string; userId: number }) { + if (!this._joined) { + const res = await apiGenAgoraData({ channel, userId }) + const { code, data } = res + if (code != 0) { + throw new Error("Failed to get Agora token") + } + const { appId, token } = data + await this.client?.join(appId, channel, token, userId) + this._joined = true + } + } + + async createTracks() { + try { + const videoTrack = await AgoraRTC.createCameraVideoTrack() + this.localTracks.videoTrack = videoTrack + } catch (err) { + console.error("Failed to create video track", err) + } + try { + const audioTrack = await AgoraRTC.createMicrophoneAudioTrack() + this.localTracks.audioTrack = audioTrack + } catch (err) { + console.error("Failed to create audio track", err) + } + this.emit("localTracksChanged", this.localTracks) + } + + async publish() { + const tracks = [] + if (this.localTracks.videoTrack) { + tracks.push(this.localTracks.videoTrack) + } + if (this.localTracks.audioTrack) { + tracks.push(this.localTracks.audioTrack) + } + if (tracks.length) { + await this.client.publish(tracks) + } + } + + async destroy() { + this.localTracks?.audioTrack?.close() + this.localTracks?.videoTrack?.close() + if (this._joined) { + await this.client?.leave() + } + this._resetData() + } + + // ----------- public methods ------------ + + // -------------- private methods -------------- + private _listenRtcEvents() { + this.client.on("network-quality", (quality) => { + this.emit("networkQuality", quality) + }) + this.client.on("user-published", async (user, mediaType) => { + await this.client.subscribe(user, mediaType) + if (mediaType === "audio") { + this._playAudio(user.audioTrack) + } + this.emit("remoteUserChanged", { + userId: user.uid, + audioTrack: user.audioTrack, + videoTrack: user.videoTrack, + }) + }) + this.client.on("user-unpublished", async (user, mediaType) => { + await this.client.unsubscribe(user, mediaType) + this.emit("remoteUserChanged", { + userId: user.uid, + audioTrack: user.audioTrack, + videoTrack: user.videoTrack, + }) + }) + this.client.on("stream-message", (uid: UID, stream: any) => { + this._parseData(stream) + }) + } + + private _parseData(data: any): ITextItem | void { + let decoder = new TextDecoder('utf-8'); + let decodedMessage = decoder.decode(data); + const textstream = JSON.parse(decodedMessage); + + console.log("[test] textstream raw data", JSON.stringify(textstream)); + + const { stream_id, is_final, text, text_ts, data_type, message_id, part_number, total_parts } = textstream; + + if (total_parts > 0) { + // If message is split, handle it accordingly + this._handleSplitMessage(message_id, part_number, total_parts, stream_id, is_final, text, text_ts); + } else { + // If there is no message_id, treat it as a complete message + this._handleCompleteMessage(stream_id, is_final, text, text_ts); + } + } + + private messageCache: { [key: string]: { parts: string[], totalParts: number } } = {}; + + /** + * Handle complete messages (not split). + */ + private _handleCompleteMessage(stream_id: number, is_final: boolean, text: string, text_ts: number): void { + const textItem: ITextItem = { + uid: `${stream_id}`, + time: text_ts, + dataType: "transcribe", + text: text, + isFinal: is_final + }; + + if (text.trim().length > 0) { + this.emit("textChanged", textItem); + } + } + + /** + * Handle split messages, track parts, and reassemble once all parts are received. + */ + private _handleSplitMessage( + message_id: string, + part_number: number, + total_parts: number, + stream_id: number, + is_final: boolean, + text: string, + text_ts: number + ): void { + // Ensure the messageCache entry exists for this message_id + if (!this.messageCache[message_id]) { + this.messageCache[message_id] = { parts: [], totalParts: total_parts }; + } + + const cache = this.messageCache[message_id]; + + // Store the received part at the correct index (part_number starts from 1, so we use part_number - 1) + cache.parts[part_number - 1] = text; + + // Check if all parts have been received + const receivedPartsCount = cache.parts.filter(part => part !== undefined).length; + + if (receivedPartsCount === total_parts) { + // All parts have been received, reassemble the message + const fullText = cache.parts.join(''); + + // Now that the message is reassembled, handle it like a complete message + this._handleCompleteMessage(stream_id, is_final, fullText, text_ts); + + // Remove the cached message since it is now fully processed + delete this.messageCache[message_id]; + } + } + + + _playAudio(audioTrack: IMicrophoneAudioTrack | IRemoteAudioTrack | undefined) { + if (audioTrack && !audioTrack.isPlaying) { + audioTrack.play() + } + } + + + private _resetData() { + this.localTracks = {} + this._joined = false + } +} + + +export const rtcManager = new RtcManager() diff --git a/demo/src/manager/rtc/types.ts b/demo/src/manager/rtc/types.ts new file mode 100644 index 00000000..15e3f515 --- /dev/null +++ b/demo/src/manager/rtc/types.ts @@ -0,0 +1,25 @@ +import { + UID, + IAgoraRTCRemoteUser, + IAgoraRTCClient, + ICameraVideoTrack, + IMicrophoneAudioTrack, + NetworkQuality, +} from "agora-rtc-sdk-ng" +import { ITextItem } from "@/types" + +export interface IRtcUser extends IUserTracks { + userId: UID +} + +export interface RtcEvents { + remoteUserChanged: (user: IRtcUser) => void + localTracksChanged: (tracks: IUserTracks) => void + networkQuality: (quality: NetworkQuality) => void + textChanged: (text: ITextItem) => void +} + +export interface IUserTracks { + videoTrack?: ICameraVideoTrack + audioTrack?: IMicrophoneAudioTrack +} diff --git a/demo/src/manager/types.ts b/demo/src/manager/types.ts new file mode 100644 index 00000000..50e5b1c0 --- /dev/null +++ b/demo/src/manager/types.ts @@ -0,0 +1 @@ +export type EventHandler = (...data: T) => void diff --git a/demo/src/middleware.tsx b/demo/src/middleware.tsx new file mode 100644 index 00000000..724e0b4d --- /dev/null +++ b/demo/src/middleware.tsx @@ -0,0 +1,44 @@ +// middleware.js +import { NextRequest, NextResponse } from 'next/server'; + + +const { AGENT_SERVER_URL } = process.env; + +// Check if environment variables are available +if (!AGENT_SERVER_URL) { + throw "Environment variables AGENT_SERVER_URL are not available"; +} + +export function middleware(req: NextRequest) { + const { pathname } = req.nextUrl; + + if (pathname.startsWith('/api/agents/')) { + if (!pathname.startsWith('/api/agents/start')) { + + // Proxy all other agents API requests + const url = req.nextUrl.clone(); + url.href = `${AGENT_SERVER_URL}${pathname.replace('/api/agents/', '/')}`; + + // console.log(`Rewriting request to ${url.href}`); + return NextResponse.rewrite(url); + } + } else if (pathname.startsWith('/api/vector/')) { + + // Proxy all other documents requests + const url = req.nextUrl.clone(); + url.href = `${AGENT_SERVER_URL}${pathname.replace('/api/vector/', '/vector/')}`; + + // console.log(`Rewriting request to ${url.href}`); + return NextResponse.rewrite(url); + } else if (pathname.startsWith('/api/token/')) { + // Proxy all other documents requests + const url = req.nextUrl.clone(); + url.href = `${AGENT_SERVER_URL}${pathname.replace('/api/token/', '/token/')}`; + + // console.log(`Rewriting request to ${url.href}`); + return NextResponse.rewrite(url); + } else { + return NextResponse.next(); + } + +} \ No newline at end of file diff --git a/demo/src/platform/mobile/chat/chatItem/index.module.scss b/demo/src/platform/mobile/chat/chatItem/index.module.scss new file mode 100644 index 00000000..27057120 --- /dev/null +++ b/demo/src/platform/mobile/chat/chatItem/index.module.scss @@ -0,0 +1,86 @@ +.agentChatItem { + width: 100%; + display: flex; + justify-content: flex-start; + + .left { + flex: 0 0 auto; + display: flex; + width: 32px; + height: 32px; + padding: 10px; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 10px; + border-radius: 200px; + background: var(--Grey-700, #475467); + + .userName { + color: var(---white, #FFF); + text-align: center; + font-size: 14px; + font-weight: 500; + line-height: 150%; + } + } + + .right { + margin-left: 12px; + + .userName { + font-size: 14px; + font-weight: 500; + line-height: 20px; + color: var(--theme-color, #667085) !important; + } + + + .agent { + color: var(--theme-color, #EAECF0) !important; + } + + } +} + +.userChatItem { + width: 100%; + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: flex-end; + + .userName { + text-align: right; + color: var(--Grey-600, #667085); + font-weight: 500; + line-height: 20px; + } + + + +} + + +.chatItem { + .text { + margin-top: 6px; + color: #FFF; + display: flex; + padding: 8px 14px; + flex-direction: column; + justify-content: left; + font-size: 14px; + font-weight: 400; + line-height: 21px; + white-space: pre-wrap; + border-radius: 0px 8px 8px 8px; + border: 1px solid #272A2F; + background: #1E2024; + box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); + } +} + +.chatItem+.chatItem { + margin-top: 14px; +} diff --git a/demo/src/platform/mobile/chat/chatItem/index.tsx b/demo/src/platform/mobile/chat/chatItem/index.tsx new file mode 100644 index 00000000..bde3350c --- /dev/null +++ b/demo/src/platform/mobile/chat/chatItem/index.tsx @@ -0,0 +1,50 @@ +import { IChatItem } from "@/types" +import styles from "./index.module.scss" + +interface ChatItemProps { + data: IChatItem +} + + +const AgentChatItem = (props: ChatItemProps) => { + const { data } = props + const { text } = data + + + return
+ + Ag + + +
Agent
+
+ {text} +
+ +
+} + +const UserChatItem = (props: ChatItemProps) => { + const { data } = props + const { text } = data + + return
+
You
+
{text}
+
+} + + +const ChatItem = (props: ChatItemProps) => { + const { data } = props + + + return ( + data.type === "agent" ? : + ); + + +} + + +export default ChatItem diff --git a/demo/src/platform/mobile/chat/index.module.scss b/demo/src/platform/mobile/chat/index.module.scss new file mode 100644 index 00000000..8ded1f2c --- /dev/null +++ b/demo/src/platform/mobile/chat/index.module.scss @@ -0,0 +1,78 @@ +.chat { + flex: 1 1 auto; + display: flex; + flex-direction: column; + align-items: flex-start; + align-self: stretch; + background: #181A1D; + overflow: hidden; + + .header { + display: flex; + flex-direction: column; + align-items: stretch; + row-gap: 10px; + border-bottom: 1px solid #272A2F; + width: 100%; + + + .text { + margin-left: 4px; + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 600; + height: 40px; + line-height: 40px; + letter-spacing: 0.449px; + } + + .languageSelect { + width: 100%; + } + + + + + } + + .content { + margin-top: 16px; + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 10px; + align-self: stretch; + overflow-y: auto; + + + &::-webkit-scrollbar { + width: 6px + } + + &::-webkit-scrollbar-track { + background-color: transparent; + } + + &::-webkit-scrollbar-thumb { + background-color: #6B6B6B; + border-radius: 4px; + } + } + + +} + + +.dropdownRender { + display: flex; + justify-content: flex-end; + + + .btn { + color: var(--theme-color, #EAECF0); + + &:hover { + color: var(--theme-color, #EAECF0) !important; + } + } +} \ No newline at end of file diff --git a/demo/src/platform/mobile/chat/index.tsx b/demo/src/platform/mobile/chat/index.tsx new file mode 100644 index 00000000..bb071d4e --- /dev/null +++ b/demo/src/platform/mobile/chat/index.tsx @@ -0,0 +1,65 @@ +import { ReactElement, useEffect, useContext, useState } from "react" +import ChatItem from "./chatItem" +import { IChatItem } from "@/types" +import { useAppDispatch, useAutoScroll, LANGUAGE_OPTIONS, useAppSelector, GRAPH_OPTIONS, isRagGraph } from "@/common" +import { setGraphName, setLanguage } from "@/store/reducers/global" +import { Select, } from 'antd'; +import { MenuContext } from "../menu/context" +import PdfSelect from "@/components/pdfSelect" + +import styles from "./index.module.scss" + + +const Chat = () => { + const chatItems = useAppSelector(state => state.global.chatItems) + const language = useAppSelector(state => state.global.language) + const agentConnected = useAppSelector(state => state.global.agentConnected) + const graphName = useAppSelector(state => state.global.graphName) + const dispatch = useAppDispatch() + // genRandomChatList + // const [chatItems, setChatItems] = useState([]) + const context = useContext(MenuContext); + + if (!context) { + throw new Error("MenuContext is not found") + } + + const { scrollToBottom } = context; + + + useEffect(() => { + scrollToBottom() + }, [chatItems, scrollToBottom]) + + + + const onLanguageChange = (val: any) => { + dispatch(setLanguage(val)) + } + + const onGraphNameChange = (val: any) => { + dispatch(setGraphName(val)) + } + + + return
+
+ + + {isRagGraph(graphName) ? : null} +
+
+ {chatItems.map((item, index) => { + return + })} +
+
+} + + +export default Chat diff --git a/demo/src/platform/mobile/description/index.module.scss b/demo/src/platform/mobile/description/index.module.scss new file mode 100644 index 00000000..7305f5a7 --- /dev/null +++ b/demo/src/platform/mobile/description/index.module.scss @@ -0,0 +1,71 @@ +.description { + position: relative; + display: flex; + padding: 12px 16px; + height: 60px; + align-items: center; + gap: 12px; + align-self: stretch; + border-bottom: 1px solid #272A2F; + background: #181A1D; + box-sizing: border-box; + + .title { + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-style: normal; + font-weight: 600; + flex: 1 1 auto; + /* 21px */ + letter-spacing: 0.449px; + } + + .text { + margin-left: 12px; + flex: 1 1 auto; + color: var(--Grey-600, #667085); + font-size: 14px; + font-style: normal; + font-weight: 400; + } + + + .btnConnect { + width: 150px; + display: flex; + padding: 8px 14px; + justify-content: center; + align-items: center; + gap: 8px; + align-self: stretch; + border-radius: 6px; + background: var(--theme-color, #0888FF); + box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05); + cursor: pointer; + user-select: none; + caret-color: transparent; + box-sizing: border-box; + + .btnText { + color: var(---White, #FFF); + font-size: 14px; + font-weight: 500; + line-height: 20px; + } + + .btnText.disconnect { + color: var(--Error-400-T, #E95C7B); + } + + .loading { + margin-left: 4px; + } + } + + + .btnConnect.disconnect { + background: #181A1D; + border: 1px solid var(--Error-400-T, #E95C7B); + } + +} diff --git a/demo/src/platform/mobile/description/index.tsx b/demo/src/platform/mobile/description/index.tsx new file mode 100644 index 00000000..7473d550 --- /dev/null +++ b/demo/src/platform/mobile/description/index.tsx @@ -0,0 +1,100 @@ +import { setAgentConnected } from "@/store/reducers/global" +import { + DESCRIPTION, useAppDispatch, useAppSelector, apiPing, genUUID, + apiStartService, apiStopService +} from "@/common" +import { message } from "antd" +import { useEffect, useState } from "react" +import { LoadingOutlined, } from "@ant-design/icons" +import styles from "./index.module.scss" + +let intervalId: any + +const Description = () => { + const dispatch = useAppDispatch() + const agentConnected = useAppSelector(state => state.global.agentConnected) + const channel = useAppSelector(state => state.global.options.channel) + const userId = useAppSelector(state => state.global.options.userId) + const language = useAppSelector(state => state.global.language) + const voiceType = useAppSelector(state => state.global.voiceType) + const graphName = useAppSelector(state => state.global.graphName) + const [loading, setLoading] = useState(false) + + useEffect(() => { + if (channel) { + checkAgentConnected() + } + }, [channel]) + + + const checkAgentConnected = async () => { + const res: any = await apiPing(channel) + if (res?.code == 0) { + dispatch(setAgentConnected(true)) + } + } + + const onClickConnect = async () => { + if (loading) { + return + } + setLoading(true) + if (agentConnected) { + await apiStopService(channel) + dispatch(setAgentConnected(false)) + message.success("Agent disconnected") + stopPing() + } else { + const res = await apiStartService({ + channel, + userId, + graphName, + language, + voiceType + }) + const { code, msg } = res || {} + if (code != 0) { + if (code == "10001") { + message.error("The number of users experiencing the program simultaneously has exceeded the limit. Please try again later.") + } else { + message.error(`code:${code},msg:${msg}`) + } + setLoading(false) + throw new Error(msg) + } + dispatch(setAgentConnected(true)) + message.success("Agent connected") + startPing() + } + setLoading(false) + } + + const startPing = () => { + if (intervalId) { + stopPing() + } + intervalId = setInterval(() => { + apiPing(channel) + }, 3000) + } + + const stopPing = () => { + if (intervalId) { + clearInterval(intervalId) + intervalId = null + } + } + + return
+ Description + + + {!agentConnected ? "Connect" : "Disconnect"} + {loading ? : null} + + +
+} + + +export default Description diff --git a/demo/src/platform/mobile/entry/index.module.scss b/demo/src/platform/mobile/entry/index.module.scss new file mode 100644 index 00000000..41322c12 --- /dev/null +++ b/demo/src/platform/mobile/entry/index.module.scss @@ -0,0 +1,18 @@ +.entry { + position: relative; + height: 100%; + box-sizing: border-box; + + .content { + position: relative; + padding: 16px; + box-sizing: border-box; + + + .body { + margin-top: 16px; + display: flex; + gap: 24px; + } + } +} diff --git a/demo/src/platform/mobile/entry/index.tsx b/demo/src/platform/mobile/entry/index.tsx new file mode 100644 index 00000000..c5f51d5c --- /dev/null +++ b/demo/src/platform/mobile/entry/index.tsx @@ -0,0 +1,30 @@ +import Chat from "../chat" +import Description from "../description" +import Rtc from "../rtc" +import Header from "../header" +import Menu, { IMenuData } from "../menu" +import styles from "./index.module.scss" + + +const MenuData: IMenuData[] = [{ + name: "Agent", + component: , +}, { + name: "Chat", + component: , +}] + + +const MobileEntry = () => { + + return
+
+ +
+ +
+
+} + + +export default MobileEntry diff --git a/demo/src/platform/mobile/header/index.module.scss b/demo/src/platform/mobile/header/index.module.scss new file mode 100644 index 00000000..707e4215 --- /dev/null +++ b/demo/src/platform/mobile/header/index.module.scss @@ -0,0 +1,57 @@ +.header { + display: flex; + width: 100%; + height: 48px; + padding: 16px; + justify-content: space-between; + align-items: center; + border-bottom: 1px solid #24262A; + background: #1E2024; + box-shadow: 0px 12px 16px -4px rgba(8, 15, 52, 0.06), 0px 4px 6px -2px rgba(8, 15, 52, 0.03); + box-sizing: border-box; + z-index: 999; + + .logoWrapper { + display: flex; + align-items: center; + + .text { + margin-left: 8px; + color: var(---white, #FFF); + text-align: right; + font-family: Inter; + font-size: 16px; + font-weight: 500; + } + } + + .content { + padding-left: 12px; + display: flex; + align-items: center; + justify-content: flex-start; + height: 48px; + flex: 1 1 auto; + color: var(--Grey-300, #EAECF0); + font-size: 16px; + font-weight: 500; + line-height: 48px; + letter-spacing: 0.449px; + text-align: center; + + .text { + margin-left: 4px; + font-size: 12px; + } + } + + .links { + display: flex; + align-items: center; + gap: 8px; + + span { + display: flex; + } + } +} diff --git a/demo/src/platform/mobile/header/index.tsx b/demo/src/platform/mobile/header/index.tsx new file mode 100644 index 00000000..6e56a017 --- /dev/null +++ b/demo/src/platform/mobile/header/index.tsx @@ -0,0 +1,48 @@ +"use client" + +import { useAppSelector, GITHUB_URL, useSmallScreen } from "@/common" +import Network from "./network" +import InfoPopover from "./infoPopover" +import StylePopover from "./stylePopover" +import { GithubIcon, LogoIcon, InfoIcon, ColorPickerIcon } from "@/components/icons" + +import styles from "./index.module.scss" + +const Header = () => { + const themeColor = useAppSelector(state => state.global.themeColor) + const options = useAppSelector(state => state.global.options) + const { channel } = options + + + const onClickGithub = () => { + if (typeof window !== "undefined") { + window.open(GITHUB_URL, "_blank") + } + } + + + + return
+ + + + + + + {channel} + + +
+ + + + + + + +
+
+} + + +export default Header diff --git a/demo/src/platform/mobile/header/infoPopover/index.module.scss b/demo/src/platform/mobile/header/infoPopover/index.module.scss new file mode 100644 index 00000000..cd3f72f8 --- /dev/null +++ b/demo/src/platform/mobile/header/infoPopover/index.module.scss @@ -0,0 +1,43 @@ +.info { + display: flex; + padding: 12px 16px; + flex-direction: column; + align-items: flex-start; + gap: 8px; + align-self: stretch; + + .title { + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + } + + .item { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + + .title { + color: var(--Grey-600, #667085); + font-size: 14px; + font-weight: 400; + line-height: 150%; + } + + .content { + color: var(--theme-color, #FFF); + font-size: 14px; + font-weight: 400; + line-height: 150%; + } + } + + .slider { + height: 1px; + width: 100%; + background-color: #0D0F12; + } +} diff --git a/demo/src/platform/mobile/header/infoPopover/index.tsx b/demo/src/platform/mobile/header/infoPopover/index.tsx new file mode 100644 index 00000000..cd451418 --- /dev/null +++ b/demo/src/platform/mobile/header/infoPopover/index.tsx @@ -0,0 +1,57 @@ +import { useMemo } from "react" +import { useAppSelector } from "@/common" +import { Popover } from 'antd'; + + +import styles from "./index.module.scss" + +interface InfoPopoverProps { + children?: React.ReactNode +} + +const InfoPopover = (props: InfoPopoverProps) => { + const { children } = props + const options = useAppSelector(state => state.global.options) + const { channel, userId } = options + + const roomConnected = useAppSelector(state => state.global.roomConnected) + const agentConnected = useAppSelector(state => state.global.agentConnected) + + const roomConnectedText = useMemo(() => { + return roomConnected ? "TRUE" : "FALSE" + }, [roomConnected]) + + const agentConnectedText = useMemo(() => { + return agentConnected ? "TRUE" : "FALSE" + }, [agentConnected]) + + + + const content =
+
INFO
+
+ Room + {channel} +
+
+ Participant + {userId} +
+
+
STATUS
+
+
Room connected
+
{roomConnectedText}
+
+
+
Agent connected
+
{agentConnectedText}
+
+
+ + + return {children} + +} + +export default InfoPopover diff --git a/demo/src/platform/mobile/header/network/index.module.scss b/demo/src/platform/mobile/header/network/index.module.scss new file mode 100644 index 00000000..e69de29b diff --git a/demo/src/platform/mobile/header/network/index.tsx b/demo/src/platform/mobile/header/network/index.tsx new file mode 100644 index 00000000..92b4e33b --- /dev/null +++ b/demo/src/platform/mobile/header/network/index.tsx @@ -0,0 +1,37 @@ +"use client"; + +import React from "react"; +import { rtcManager } from "@/manager" +import { NetworkQuality } from "agora-rtc-sdk-ng" +import { useEffect, useState } from "react" +import { NetworkIcon } from "@/components/icons" + +interface NetworkProps { + style?: React.CSSProperties +} + +const NetWork = (props: NetworkProps) => { + const { style } = props + + const [networkQuality, setNetworkQuality] = useState() + + useEffect(() => { + rtcManager.on("networkQuality", onNetworkQuality) + + return () => { + rtcManager.off("networkQuality", onNetworkQuality) + } + }, []) + + const onNetworkQuality = (quality: NetworkQuality) => { + setNetworkQuality(quality) + } + + return ( + + + + ) +} + +export default NetWork diff --git a/demo/src/platform/mobile/header/stylePopover/colorPicker/index.module.scss b/demo/src/platform/mobile/header/stylePopover/colorPicker/index.module.scss new file mode 100644 index 00000000..405e7781 --- /dev/null +++ b/demo/src/platform/mobile/header/stylePopover/colorPicker/index.module.scss @@ -0,0 +1,24 @@ +.colorPicker { + height: 24px; + display: flex; + align-items: center; + + :global(.react-colorful) { + width: 220px; + height: 8px; + } + + :global(.react-colorful__saturation) { + display: none; + } + + :global(.react-colorful__hue) { + border-radius: 8px !important; + height: 8px; + } + + :global(.react-colorful__pointer) { + width: 24px; + height: 24px; + } +} diff --git a/demo/src/platform/mobile/header/stylePopover/colorPicker/index.tsx b/demo/src/platform/mobile/header/stylePopover/colorPicker/index.tsx new file mode 100644 index 00000000..28163d77 --- /dev/null +++ b/demo/src/platform/mobile/header/stylePopover/colorPicker/index.tsx @@ -0,0 +1,22 @@ +"use client" + +import { HexColorPicker } from "react-colorful"; +import { useAppSelector, useAppDispatch } from "@/common" +import { setThemeColor } from "@/store/reducers/global" +import styles from "./index.module.scss"; + +const ColorPicker = () => { + const dispatch = useAppDispatch() + const themeColor = useAppSelector(state => state.global.themeColor) + + const onColorChange = (color: string) => { + console.log(color); + dispatch(setThemeColor(color)) + }; + + return
+ +
+}; + +export default ColorPicker; diff --git a/demo/src/platform/mobile/header/stylePopover/index.module.scss b/demo/src/platform/mobile/header/stylePopover/index.module.scss new file mode 100644 index 00000000..defdcc12 --- /dev/null +++ b/demo/src/platform/mobile/header/stylePopover/index.module.scss @@ -0,0 +1,51 @@ +.info { + padding: 12px 16px; + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 16px; + align-self: stretch; + + + .title { + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + } + + .color { + font-size: 0; + white-space: nowrap; + + .item { + position: relative; + display: inline-block; + width: 28px; + height: 28px; + border-radius: 4px; + border: 2px solid transparent; + font-size: 0; + cursor: pointer; + + .inner { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + width: 18px; + height: 18px; + border-radius: 2px; + box-sizing: border-box; + } + } + + .item+.item { + margin-left: 12px; + } + + } + + +} diff --git a/demo/src/platform/mobile/header/stylePopover/index.tsx b/demo/src/platform/mobile/header/stylePopover/index.tsx new file mode 100644 index 00000000..f8508323 --- /dev/null +++ b/demo/src/platform/mobile/header/stylePopover/index.tsx @@ -0,0 +1,54 @@ +import { useMemo } from "react" +import { COLOR_LIST, useAppSelector, useAppDispatch } from "@/common" +import { setThemeColor } from "@/store/reducers/global" +import ColorPicker from "./colorPicker" +import { Popover } from 'antd'; + + +import styles from "./index.module.scss" + +interface StylePopoverProps { + children?: React.ReactNode +} + +const StylePopover = (props: StylePopoverProps) => { + const { children } = props + const dispatch = useAppDispatch() + const themeColor = useAppSelector(state => state.global.themeColor) + + + const onClickColor = (index: number) => { + const target = COLOR_LIST[index] + if (target.active !== themeColor) { + dispatch(setThemeColor(target.active)) + } + } + + const content =
+
STYLE
+
+ { + COLOR_LIST.map((item, index) => { + return onClickColor(index)} + className={styles.item} + key={index}> + + + }) + } +
+ +
+ + + return {children} + +} + +export default StylePopover diff --git a/demo/src/platform/mobile/menu/context.ts b/demo/src/platform/mobile/menu/context.ts new file mode 100644 index 00000000..41c52911 --- /dev/null +++ b/demo/src/platform/mobile/menu/context.ts @@ -0,0 +1,9 @@ +import { createContext } from "react" + +export interface MenuContextType { + scrollToBottom: () => void; +} + +export const MenuContext = createContext({ + scrollToBottom: () => { } +}); diff --git a/demo/src/platform/mobile/menu/index.module.scss b/demo/src/platform/mobile/menu/index.module.scss new file mode 100644 index 00000000..58b1b3fe --- /dev/null +++ b/demo/src/platform/mobile/menu/index.module.scss @@ -0,0 +1,69 @@ +.menu { + width: 100%; + border: 1px solid #272A2F; + border-radius: 4px; + background: #0F0F11; + overflow: hidden; + box-sizing: border-box; + + .header { + height: 40px; + overflow: hidden; + border-bottom: 1px solid #272A2F; + box-sizing: border-box; + + .menuItem { + height: 40px; + padding: 0 16px; + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 600; + line-height: 40px; + letter-spacing: 0.449px; + display: inline-block; + color: #667085; + background: #181A1E; + cursor: pointer; + border-right: 1px solid #272A2F; + box-sizing: border-box; + overflow: hidden; + background: #0F0F11; + } + + .active { + color: #EAECF0; + background: #181A1D; + } + } + + + .content { + position: relative; + background: #181A1D; + // header 48px + // description 60px + // paddingTop 16px 16px + // menu header 40px + height: calc(100vh - 48px - 60px - 32px - 40px - 2px); + overflow: hidden; + box-sizing: border-box; + + .item { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + padding: 16px; + z-index: -1; + overflow: auto; + visibility: hidden; + box-sizing: border-box; + } + + .active { + z-index: 1; + visibility: visible; + } + } +} diff --git a/demo/src/platform/mobile/menu/index.tsx b/demo/src/platform/mobile/menu/index.tsx new file mode 100644 index 00000000..2e20de78 --- /dev/null +++ b/demo/src/platform/mobile/menu/index.tsx @@ -0,0 +1,76 @@ +"use client" + +import { ReactElement, useEffect, useState, useRef, useMemo, useCallback } from "react" +import { useAutoScroll } from "@/common" +import { MenuContext } from "./context" +import styles from "./index.module.scss" + +export interface IMenuData { + name: string, + component: ReactElement +} + +export interface IMenuContentComponentPros { + scrollToBottom: () => void +} + +interface MenuProps { + data: IMenuData[] +} + + +const Menu = (props: MenuProps) => { + const { data } = props + const [activeIndex, setActiveIndex] = useState(0) + const contentRefList = useRef<(HTMLDivElement | null)[]>([]) + + const onClickItem = (index: number) => { + setActiveIndex(index) + } + + useEffect(() => { + scrollToTop() + }, [activeIndex]) + + const scrollToBottom = useCallback(() => { + const current = contentRefList.current?.[activeIndex] + if (current) { + current.scrollTop = current.scrollHeight + } + }, [contentRefList, activeIndex]) + + const scrollToTop = useCallback(() => { + const current = contentRefList.current?.[activeIndex] + if (current) { + current.scrollTop = 0 + } + }, [contentRefList, activeIndex]) + + + return
+
+ {data.map((item, index) => { + return onClickItem(index)}>{item.name} + })} +
+
+ + {data.map((item, index) => { + return
{ + contentRefList.current[index] = el; + }} + className={`${styles.item} ${index == activeIndex ? styles.active : ''}`}> + {item.component} +
+ })} + +
+
+} + +export default Menu diff --git a/demo/src/platform/mobile/rtc/agent/index.module.scss b/demo/src/platform/mobile/rtc/agent/index.module.scss new file mode 100644 index 00000000..fa3ae2ec --- /dev/null +++ b/demo/src/platform/mobile/rtc/agent/index.module.scss @@ -0,0 +1,31 @@ +.agent { + position: relative; + display: flex; + height: 292px; + padding: 20px 16px; + flex-direction: column; + justify-content: flex-start; + align-items: center; + align-self: stretch; + background: linear-gradient(154deg, rgba(27, 66, 166, 0.16) 0%, rgba(27, 45, 140, 0.00) 18%), linear-gradient(153deg, rgba(23, 24, 28, 0.00) 53.75%, #11174E 100%), #0F0F11; + box-shadow: 0px 3.999px 48.988px 0px rgba(0, 7, 72, 0.12); + backdrop-filter: blur(7); + box-sizing: border-box; + + .text { + margin-top: 50px; + color: var(--theme-color, #EAECF0); + font-size: 24px; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + } + + .view { + margin-top: 32px; + display: flex; + align-items: center; + justify-content: center; + height: 56px; + } +} diff --git a/demo/src/platform/mobile/rtc/agent/index.tsx b/demo/src/platform/mobile/rtc/agent/index.tsx new file mode 100644 index 00000000..a7fd7944 --- /dev/null +++ b/demo/src/platform/mobile/rtc/agent/index.tsx @@ -0,0 +1,34 @@ +"use client" + +import { useAppSelector, useMultibandTrackVolume } from "@/common" +import AudioVisualizer from "../audioVisualizer" +import { IMicrophoneAudioTrack } from 'agora-rtc-sdk-ng'; +import styles from "./index.module.scss" + +interface AgentProps { + audioTrack?: IMicrophoneAudioTrack +} + +const Agent = (props: AgentProps) => { + const { audioTrack } = props + + const subscribedVolumes = useMultibandTrackVolume(audioTrack, 12); + + return
+
Agent
+
+ +
+
+ +} + + +export default Agent; diff --git a/demo/src/platform/mobile/rtc/audioVisualizer/index.module.scss b/demo/src/platform/mobile/rtc/audioVisualizer/index.module.scss new file mode 100644 index 00000000..1beae944 --- /dev/null +++ b/demo/src/platform/mobile/rtc/audioVisualizer/index.module.scss @@ -0,0 +1,17 @@ +.audioVisualizer { + display: flex; + justify-content: center; + align-items: center; + + + .item {} + + .agent { + background-color: var(--theme-color, #EAECF0); + box-shadow: 0 0 10px var(--theme-color, #EAECF0); + } + + .user { + background-color: var(--Grey-300, #EAECF0); + } +} diff --git a/demo/src/platform/mobile/rtc/audioVisualizer/index.tsx b/demo/src/platform/mobile/rtc/audioVisualizer/index.tsx new file mode 100644 index 00000000..bc21f554 --- /dev/null +++ b/demo/src/platform/mobile/rtc/audioVisualizer/index.tsx @@ -0,0 +1,48 @@ +"use client" + +import { useState, useEffect } from "react" +import styles from "./index.module.scss" + +interface AudioVisualizerProps { + type: "agent" | "user"; + frequencies: Float32Array[]; + gap: number; + barWidth: number; + minBarHeight: number; + maxBarHeight: number + borderRadius: number; +} + + +const AudioVisualizer = (props: AudioVisualizerProps) => { + const { frequencies, gap, barWidth, minBarHeight, maxBarHeight, borderRadius, type } = props; + + const summedFrequencies = frequencies.map((bandFrequencies) => { + const sum = bandFrequencies.reduce((a, b) => a + b, 0) + if (sum <= 0) { + return 0 + } + return Math.sqrt(sum / bandFrequencies.length); + }); + + return
{ + summedFrequencies.map((frequency, index) => { + + const style = { + height: minBarHeight + frequency * (maxBarHeight - minBarHeight) + "px", + borderRadius: borderRadius + "px", + width: barWidth + "px", + transition: + "background-color 0.35s ease-out, transform 0.25s ease-out", + // transform: transform, + } + + return + }) + }
+} + + +export default AudioVisualizer; diff --git a/demo/src/platform/mobile/rtc/camSection/camSelect/index.module.scss b/demo/src/platform/mobile/rtc/camSection/camSelect/index.module.scss new file mode 100644 index 00000000..8ca5088b --- /dev/null +++ b/demo/src/platform/mobile/rtc/camSection/camSelect/index.module.scss @@ -0,0 +1,4 @@ +.select { + flex: 0 0 200px; + width: 200px; +} diff --git a/demo/src/platform/mobile/rtc/camSection/camSelect/index.tsx b/demo/src/platform/mobile/rtc/camSection/camSelect/index.tsx new file mode 100644 index 00000000..33a5e003 --- /dev/null +++ b/demo/src/platform/mobile/rtc/camSection/camSelect/index.tsx @@ -0,0 +1,57 @@ +"use client" + +import AgoraRTC, { ICameraVideoTrack } from "agora-rtc-sdk-ng" +import { useState, useEffect } from "react" +import { Select } from "antd" + +import styles from "./index.module.scss" + +interface CamSelectProps { + videoTrack?: ICameraVideoTrack +} + +interface SelectItem { + label: string + value: string + deviceId: string +} + +const DEFAULT_ITEM: SelectItem = { + label: "Default", + value: "default", + deviceId: "" +} + +const CamSelect = (props: CamSelectProps) => { + const { videoTrack } = props + const [items, setItems] = useState([DEFAULT_ITEM]); + const [value, setValue] = useState("default"); + + useEffect(() => { + if (videoTrack) { + const label = videoTrack?.getTrackLabel(); + setValue(label); + AgoraRTC.getCameras().then(arr => { + setItems(arr.map(item => ({ + label: item.label, + value: item.label, + deviceId: item.deviceId + }))); + }); + } + }, [videoTrack]); + + const onChange = async (value: string) => { + const target = items.find(item => item.value === value); + if (target) { + setValue(target.value); + if (videoTrack) { + await videoTrack.setDevice(target.deviceId); + } + } + } + + return +} + +export default CamSelect diff --git a/demo/src/platform/mobile/rtc/camSection/index.module.scss b/demo/src/platform/mobile/rtc/camSection/index.module.scss new file mode 100644 index 00000000..76f4ad1e --- /dev/null +++ b/demo/src/platform/mobile/rtc/camSection/index.module.scss @@ -0,0 +1,54 @@ +.camera { + position: relative; + width: 100%; + height: 100%; + box-sizing: border-box; + + .title { + margin-bottom: 10px; + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 500; + line-height: 150%; + letter-spacing: 0.449px; + } + + .select { + height: 32px; + display: flex; + width: 100%; + justify-content: flex-start; + align-items: center; + + .iconWrapper { + flex: 0 0 auto; + margin-right: 12px; + display: flex; + width: 32px; + height: 32px; + flex-direction: column; + justify-content: center; + align-items: center; + flex-shrink: 0; + border-radius: 6px; + border: 1px solid #2B2F36; + cursor: pointer; + } + + .select { + flex: 0 0 auto; + width: 200px; + } + } + + .view { + position: relative; + margin-top: 12px; + min-height: 210px; + height: 210px; + border-radius: 6px; + border: 1px solid #272A2F; + background: #1E2024; + box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); + } +} diff --git a/demo/src/platform/mobile/rtc/camSection/index.tsx b/demo/src/platform/mobile/rtc/camSection/index.tsx new file mode 100644 index 00000000..2bd0e8db --- /dev/null +++ b/demo/src/platform/mobile/rtc/camSection/index.tsx @@ -0,0 +1,42 @@ +"use client" + +import CamSelect from "./camSelect" +import { CamIcon } from "@/components/icons" +import styles from "./index.module.scss" +import { ICameraVideoTrack } from 'agora-rtc-sdk-ng'; +import { LocalStreamPlayer } from "../streamPlayer" +import { useState, useEffect, useMemo } from 'react'; +import { useSmallScreen } from "@/common" + +interface CamSectionProps { + videoTrack?: ICameraVideoTrack +} + +const CamSection = (props: CamSectionProps) => { + const { videoTrack } = props + const [videoMute, setVideoMute] = useState(false) + + useEffect(() => { + videoTrack?.setMuted(videoMute) + }, [videoTrack, videoMute]) + + const onClickMute = () => { + setVideoMute(!videoMute) + } + + return
+
CAMERA
+
+ + + + +
+
+ +
+
+} + + +export default CamSection; diff --git a/demo/src/platform/mobile/rtc/index.module.scss b/demo/src/platform/mobile/rtc/index.module.scss new file mode 100644 index 00000000..ff7b7958 --- /dev/null +++ b/demo/src/platform/mobile/rtc/index.module.scss @@ -0,0 +1,55 @@ +.rtc { + flex: 0 0 420px; + display: flex; + flex-direction: column; + align-items: flex-start; + flex-shrink: 0; + align-self: stretch; + border-radius: 8px; + border: 1px solid #272A2F; + background: #181A1D; + box-sizing: border-box; + + .header { + display: flex; + height: 40px; + padding: 0px 16px; + align-items: center; + align-self: stretch; + border-bottom: 1px solid #272A2F; + + .text { + flex: 1 1 auto; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + color: var(--Grey-300, #EAECF0); + } + + .voiceSelect { + flex: 0 0 120px; + } + } + + .you { + display: flex; + padding: 24px 16px; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 24px; + align-self: stretch; + border-top: 1px solid #272A2F; + + .title { + color: var(--Grey-300, #EAECF0); + font-size: 24px; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + text-align: center; + } + + + } +} diff --git a/demo/src/platform/mobile/rtc/index.tsx b/demo/src/platform/mobile/rtc/index.tsx new file mode 100644 index 00000000..bc15c070 --- /dev/null +++ b/demo/src/platform/mobile/rtc/index.tsx @@ -0,0 +1,128 @@ +"use client" + +import { ICameraVideoTrack, IMicrophoneAudioTrack } from "agora-rtc-sdk-ng" +import { useAppSelector, useAppDispatch, VOICE_OPTIONS } from "@/common" +import { ITextItem } from "@/types" +import { rtcManager, IUserTracks, IRtcUser } from "@/manager" +import { setRoomConnected, addChatItem, setVoiceType } from "@/store/reducers/global" +import MicSection from "./micSection" +import CamSection from "./camSection" +import Agent from "./agent" +import styles from "./index.module.scss" +import { useRef, useEffect, useState, Fragment } from "react" +import { VoiceIcon } from "@/components/icons" +import CustomSelect from "@/components/customSelect" + +let hasInit = false + +const Rtc = () => { + const dispatch = useAppDispatch() + const options = useAppSelector(state => state.global.options) + const voiceType = useAppSelector(state => state.global.voiceType) + const agentConnected = useAppSelector(state => state.global.agentConnected) + const { userId, channel } = options + const [videoTrack, setVideoTrack] = useState() + const [audioTrack, setAudioTrack] = useState() + const [remoteuser, setRemoteUser] = useState() + + useEffect(() => { + if (!options.channel) { + return + } + if (hasInit) { + return + } + + init() + + return () => { + if (hasInit) { + destory() + } + } + }, [options.channel]) + + + const init = async () => { + console.log("[test] init") + rtcManager.on("localTracksChanged", onLocalTracksChanged) + rtcManager.on("textChanged", onTextChanged) + rtcManager.on("remoteUserChanged", onRemoteUserChanged) + await rtcManager.createTracks() + await rtcManager.join({ + channel, + userId + }) + await rtcManager.publish() + dispatch(setRoomConnected(true)) + hasInit = true + } + + const destory = async () => { + console.log("[test] destory") + rtcManager.off("textChanged", onTextChanged) + rtcManager.off("localTracksChanged", onLocalTracksChanged) + rtcManager.off("remoteUserChanged", onRemoteUserChanged) + await rtcManager.destroy() + dispatch(setRoomConnected(false)) + hasInit = false + } + + const onRemoteUserChanged = (user: IRtcUser) => { + console.log("[test] onRemoteUserChanged", user) + setRemoteUser(user) + } + + const onLocalTracksChanged = (tracks: IUserTracks) => { + console.log("[test] onLocalTracksChanged", tracks) + const { videoTrack, audioTrack } = tracks + if (videoTrack) { + setVideoTrack(videoTrack) + } + if (audioTrack) { + setAudioTrack(audioTrack) + } + } + + const onTextChanged = (text: ITextItem) => { + if (text.dataType == "transcribe") { + const isAgent = Number(text.uid) != Number(userId) + dispatch(addChatItem({ + userId: text.uid, + text: text.text, + type: isAgent ? "agent" : "user", + isFinal: text.isFinal, + time: text.time + })) + } + } + + const onVoiceChange = (value: any) => { + dispatch(setVoiceType(value)) + } + + + return
+
+ Audio & Video + } + options={VOICE_OPTIONS} onChange={onVoiceChange}> +
+ {/* agent */} + + {/* you */} +
+
You
+ {/* microphone */} + + {/* camera */} + +
+
+} + + +export default Rtc; diff --git a/demo/src/platform/mobile/rtc/micSection/index.module.scss b/demo/src/platform/mobile/rtc/micSection/index.module.scss new file mode 100644 index 00000000..60cc6fe1 --- /dev/null +++ b/demo/src/platform/mobile/rtc/micSection/index.module.scss @@ -0,0 +1,58 @@ +.microphone { + position: relative; + width: 100%; + height: 100%; + box-sizing: border-box; + + .title { + margin-bottom: 10px; + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 500; + line-height: 150%; + letter-spacing: 0.449px; + } + + + .select { + height: 32px; + display: flex; + width: 100%; + justify-content: flex-start; + align-items: center; + + + .iconWrapper { + flex: 0 0 auto; + margin-right: 12px; + display: flex; + width: 32px; + height: 32px; + flex-direction: column; + justify-content: center; + align-items: center; + flex-shrink: 0; + border-radius: 6px; + border: 1px solid #2B2F36; + cursor: pointer; + } + + + } + + .view { + margin-top: 12px; + display: flex; + height: 120px; + padding: 24px; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 10px; + align-self: stretch; + border-radius: 6px; + border: 1px solid #272A2F; + background: #1E2024; + box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); + } +} diff --git a/demo/src/platform/mobile/rtc/micSection/index.tsx b/demo/src/platform/mobile/rtc/micSection/index.tsx new file mode 100644 index 00000000..3c739159 --- /dev/null +++ b/demo/src/platform/mobile/rtc/micSection/index.tsx @@ -0,0 +1,70 @@ +"use client" + +import { useEffect, useMemo, useState } from "react" +import { useMultibandTrackVolume, useSmallScreen } from "@/common" +import AudioVisualizer from "../audioVisualizer" +import { MicIcon } from "@/components/icons" +import styles from "./index.module.scss" +import { IMicrophoneAudioTrack } from 'agora-rtc-sdk-ng'; +import MicSelect from "./micSelect"; + +interface MicSectionProps { + audioTrack?: IMicrophoneAudioTrack +} + +const MicSection = (props: MicSectionProps) => { + const { audioTrack } = props + const [audioMute, setAudioMute] = useState(false) + const [mediaStreamTrack, setMediaStreamTrack] = useState() + + + + useEffect(() => { + audioTrack?.on("track-updated", onAudioTrackupdated) + if (audioTrack) { + setMediaStreamTrack(audioTrack.getMediaStreamTrack()) + } + + return () => { + audioTrack?.off("track-updated", onAudioTrackupdated) + } + }, [audioTrack]) + + useEffect(() => { + audioTrack?.setMuted(audioMute) + }, [audioTrack, audioMute]) + + const subscribedVolumes = useMultibandTrackVolume(mediaStreamTrack, 20); + + const onAudioTrackupdated = (track: MediaStreamTrack) => { + console.log("[test] audio track updated", track) + setMediaStreamTrack(track) + } + + const onClickMute = () => { + setAudioMute(!audioMute) + } + + return
+
MICROPHONE
+
+ + + + +
+
+ +
+
+} + + +export default MicSection; diff --git a/demo/src/platform/mobile/rtc/micSection/micSelect/index.module.scss b/demo/src/platform/mobile/rtc/micSection/micSelect/index.module.scss new file mode 100644 index 00000000..8ca5088b --- /dev/null +++ b/demo/src/platform/mobile/rtc/micSection/micSelect/index.module.scss @@ -0,0 +1,4 @@ +.select { + flex: 0 0 200px; + width: 200px; +} diff --git a/demo/src/platform/mobile/rtc/micSection/micSelect/index.tsx b/demo/src/platform/mobile/rtc/micSection/micSelect/index.tsx new file mode 100644 index 00000000..efc842b5 --- /dev/null +++ b/demo/src/platform/mobile/rtc/micSection/micSelect/index.tsx @@ -0,0 +1,58 @@ +"use client" + +import AgoraRTC from "agora-rtc-sdk-ng" +import { useState, useEffect } from "react" +import { Select } from "antd" +import { IMicrophoneAudioTrack } from "agora-rtc-sdk-ng" + +import styles from "./index.module.scss" + +interface MicSelectProps { + audioTrack?: IMicrophoneAudioTrack +} + +interface SelectItem { + label: string + value: string + deviceId: string +} + +const DEFAULT_ITEM: SelectItem = { + label: "Default", + value: "default", + deviceId: "" +} + +const MicSelect = (props: MicSelectProps) => { + const { audioTrack } = props + const [items, setItems] = useState([DEFAULT_ITEM]); + const [value, setValue] = useState("default"); + + useEffect(() => { + if (audioTrack) { + const label = audioTrack?.getTrackLabel(); + setValue(label); + AgoraRTC.getMicrophones().then(arr => { + setItems(arr.map(item => ({ + label: item.label, + value: item.label, + deviceId: item.deviceId + }))); + }); + } + }, [audioTrack]); + + const onChange = async (value: string) => { + const target = items.find(item => item.value === value); + if (target) { + setValue(target.value); + if (audioTrack) { + await audioTrack.setDevice(target.deviceId); + } + } + } + + return +} + +export default MicSelect diff --git a/demo/src/platform/mobile/rtc/streamPlayer/index.module.scss b/demo/src/platform/mobile/rtc/streamPlayer/index.module.scss new file mode 100644 index 00000000..b1c57c10 --- /dev/null +++ b/demo/src/platform/mobile/rtc/streamPlayer/index.module.scss @@ -0,0 +1,6 @@ +.streamPlayer { + position: relative; + width: 100%; + height: 100%; + overflow: hidden; +} diff --git a/demo/src/platform/mobile/rtc/streamPlayer/index.tsx b/demo/src/platform/mobile/rtc/streamPlayer/index.tsx new file mode 100644 index 00000000..ba78e377 --- /dev/null +++ b/demo/src/platform/mobile/rtc/streamPlayer/index.tsx @@ -0,0 +1 @@ +export * from "./localStreamPlayer" diff --git a/demo/src/platform/mobile/rtc/streamPlayer/localStreamPlayer.tsx b/demo/src/platform/mobile/rtc/streamPlayer/localStreamPlayer.tsx new file mode 100644 index 00000000..e3e7f06a --- /dev/null +++ b/demo/src/platform/mobile/rtc/streamPlayer/localStreamPlayer.tsx @@ -0,0 +1,46 @@ +"use client" + +import { + ICameraVideoTrack, + IMicrophoneAudioTrack, + IRemoteAudioTrack, + IRemoteVideoTrack, + VideoPlayerConfig, +} from "agora-rtc-sdk-ng" +import { useRef, useState, useLayoutEffect, forwardRef, useEffect, useMemo } from "react" + +import styles from "./index.module.scss" + +interface StreamPlayerProps { + videoTrack?: ICameraVideoTrack + audioTrack?: IMicrophoneAudioTrack + style?: React.CSSProperties + fit?: "cover" | "contain" | "fill" + onClick?: () => void + mute?: boolean +} + +export const LocalStreamPlayer = forwardRef((props: StreamPlayerProps, ref) => { + const { videoTrack, audioTrack, mute = false, style = {}, fit = "cover", onClick = () => { } } = props + const vidDiv = useRef(null) + + useLayoutEffect(() => { + const config = { fit } as VideoPlayerConfig + if (mute) { + videoTrack?.stop() + } else { + if (!videoTrack?.isPlaying) { + videoTrack?.play(vidDiv.current!, config) + } + } + + return () => { + videoTrack?.stop() + } + }, [videoTrack, fit, mute]) + + // local audio track need not to be played + // useLayoutEffect(() => {}, [audioTrack, localAudioMute]) + + return
+}) diff --git a/demo/src/platform/pc/chat/chatItem/index.module.scss b/demo/src/platform/pc/chat/chatItem/index.module.scss new file mode 100644 index 00000000..f28ef7ee --- /dev/null +++ b/demo/src/platform/pc/chat/chatItem/index.module.scss @@ -0,0 +1,90 @@ +.agentChatItem { + width: 100%; + display: flex; + justify-content: flex-start; + + .left { + flex: 0 0 auto; + display: flex; + width: 32px; + height: 32px; + padding: 10px; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 10px; + border-radius: 200px; + background: var(--Grey-700, #475467); + + .userName { + color: var(---white, #FFF); + text-align: center; + font-size: 14px; + font-weight: 500; + line-height: 150%; + } + } + + .right { + margin-left: 12px; + flex: 1 1 auto; + + .userName { + font-size: 14px; + font-weight: 500; + line-height: 20px; + color: var(--theme-color, #667085) !important; + } + + + .agent { + color: var(--theme-color, #EAECF0) !important; + } + + } +} + +.userChatItem { + width: 100%; + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: flex-end; + + .userName { + text-align: right; + color: var(--Grey-600, #667085); + font-weight: 500; + line-height: 20px; + } + + + +} + + +.chatItem { + .text { + max-width: 80%; + width: fit-content; + margin-top: 6px; + color: #FFF; + display: flex; + padding: 8px 14px; + flex-direction: column; + justify-content: center; + align-items: flex-start; + font-size: 14px; + font-weight: 400; + line-height: 21px; + white-space: pre-wrap; + border-radius: 0px 8px 8px 8px; + border: 1px solid #272A2F; + background: #1E2024; + box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); + } +} + +.chatItem+.chatItem { + margin-top: 14px; +} diff --git a/demo/src/platform/pc/chat/chatItem/index.tsx b/demo/src/platform/pc/chat/chatItem/index.tsx new file mode 100644 index 00000000..6364aaea --- /dev/null +++ b/demo/src/platform/pc/chat/chatItem/index.tsx @@ -0,0 +1,51 @@ +import { IChatItem } from "@/types" +import styles from "./index.module.scss" +import { usePrevious } from "@/common" +import { use, useEffect, useMemo, useState } from "react" + +interface ChatItemProps { + data: IChatItem +} + + +const AgentChatItem = (props: ChatItemProps) => { + const { data } = props + const { text } = data + + return
+ + Ag + + +
Agent
+
+ {text} +
+ +
+} + +const UserChatItem = (props: ChatItemProps) => { + const { data } = props + const { text } = data + + return
+
You
+
{text}
+
+} + + +const ChatItem = (props: ChatItemProps) => { + const { data } = props + + + return ( + data.type === "agent" ? : + ); + + +} + + +export default ChatItem diff --git a/demo/src/platform/pc/chat/index.module.scss b/demo/src/platform/pc/chat/index.module.scss new file mode 100644 index 00000000..39c4956d --- /dev/null +++ b/demo/src/platform/pc/chat/index.module.scss @@ -0,0 +1,79 @@ +.chat { + flex: 1 1 auto; + min-width: 500px; + display: flex; + flex-direction: column; + align-items: flex-start; + align-self: stretch; + border-radius: 8px; + border: 1px solid #272A2F; + background: #181A1D; + overflow: hidden; + + .header { + display: flex; + height: 42px; + padding: 0px 16px; + align-items: center; + align-self: stretch; + border-bottom: 1px solid #272A2F; + + .left { + flex: 1 1 auto; + display: flex; + align-items: center; + gap: 5px; + + .text { + margin-left: 4px; + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 600; + height: 40px; + line-height: 40px; + letter-spacing: 0.449px; + } + + .languageSelect { + width: 100px; + } + } + + + .right { + display: flex; + align-items: center; + gap: 10px; + flex: 0 0 230px; + justify-content: right; + } + + } + + .content { + display: flex; + padding: 12px 24px; + flex-direction: column; + align-items: flex-start; + gap: 10px; + flex: 1 0 500px; + align-self: stretch; + overflow-y: auto; + + + &::-webkit-scrollbar { + width: 6px + } + + &::-webkit-scrollbar-track { + background-color: transparent; + } + + &::-webkit-scrollbar-thumb { + background-color: #6B6B6B; + border-radius: 4px; + } + } + + +} diff --git a/demo/src/platform/pc/chat/index.tsx b/demo/src/platform/pc/chat/index.tsx new file mode 100644 index 00000000..64dea171 --- /dev/null +++ b/demo/src/platform/pc/chat/index.tsx @@ -0,0 +1,66 @@ +"use client" + +import { ReactElement, useEffect, useRef, useState } from "react" +import ChatItem from "./chatItem" +import { + genRandomChatList, useAppDispatch, useAutoScroll, + LANGUAGE_OPTIONS, useAppSelector, + GRAPH_OPTIONS, + isRagGraph, +} from "@/common" +import { setGraphName, setLanguage } from "@/store/reducers/global" +import { Select, } from 'antd'; +import PdfSelect from "@/components/pdfSelect" + +import styles from "./index.module.scss" + + + + +const Chat = () => { + const dispatch = useAppDispatch() + const chatItems = useAppSelector(state => state.global.chatItems) + const language = useAppSelector(state => state.global.language) + const graphName = useAppSelector(state => state.global.graphName) + const agentConnected = useAppSelector(state => state.global.agentConnected) + + // const chatItems = genRandomChatList(10) + const chatRef = useRef(null) + + + useAutoScroll(chatRef) + + + const onLanguageChange = (val: any) => { + dispatch(setLanguage(val)) + } + + const onGraphNameChange = (val: any) => { + dispatch(setGraphName(val)) + } + + + return
+
+ + + + + + {isRagGraph(graphName) ? : null} + +
+
+ {chatItems.map((item, index) => { + return + })} +
+
+} + + +export default Chat diff --git a/demo/src/platform/pc/description/index.module.scss b/demo/src/platform/pc/description/index.module.scss new file mode 100644 index 00000000..50b29301 --- /dev/null +++ b/demo/src/platform/pc/description/index.module.scss @@ -0,0 +1,73 @@ +.description { + position: relative; + display: flex; + padding: 12px 16px; + align-items: center; + gap: 12px; + align-self: stretch; + border-radius: 8px; + border: 1px solid #272A2F; + background: #181A1D; + + .title { + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-style: normal; + font-weight: 600; + /* 21px */ + letter-spacing: 0.449px; + } + + .text { + margin-left: 12px; + flex: 1 1 auto; + color: var(--Grey-600, #667085); + font-size: 14px; + font-style: normal; + font-weight: 400; + } + + + .btnConnect { + width: 150px; + display: flex; + padding: 8px 14px; + justify-content: center; + align-items: center; + gap: 8px; + align-self: stretch; + border-radius: 6px; + background: var(--theme-color, #0888FF); + border: 1px solid var(--theme-color, #0888FF); + box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05); + cursor: pointer; + user-select: none; + caret-color: transparent; + box-sizing: border-box; + + .btnText { + width: 100px; + text-align: center; + color: var(---White, #FFF); + font-size: 14px; + font-weight: 500; + line-height: 20px; + } + + .btnText.disconnect { + color: var(--Error-400-T, #E95C7B); + } + + + .loading { + margin-left: 4px; + } + } + + + .btnConnect.disconnect { + background: #181A1D; + border: 1px solid var(--Error-400-T, #E95C7B); + } + +} diff --git a/demo/src/platform/pc/description/index.tsx b/demo/src/platform/pc/description/index.tsx new file mode 100644 index 00000000..a9a055cd --- /dev/null +++ b/demo/src/platform/pc/description/index.tsx @@ -0,0 +1,101 @@ +import { setAgentConnected } from "@/store/reducers/global" +import { + DESCRIPTION, useAppDispatch, useAppSelector, apiPing, genUUID, + apiStartService, apiStopService +} from "@/common" +import { Select, Button, message, Upload } from "antd" +import { useEffect, useState, MouseEventHandler } from "react" +import { LoadingOutlined, UploadOutlined } from "@ant-design/icons" +import styles from "./index.module.scss" + +let intervalId: any + +const Description = () => { + const dispatch = useAppDispatch() + const agentConnected = useAppSelector(state => state.global.agentConnected) + const channel = useAppSelector(state => state.global.options.channel) + const userId = useAppSelector(state => state.global.options.userId) + const language = useAppSelector(state => state.global.language) + const voiceType = useAppSelector(state => state.global.voiceType) + const graphName = useAppSelector(state => state.global.graphName) + const [loading, setLoading] = useState(false) + + useEffect(() => { + if (channel) { + checkAgentConnected() + } + }, [channel]) + + + const checkAgentConnected = async () => { + const res: any = await apiPing(channel) + if (res?.code == 0) { + dispatch(setAgentConnected(true)) + } + } + + const onClickConnect = async () => { + if (loading) { + return + } + setLoading(true) + if (agentConnected) { + await apiStopService(channel) + dispatch(setAgentConnected(false)) + message.success("Agent disconnected") + stopPing() + } else { + const res = await apiStartService({ + channel, + userId, + graphName, + language, + voiceType + }) + const { code, msg } = res || {} + if (code != 0) { + if (code == "10001") { + message.error("The number of users experiencing the program simultaneously has exceeded the limit. Please try again later.") + } else { + message.error(`code:${code},msg:${msg}`) + } + setLoading(false) + throw new Error(msg) + } + dispatch(setAgentConnected(true)) + message.success("Agent connected") + startPing() + } + setLoading(false) + } + + const startPing = () => { + if (intervalId) { + stopPing() + } + intervalId = setInterval(() => { + apiPing(channel) + }, 3000) + } + + const stopPing = () => { + if (intervalId) { + clearInterval(intervalId) + intervalId = null + } + } + + return
+ Description + Astra is a multimodal agent powered by TEN + + + {!agentConnected ? "Connect" : "Disconnect"} + {loading ? : null} + + +
+} + + +export default Description diff --git a/demo/src/platform/pc/entry/index.module.scss b/demo/src/platform/pc/entry/index.module.scss new file mode 100644 index 00000000..f138183f --- /dev/null +++ b/demo/src/platform/pc/entry/index.module.scss @@ -0,0 +1,17 @@ +.entry { + position: relative; + height: 100%; + box-sizing: border-box; + + .content { + position: relative; + padding: 16px; + box-sizing: border-box; + + .body { + margin-top: 16px; + display: flex; + gap: 24px; + } + } +} diff --git a/demo/src/platform/pc/entry/index.tsx b/demo/src/platform/pc/entry/index.tsx new file mode 100644 index 00000000..e7acd7f1 --- /dev/null +++ b/demo/src/platform/pc/entry/index.tsx @@ -0,0 +1,22 @@ +import Chat from "../chat" +import Description from "../description" +import Rtc from "../rtc" +import Header from "../header" + +import styles from "./index.module.scss" + +const PCEntry = () => { + return
+
+
+ +
+ + +
+
+
+} + + +export default PCEntry diff --git a/demo/src/platform/pc/header/index.module.scss b/demo/src/platform/pc/header/index.module.scss new file mode 100644 index 00000000..31138cc7 --- /dev/null +++ b/demo/src/platform/pc/header/index.module.scss @@ -0,0 +1,58 @@ +.header { + display: flex; + width: 100%; + height: 48px; + padding: 24px; + justify-content: space-between; + align-items: center; + border-bottom: 1px solid #24262A; + background: #1E2024; + box-shadow: 0px 12px 16px -4px rgba(8, 15, 52, 0.06), 0px 4px 6px -2px rgba(8, 15, 52, 0.03); + box-sizing: border-box; + z-index: 999; + + .logoWrapper { + display: flex; + align-items: center; + + .text { + margin-left: 8px; + color: var(---white, #FFF); + text-align: right; + font-family: Inter; + font-size: 16px; + font-weight: 500; + } + } + + .content { + display: flex; + align-items: center; + justify-content: center; + height: 48px; + flex: 1 1 auto; + color: var(--Grey-300, #EAECF0); + font-size: 16px; + font-weight: 500; + line-height: 48px; + letter-spacing: 0.449px; + text-align: center; + + .text { + margin-left: 4px; + } + } + + .links { + display: flex; + align-items: center; + gap: 8px; + + span { + display: flex; + } + } + .githubWrapper { + cursor: pointer; + } +} diff --git a/demo/src/platform/pc/header/index.tsx b/demo/src/platform/pc/header/index.tsx new file mode 100644 index 00000000..a55b3f04 --- /dev/null +++ b/demo/src/platform/pc/header/index.tsx @@ -0,0 +1,48 @@ +"use client" + +import { useAppSelector, GITHUB_URL, useSmallScreen } from "@/common" +import Network from "./network" +import InfoPopover from "./infoPopover" +import StylePopover from "./stylePopover" +import { GithubIcon, LogoIcon, InfoIcon, ColorPickerIcon } from "@/components/icons" + +import styles from "./index.module.scss" + +const Header = () => { + const themeColor = useAppSelector(state => state.global.themeColor) + const options = useAppSelector(state => state.global.options) + const { channel } = options + + + const onClickGithub = () => { + if (typeof window !== "undefined") { + window.open(GITHUB_URL, "_blank") + } + } + + + + return
+ + + + + + + Channel Name: {channel} + + +
+ + + + + + + +
+
+} + + +export default Header diff --git a/demo/src/platform/pc/header/infoPopover/index.module.scss b/demo/src/platform/pc/header/infoPopover/index.module.scss new file mode 100644 index 00000000..cd3f72f8 --- /dev/null +++ b/demo/src/platform/pc/header/infoPopover/index.module.scss @@ -0,0 +1,43 @@ +.info { + display: flex; + padding: 12px 16px; + flex-direction: column; + align-items: flex-start; + gap: 8px; + align-self: stretch; + + .title { + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + } + + .item { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + + .title { + color: var(--Grey-600, #667085); + font-size: 14px; + font-weight: 400; + line-height: 150%; + } + + .content { + color: var(--theme-color, #FFF); + font-size: 14px; + font-weight: 400; + line-height: 150%; + } + } + + .slider { + height: 1px; + width: 100%; + background-color: #0D0F12; + } +} diff --git a/demo/src/platform/pc/header/infoPopover/index.tsx b/demo/src/platform/pc/header/infoPopover/index.tsx new file mode 100644 index 00000000..cd451418 --- /dev/null +++ b/demo/src/platform/pc/header/infoPopover/index.tsx @@ -0,0 +1,57 @@ +import { useMemo } from "react" +import { useAppSelector } from "@/common" +import { Popover } from 'antd'; + + +import styles from "./index.module.scss" + +interface InfoPopoverProps { + children?: React.ReactNode +} + +const InfoPopover = (props: InfoPopoverProps) => { + const { children } = props + const options = useAppSelector(state => state.global.options) + const { channel, userId } = options + + const roomConnected = useAppSelector(state => state.global.roomConnected) + const agentConnected = useAppSelector(state => state.global.agentConnected) + + const roomConnectedText = useMemo(() => { + return roomConnected ? "TRUE" : "FALSE" + }, [roomConnected]) + + const agentConnectedText = useMemo(() => { + return agentConnected ? "TRUE" : "FALSE" + }, [agentConnected]) + + + + const content =
+
INFO
+
+ Room + {channel} +
+
+ Participant + {userId} +
+
+
STATUS
+
+
Room connected
+
{roomConnectedText}
+
+
+
Agent connected
+
{agentConnectedText}
+
+
+ + + return {children} + +} + +export default InfoPopover diff --git a/demo/src/platform/pc/header/network/index.module.scss b/demo/src/platform/pc/header/network/index.module.scss new file mode 100644 index 00000000..e69de29b diff --git a/demo/src/platform/pc/header/network/index.tsx b/demo/src/platform/pc/header/network/index.tsx new file mode 100644 index 00000000..92b4e33b --- /dev/null +++ b/demo/src/platform/pc/header/network/index.tsx @@ -0,0 +1,37 @@ +"use client"; + +import React from "react"; +import { rtcManager } from "@/manager" +import { NetworkQuality } from "agora-rtc-sdk-ng" +import { useEffect, useState } from "react" +import { NetworkIcon } from "@/components/icons" + +interface NetworkProps { + style?: React.CSSProperties +} + +const NetWork = (props: NetworkProps) => { + const { style } = props + + const [networkQuality, setNetworkQuality] = useState() + + useEffect(() => { + rtcManager.on("networkQuality", onNetworkQuality) + + return () => { + rtcManager.off("networkQuality", onNetworkQuality) + } + }, []) + + const onNetworkQuality = (quality: NetworkQuality) => { + setNetworkQuality(quality) + } + + return ( + + + + ) +} + +export default NetWork diff --git a/demo/src/platform/pc/header/stylePopover/colorPicker/index.module.scss b/demo/src/platform/pc/header/stylePopover/colorPicker/index.module.scss new file mode 100644 index 00000000..405e7781 --- /dev/null +++ b/demo/src/platform/pc/header/stylePopover/colorPicker/index.module.scss @@ -0,0 +1,24 @@ +.colorPicker { + height: 24px; + display: flex; + align-items: center; + + :global(.react-colorful) { + width: 220px; + height: 8px; + } + + :global(.react-colorful__saturation) { + display: none; + } + + :global(.react-colorful__hue) { + border-radius: 8px !important; + height: 8px; + } + + :global(.react-colorful__pointer) { + width: 24px; + height: 24px; + } +} diff --git a/demo/src/platform/pc/header/stylePopover/colorPicker/index.tsx b/demo/src/platform/pc/header/stylePopover/colorPicker/index.tsx new file mode 100644 index 00000000..28163d77 --- /dev/null +++ b/demo/src/platform/pc/header/stylePopover/colorPicker/index.tsx @@ -0,0 +1,22 @@ +"use client" + +import { HexColorPicker } from "react-colorful"; +import { useAppSelector, useAppDispatch } from "@/common" +import { setThemeColor } from "@/store/reducers/global" +import styles from "./index.module.scss"; + +const ColorPicker = () => { + const dispatch = useAppDispatch() + const themeColor = useAppSelector(state => state.global.themeColor) + + const onColorChange = (color: string) => { + console.log(color); + dispatch(setThemeColor(color)) + }; + + return
+ +
+}; + +export default ColorPicker; diff --git a/demo/src/platform/pc/header/stylePopover/index.module.scss b/demo/src/platform/pc/header/stylePopover/index.module.scss new file mode 100644 index 00000000..98c7f182 --- /dev/null +++ b/demo/src/platform/pc/header/stylePopover/index.module.scss @@ -0,0 +1,51 @@ +.info { + display: flex; + padding: 12px 16px; + flex-direction: column; + align-items: flex-start; + gap: 16px; + align-self: stretch; + + + .title { + color: var(--Grey-300, #EAECF0); + font-size: 14px; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + } + + .color { + font-size: 0; + white-space: nowrap; + + .item { + position: relative; + display: inline-block; + width: 28px; + height: 28px; + border-radius: 4px; + border: 2px solid transparent; + font-size: 0; + cursor: pointer; + + .inner { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + width: 18px; + height: 18px; + border-radius: 2px; + box-sizing: border-box; + } + } + + .item+.item { + margin-left: 12px; + } + + } + + +} diff --git a/demo/src/platform/pc/header/stylePopover/index.tsx b/demo/src/platform/pc/header/stylePopover/index.tsx new file mode 100644 index 00000000..f8508323 --- /dev/null +++ b/demo/src/platform/pc/header/stylePopover/index.tsx @@ -0,0 +1,54 @@ +import { useMemo } from "react" +import { COLOR_LIST, useAppSelector, useAppDispatch } from "@/common" +import { setThemeColor } from "@/store/reducers/global" +import ColorPicker from "./colorPicker" +import { Popover } from 'antd'; + + +import styles from "./index.module.scss" + +interface StylePopoverProps { + children?: React.ReactNode +} + +const StylePopover = (props: StylePopoverProps) => { + const { children } = props + const dispatch = useAppDispatch() + const themeColor = useAppSelector(state => state.global.themeColor) + + + const onClickColor = (index: number) => { + const target = COLOR_LIST[index] + if (target.active !== themeColor) { + dispatch(setThemeColor(target.active)) + } + } + + const content =
+
STYLE
+
+ { + COLOR_LIST.map((item, index) => { + return onClickColor(index)} + className={styles.item} + key={index}> + + + }) + } +
+ +
+ + + return {children} + +} + +export default StylePopover diff --git a/demo/src/platform/pc/rtc/agent/index.module.scss b/demo/src/platform/pc/rtc/agent/index.module.scss new file mode 100644 index 00000000..fa3ae2ec --- /dev/null +++ b/demo/src/platform/pc/rtc/agent/index.module.scss @@ -0,0 +1,31 @@ +.agent { + position: relative; + display: flex; + height: 292px; + padding: 20px 16px; + flex-direction: column; + justify-content: flex-start; + align-items: center; + align-self: stretch; + background: linear-gradient(154deg, rgba(27, 66, 166, 0.16) 0%, rgba(27, 45, 140, 0.00) 18%), linear-gradient(153deg, rgba(23, 24, 28, 0.00) 53.75%, #11174E 100%), #0F0F11; + box-shadow: 0px 3.999px 48.988px 0px rgba(0, 7, 72, 0.12); + backdrop-filter: blur(7); + box-sizing: border-box; + + .text { + margin-top: 50px; + color: var(--theme-color, #EAECF0); + font-size: 24px; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + } + + .view { + margin-top: 32px; + display: flex; + align-items: center; + justify-content: center; + height: 56px; + } +} diff --git a/demo/src/platform/pc/rtc/agent/index.tsx b/demo/src/platform/pc/rtc/agent/index.tsx new file mode 100644 index 00000000..a7fd7944 --- /dev/null +++ b/demo/src/platform/pc/rtc/agent/index.tsx @@ -0,0 +1,34 @@ +"use client" + +import { useAppSelector, useMultibandTrackVolume } from "@/common" +import AudioVisualizer from "../audioVisualizer" +import { IMicrophoneAudioTrack } from 'agora-rtc-sdk-ng'; +import styles from "./index.module.scss" + +interface AgentProps { + audioTrack?: IMicrophoneAudioTrack +} + +const Agent = (props: AgentProps) => { + const { audioTrack } = props + + const subscribedVolumes = useMultibandTrackVolume(audioTrack, 12); + + return
+
Agent
+
+ +
+
+ +} + + +export default Agent; diff --git a/demo/src/platform/pc/rtc/audioVisualizer/index.module.scss b/demo/src/platform/pc/rtc/audioVisualizer/index.module.scss new file mode 100644 index 00000000..1beae944 --- /dev/null +++ b/demo/src/platform/pc/rtc/audioVisualizer/index.module.scss @@ -0,0 +1,17 @@ +.audioVisualizer { + display: flex; + justify-content: center; + align-items: center; + + + .item {} + + .agent { + background-color: var(--theme-color, #EAECF0); + box-shadow: 0 0 10px var(--theme-color, #EAECF0); + } + + .user { + background-color: var(--Grey-300, #EAECF0); + } +} diff --git a/demo/src/platform/pc/rtc/audioVisualizer/index.tsx b/demo/src/platform/pc/rtc/audioVisualizer/index.tsx new file mode 100644 index 00000000..bc21f554 --- /dev/null +++ b/demo/src/platform/pc/rtc/audioVisualizer/index.tsx @@ -0,0 +1,48 @@ +"use client" + +import { useState, useEffect } from "react" +import styles from "./index.module.scss" + +interface AudioVisualizerProps { + type: "agent" | "user"; + frequencies: Float32Array[]; + gap: number; + barWidth: number; + minBarHeight: number; + maxBarHeight: number + borderRadius: number; +} + + +const AudioVisualizer = (props: AudioVisualizerProps) => { + const { frequencies, gap, barWidth, minBarHeight, maxBarHeight, borderRadius, type } = props; + + const summedFrequencies = frequencies.map((bandFrequencies) => { + const sum = bandFrequencies.reduce((a, b) => a + b, 0) + if (sum <= 0) { + return 0 + } + return Math.sqrt(sum / bandFrequencies.length); + }); + + return
{ + summedFrequencies.map((frequency, index) => { + + const style = { + height: minBarHeight + frequency * (maxBarHeight - minBarHeight) + "px", + borderRadius: borderRadius + "px", + width: barWidth + "px", + transition: + "background-color 0.35s ease-out, transform 0.25s ease-out", + // transform: transform, + } + + return + }) + }
+} + + +export default AudioVisualizer; diff --git a/demo/src/platform/pc/rtc/camSection/camSelect/index.module.scss b/demo/src/platform/pc/rtc/camSection/camSelect/index.module.scss new file mode 100644 index 00000000..8ca5088b --- /dev/null +++ b/demo/src/platform/pc/rtc/camSection/camSelect/index.module.scss @@ -0,0 +1,4 @@ +.select { + flex: 0 0 200px; + width: 200px; +} diff --git a/demo/src/platform/pc/rtc/camSection/camSelect/index.tsx b/demo/src/platform/pc/rtc/camSection/camSelect/index.tsx new file mode 100644 index 00000000..33a5e003 --- /dev/null +++ b/demo/src/platform/pc/rtc/camSection/camSelect/index.tsx @@ -0,0 +1,57 @@ +"use client" + +import AgoraRTC, { ICameraVideoTrack } from "agora-rtc-sdk-ng" +import { useState, useEffect } from "react" +import { Select } from "antd" + +import styles from "./index.module.scss" + +interface CamSelectProps { + videoTrack?: ICameraVideoTrack +} + +interface SelectItem { + label: string + value: string + deviceId: string +} + +const DEFAULT_ITEM: SelectItem = { + label: "Default", + value: "default", + deviceId: "" +} + +const CamSelect = (props: CamSelectProps) => { + const { videoTrack } = props + const [items, setItems] = useState([DEFAULT_ITEM]); + const [value, setValue] = useState("default"); + + useEffect(() => { + if (videoTrack) { + const label = videoTrack?.getTrackLabel(); + setValue(label); + AgoraRTC.getCameras().then(arr => { + setItems(arr.map(item => ({ + label: item.label, + value: item.label, + deviceId: item.deviceId + }))); + }); + } + }, [videoTrack]); + + const onChange = async (value: string) => { + const target = items.find(item => item.value === value); + if (target) { + setValue(target.value); + if (videoTrack) { + await videoTrack.setDevice(target.deviceId); + } + } + } + + return +} + +export default CamSelect diff --git a/demo/src/platform/pc/rtc/camSection/index.module.scss b/demo/src/platform/pc/rtc/camSection/index.module.scss new file mode 100644 index 00000000..28b88e2e --- /dev/null +++ b/demo/src/platform/pc/rtc/camSection/index.module.scss @@ -0,0 +1,54 @@ +.camera { + position: relative; + width: 100%; + height: 100%; + box-sizing: border-box; + + .select { + height: 32px; + display: flex; + width: 100%; + justify-content: flex-start; + align-items: center; + + .text { + flex: 1 1 auto; + height: 32px; + line-height: 32px; + color: var(--Grey-300, #EAECF0); + font-weight: 500; + letter-spacing: 0.449px; + } + + .iconWrapper { + flex: 0 0 auto; + margin-right: 12px; + display: flex; + width: 32px; + height: 32px; + flex-direction: column; + justify-content: center; + align-items: center; + flex-shrink: 0; + border-radius: 6px; + border: 1px solid #2B2F36; + cursor: pointer; + } + + .select { + flex: 0 0 auto; + width: 200px; + } + } + + .view { + position: relative; + margin-top: 12px; + min-height: 210px; + height: 210px; + border-radius: 6px; + border: 1px solid #272A2F; + background: #1E2024; + box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); + } +} diff --git a/demo/src/platform/pc/rtc/camSection/index.tsx b/demo/src/platform/pc/rtc/camSection/index.tsx new file mode 100644 index 00000000..99e5392c --- /dev/null +++ b/demo/src/platform/pc/rtc/camSection/index.tsx @@ -0,0 +1,47 @@ +"use client" + +import CamSelect from "./camSelect" +import { CamIcon } from "@/components/icons" +import styles from "./index.module.scss" +import { ICameraVideoTrack } from 'agora-rtc-sdk-ng'; +import { LocalStreamPlayer } from "../streamPlayer" +import { useState, useEffect, useMemo } from 'react'; +import { useSmallScreen } from "@/common" + +interface CamSectionProps { + videoTrack?: ICameraVideoTrack +} + +const CamSection = (props: CamSectionProps) => { + const { videoTrack } = props + const [videoMute, setVideoMute] = useState(false) + const { xs } = useSmallScreen() + + const CamText = useMemo(() => { + return xs ? "CAM" : "CAMERA" + }, [xs]) + + useEffect(() => { + videoTrack?.setMuted(videoMute) + }, [videoTrack, videoMute]) + + const onClickMute = () => { + setVideoMute(!videoMute) + } + + return
+
+ {CamText} + + + + +
+
+ +
+
+} + + +export default CamSection; diff --git a/demo/src/platform/pc/rtc/index.module.scss b/demo/src/platform/pc/rtc/index.module.scss new file mode 100644 index 00000000..b62025c5 --- /dev/null +++ b/demo/src/platform/pc/rtc/index.module.scss @@ -0,0 +1,55 @@ +.rtc { + flex: 0 0 420px; + display: flex; + flex-direction: column; + align-items: flex-start; + flex-shrink: 0; + align-self: stretch; + border-radius: 8px; + border: 1px solid #272A2F; + background: #181A1D; + box-sizing: border-box; + + .header { + display: flex; + height: 42px; + padding: 0px 16px; + align-items: center; + align-self: stretch; + border-bottom: 1px solid #272A2F; + + .text { + flex: 1 1 auto; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + color: var(--Grey-300, #EAECF0); + } + + .voiceSelect { + flex: 0 0 120px; + } + } + + .you { + display: flex; + padding: 24px 16px; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 24px; + align-self: stretch; + border-top: 1px solid #272A2F; + + .title { + color: var(--Grey-300, #EAECF0); + font-size: 24px; + font-weight: 600; + line-height: 150%; + letter-spacing: 0.449px; + text-align: center; + } + + + } +} diff --git a/demo/src/platform/pc/rtc/index.tsx b/demo/src/platform/pc/rtc/index.tsx new file mode 100644 index 00000000..1195ca0f --- /dev/null +++ b/demo/src/platform/pc/rtc/index.tsx @@ -0,0 +1,128 @@ +"use client" + +import { ICameraVideoTrack, IMicrophoneAudioTrack } from "agora-rtc-sdk-ng" +import { useAppSelector, useAppDispatch, VOICE_OPTIONS } from "@/common" +import { ITextItem } from "@/types" +import { rtcManager, IUserTracks, IRtcUser } from "@/manager" +import { setRoomConnected, addChatItem, setVoiceType } from "@/store/reducers/global" +import MicSection from "./micSection" +import CamSection from "./camSection" +import Agent from "./agent" +import styles from "./index.module.scss" +import { useRef, useEffect, useState, Fragment } from "react" +import { VoiceIcon } from "@/components/icons" +import CustomSelect from "@/components/customSelect" + +let hasInit = false + +const Rtc = () => { + const dispatch = useAppDispatch() + const options = useAppSelector(state => state.global.options) + const voiceType = useAppSelector(state => state.global.voiceType) + const agentConnected = useAppSelector(state => state.global.agentConnected) + const { userId, channel } = options + const [videoTrack, setVideoTrack] = useState() + const [audioTrack, setAudioTrack] = useState() + const [remoteuser, setRemoteUser] = useState() + + useEffect(() => { + if (!options.channel) { + return + } + if (hasInit) { + return + } + + init() + + return () => { + if (hasInit) { + destory() + } + } + }, [options.channel]) + + + const init = async () => { + console.log("[test] init") + rtcManager.on("localTracksChanged", onLocalTracksChanged) + rtcManager.on("textChanged", onTextChanged) + rtcManager.on("remoteUserChanged", onRemoteUserChanged) + await rtcManager.createTracks() + await rtcManager.join({ + channel, + userId + }) + await rtcManager.publish() + dispatch(setRoomConnected(true)) + hasInit = true + } + + const destory = async () => { + console.log("[test] destory") + rtcManager.off("textChanged", onTextChanged) + rtcManager.off("localTracksChanged", onLocalTracksChanged) + rtcManager.off("remoteUserChanged", onRemoteUserChanged) + await rtcManager.destroy() + dispatch(setRoomConnected(false)) + hasInit = false + } + + const onRemoteUserChanged = (user: IRtcUser) => { + console.log("[test] onRemoteUserChanged", user) + setRemoteUser(user) + } + + const onLocalTracksChanged = (tracks: IUserTracks) => { + console.log("[test] onLocalTracksChanged", tracks) + const { videoTrack, audioTrack } = tracks + if (videoTrack) { + setVideoTrack(videoTrack) + } + if (audioTrack) { + setAudioTrack(audioTrack) + } + } + + const onTextChanged = (text: ITextItem) => { + if (text.dataType == "transcribe") { + const isAgent = Number(text.uid) != Number(userId) + dispatch(addChatItem({ + userId: text.uid, + text: text.text, + type: isAgent ? "agent" : "user", + isFinal: text.isFinal, + time: text.time + })) + } + } + + const onVoiceChange = (value: any) => { + dispatch(setVoiceType(value)) + } + + + return
+
+ Audio & Video + } + options={VOICE_OPTIONS} onChange={onVoiceChange}> +
+ {/* agent */} + + {/* you */} +
+
You
+ {/* microphone */} + + {/* camera */} + +
+
+} + + +export default Rtc; diff --git a/demo/src/platform/pc/rtc/micSection/index.module.scss b/demo/src/platform/pc/rtc/micSection/index.module.scss new file mode 100644 index 00000000..81fffd3d --- /dev/null +++ b/demo/src/platform/pc/rtc/micSection/index.module.scss @@ -0,0 +1,56 @@ +.microphone { + position: relative; + width: 100%; + height: 100%; + box-sizing: border-box; + + .select { + height: 32px; + display: flex; + width: 100%; + justify-content: flex-start; + align-items: center; + + .text { + flex: 1 1 auto; + height: 32px; + line-height: 32px; + color: var(--Grey-300, #EAECF0); + font-weight: 500; + letter-spacing: 0.449px; + } + + .iconWrapper { + flex: 0 0 auto; + margin-right: 12px; + display: flex; + width: 32px; + height: 32px; + flex-direction: column; + justify-content: center; + align-items: center; + flex-shrink: 0; + border-radius: 6px; + border: 1px solid #2B2F36; + cursor: pointer; + } + + + } + + .view { + margin-top: 12px; + display: flex; + height: 120px; + padding: 24px; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 10px; + align-self: stretch; + border-radius: 6px; + border: 1px solid #272A2F; + background: #1E2024; + box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); + } +} diff --git a/demo/src/platform/pc/rtc/micSection/index.tsx b/demo/src/platform/pc/rtc/micSection/index.tsx new file mode 100644 index 00000000..6d97f3e2 --- /dev/null +++ b/demo/src/platform/pc/rtc/micSection/index.tsx @@ -0,0 +1,73 @@ +"use client" + +import { useEffect, useMemo, useState } from "react" +import { useMultibandTrackVolume, useSmallScreen } from "@/common" +import AudioVisualizer from "../audioVisualizer" +import { MicIcon } from "@/components/icons" +import styles from "./index.module.scss" +import { IMicrophoneAudioTrack } from 'agora-rtc-sdk-ng'; +import MicSelect from "./micSelect"; + +interface MicSectionProps { + audioTrack?: IMicrophoneAudioTrack +} + +const MicSection = (props: MicSectionProps) => { + const { audioTrack } = props + const [audioMute, setAudioMute] = useState(false) + const [mediaStreamTrack, setMediaStreamTrack] = useState() + const { xs } = useSmallScreen() + + const MicText = useMemo(() => { + return xs ? "MIC" : "MICROPHONE" + }, [xs]) + + useEffect(() => { + audioTrack?.on("track-updated", onAudioTrackupdated) + if (audioTrack) { + setMediaStreamTrack(audioTrack.getMediaStreamTrack()) + } + + return () => { + audioTrack?.off("track-updated", onAudioTrackupdated) + } + }, [audioTrack]) + + useEffect(() => { + audioTrack?.setMuted(audioMute) + }, [audioTrack, audioMute]) + + const subscribedVolumes = useMultibandTrackVolume(mediaStreamTrack, 20); + + const onAudioTrackupdated = (track: MediaStreamTrack) => { + console.log("[test] audio track updated", track) + setMediaStreamTrack(track) + } + + const onClickMute = () => { + setAudioMute(!audioMute) + } + + return
+
+ {MicText} + + + + +
+
+ +
+
+} + + +export default MicSection; diff --git a/demo/src/platform/pc/rtc/micSection/micSelect/index.module.scss b/demo/src/platform/pc/rtc/micSection/micSelect/index.module.scss new file mode 100644 index 00000000..8ca5088b --- /dev/null +++ b/demo/src/platform/pc/rtc/micSection/micSelect/index.module.scss @@ -0,0 +1,4 @@ +.select { + flex: 0 0 200px; + width: 200px; +} diff --git a/demo/src/platform/pc/rtc/micSection/micSelect/index.tsx b/demo/src/platform/pc/rtc/micSection/micSelect/index.tsx new file mode 100644 index 00000000..efc842b5 --- /dev/null +++ b/demo/src/platform/pc/rtc/micSection/micSelect/index.tsx @@ -0,0 +1,58 @@ +"use client" + +import AgoraRTC from "agora-rtc-sdk-ng" +import { useState, useEffect } from "react" +import { Select } from "antd" +import { IMicrophoneAudioTrack } from "agora-rtc-sdk-ng" + +import styles from "./index.module.scss" + +interface MicSelectProps { + audioTrack?: IMicrophoneAudioTrack +} + +interface SelectItem { + label: string + value: string + deviceId: string +} + +const DEFAULT_ITEM: SelectItem = { + label: "Default", + value: "default", + deviceId: "" +} + +const MicSelect = (props: MicSelectProps) => { + const { audioTrack } = props + const [items, setItems] = useState([DEFAULT_ITEM]); + const [value, setValue] = useState("default"); + + useEffect(() => { + if (audioTrack) { + const label = audioTrack?.getTrackLabel(); + setValue(label); + AgoraRTC.getMicrophones().then(arr => { + setItems(arr.map(item => ({ + label: item.label, + value: item.label, + deviceId: item.deviceId + }))); + }); + } + }, [audioTrack]); + + const onChange = async (value: string) => { + const target = items.find(item => item.value === value); + if (target) { + setValue(target.value); + if (audioTrack) { + await audioTrack.setDevice(target.deviceId); + } + } + } + + return +} + +export default MicSelect diff --git a/demo/src/platform/pc/rtc/streamPlayer/index.module.scss b/demo/src/platform/pc/rtc/streamPlayer/index.module.scss new file mode 100644 index 00000000..b1c57c10 --- /dev/null +++ b/demo/src/platform/pc/rtc/streamPlayer/index.module.scss @@ -0,0 +1,6 @@ +.streamPlayer { + position: relative; + width: 100%; + height: 100%; + overflow: hidden; +} diff --git a/demo/src/platform/pc/rtc/streamPlayer/index.tsx b/demo/src/platform/pc/rtc/streamPlayer/index.tsx new file mode 100644 index 00000000..ba78e377 --- /dev/null +++ b/demo/src/platform/pc/rtc/streamPlayer/index.tsx @@ -0,0 +1 @@ +export * from "./localStreamPlayer" diff --git a/demo/src/platform/pc/rtc/streamPlayer/localStreamPlayer.tsx b/demo/src/platform/pc/rtc/streamPlayer/localStreamPlayer.tsx new file mode 100644 index 00000000..e3e7f06a --- /dev/null +++ b/demo/src/platform/pc/rtc/streamPlayer/localStreamPlayer.tsx @@ -0,0 +1,46 @@ +"use client" + +import { + ICameraVideoTrack, + IMicrophoneAudioTrack, + IRemoteAudioTrack, + IRemoteVideoTrack, + VideoPlayerConfig, +} from "agora-rtc-sdk-ng" +import { useRef, useState, useLayoutEffect, forwardRef, useEffect, useMemo } from "react" + +import styles from "./index.module.scss" + +interface StreamPlayerProps { + videoTrack?: ICameraVideoTrack + audioTrack?: IMicrophoneAudioTrack + style?: React.CSSProperties + fit?: "cover" | "contain" | "fill" + onClick?: () => void + mute?: boolean +} + +export const LocalStreamPlayer = forwardRef((props: StreamPlayerProps, ref) => { + const { videoTrack, audioTrack, mute = false, style = {}, fit = "cover", onClick = () => { } } = props + const vidDiv = useRef(null) + + useLayoutEffect(() => { + const config = { fit } as VideoPlayerConfig + if (mute) { + videoTrack?.stop() + } else { + if (!videoTrack?.isPlaying) { + videoTrack?.play(vidDiv.current!, config) + } + } + + return () => { + videoTrack?.stop() + } + }, [videoTrack, fit, mute]) + + // local audio track need not to be played + // useLayoutEffect(() => {}, [audioTrack, localAudioMute]) + + return
+}) diff --git a/demo/src/protobuf/SttMessage.js b/demo/src/protobuf/SttMessage.js new file mode 100644 index 00000000..e69de29b diff --git a/demo/src/protobuf/SttMessage.proto b/demo/src/protobuf/SttMessage.proto new file mode 100644 index 00000000..d8e07a54 --- /dev/null +++ b/demo/src/protobuf/SttMessage.proto @@ -0,0 +1,40 @@ +syntax = "proto3"; + +package Agora.SpeechToText; + +option objc_class_prefix = "Stt"; + +option csharp_namespace = "AgoraSTTSample.Protobuf"; + +option java_package = "io.agora.rtc.speech2text"; +option java_outer_classname = "AgoraSpeech2TextProtobuffer"; + +message Text { + int32 vendor = 1; + int32 version = 2; + int32 seqnum = 3; + int64 uid = 4; + int32 flag = 5; + int64 time = 6; + int32 lang = 7; + int32 starttime = 8; + int32 offtime = 9; + repeated Word words = 10; + bool end_of_segment = 11; + int32 duration_ms = 12; + string data_type = 13; // transcribe ,translate + repeated Translation trans = 14; + string culture = 15; +} +message Word { + string text = 1; + int32 start_ms = 2; + int32 duration_ms = 3; + bool is_final = 4; + double confidence = 5; +} +message Translation { + bool is_final = 1; + string lang = 2; // 翻译语言 + repeated string texts = 3; +} diff --git a/demo/src/protobuf/SttMessage_es6.js b/demo/src/protobuf/SttMessage_es6.js new file mode 100644 index 00000000..54188af8 --- /dev/null +++ b/demo/src/protobuf/SttMessage_es6.js @@ -0,0 +1,134 @@ +/* eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars */ +import * as $protobuf from "protobufjs/light" + +const $root = ($protobuf.roots.default || ($protobuf.roots.default = new $protobuf.Root())).addJSON( + { + Agora: { + nested: { + SpeechToText: { + options: { + objc_class_prefix: "Stt", + csharp_namespace: "AgoraSTTSample.Protobuf", + java_package: "io.agora.rtc.speech2text", + java_outer_classname: "AgoraSpeech2TextProtobuffer", + }, + nested: { + Text: { + fields: { + vendor: { + type: "int32", + id: 1, + }, + version: { + type: "int32", + id: 2, + }, + seqnum: { + type: "int32", + id: 3, + }, + uid: { + type: "uint32", + id: 4, + }, + flag: { + type: "int32", + id: 5, + }, + time: { + type: "int64", + id: 6, + }, + lang: { + type: "int32", + id: 7, + }, + starttime: { + type: "int32", + id: 8, + }, + offtime: { + type: "int32", + id: 9, + }, + words: { + rule: "repeated", + type: "Word", + id: 10, + }, + endOfSegment: { + type: "bool", + id: 11, + }, + durationMs: { + type: "int32", + id: 12, + }, + dataType: { + type: "string", + id: 13, + }, + trans: { + rule: "repeated", + type: "Translation", + id: 14, + }, + culture: { + type: "string", + id: 15, + }, + textTs: { + type: "int64", + id: 16, + }, + }, + }, + Word: { + fields: { + text: { + type: "string", + id: 1, + }, + startMs: { + type: "int32", + id: 2, + }, + durationMs: { + type: "int32", + id: 3, + }, + isFinal: { + type: "bool", + id: 4, + }, + confidence: { + type: "double", + id: 5, + }, + }, + }, + Translation: { + fields: { + isFinal: { + type: "bool", + id: 1, + }, + lang: { + type: "string", + id: 2, + }, + texts: { + rule: "repeated", + type: "string", + id: 3, + }, + }, + }, + }, + }, + }, + }, + }, +) + +export { $root as default } diff --git a/demo/src/store/index.ts b/demo/src/store/index.ts new file mode 100644 index 00000000..8c6c1482 --- /dev/null +++ b/demo/src/store/index.ts @@ -0,0 +1,21 @@ +"use client" + +import globalReducer from "./reducers/global" +import { configureStore } from '@reduxjs/toolkit' + +export * from "./provider" + +export const makeStore = () => { + return configureStore({ + reducer: { + global: globalReducer, + }, + devTools: process.env.NODE_ENV !== "production", + }) +} + +// Infer the type of makeStore +export type AppStore = ReturnType +// Infer the `RootState` and `AppDispatch` types from the store itself +export type RootState = ReturnType +export type AppDispatch = AppStore['dispatch'] diff --git a/demo/src/store/provider/index.tsx b/demo/src/store/provider/index.tsx new file mode 100644 index 00000000..f34703b7 --- /dev/null +++ b/demo/src/store/provider/index.tsx @@ -0,0 +1,21 @@ +"use client"; + +import { useRef } from 'react' +import { Provider } from 'react-redux' +import { makeStore, AppStore } from '..' + +export function StoreProvider({ + children +}: { + children: React.ReactNode +}) { + const storeRef = useRef() + + if (!storeRef.current) { + // Create the store instance the first time this renders + storeRef.current = makeStore() + } + + return {children} +} + diff --git a/demo/src/store/reducers/global.ts b/demo/src/store/reducers/global.ts new file mode 100644 index 00000000..b29f0af8 --- /dev/null +++ b/demo/src/store/reducers/global.ts @@ -0,0 +1,105 @@ +import { IOptions, IChatItem, Language, VoiceType } from "@/types" +import { createSlice, PayloadAction } from "@reduxjs/toolkit" +import { DEFAULT_OPTIONS, COLOR_LIST, setOptionsToLocal, genRandomChatList } from "@/common" + +export interface InitialState { + options: IOptions + roomConnected: boolean, + agentConnected: boolean, + themeColor: string, + language: Language + voiceType: VoiceType + chatItems: IChatItem[], + graphName: string +} + +const getInitialState = (): InitialState => { + return { + options: DEFAULT_OPTIONS, + themeColor: COLOR_LIST[0].active, + roomConnected: false, + agentConnected: false, + language: "en-US", + voiceType: "male", + chatItems: [], + graphName: "camera.va.openai.azure" + } +} + +export const globalSlice = createSlice({ + name: "global", + initialState: getInitialState(), + reducers: { + setOptions: (state, action: PayloadAction>) => { + state.options = { ...state.options, ...action.payload } + setOptionsToLocal(state.options) + }, + setThemeColor: (state, action: PayloadAction) => { + state.themeColor = action.payload + document.documentElement.style.setProperty('--theme-color', action.payload); + }, + setRoomConnected: (state, action: PayloadAction) => { + state.roomConnected = action.payload + }, + addChatItem: (state, action: PayloadAction) => { + const { userId, text, isFinal, type, time } = action.payload + const LastFinalIndex = state.chatItems.findLastIndex((el) => { + return el.userId == userId && el.isFinal + }) + const LastNonFinalIndex = state.chatItems.findLastIndex((el) => { + return el.userId == userId && !el.isFinal + }) + let LastFinalItem = state.chatItems[LastFinalIndex] + let LastNonFinalItem = state.chatItems[LastNonFinalIndex] + if (LastFinalItem) { + // has last final Item + if (time <= LastFinalItem.time) { + // discard + console.log("[test] addChatItem, time < last final item, discard!:", text, isFinal, type) + return + } else { + if (LastNonFinalItem) { + console.log("[test] addChatItem, update last item(none final):", text, isFinal, type) + state.chatItems[LastNonFinalIndex] = action.payload + } else { + console.log("[test] addChatItem, add new item:", text, isFinal, type) + state.chatItems.push(action.payload) + } + } + } else { + // no last final Item + if (LastNonFinalItem) { + console.log("[test] addChatItem, update last item(none final):", text, isFinal, type) + state.chatItems[LastNonFinalIndex] = action.payload + } else { + console.log("[test] addChatItem, add new item:", text, isFinal, type) + state.chatItems.push(action.payload) + } + } + state.chatItems.sort((a, b) => a.time - b.time) + }, + setAgentConnected: (state, action: PayloadAction) => { + state.agentConnected = action.payload + }, + setLanguage: (state, action: PayloadAction) => { + state.language = action.payload + }, + setGraphName: (state, action: PayloadAction) => { + state.graphName = action.payload + }, + setVoiceType: (state, action: PayloadAction) => { + state.voiceType = action.payload + }, + reset: (state) => { + Object.assign(state, getInitialState()) + document.documentElement.style.setProperty('--theme-color', COLOR_LIST[0].active); + }, + }, +}) + +export const { reset, setOptions, + setRoomConnected, setAgentConnected, setVoiceType, + addChatItem, setThemeColor, setLanguage, setGraphName } = + globalSlice.actions + +export default globalSlice.reducer diff --git a/demo/src/types/index.ts b/demo/src/types/index.ts new file mode 100644 index 00000000..f5492003 --- /dev/null +++ b/demo/src/types/index.ts @@ -0,0 +1,62 @@ +export type Language = "en-US" | "zh-CN" | "ja-JP" | "ko-KR" +export type VoiceType = "male" | "female" + +export interface ColorItem { + active: string, + default: string +} + + +export interface IOptions { + channel: string, + userName: string, + userId: number +} + + +export interface IChatItem { + userId: number | string, + userName?: string, + text: string + type: "agent" | "user" + isFinal?: boolean + time: number +} + + +export interface ITextItem { + dataType: "transcribe" | "translate" + uid: string + time: number + text: string + isFinal: boolean +} + +export interface GraphOptionItem { + label: string + value: string +} + +export interface LanguageOptionItem { + label: string + value: Language +} + + +export interface VoiceOptionItem { + label: string + value: VoiceType +} + + +export interface OptionType { + value: string; + label: string; +} + + +export interface IPdfData { + fileName: string, + collection: string +} + diff --git a/demo/tsconfig.json b/demo/tsconfig.json new file mode 100644 index 00000000..15dcdd38 --- /dev/null +++ b/demo/tsconfig.json @@ -0,0 +1,40 @@ +{ + "compilerOptions": { + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "paths": { + "@/*": [ + "./src/*" + ] + } + }, + "include": [ + "svgr.d.ts", + "next-env.d.ts", + "**/*.ts", + "**/*.tsx", + ".next/types/**/*.ts" + ], + "exclude": [ + "node_modules" + ] +} diff --git a/docker-compose.yml b/docker-compose.yml index 6ad1a0ef..1793137c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,6 +28,7 @@ services: - astra_network environment: - AGENT_SERVER_URL=http://astra_agents_dev:8080 + - TEN_DEV_SERVER_URL=http://astra_agents_dev:49483 # use this when you want to run the playground in local development mode # astra_playground_dev: diff --git a/playground/.env b/playground/.env index 5f92b324..8739b9b0 100644 --- a/playground/.env +++ b/playground/.env @@ -1 +1,2 @@ -AGENT_SERVER_URL=http://localhost:8080 \ No newline at end of file +AGENT_SERVER_URL=http://localhost:8080 +TEN_DEV_SERVER_URL=http://localhost:49483 \ No newline at end of file diff --git a/playground/src/app/api/agents/start/route.tsx b/playground/src/app/api/agents/start/route.tsx index 5a7b4440..78a8bc43 100644 --- a/playground/src/app/api/agents/start/route.tsx +++ b/playground/src/app/api/agents/start/route.tsx @@ -1,5 +1,4 @@ import { NextRequest, NextResponse } from 'next/server'; -import { getGraphProperties } from './graph'; /** * Handles the POST request to start an agent. @@ -24,6 +23,7 @@ export async function POST(request: NextRequest) { graph_name, language, voice_type, + properties } = body; // Send a POST request to start the agent @@ -38,7 +38,7 @@ export async function POST(request: NextRequest) { user_uid, graph_name, // Get the graph properties based on the graph name, language, and voice type - properties: getGraphProperties(graph_name, language, voice_type), + properties: properties, }), }); diff --git a/playground/src/app/global.css b/playground/src/app/global.css index f7007287..7a1e1861 100644 --- a/playground/src/app/global.css +++ b/playground/src/app/global.css @@ -8,6 +8,7 @@ html, body { background-color: #0F0F11; font-family: "PingFang SC"; + height: 100%; } a { diff --git a/playground/src/app/page.tsx b/playground/src/app/page.tsx index 1bdcdeda..882aa4bd 100644 --- a/playground/src/app/page.tsx +++ b/playground/src/app/page.tsx @@ -1,14 +1,35 @@ -import LoginCard from "@/components/loginCard" -import styles from "./index.module.scss" +"use client" -export default function Login() { +import AuthInitializer from "@/components/authInitializer" +import { getRandomChannel, getRandomUserId, isMobile, useAppDispatch, useAppSelector } from "@/common" +import dynamic from 'next/dynamic' +import { useEffect, useState } from "react" +import { setOptions } from "@/store/reducers/global" + +const PCEntry = dynamic(() => import('@/platform/pc/entry'), { + ssr: false, +}) + +const MobileEntry = dynamic(() => import('@/platform/mobile/entry'), { + ssr: false, +}) + +export default function Home() { + const dispatch = useAppDispatch() + const [mobile, setMobile] = useState(null); + + + useEffect(() => { + setMobile(isMobile()) + }) return ( -
-
-
-
- -
+ mobile === null ? <> : + + {mobile ? : } + ); } + + + diff --git a/playground/src/common/constant.ts b/playground/src/common/constant.ts index fee0c18e..0fd93c81 100644 --- a/playground/src/common/constant.ts +++ b/playground/src/common/constant.ts @@ -6,7 +6,6 @@ export const DEFAULT_OPTIONS: IOptions = { userName: "", userId: 0 } -export const DESCRIPTION = "This is an AI voice assistant powered by ASTRA.ai framework, Agora, Azure and ChatGPT." export const LANGUAGE_OPTIONS: LanguageOptionItem[] = [ { label: "English", diff --git a/playground/src/common/hooks.ts b/playground/src/common/hooks.ts index 9759fa29..ff1d8050 100644 --- a/playground/src/common/hooks.ts +++ b/playground/src/common/hooks.ts @@ -129,3 +129,16 @@ export const usePrevious = (value: any) => { }; +export const useGraphExtensions = () => { + const graphName = useAppSelector(state => state.global.graphName); + const nodes = useAppSelector(state => state.global.extensions); + const [graphExtensions, setGraphExtensions] = useState>({}); + + useEffect(() => { + if (nodes && nodes[graphName]) { + setGraphExtensions(nodes[graphName]); + } + }, [graphName, nodes]); + + return graphExtensions; +}; \ No newline at end of file diff --git a/playground/src/common/request.ts b/playground/src/common/request.ts index 160cc065..624d5989 100644 --- a/playground/src/common/request.ts +++ b/playground/src/common/request.ts @@ -7,6 +7,7 @@ interface StartRequestConfig { graphName: string, language: Language, voiceType: "male" | "female" + properties: Record } interface GenAgoraDataConfig { @@ -15,7 +16,7 @@ interface GenAgoraDataConfig { } export const apiGenAgoraData = async (config: GenAgoraDataConfig) => { - // the request will be rewrite at next.config.mjs to send to $AGENT_SERVER_URL + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL const url = `/api/token/generate` const { userId, channel } = config const data = { @@ -37,14 +38,15 @@ export const apiGenAgoraData = async (config: GenAgoraDataConfig) => { export const apiStartService = async (config: StartRequestConfig): Promise => { // look at app/api/agents/start/route.tsx for the server-side implementation const url = `/api/agents/start` - const { channel, userId, graphName, language, voiceType } = config + const { channel, userId, graphName, language, voiceType, properties } = config const data = { request_id: genUUID(), channel_name: channel, user_uid: userId, graph_name: graphName, language, - voice_type: voiceType + voice_type: voiceType, + properties, } let resp: any = await fetch(url, { method: "POST", @@ -131,3 +133,42 @@ export const apiPing = async (channel: string) => { resp = (await resp.json()) || {} return resp } + +export const apiGetGraphs = async () => { + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL + const url = `/api/dev/v1/graphs` + let resp: any = await fetch(url, { + method: "GET", + headers: { + "Content-Type": "application/json", + } + }) + resp = (await resp.json()) || {} + return resp +} + +export const apiGetExtensionMetadata = async () => { + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL + const url = `/api/dev/v1/addons/extensions` + let resp: any = await fetch(url, { + method: "GET", + headers: { + "Content-Type": "application/json", + } + }) + resp = (await resp.json()) || {} + return resp +} + +export const apiGetNodes = async (graphName: string) => { + // the request will be rewrite at middleware.tsx to send to $AGENT_SERVER_URL + const url = `/api/dev/v1/graphs/${graphName}/nodes` + let resp: any = await fetch(url, { + method: "GET", + headers: { + "Content-Type": "application/json", + } + }) + resp = (await resp.json()) || {} + return resp +} \ No newline at end of file diff --git a/playground/src/components/authInitializer/index.tsx b/playground/src/components/authInitializer/index.tsx index 5ef763a1..65336e21 100644 --- a/playground/src/components/authInitializer/index.tsx +++ b/playground/src/components/authInitializer/index.tsx @@ -1,7 +1,7 @@ "use client" import { ReactNode, useEffect } from "react" -import { useAppDispatch, getOptionsFromLocal } from "@/common" +import { useAppDispatch, getOptionsFromLocal, getRandomChannel, getRandomUserId } from "@/common" import { setOptions, reset } from "@/store/reducers/global" interface AuthInitializerProps { @@ -15,9 +15,15 @@ const AuthInitializer = (props: AuthInitializerProps) => { useEffect(() => { if (typeof window !== "undefined") { const options = getOptionsFromLocal() - if (options) { + if (options && options.channel) { dispatch(reset()) dispatch(setOptions(options)) + } else { + dispatch(reset()) + dispatch(setOptions({ + channel: getRandomChannel(), + userId: getRandomUserId(), + })) } } }, [dispatch]) diff --git a/playground/src/middleware.tsx b/playground/src/middleware.tsx index 724e0b4d..d25c18bf 100644 --- a/playground/src/middleware.tsx +++ b/playground/src/middleware.tsx @@ -2,15 +2,19 @@ import { NextRequest, NextResponse } from 'next/server'; -const { AGENT_SERVER_URL } = process.env; +const { AGENT_SERVER_URL, TEN_DEV_SERVER_URL } = process.env; // Check if environment variables are available if (!AGENT_SERVER_URL) { - throw "Environment variables AGENT_SERVER_URL are not available"; + throw "Environment variables AGENT_SERVER_URL are not available"; +} + +if (!TEN_DEV_SERVER_URL) { + throw "Environment variables TEN_DEV_SERVER_URL are not available"; } export function middleware(req: NextRequest) { - const { pathname } = req.nextUrl; + const { pathname } = req.nextUrl; if (pathname.startsWith('/api/agents/')) { if (!pathname.startsWith('/api/agents/start')) { @@ -21,6 +25,8 @@ export function middleware(req: NextRequest) { // console.log(`Rewriting request to ${url.href}`); return NextResponse.rewrite(url); + } else { + return NextResponse.next(); } } else if (pathname.startsWith('/api/vector/')) { @@ -35,6 +41,14 @@ export function middleware(req: NextRequest) { const url = req.nextUrl.clone(); url.href = `${AGENT_SERVER_URL}${pathname.replace('/api/token/', '/token/')}`; + // console.log(`Rewriting request to ${url.href}`); + return NextResponse.rewrite(url); + } else if (pathname.startsWith('/api/dev/')) { + + // Proxy all other documents requests + const url = req.nextUrl.clone(); + url.href = `${TEN_DEV_SERVER_URL}${pathname.replace('/api/dev/', '/api/dev-server/')}`; + // console.log(`Rewriting request to ${url.href}`); return NextResponse.rewrite(url); } else { diff --git a/playground/src/platform/mobile/description/index.tsx b/playground/src/platform/mobile/description/index.tsx index 7473d550..bae88001 100644 --- a/playground/src/platform/mobile/description/index.tsx +++ b/playground/src/platform/mobile/description/index.tsx @@ -1,6 +1,6 @@ import { setAgentConnected } from "@/store/reducers/global" import { - DESCRIPTION, useAppDispatch, useAppSelector, apiPing, genUUID, + useAppDispatch, useAppSelector, apiPing, genUUID, apiStartService, apiStopService } from "@/common" import { message } from "antd" @@ -50,7 +50,8 @@ const Description = () => { userId, graphName, language, - voiceType + voiceType, + properties: {} }) const { code, msg } = res || {} if (code != 0) { diff --git a/playground/src/platform/mobile/rtc/agent/index.module.scss b/playground/src/platform/mobile/rtc/agent/index.module.scss index fa3ae2ec..5bebb2bc 100644 --- a/playground/src/platform/mobile/rtc/agent/index.module.scss +++ b/playground/src/platform/mobile/rtc/agent/index.module.scss @@ -1,7 +1,6 @@ .agent { position: relative; display: flex; - height: 292px; padding: 20px 16px; flex-direction: column; justify-content: flex-start; @@ -22,7 +21,6 @@ } .view { - margin-top: 32px; display: flex; align-items: center; justify-content: center; diff --git a/playground/src/platform/mobile/rtc/agent/index.tsx b/playground/src/platform/mobile/rtc/agent/index.tsx index a7fd7944..159f6730 100644 --- a/playground/src/platform/mobile/rtc/agent/index.tsx +++ b/playground/src/platform/mobile/rtc/agent/index.tsx @@ -15,7 +15,6 @@ const Agent = (props: AgentProps) => { const subscribedVolumes = useMultibandTrackVolume(audioTrack, 12); return
-
Agent
{ {/* you */}
-
You
{/* microphone */} {/* camera */} diff --git a/playground/src/platform/pc/chat/index.tsx b/playground/src/platform/pc/chat/index.tsx index 64dea171..3ee02155 100644 --- a/playground/src/platform/pc/chat/index.tsx +++ b/playground/src/platform/pc/chat/index.tsx @@ -7,50 +7,78 @@ import { LANGUAGE_OPTIONS, useAppSelector, GRAPH_OPTIONS, isRagGraph, + apiGetGraphs, + apiGetNodes, + useGraphExtensions, + apiGetExtensionMetadata, } from "@/common" -import { setGraphName, setLanguage } from "@/store/reducers/global" -import { Select, } from 'antd'; +import { setExtensionMetadata, setGraphName, setGraphs, setLanguage, setExtensions } from "@/store/reducers/global" +import { Button, Modal, Select, Tabs, TabsProps, } from 'antd'; import PdfSelect from "@/components/pdfSelect" import styles from "./index.module.scss" - - +import { SettingOutlined } from "@ant-design/icons" +import EditableTable from "./table" const Chat = () => { const dispatch = useAppDispatch() - const chatItems = useAppSelector(state => state.global.chatItems) - const language = useAppSelector(state => state.global.language) + const graphs = useAppSelector(state => state.global.graphs) + const extensions = useAppSelector(state => state.global.extensions) const graphName = useAppSelector(state => state.global.graphName) + const chatItems = useAppSelector(state => state.global.chatItems) const agentConnected = useAppSelector(state => state.global.agentConnected) + const [modal2Open, setModal2Open] = useState(false) + const graphExtensions = useGraphExtensions() + const extensionMetadata = useAppSelector(state => state.global.extensionMetadata) + // const chatItems = genRandomChatList(10) const chatRef = useRef(null) + useEffect(() => { + apiGetGraphs().then((res: any) => { + let graphs = res["data"].map((item: any) => item["name"]) + dispatch(setGraphs(graphs)) + }) + apiGetExtensionMetadata().then((res: any) => { + let metadata = res["data"] + let metadataMap: Record = {} + metadata.forEach((item: any) => { + metadataMap[item["name"]] = item + }) + dispatch(setExtensionMetadata(metadataMap)) + }) + }, []) + + useEffect(() => { + if (!extensions[graphName]) { + apiGetNodes(graphName).then((res: any) => { + let nodes = res["data"] + let nodesMap: Record = {} + nodes.forEach((item: any) => { + nodesMap[item["name"]] = item + }) + dispatch(setExtensions({ graphName, nodesMap })) + }) + } + }, [graphName]) useAutoScroll(chatRef) - - const onLanguageChange = (val: any) => { - dispatch(setLanguage(val)) - } - const onGraphNameChange = (val: any) => { dispatch(setGraphName(val)) } - return
- + {isRagGraph(graphName) ? : null}
@@ -59,6 +87,36 @@ const Chat = () => { return })}
+ setModal2Open(false)} + footer={ + + } + > +

You can adjust extension properties here, the values will be overridden when the agent starts using "Connect." Note that this won't modify the property.json file.

+ { + let node = graphExtensions[key] + let addon = node["addon"] + let metadata = extensionMetadata[addon] + return { + key: node["name"], label: node["name"], children: { + let nodesMap = JSON.parse(JSON.stringify(graphExtensions)) + nodesMap[key]["property"] = data + dispatch(setExtensions({ graphName, nodesMap })) + }} + > + } + })} /> + } diff --git a/playground/src/platform/pc/chat/table/index.tsx b/playground/src/platform/pc/chat/table/index.tsx new file mode 100644 index 00000000..0904d4dc --- /dev/null +++ b/playground/src/platform/pc/chat/table/index.tsx @@ -0,0 +1,168 @@ +import React, { useEffect, useRef, useState } from 'react'; +import { Button, Empty, ConfigProvider, Table, Input, Form, Checkbox } from 'antd'; +import type { ColumnsType } from 'antd/es/table'; + +// Define the data type for the table rows +interface DataType { + key: string; + value: string | number | boolean | null; +} + +// Define the props for the EditableTable component +interface EditableTableProps { + initialData: Record; + onUpdate: (updatedData: Record) => void; + metadata: Record; // Metadata with property types +} + +// Helper to convert values based on type +const convertToType = (value: any, type: string) => { + switch (type) { + case 'int64': + case 'int32': + return parseInt(value, 10); + case 'float64': + return parseFloat(value); + case 'bool': + return value === true || value === 'true'; + case 'string': + return String(value); + default: + return value; + } +}; + +const EditableTable: React.FC = ({ initialData, onUpdate, metadata }) => { + const [dataSource, setDataSource] = useState( + Object.entries(initialData).map(([key, value]) => ({ key, value })) + ); + const [editingKey, setEditingKey] = useState(''); + const [form] = Form.useForm(); + const inputRef = useRef(null); // Ref to manage focus + + // Function to check if the current row is being edited + const isEditing = (record: DataType) => record.key === editingKey; + + // Function to toggle editing on a row + const edit = (record: DataType) => { + form.setFieldsValue({ value: record.value ?? '' }); + setEditingKey(record.key); + }; + + // Function to handle when the value of a non-boolean field is changed + const handleValueChange = async (key: string) => { + try { + const row = await form.validateFields(); + const newData = [...dataSource]; + const index = newData.findIndex((item) => key === item.key); + + if (index > -1) { + const item = newData[index]; + const valueType = metadata[key]?.type || 'string'; + newData.splice(index, 1, { ...item, ...row, value: convertToType(row.value, valueType) }); + setDataSource(newData); + setEditingKey(''); + + // Notify the parent component of the update + const updatedData = Object.fromEntries(newData.map(({ key, value }) => [key, value])); + onUpdate(updatedData); + } + } catch (errInfo) { + console.log('Validation Failed:', errInfo); + } + }; + + // Toggle the checkbox for boolean values directly in the table cell + const handleCheckboxChange = (key: string, checked: boolean) => { + const newData = [...dataSource]; + const index = newData.findIndex((item) => key === item.key); + if (index > -1) { + newData[index].value = checked; // Update the boolean value + setDataSource(newData); + + // Notify the parent component of the update + const updatedData = Object.fromEntries(newData.map(({ key, value }) => [key, value])); + onUpdate(updatedData); + } + }; + + // Auto-focus on the input when entering edit mode + useEffect(() => { + if (editingKey) { + inputRef.current?.focus(); // Focus the input field when editing starts + } + }, [editingKey]); + + // Define columns for the table + const columns: ColumnsType = [ + { + title: 'Key', + dataIndex: 'key', + width: '30%', + key: 'key', + }, + { + title: 'Value', + dataIndex: 'value', + width: '50%', + key: 'value', + render: (_, record: DataType) => { + const valueType = metadata[record.key]?.type || 'string'; + + // Always display the checkbox for boolean values + if (valueType === 'bool') { + return ( + handleCheckboxChange(record.key, e.target.checked)} + /> + ); + } + + // Inline editing for other types (string, number) + const editable = isEditing(record); + return editable ? ( + + handleValueChange(record.key)} // Save on pressing Enter + onBlur={() => handleValueChange(record.key)} // Save on losing focus + /> + + ) : ( +
edit(record)}> + {record.value !== null && record.value !== undefined + ? record.value + : 'Click to edit'} +
// Display placeholder for empty values + ); + }, + }, + ]; + + return ( + ( + + + )} + > +
+ + + + ); +}; + +export default EditableTable; diff --git a/playground/src/platform/pc/description/index.tsx b/playground/src/platform/pc/description/index.tsx index a9a055cd..09d2da5a 100644 --- a/playground/src/platform/pc/description/index.tsx +++ b/playground/src/platform/pc/description/index.tsx @@ -1,7 +1,8 @@ import { setAgentConnected } from "@/store/reducers/global" import { - DESCRIPTION, useAppDispatch, useAppSelector, apiPing, genUUID, - apiStartService, apiStopService + useAppDispatch, useAppSelector, apiPing, genUUID, + apiStartService, apiStopService, + useGraphExtensions } from "@/common" import { Select, Button, message, Upload } from "antd" import { useEffect, useState, MouseEventHandler } from "react" @@ -17,8 +18,9 @@ const Description = () => { const userId = useAppSelector(state => state.global.options.userId) const language = useAppSelector(state => state.global.language) const voiceType = useAppSelector(state => state.global.voiceType) - const graphName = useAppSelector(state => state.global.graphName) const [loading, setLoading] = useState(false) + const graphName = useAppSelector(state => state.global.graphName) + const graphNodes = useGraphExtensions() useEffect(() => { if (channel) { @@ -45,12 +47,18 @@ const Description = () => { message.success("Agent disconnected") stopPing() } else { + let properties: Record = {} + Object.keys(graphNodes).forEach(extensionName => { + properties[extensionName] = {} + properties[extensionName] = graphNodes[extensionName].property + }) const res = await apiStartService({ channel, userId, graphName, language, - voiceType + voiceType, + properties: properties }) const { code, msg } = res || {} if (code != 0) { diff --git a/playground/src/platform/pc/entry/index.module.scss b/playground/src/platform/pc/entry/index.module.scss index f138183f..bb001f27 100644 --- a/playground/src/platform/pc/entry/index.module.scss +++ b/playground/src/platform/pc/entry/index.module.scss @@ -2,16 +2,27 @@ position: relative; height: 100%; box-sizing: border-box; + display: flex; + flex-direction: column; .content { position: relative; padding: 16px; box-sizing: border-box; + display: flex; + height: calc(100% - 64px); + flex-direction: column; .body { margin-top: 16px; display: flex; gap: 24px; + flex-grow: 1; + + .chat { + display: flex; + flex-grow: 1; + } } } -} +} \ No newline at end of file diff --git a/playground/src/platform/pc/entry/index.tsx b/playground/src/platform/pc/entry/index.tsx index e7acd7f1..a7ee7592 100644 --- a/playground/src/platform/pc/entry/index.tsx +++ b/playground/src/platform/pc/entry/index.tsx @@ -11,8 +11,12 @@ const PCEntry = () => {
- - +
+ +
+
+ +
diff --git a/playground/src/platform/pc/rtc/agent/index.module.scss b/playground/src/platform/pc/rtc/agent/index.module.scss index fa3ae2ec..5bebb2bc 100644 --- a/playground/src/platform/pc/rtc/agent/index.module.scss +++ b/playground/src/platform/pc/rtc/agent/index.module.scss @@ -1,7 +1,6 @@ .agent { position: relative; display: flex; - height: 292px; padding: 20px 16px; flex-direction: column; justify-content: flex-start; @@ -22,7 +21,6 @@ } .view { - margin-top: 32px; display: flex; align-items: center; justify-content: center; diff --git a/playground/src/platform/pc/rtc/agent/index.tsx b/playground/src/platform/pc/rtc/agent/index.tsx index a7fd7944..159f6730 100644 --- a/playground/src/platform/pc/rtc/agent/index.tsx +++ b/playground/src/platform/pc/rtc/agent/index.tsx @@ -15,7 +15,6 @@ const Agent = (props: AgentProps) => { const subscribedVolumes = useMultibandTrackVolume(audioTrack, 12); return
-
Agent
{ const dispatch = useAppDispatch() const options = useAppSelector(state => state.global.options) - const voiceType = useAppSelector(state => state.global.voiceType) - const agentConnected = useAppSelector(state => state.global.agentConnected) const { userId, channel } = options const [videoTrack, setVideoTrack] = useState() const [audioTrack, setAudioTrack] = useState() @@ -97,25 +93,15 @@ const Rtc = () => { } } - const onVoiceChange = (value: any) => { - dispatch(setVoiceType(value)) - } - return
Audio & Video - } - options={VOICE_OPTIONS} onChange={onVoiceChange}>
{/* agent */} {/* you */}
-
You
{/* microphone */} {/* camera */} diff --git a/playground/src/store/reducers/global.ts b/playground/src/store/reducers/global.ts index b29f0af8..dbdbff3b 100644 --- a/playground/src/store/reducers/global.ts +++ b/playground/src/store/reducers/global.ts @@ -10,7 +10,10 @@ export interface InitialState { language: Language voiceType: VoiceType chatItems: IChatItem[], - graphName: string + graphName: string, + graphs: string[], + extensions: Record, + extensionMetadata: Record } const getInitialState = (): InitialState => { @@ -22,7 +25,10 @@ const getInitialState = (): InitialState => { language: "en-US", voiceType: "male", chatItems: [], - graphName: "camera.va.openai.azure" + graphName: "camera.va.openai.azure", + graphs: [], + extensions: {}, + extensionMetadata: {}, } } @@ -87,6 +93,16 @@ export const globalSlice = createSlice({ setGraphName: (state, action: PayloadAction) => { state.graphName = action.payload }, + setGraphs: (state, action: PayloadAction) => { + state.graphs = action.payload + }, + setExtensions: (state, action: PayloadAction>) => { + let { graphName, nodesMap } = action.payload + state.extensions[graphName] = nodesMap + }, + setExtensionMetadata: (state, action: PayloadAction>) => { + state.extensionMetadata = action.payload + }, setVoiceType: (state, action: PayloadAction) => { state.voiceType = action.payload }, @@ -99,7 +115,7 @@ export const globalSlice = createSlice({ export const { reset, setOptions, setRoomConnected, setAgentConnected, setVoiceType, - addChatItem, setThemeColor, setLanguage, setGraphName } = + addChatItem, setThemeColor, setLanguage, setGraphName, setGraphs, setExtensions, setExtensionMetadata } = globalSlice.actions export default globalSlice.reducer From 09a1df232a08c31c67d1bc59e20769302db2a936 Mon Sep 17 00:00:00 2001 From: Zhang Qianze Date: Wed, 18 Sep 2024 01:33:21 +0800 Subject: [PATCH 09/55] fix: fix table type issue --- playground/src/platform/pc/chat/table/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playground/src/platform/pc/chat/table/index.tsx b/playground/src/platform/pc/chat/table/index.tsx index 0904d4dc..944dedd4 100644 --- a/playground/src/platform/pc/chat/table/index.tsx +++ b/playground/src/platform/pc/chat/table/index.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useRef, useState } from 'react'; -import { Button, Empty, ConfigProvider, Table, Input, Form, Checkbox } from 'antd'; +import { Button, Empty, ConfigProvider, Table, Input, Form, Checkbox, InputRef } from 'antd'; import type { ColumnsType } from 'antd/es/table'; // Define the data type for the table rows @@ -38,7 +38,7 @@ const EditableTable: React.FC = ({ initialData, onUpdate, me ); const [editingKey, setEditingKey] = useState(''); const [form] = Form.useForm(); - const inputRef = useRef(null); // Ref to manage focus + const inputRef = useRef(null); // Ref to manage focus // Function to check if the current row is being edited const isEditing = (record: DataType) => record.key === editingKey; From 2586851d4296f97ed68da7a8a962f429cf3e9281 Mon Sep 17 00:00:00 2001 From: Zhang Qianze Date: Wed, 18 Sep 2024 01:47:41 +0800 Subject: [PATCH 10/55] feat: image update --- docker-compose.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1793137c..ec33837b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: networks: - astra_network astra_playground: - image: ghcr.io/ten-framework/astra_playground:v0.4.1-6-g32b7fac + image: ghcr.io/ten-framework/astra_playground:v0.4.1-9-g09a1df2 container_name: astra_playground restart: always ports: @@ -29,6 +29,16 @@ services: environment: - AGENT_SERVER_URL=http://astra_agents_dev:8080 - TEN_DEV_SERVER_URL=http://astra_agents_dev:49483 + agent_demo_ui: + image: ghcr.io/ten-framework/agent_demo:v0.4.1-9-g09a1df2 + container_name: agent_demo_ui + restart: always + ports: + - "3002:3000" + networks: + - astra_network + environment: + - AGENT_SERVER_URL=http://astra_agents_dev:8080 # use this when you want to run the playground in local development mode # astra_playground_dev: From 3b8536d9aba09ee663db15a169174ebcb26230de Mon Sep 17 00:00:00 2001 From: Zhang Qianze Date: Wed, 18 Sep 2024 01:59:03 +0800 Subject: [PATCH 11/55] feat: adjust demo ui --- demo/src/app/global.css | 1 + demo/src/platform/pc/entry/index.module.scss | 10 ++++++++++ demo/src/platform/pc/entry/index.tsx | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/demo/src/app/global.css b/demo/src/app/global.css index f7007287..7a1e1861 100644 --- a/demo/src/app/global.css +++ b/demo/src/app/global.css @@ -8,6 +8,7 @@ html, body { background-color: #0F0F11; font-family: "PingFang SC"; + height: 100%; } a { diff --git a/demo/src/platform/pc/entry/index.module.scss b/demo/src/platform/pc/entry/index.module.scss index f138183f..5f161d2c 100644 --- a/demo/src/platform/pc/entry/index.module.scss +++ b/demo/src/platform/pc/entry/index.module.scss @@ -2,16 +2,26 @@ position: relative; height: 100%; box-sizing: border-box; + display: flex; + flex-direction: column; .content { position: relative; padding: 16px; box-sizing: border-box; + display: flex; + height: calc(100% - 64px); + flex-direction: column; .body { margin-top: 16px; display: flex; gap: 24px; + flex-grow: 1; + .chat { + display: flex; + flex-grow: 1; + } } } } diff --git a/demo/src/platform/pc/entry/index.tsx b/demo/src/platform/pc/entry/index.tsx index e7acd7f1..a7ee7592 100644 --- a/demo/src/platform/pc/entry/index.tsx +++ b/demo/src/platform/pc/entry/index.tsx @@ -11,8 +11,12 @@ const PCEntry = () => {
- - +
+ +
+
+ +
From 38a8fa93e3bf858d44a47c9953c8cbc2e70fcd96 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 30 Sep 2024 14:16:48 +0800 Subject: [PATCH 12/55] feat: update build image (#301) --- .devcontainer/devcontainer.json | 2 +- Dockerfile | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3e445b9d..bf7a4c1c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ // README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile { "name": "astra", - "image": "ghcr.io/ten-framework/astra_agents_build:0.5.2", + "image": "ghcr.io/ten-framework/ten_agent_build:0.1.0", "customizations": { "vscode": { "extensions": [ diff --git a/Dockerfile b/Dockerfile index ba9dc57a..97adf23a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/ten-framework/astra_agents_build:0.5.2 AS builder +FROM ghcr.io/ten-framework/ten_agent_build:0.1.0 AS builder ARG SESSION_CONTROL_CONF=session_control.conf diff --git a/docker-compose.yml b/docker-compose.yml index ec33837b..7b42c1b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: astra_agents_dev: - image: ghcr.io/ten-framework/astra_agents_build:0.5.2 + image: ghcr.io/ten-framework/ten_agent_build:0.1.0 container_name: astra_agents_dev platform: linux/amd64 tty: true From fdf930fb7768d3a71ff00f5fe8d44815a5ad0dd8 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 30 Sep 2024 13:13:35 +0000 Subject: [PATCH 13/55] feat: add v2v extension --- .../extension/openai_v2v_python/BUILD.gn | 21 + .../extension/openai_v2v_python/README.md | 29 + .../extension/openai_v2v_python/__init__.py | 11 + .../extension/openai_v2v_python/addon.py | 22 + .../extension/openai_v2v_python/client.py | 171 ++++ .../extension/openai_v2v_python/extension.py | 380 ++++++++ .../extension/openai_v2v_python/log.py | 22 + .../extension/openai_v2v_python/manifest.json | 73 ++ .../extension/openai_v2v_python/messages.py | 822 ++++++++++++++++++ .../extension/openai_v2v_python/property.json | 1 + .../openai_v2v_python/requirements.txt | 6 + 11 files changed, 1558 insertions(+) create mode 100644 agents/ten_packages/extension/openai_v2v_python/BUILD.gn create mode 100644 agents/ten_packages/extension/openai_v2v_python/README.md create mode 100644 agents/ten_packages/extension/openai_v2v_python/__init__.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/addon.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/client.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/extension.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/log.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/manifest.json create mode 100644 agents/ten_packages/extension/openai_v2v_python/messages.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/property.json create mode 100644 agents/ten_packages/extension/openai_v2v_python/requirements.txt diff --git a/agents/ten_packages/extension/openai_v2v_python/BUILD.gn b/agents/ten_packages/extension/openai_v2v_python/BUILD.gn new file mode 100644 index 00000000..1a40f3c2 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/BUILD.gn @@ -0,0 +1,21 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2022-11. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +import("//build/feature/ten_package.gni") + +ten_package("openai_v2v_python") { + package_kind = "extension" + + resources = [ + "__init__.py", + "addon.py", + "extension.py", + "log.py", + "manifest.json", + "property.json", + ] +} diff --git a/agents/ten_packages/extension/openai_v2v_python/README.md b/agents/ten_packages/extension/openai_v2v_python/README.md new file mode 100644 index 00000000..894643e7 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/README.md @@ -0,0 +1,29 @@ +# openai_v2v_python + + + +## Features + + + +- xxx feature + +## API + +Refer to `api` definition in [manifest.json] and default values in [property.json](property.json). + + + +## Development + +### Build + + + +### Unit test + + + +## Misc + + diff --git a/agents/ten_packages/extension/openai_v2v_python/__init__.py b/agents/ten_packages/extension/openai_v2v_python/__init__.py new file mode 100644 index 00000000..262c322e --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/__init__.py @@ -0,0 +1,11 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +from . import addon +from .log import logger + +logger.info("openai_v2v_python extension loaded") diff --git a/agents/ten_packages/extension/openai_v2v_python/addon.py b/agents/ten_packages/extension/openai_v2v_python/addon.py new file mode 100644 index 00000000..8cac9953 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/addon.py @@ -0,0 +1,22 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +from ten import ( + Addon, + register_addon_as_extension, + TenEnv, +) +from .extension import OpenAIV2VExtension +from .log import logger + + +@register_addon_as_extension("openai_v2v_python") +class OpenAIV2VExtensionAddon(Addon): + + def on_create_instance(self, ten_env: TenEnv, name: str, context) -> None: + logger.info("OpenAIV2VExtensionAddon on_create_instance") + ten_env.on_create_instance_done(OpenAIV2VExtension(name), context) diff --git a/agents/ten_packages/extension/openai_v2v_python/client.py b/agents/ten_packages/extension/openai_v2v_python/client.py new file mode 100644 index 00000000..0e446ec7 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/client.py @@ -0,0 +1,171 @@ +import asyncio +import base64 +import json +import logging +import os +from typing import Any, AsyncGenerator + +import uuid +import aiohttp +from . import messages + +logging.basicConfig(level=logging.INFO) +logger = logging.getLogger(__name__) + + +def smart_str(s: str, max_field_len: int = 128) -> str: + """parse string as json, truncate data field to 128 characters, reserialize""" + try: + data = json.loads(s) + if "delta" in data: + key = "delta" + elif "audio" in data: + key = "audio" + else: + return s + + if len(data[key]) > max_field_len: + data[key] = data[key][:max_field_len] + "..." + return json.dumps(data) + except json.JSONDecodeError: + return s + + +def generate_client_event_id() -> str: + return str(uuid.uuid4()) + +class RealtimeApiConfig: + def __init__( + self, + base_uri: str = "wss://api.openai.com", + api_key: str | None = None, + path: str = "/v1/realtime", + verbose: bool = False, + model: str="gpt-4o-realtime-preview-2024-10-01", + language: str = "en-US", + system_message: str="You are a helpful assistant, you are professional but lively and friendly. User's input will mainly be {language}, and your response must be {language}.", + temperature: float =0.5, + max_tokens: int =1024, + voice: messages.Voices = messages.Voices.Alloy, + server_vad:bool=True, + ): + self.base_uri = base_uri + self.api_key = api_key + self.path = path + self.verbose = verbose + self.model = model + self.language = language + self.system_message = system_message + self.temperature = temperature + self.max_tokens = max_tokens + self.voice = voice + self.server_vad = server_vad + + def build_ctx(self) -> dict: + return { + "language": self.language + } + +class RealtimeApiClient: + def __init__( + self, + base_uri: str, + api_key: str | None = None, + path: str = "/v1/realtime", + model: str = "gpt-4o-realtime-preview-2024-10-01", + verbose: bool = False, + session: aiohttp.ClientSession | None = None, + ): + is_local = ( + base_uri.startswith("localhost") + or base_uri.startswith("127.0.0.1") + or base_uri.startswith("0.0.0.0") + ) + has_scheme = base_uri.startswith("ws://") or base_uri.startswith("wss://") + self.url = f"{base_uri}{path}" + if model: + self.url += f"?model={model}" + if verbose: + logger.info(f"URL: {self.url} {is_local=} {has_scheme=}") + + if not has_scheme: + if is_local: + self.url = f"ws://{self.url}" + else: + self.url = f"wss://{self.url}" + + self.api_key = api_key or os.environ.get("OPENAI_API_KEY") + self.websocket: aiohttp.ClientWebSocketResponse | None = None + self.verbose = verbose + self.session = session or aiohttp.ClientSession() + + async def __aenter__(self) -> "RealtimeApiClient": + await self.connect() + return self + + async def __aexit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> bool: + await self.shutdown() + return False + + async def connect(self): + auth = aiohttp.BasicAuth("", self.api_key) if self.api_key else None + + headers = {"OpenAI-Beta": "realtime=v1"} + if "PROD_COMPLETIONS_API_KEY" in os.environ: + headers["X-Prod-Completions-Api-Key"] = os.environ["PROD_COMPLETIONS_API_KEY"] + elif "OPENAI_API_KEY" in os.environ: + headers["X-Prod-Completions-Api-Key"] = os.environ["OPENAI_API_KEY"] + if "PROD_COMPLETIONS_ORG_ID" in os.environ: + headers["X-Prod-Completions-Org-Id"] = os.environ["PROD_COMPLETIONS_ORG_ID"] + if headers: + logger.debug("Using X-Prod-Completions-* headers for api credentials") + + self.websocket = await self.session.ws_connect( + url=self.url, + auth=auth, + headers=headers, + ) + + async def send_audio_data(self, audio_data: bytes): + """audio_data is assumed to be pcm16 24kHz mono little-endian""" + base64_audio_data = base64.b64encode(audio_data).decode("utf-8") + message = messages.InputAudioBufferAppend(audio=base64_audio_data) + await self.send_message(message) + + async def send_message(self, message: messages.ClientToServerMessage): + assert self.websocket is not None + if message.event_id is None: + message.event_id = generate_client_event_id() + message_str = message.model_dump_json() + if self.verbose: + logger.info(f"-> {smart_str(message_str)}") + await self.websocket.send_str(message_str) + + async def listen(self) -> AsyncGenerator[messages.RealtimeMessage, None]: + assert self.websocket is not None + if self.verbose: + logger.info("Listening for realtimeapi messages") + try: + async for msg in self.websocket: + if msg.type == aiohttp.WSMsgType.TEXT: + if self.verbose: + logger.info(f"<- {smart_str(msg.data)}") + yield self.handle_server_message(msg.data) + elif msg.type == aiohttp.WSMsgType.ERROR: + logger.error("Error during receive: %s", self.websocket.exception()) + break + except asyncio.CancelledError: + logger.info("Receive messages task cancelled") + + def handle_server_message(self, message: str) -> messages.ServerToClientMessage: + try: + return messages.parse_server_message(message) + except Exception as e: + logger.error("Error handling message: " + str(e)) + raise e + + async def shutdown(self): + # Close the websocket connection if it exists + if self.websocket: + await self.websocket.close() + self.websocket = None diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py new file mode 100644 index 00000000..cf6734fb --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -0,0 +1,380 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +import asyncio +import threading +import base64 +from datetime import datetime + +from ten import ( + AudioFrame, + VideoFrame, + Extension, + TenEnv, + Cmd, + StatusCode, + CmdResult, + Data, +) +from ten.audio_frame import AudioFrameDataFmt +from .log import logger +from .client import RealtimeApiClient, RealtimeApiConfig +from .messages import * + +# properties +PROPERTY_API_KEY = "api_key" # Required +PROPERTY_MODEL = "model" # Optional +PROPERTY_SYSTEM_MESSAGE = "system_message" # Optional +PROPERTY_TEMPERATURE = "temperature" # Optional +PROPERTY_MAX_TOKENS = "max_tokens" # Optional +PROPERTY_VOICE = "voice" #Optional +PROPERTY_SERVER_VAD = "server_vad" #Optional +PROPERTY_STREAM_ID = "stream_id" +PROPERTY_LANGUAGE = "language" + +DATA_TEXT_DATA = "text_data" +CMD_FLUSH = "flush" +AUDIO_PCM_FRAME = "pcm_frame" + +ROLE_ASSISTANT = "assistant" +ROLE_USER = "user" + +class OpenAIV2VExtension(Extension): + # handler + queue = asyncio.Queue(maxsize=3000) + loop = None + thread: threading.Thread = None + client: RealtimeApiClient = None + connected: bool = False + + # openai related + config: RealtimeApiConfig = None + session_id: str = "" + + # audo related + sample_rate : int = 24000 + out_audio_buff: bytearray = b'' + audio_len_threshold : int = 10240 + transcript: str = '' + + # agora related + stream_id: int = 0 + remote_stream_id: int = 0 + ctx: dict = {} + + def on_init(self, ten_env: TenEnv) -> None: + logger.info("OpenAIV2VExtension on_init") + self.config = RealtimeApiConfig() + self.loop = asyncio.new_event_loop() + ten_env.on_init_done() + + def on_start(self, ten_env: TenEnv) -> None: + logger.info("OpenAIV2VExtension on_start") + + self.fetch_properties(ten_env) + + # Start async handler + def start_event_loop(loop): + asyncio.set_event_loop(loop) + loop.run_forever() + + self.thread = threading.Thread(target=start_event_loop, args=(self.loop,)) + self.thread.start() + + asyncio.run_coroutine_threadsafe(self.init_client(), self.loop) + + ten_env.on_start_done() + + def on_stop(self, ten_env: TenEnv) -> None: + logger.info("OpenAIV2VExtension on_stop") + + self.connected = False + + if self.thread: + self.loop.call_soon_threadsafe(self.loop.stop) + self.thread.join() + + ten_env.on_stop_done() + + def on_deinit(self, ten_env: TenEnv) -> None: + logger.info("OpenAIV2VExtension on_deinit") + ten_env.on_deinit_done() + + def on_audio_frame(self, ten_env: TenEnv, audio_frame: AudioFrame) -> None: + try: + # frame_name = audio_frame.get_name() + stream_id = audio_frame.get_property_int("stream_id") + # logger.info(f"OpenAIV2VExtension on_audio_frame {frame_name} {stream_id}") + if self.remote_stream_id == 0: + self.remote_stream_id = stream_id + asyncio.run_coroutine_threadsafe(self.run_client_loop(ten_env), self.loop) + logger.info(f"Start session for {stream_id}") + + frame_buf = audio_frame.get_buf() + asyncio.run_coroutine_threadsafe(self.on_audio(frame_buf), self.loop) + except: + logger.exception(f"OpenAIV2VExtension on audio frame failed") + + # Should not be here + def on_video_frame(self, ten_env: TenEnv, video_frame: VideoFrame) -> None: + pass + + # Should not be here + def on_cmd(self, ten_env: TenEnv, cmd: Cmd) -> None: + cmd_result = CmdResult.create(StatusCode.OK) + ten_env.return_result(cmd_result, cmd) + + # Should not be here + def on_data(self, ten_env: TenEnv, data: Data) -> None: + pass + + async def init_client(self): + try: + self.client = RealtimeApiClient(base_uri=self.config.base_uri, api_key=self.config.api_key, model=self.config.model) + logger.info(f"Finish init client {self.config} {self.client}") + except: + logger.exception(f"Failed to create client {self.config}") + + async def run_client_loop(self, ten_env: TenEnv): + def get_time_ms() -> int: + current_time = datetime.now() + return current_time.microsecond // 1000 + + try: + await self.client.connect() + self.connected = True + item_id = "" # For truncate + response_id = "" + content_index = 0 + relative_start_ms = get_time_ms() + flushed = set() + + logger.info("Client loop started") + async for message in self.client.listen(): + try: + logger.info(f"Received message: {message.type}") + match message: + case SessionCreated(): + logger.info(f"Session is created: {message.session.id}") + self.session_id = message.session.id + update_msg = self.update_session() + await self.client.send_message(update_msg) + + update_conversation = self.update_conversation() + await self.client.send_message(update_conversation) + case ItemInputAudioTranscriptionCompleted(): + logger.info(f"On request transript {message.transcript}") + self.send_transcript(ten_env, message.transcript, ROLE_USER, True) + case ItemInputAudioTranscriptionFailed(): + logger.warning(f"On request transript failed {message.item_id} {message.error}") + case ItemCreated(): + logger.info(f"On item created {message.item}") + case ResponseCreated(): + logger.info(f"On response created {message.response.id}") + response_id = message.response.id + case ResponseDone(): + logger.info(f"On response done {message.response.id} {message.response.status}") + if message.response.id == response_id: + response_id = "" + case ResponseAudioTranscriptDelta(): + logger.info(f"On response transript delta {message.response_id} {message.output_index} {message.content_index} {message.delta}") + if message.response_id in flushed: + logger.warning(f"On flushed transript delta {message.response_id} {message.output_index} {message.content_index} {message.delta}") + continue + self.transcript += message.delta + self.send_transcript(ten_env, self.transcript, ROLE_ASSISTANT, False) + case ResponseAudioTranscriptDone(): + logger.info(f"On response transript done {message.output_index} {message.content_index} {message.transcript}") + if message.response_id in flushed: + logger.warning(f"On flushed transript done {message.response_id}") + continue + self.transcript = "" + self.send_transcript(ten_env, message.transcript, ROLE_ASSISTANT, True) + case ResponseOutputItemDone(): + logger.info(f"Output item done {message.item}") + case ResponseOutputItemAdded(): + logger.info(f"Output item added {message.output_index} {message.item.id}") + case ResponseAudioDelta(): + if message.response_id in flushed: + logger.warning(f"On flushed audio delta {message.response_id} {message.item_id} {message.content_index}") + continue + item_id = message.item_id + content_index = message.content_index + self.on_audio_delta(ten_env, message.delta) + case InputAudioBufferSpeechStarted(): + logger.info(f"On server listening, in response {response_id}, last item {item_id}") + # Tuncate the on-going audio stream + end_ms = get_time_ms() - relative_start_ms + if item_id: + truncate = ItemTruncate(item_id=item_id, content_index=content_index, audio_end_ms=end_ms) + await self.client.send_message(truncate) + self.flush(ten_env) + if response_id: + transcript = self.transcript + "[interrupted]" + self.send_transcript(ten_env, transcript, ROLE_ASSISTANT, True) + self.transcript = "" + flushed.add(response_id) # memory leak, change to lru later + item_id = "" + case InputAudioBufferSpeechStopped(): + relative_start_ms = get_time_ms() - message.audio_end_ms + logger.info(f"On server stop listening, {message.audio_end_ms}, relative {relative_start_ms}") + case ErrorMessage(): + logger.error(f"Error message received: {message.error}") + case _: + logger.debug(f"Not handled message {message}") + except: + logger.exception(f"Error processing message: {message.type}") + + logger.info("Client loop finished") + except: + logger.exception(f"Failed to handle loop") + + async def on_audio(self, buff: bytearray): + self.out_audio_buff += buff + # Buffer audio + if len(self.out_audio_buff) >= self.audio_len_threshold and self.session_id != "": + await self.client.send_audio_data(self.out_audio_buff) + logger.info(f"Send audio frame to OpenAI: {len(self.out_audio_buff)}") + self.out_audio_buff = b'' + + def fetch_properties(self, ten_env: TenEnv): + try: + api_key = ten_env.get_property_string(PROPERTY_API_KEY) + self.config.api_key = api_key + except Exception as err: + logger.info(f"GetProperty required {PROPERTY_API_KEY} failed, err: {err}") + return + + try: + model = ten_env.get_property_string(PROPERTY_MODEL) + if model: + self.config.model = model + except Exception as err: + logger.info(f"GetProperty optional {PROPERTY_MODEL} error: {err}") + + try: + system_message = ten_env.get_property_string(PROPERTY_SYSTEM_MESSAGE) + if system_message: + self.config.system_message = system_message + except Exception as err: + logger.info(f"GetProperty optional {PROPERTY_SYSTEM_MESSAGE} error: {err}") + + try: + temperature = ten_env.get_property_float(PROPERTY_TEMPERATURE) + self.config.temperature = float(temperature) + except Exception as err: + logger.info( + f"GetProperty optional {PROPERTY_TEMPERATURE} failed, err: {err}" + ) + + try: + max_tokens = ten_env.get_property_int(PROPERTY_MAX_TOKENS) + if max_tokens > 0: + self.config.max_tokens = int(max_tokens) + except Exception as err: + logger.info( + f"GetProperty optional {PROPERTY_MAX_TOKENS} failed, err: {err}" + ) + + try: + voice = ten_env.get_property_string(PROPERTY_VOICE) + if voice: + v = DEFAULT_VOICE + if voice == "alloy": + v = Voices.Alloy + elif voice == "echo": + v = Voices.Echo + elif voice == "shimmer": + v = Voices.Shimmer + self.config.voice = v + except Exception as err: + logger.info(f"GetProperty optional {PROPERTY_VOICE} error: {err}") + + try: + language = ten_env.get_property_string(PROPERTY_LANGUAGE) + if language: + self.config.language = language + except Exception as err: + logger.info(f"GetProperty optional {PROPERTY_LANGUAGE} error: {err}") + + try: + server_vad = ten_env.get_property_bool(PROPERTY_SERVER_VAD) + self.config.server_vad = server_vad + except Exception as err: + logger.info( + f"GetProperty optional {PROPERTY_SERVER_VAD} failed, err: {err}" + ) + + try: + self.stream_id = ten_env.get_property_int(PROPERTY_STREAM_ID) + except Exception as err: + logger.info( + f"GetProperty optional {PROPERTY_STREAM_ID} failed, err: {err}" + ) + + self.ctx = self.config.build_ctx() + + def update_session(self) -> SessionUpdate: + params = SessionUpdateParams() + params.model = self.config.model + params.voice = self.config.voice + params.input_audio_format = AudioFormats.PCM16 + params.output_audio_format = AudioFormats.PCM16 + params.turn_detection = DEFAULT_TURN_DETECTION + params.input_audio_transcription = InputAudioTranscription(enabled=True, model='whisper-1') + params.temperature = self.config.temperature + params.max_response_output_tokens = self.config.max_tokens + return SessionUpdate(session=params) + + def update_conversation(self) -> UpdateConversationConfig: + prompt = self.replace(self.config.system_message) + conf = UpdateConversationConfig() + conf.system_message = prompt + conf.temperature = self.config.temperature + conf.max_tokens = self.config.max_tokens + conf.tool_choice = "none" + conf.disable_audio = False + conf.output_audio_format = AudioFormats.PCM16 + return conf + + def replace(self, prompt:str) -> str: + result = prompt + for token, value in self.ctx.items(): + result = result.replace(f"{token}", value) + return result + + def on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: + audio_data = base64.b64decode(delta) + f = AudioFrame.create(AUDIO_PCM_FRAME) + f.set_sample_rate(self.sample_rate) + f.set_bytes_per_sample(2) + f.set_number_of_channels(1) + f.set_data_fmt(AudioFrameDataFmt.INTERLEAVE) + f.set_samples_per_channel(len(audio_data) // 2) + f.alloc_buf(len(audio_data)) + buff = f.lock_buf() + buff[:] = audio_data + f.unlock_buf(buff) + ten_env.send_audio_frame(f) + + def send_transcript(self, ten_env: TenEnv, transcript: str, role: str, is_final: bool) -> None: + try: + d = Data.create(DATA_TEXT_DATA) + d.set_property_string("text", transcript) + d.set_property_bool("end_of_segment", is_final) + d.set_property_int("stream_id", self.stream_id if role == ROLE_ASSISTANT else self.remote_stream_id) + d.set_property_bool("is_final", is_final) + ten_env.send_data(d) + except: + logger.exception(f"Error send text data {role}: {transcript} {is_final}") + + def flush(self, ten_env: TenEnv) -> None: + try: + c = Cmd.create(CMD_FLUSH) + ten_env.send_cmd(c, lambda ten, result: logger.info("flush done")) + except: + logger.exception(f"Error flush") \ No newline at end of file diff --git a/agents/ten_packages/extension/openai_v2v_python/log.py b/agents/ten_packages/extension/openai_v2v_python/log.py new file mode 100644 index 00000000..3edfe294 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/log.py @@ -0,0 +1,22 @@ +# +# +# Agora Real Time Engagement +# Created by Wei Hu in 2024-08. +# Copyright (c) 2024 Agora IO. All rights reserved. +# +# +import logging + +logger = logging.getLogger("openai_v2v_python") +logger.setLevel(logging.INFO) + +formatter_str = ( + "%(asctime)s - %(name)s - %(levelname)s - %(process)d - " + "[%(filename)s:%(lineno)d] - %(message)s" +) +formatter = logging.Formatter(formatter_str) + +console_handler = logging.StreamHandler() +console_handler.setFormatter(formatter) + +logger.addHandler(console_handler) diff --git a/agents/ten_packages/extension/openai_v2v_python/manifest.json b/agents/ten_packages/extension/openai_v2v_python/manifest.json new file mode 100644 index 00000000..2e24f7d8 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/manifest.json @@ -0,0 +1,73 @@ +{ + "type": "extension", + "name": "openai_v2v_python", + "version": "0.1.0", + "dependencies": [ + { + "type": "system", + "name": "ten_runtime_python", + "version": "0.2" + } + ], + "package": { + "include": [ + "manifest.json", + "property.json", + "BUILD.gn", + "**.tent", + "**.py", + "README.md" + ] + }, + "api": { + "property": { + "api_key": { + "type": "string" + }, + "stream_id": { + "type": "int32" + }, + "temperature": { + "type": "float64" + }, + "model": { + "type": "string" + }, + "max_tokens": { + "type": "int64" + }, + "system_message": { + "type": "string" + }, + "voice": { + "type": "string" + }, + "server_vad": { + "type": "bool" + }, + "language": { + "type": "string" + } + }, + "audio_frame_in": [ + { + "name": "pcm_frame" + } + ], + "data_out": [ + { + "name": "text_data" + } + ], + "cmd_out": [ + { + "name": "flush" + } + ], + "audio_frame_out": [ + { + "name": "pcm_frame" + } + ] + } +} \ No newline at end of file diff --git a/agents/ten_packages/extension/openai_v2v_python/messages.py b/agents/ten_packages/extension/openai_v2v_python/messages.py new file mode 100644 index 00000000..2ed55d78 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/messages.py @@ -0,0 +1,822 @@ +import abc +import random +import string +from enum import Enum, StrEnum +from typing import Annotated, Any, Literal, Set + +from pydantic import BaseModel, PrivateAttr, TypeAdapter +from pydantic.fields import Field + +#################################################################################################### +# ID Generation +#################################################################################################### +# Do not use internal libraries for now. + + +def generate_rand_str(prefix: str, len: int = 16) -> str: + # Generate a random string of specified length with the given prefix + random_str = "".join(random.choices(string.ascii_letters + string.digits, k=len)) + return f"{prefix}_{random_str}" + + +def generate_event_id() -> str: + return generate_rand_str("event") + + +def generate_response_id() -> str: + return generate_rand_str("resp") + + +#################################################################################################### +# Common +#################################################################################################### + +DEFAULT_CONVERSATION = "default" + +DEFAULT_TEMPERATURE = 0.8 + + +class Voices(str, Enum): + Alloy = "alloy" + Echo = "echo" + Shimmer = "shimmer" + + +DEFAULT_VOICE = Voices.Alloy + + +class AudioFormats(str, Enum): + PCM16 = "pcm16" + G711_ULAW = "g711_ulaw" + G711_ALAW = "g711_alaw" + + +DEFAULT_AUDIO_FORMAT = AudioFormats.PCM16 + + +class InputAudioTranscription(BaseModel): + # FIXME: add enabled + model: Literal["whisper-1"] + + +class NoTurnDetection(BaseModel): + type: Literal["none"] = "none" + + +class ServerVAD(BaseModel): + type: Literal["server_vad"] = "server_vad" + threshold: float | None = None + prefix_padding_ms: int | None = None + silence_duration_ms: int | None = None + + +TurnDetection = ServerVAD | NoTurnDetection + +VAD_THRESHOLD_DEFAULT = 0.5 +VAD_PREFIX_PADDING_MS_DEFAULT = 300 +VAD_SILENCE_DURATION_MS_DEFAULT = 200 +DEFAULT_TURN_DETECTION = ServerVAD( + threshold=VAD_THRESHOLD_DEFAULT, + prefix_padding_ms=VAD_PREFIX_PADDING_MS_DEFAULT, + silence_duration_ms=VAD_SILENCE_DURATION_MS_DEFAULT, +) + + +class FunctionToolChoice(BaseModel): + type: Literal["function"] = "function" + name: str + + +ToolChoice = Literal["none", "auto", "required"] | FunctionToolChoice + + +class ItemType(StrEnum): + message = "message" + function_call = "function_call" + function_call_output = "function_call_output" + + +class MessageRole(StrEnum): + system = "system" + user = "user" + assistant = "assistant" + + +class ContentType(StrEnum): + input_text = "input_text" + input_audio = "input_audio" + text = "text" + audio = "audio" + + +class InputTextContentPartParam(BaseModel): + type: Literal[ContentType.input_text] = ContentType.input_text + text: str + + +class InputAudioContentPartParam(BaseModel): + type: Literal[ContentType.input_audio] = ContentType.input_audio + audio: str + transcript: str | None = None + + +class OutputTextContentPartParam(BaseModel): + type: Literal[ContentType.text] = ContentType.text + text: str + + +SystemContentPartParam = InputTextContentPartParam +UserContentPartParam = InputTextContentPartParam | InputAudioContentPartParam +AssistantContentPartParam = OutputTextContentPartParam + +ItemParamStatus = str +""" +The client can only pass items with status `completed` or `incomplete`, +but we're lenient here since actual validation happens further down. +""" + + +class SystemMessageItemParam(BaseModel): + id: str | None = None + type: Literal[ItemType.message] = ItemType.message + role: Literal[MessageRole.system] = MessageRole.system + content: list[SystemContentPartParam] + status: ItemParamStatus | None = None + + +class UserMessageItemParam(BaseModel): + id: str | None = None + type: Literal[ItemType.message] = ItemType.message + role: Literal[MessageRole.user] = MessageRole.user + content: list[UserContentPartParam] + status: ItemParamStatus | None = None + + +class AssistantMessageItemParam(BaseModel): + id: str | None = None + type: Literal[ItemType.message] = ItemType.message + role: Literal[MessageRole.assistant] = MessageRole.assistant + content: list[AssistantContentPartParam] + status: ItemParamStatus | None = None + + +class MessageReferenceItemParam(BaseModel): + type: Literal[ItemType.message] = ItemType.message + id: str + status: ItemParamStatus | None = None + + +class FunctionCallItemParam(BaseModel): + id: str | None = None + type: Literal[ItemType.function_call] = ItemType.function_call + name: str + call_id: str + arguments: str + status: ItemParamStatus | None = None + + +class FunctionCallOutputItemParam(BaseModel): + id: str | None = None + type: Literal[ItemType.function_call_output] = ItemType.function_call_output + status: ItemParamStatus | None = None + call_id: str + output: str + + +ItemParam = ( + SystemMessageItemParam + | UserMessageItemParam + | AssistantMessageItemParam + | FunctionCallItemParam + | FunctionCallOutputItemParam + # Note: it's important this comes after the other item types, so that we accept user-provided + # item IDs. + | MessageReferenceItemParam +) + +ItemStatus = Literal["in_progress", "completed", "incomplete"] + + +class BaseItem(BaseModel): + id: str | None = None + object: Literal["realtime.item"] | None = None + type: ItemType + status: ItemStatus + + +class InputTextContentPart(BaseModel): + type: Literal[ContentType.input_text] = ContentType.input_text + text: str + + +class InputAudioContentPart(BaseModel): + type: Literal[ContentType.input_audio] = ContentType.input_audio + transcript: str | None + + +class TextContentPart(BaseModel): + type: Literal[ContentType.text] = ContentType.text + text: str + + +class AudioContentPart(BaseModel): + type: Literal[ContentType.audio] = ContentType.audio + transcript: str | None + _audio: str = PrivateAttr(default_factory=str) + + +ContentPart = InputTextContentPart | InputAudioContentPart | TextContentPart | AudioContentPart + + +class MessageItem(BaseItem): + type: Literal[ItemType.message] = ItemType.message + role: MessageRole + content: list[ContentPart] + + +class FunctionCallItem(BaseItem): + type: Literal[ItemType.function_call] = ItemType.function_call + name: str + call_id: str + arguments: str + + +class FunctionCallOutputItem(BaseItem): + type: Literal[ItemType.function_call_output] = ItemType.function_call_output + call_id: str + output: str + + +Item = MessageItem | FunctionCallItem | FunctionCallOutputItem + +ResponseStatus = Literal["in_progress", "completed", "cancelled", "incomplete", "failed"] + + +class ResponseCancelledDetails(BaseModel): + type: Literal["cancelled"] = "cancelled" + reason: Literal["turn_detected", "client_cancelled"] + + +class ResponseIncompleteDetails(BaseModel): + type: Literal["incomplete"] = "incomplete" + reason: Literal["max_output_tokens", "content_filter"] + + +class ResponseFailedDetails(BaseModel): + type: Literal["failed"] = "failed" + error: Any + + +ResponseStatusDetails = ResponseCancelledDetails | ResponseIncompleteDetails | ResponseFailedDetails + + +class Usage(BaseModel): + total_tokens: int + input_tokens: int + output_tokens: int + + +class RateLimitDetails(BaseModel): + name: str + limit: int + remaining: int + reset_seconds: float + + +#################################################################################################### +# Events +#################################################################################################### + + +class EventType(str, Enum): + # Client Events + + SESSION_UPDATE = "session.update" + INPUT_AUDIO_BUFFER_APPEND = "input_audio_buffer.append" + INPUT_AUDIO_BUFFER_COMMIT = "input_audio_buffer.commit" + INPUT_AUDIO_BUFFER_CLEAR = "input_audio_buffer.clear" + # TODO: gate to enabled users + UPDATE_CONVERSATION_CONFIG = "update_conversation_config" + ITEM_CREATE = "conversation.item.create" + ITEM_TRUNCATE = "conversation.item.truncate" + ITEM_DELETE = "conversation.item.delete" + RESPONSE_CREATE = "response.create" + RESPONSE_CANCEL = "response.cancel" + + # Server Events + + ERROR = "error" + SESSION_CREATED = "session.created" + + INPUT_AUDIO_BUFFER_COMMITTED = "input_audio_buffer.committed" + INPUT_AUDIO_BUFFER_CLEARED = "input_audio_buffer.cleared" + INPUT_AUDIO_BUFFER_SPEECH_STARTED = "input_audio_buffer.speech_started" + INPUT_AUDIO_BUFFER_SPEECH_STOPPED = "input_audio_buffer.speech_stopped" + + ITEM_CREATED = "conversation.item.created" + ITEM_DELETED = "conversation.item.deleted" + ITEM_TRUNCATED = "conversation.item.truncated" + ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED = ( + "conversation.item.input_audio_transcription.completed" + ) + ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED = "conversation.item.input_audio_transcription.failed" + + RESPONSE_CREATED = "response.created" + RESPONSE_CANCELLED = "response.cancelled" + RESPONSE_DONE = "response.done" + RESPONSE_OUTPUT_ITEM_ADDED = "response.output_item.added" + RESPONSE_OUTPUT_ITEM_DONE = "response.output_item.done" + RESPONSE_CONTENT_PART_ADDED = "response.content_part.added" + RESPONSE_CONTENT_PART_DONE = "response.content_part.done" + RESPONSE_TEXT_DELTA = "response.text.delta" + RESPONSE_TEXT_DONE = "response.text.done" + RESPONSE_AUDIO_TRANSCRIPT_DELTA = "response.audio_transcript.delta" + RESPONSE_AUDIO_TRANSCRIPT_DONE = "response.audio_transcript.done" + RESPONSE_AUDIO_DELTA = "response.audio.delta" + RESPONSE_AUDIO_DONE = "response.audio.done" + RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA = "response.function_call_arguments.delta" + RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE = "response.function_call_arguments.done" + RATE_LIMITS_UPDATED = "rate_limits.updated" + + +class RealtimeMessage(BaseModel, abc.ABC): + type: EventType + + +#################################################################################################### +# Client Events +# +# NOTE: See `api/params/client_events.py` for the xapi source of truth. +# Keep these classes in sync with the xapi versions for easier client and testing usage. +#################################################################################################### +class ClientToServerMessage(RealtimeMessage, abc.ABC): + event_id: str | None = None + + +class SessionUpdateParams(BaseModel): + model: str | None = None + modalities: Set[Literal["text", "audio"]] | None = None + voice: Voices | None = None + instructions: str | None = None + input_audio_format: AudioFormats | None = None + output_audio_format: AudioFormats | None = None + input_audio_transcription: InputAudioTranscription | None = None + turn_detection: TurnDetection | None = None + tools: list[dict[str, Any]] | None = None + tool_choice: ToolChoice | None = None + temperature: float | None = None + # FIXME: support -1 + # max_response_output_tokens: int | None = None + + +class SessionUpdate(ClientToServerMessage): + type: Literal[EventType.SESSION_UPDATE] = EventType.SESSION_UPDATE + session: SessionUpdateParams + + +class InputAudioBufferAppend(ClientToServerMessage): + """ + Append audio data to the user audio buffer, this should be in the format specified by + input_audio_format in the session config. + """ + + type: Literal[EventType.INPUT_AUDIO_BUFFER_APPEND] = EventType.INPUT_AUDIO_BUFFER_APPEND + audio: str + + +class InputAudioBufferCommit(ClientToServerMessage): + """ + Commit the pending user audio buffer, which creates a user message item with the audio content + and clears the buffer. + """ + + type: Literal[EventType.INPUT_AUDIO_BUFFER_COMMIT] = EventType.INPUT_AUDIO_BUFFER_COMMIT + + +class InputAudioBufferClear(ClientToServerMessage): + """ + Clear the user audio buffer, discarding any pending audio data. + """ + + type: Literal[EventType.INPUT_AUDIO_BUFFER_CLEAR] = EventType.INPUT_AUDIO_BUFFER_CLEAR + + +class ItemCreate(ClientToServerMessage): + type: Literal[EventType.ITEM_CREATE] = EventType.ITEM_CREATE + previous_item_id: str | None = None + item: ItemParam + + +class ItemTruncate(ClientToServerMessage): + type: Literal[EventType.ITEM_TRUNCATE] = EventType.ITEM_TRUNCATE + item_id: str + content_index: int + audio_end_ms: int + + +class ItemDelete(ClientToServerMessage): + type: Literal[EventType.ITEM_DELETE] = EventType.ITEM_DELETE + item_id: str + + +class ResponseCreateParams(BaseModel): + """ + - commit: If true, the generated messages will be appended to the end of the conversation. + Only valid if conversation_label is set. + - cancel_previous: If True, the generation will cancel any pending generation for that specific + conversation. If False, the generation will be queued and will be generated after the + previous generation has completed. + - append_input_items: If set, these messages will be appended to the end of the conversation before + a response is generated. If commit is false, these messages will be discarded. This can only + be done with an existing conversation, and thus will throw an error if conversation_label is + not set or does not exist. + - input_items: If conversation_label is not set or does not exist, this will be the initial messages + of the conversation, i.e. the context of the generation. If the conversation exists, this will + throw an error. + """ + + # TODO: gate to enabled users + commit: bool = True + cancel_previous: bool = True + append_input_items: list[ItemParam] | None = None + input_items: list[ItemParam] | None = None + instructions: str | None = None + modalities: Set[Literal["text", "audio"]] | None = None + voice: Voices | None = None + temperature: float | None = None + # FIXME: support -1 + max_output_tokens: int | None = None + tools: list[dict[str, Any]] | None = None + tool_choice: ToolChoice | None = None + output_audio_format: AudioFormats | None = None + + +class ResponseCreate(ClientToServerMessage): + """ + Trigger model inference to generate a model turn, the response will be streamed back with + a series of events, starting with an add_message event and ending with a turn_finished event. + If functions are enabled the response may be two, the second being a tool_call. + """ + + type: Literal[EventType.RESPONSE_CREATE] = EventType.RESPONSE_CREATE + response: ResponseCreateParams | None = None + + +class ResponseCancel(ClientToServerMessage): + type: Literal[EventType.RESPONSE_CANCEL] = EventType.RESPONSE_CANCEL + + +class Conversation(BaseModel): + messages: list[Item] + config: dict[str, Any] + + +# Temporarily leaving this here to support multi-convo path. +class UpdateConversationConfig(ClientToServerMessage): + type: Literal[EventType.UPDATE_CONVERSATION_CONFIG] = EventType.UPDATE_CONVERSATION_CONFIG + label: str = DEFAULT_CONVERSATION + subscribe_to_user_audio: bool | None = None + voice: Voices | None = None + system_message: str | None = None + temperature: float | None = None + max_tokens: int | None = None + tools: list[dict[str, Any]] | None = None + tool_choice: ToolChoice | None = None + disable_audio: bool | None = None + output_audio_format: AudioFormats | None = None + + +#################################################################################################### +# Server Events +#################################################################################################### + + +class ServerToClientMessage(RealtimeMessage, abc.ABC): + event_id: str = Field(default_factory=generate_event_id) + + +class RealtimeError(BaseModel): + message: str + type: str | None = None + code: str | None = None + param: str | None = None + event_id: str | None = None + + +class Session(BaseModel): + id: str + object: Literal["realtime.session"] = "realtime.session" + model: str + modalities: Set[Literal["text", "audio"]] = Field(default_factory=lambda: {"text", "audio"}) + instructions: str + voice: Voices = DEFAULT_VOICE + input_audio_format: AudioFormats = DEFAULT_AUDIO_FORMAT + output_audio_format: AudioFormats = DEFAULT_AUDIO_FORMAT + input_audio_transcription: InputAudioTranscription | None = None + turn_detection: TurnDetection = DEFAULT_TURN_DETECTION + tools: list[dict] = [] + tool_choice: Literal["auto", "none", "required"] = "auto" + temperature: float = DEFAULT_TEMPERATURE + # FIXME: support -1 + # max_response_output_tokens: int | None = None # Null indicates infinity + + +class Response(BaseModel): + object: Literal["realtime.response"] = "realtime.response" + id: str = Field(default_factory=generate_response_id) + + status: ResponseStatus = "in_progress" + status_details: ResponseStatusDetails | None = None + + output: list[Item] = Field(default_factory=list) + + usage: Usage | None = None + + +class ErrorMessage(ServerToClientMessage): + type: Literal[EventType.ERROR] = EventType.ERROR + error: RealtimeError + + +class SessionCreated(ServerToClientMessage): + type: Literal[EventType.SESSION_CREATED] = EventType.SESSION_CREATED + session: Session + + +class InputAudioBufferCommitted(ServerToClientMessage): + """ + Signals the server has received and processed the audio buffer. + """ + + type: Literal[EventType.INPUT_AUDIO_BUFFER_COMMITTED] = EventType.INPUT_AUDIO_BUFFER_COMMITTED + previous_item_id: str | None = None + # TODO: should we make this match conversation.item.created, and add item instead? + item_id: str + + +class InputAudioBufferCleared(ServerToClientMessage): + """ + Signals the server has cleared the audio buffer. + """ + + type: Literal[EventType.INPUT_AUDIO_BUFFER_CLEARED] = EventType.INPUT_AUDIO_BUFFER_CLEARED + + +class InputAudioBufferSpeechStarted(ServerToClientMessage): + """ + If the server VAD is enabled, this event is sent when speech is detected in the user audio buffer. + It tells you where in the audio stream (in milliseconds) the speech started, plus an item_id + which will be used in the corresponding speech_stopped event and the item created in the conversation + when speech stops. + """ + + type: Literal[EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED] = ( + EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED + ) + audio_start_ms: int + item_id: str + + +class InputAudioBufferSpeechStopped(ServerToClientMessage): + """ + If the server VAD is enabled, this event is sent when speech stops in the user audio buffer. + It tells you where in the audio stream (in milliseconds) the speech stopped, plus an item_id + which will be used in the corresponding speech_started event and the item created in the conversation + when speech starts. + """ + + type: Literal[EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED] = ( + EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED + ) + audio_end_ms: int + item_id: str | None = None + + +class ItemCreated(ServerToClientMessage): + type: Literal[EventType.ITEM_CREATED] = EventType.ITEM_CREATED + previous_item_id: str | None + item: Item + + +class ItemTruncated(ServerToClientMessage): + type: Literal[EventType.ITEM_TRUNCATED] = EventType.ITEM_TRUNCATED + item_id: str + content_index: int = 0 + audio_end_ms: int + + +class ItemDeleted(ServerToClientMessage): + type: Literal[EventType.ITEM_DELETED] = EventType.ITEM_DELETED + item_id: str + + +class ItemInputAudioTranscriptionCompleted(ServerToClientMessage): + type: Literal[EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED] = ( + EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED + ) + item_id: str + content_index: int + transcript: str + + +class ItemInputAudioTranscriptionFailed(ServerToClientMessage): + type: Literal[EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED] = ( + EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED + ) + item_id: str + content_index: int + error: RealtimeError + + +class ResponseCreated(ServerToClientMessage): + type: Literal[EventType.RESPONSE_CREATED] = EventType.RESPONSE_CREATED + response: Response + + +class ResponseDone(ServerToClientMessage): + type: Literal[EventType.RESPONSE_DONE] = EventType.RESPONSE_DONE + response: Response + + +class ResponseOutputItemAdded(ServerToClientMessage): + type: Literal[EventType.RESPONSE_OUTPUT_ITEM_ADDED] = EventType.RESPONSE_OUTPUT_ITEM_ADDED + response_id: str + output_index: int + item: Item + + +class ResponseOutputItemDone(ServerToClientMessage): + type: Literal[EventType.RESPONSE_OUTPUT_ITEM_DONE] = EventType.RESPONSE_OUTPUT_ITEM_DONE + response_id: str + output_index: int + item: Item + + +class ResponseContenPartAdded(ServerToClientMessage): + type: Literal[EventType.RESPONSE_CONTENT_PART_ADDED] = EventType.RESPONSE_CONTENT_PART_ADDED + response_id: str + item_id: str + output_index: int + content_index: int + part: ContentPart + + +class ResponseContentPartDone(ServerToClientMessage): + type: Literal[EventType.RESPONSE_CONTENT_PART_DONE] = EventType.RESPONSE_CONTENT_PART_DONE + response_id: str + item_id: str + output_index: int + content_index: int + part: ContentPart + + +class ResponseTextDelta(ServerToClientMessage): + type: Literal[EventType.RESPONSE_TEXT_DELTA] = EventType.RESPONSE_TEXT_DELTA + response_id: str + item_id: str + output_index: int + content_index: int + delta: str + + +class ResponseTextDone(ServerToClientMessage): + type: Literal[EventType.RESPONSE_TEXT_DONE] = EventType.RESPONSE_TEXT_DONE + response_id: str + item_id: str + output_index: int + content_index: int + text: str + + +class ResponseAudioTranscriptDelta(ServerToClientMessage): + type: Literal[EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA] = ( + EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA + ) + response_id: str + item_id: str + output_index: int + content_index: int + delta: str + + +class ResponseAudioTranscriptDone(ServerToClientMessage): + type: Literal[EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE] = ( + EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE + ) + response_id: str + item_id: str + output_index: int + content_index: int + transcript: str + + +class ResponseAudioDelta(ServerToClientMessage): + type: Literal[EventType.RESPONSE_AUDIO_DELTA] = EventType.RESPONSE_AUDIO_DELTA + response_id: str + item_id: str + output_index: int + content_index: int + delta: str + + +class ResponseAudioDone(ServerToClientMessage): + type: Literal[EventType.RESPONSE_AUDIO_DONE] = EventType.RESPONSE_AUDIO_DONE + response_id: str + item_id: str + output_index: int + content_index: int + + +class ResponseFunctionCallArgumentsDelta(ServerToClientMessage): + type: Literal[EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA] = ( + EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA + ) + response_id: str + item_id: str + output_index: int + call_id: str + delta: str + + +class ResponseFunctionCallArgumentsDone(ServerToClientMessage): + type: Literal[EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE] = ( + EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE + ) + response_id: str + item_id: str + output_index: int + call_id: str + name: str + arguments: str + + +DeltaType = ( + ResponseTextDelta + | ResponseAudioDelta + | ResponseAudioTranscriptDelta + | ResponseFunctionCallArgumentsDelta +) + + +class RateLimitsUpdated(ServerToClientMessage): + type: Literal[EventType.RATE_LIMITS_UPDATED] = EventType.RATE_LIMITS_UPDATED + rate_limits: list[RateLimitDetails] + + +ClientToServerMessages = ( + InputAudioBufferAppend + | InputAudioBufferClear + | InputAudioBufferCommit + | ItemCreate + | ItemDelete + | ItemTruncate + | ResponseCancel + | ResponseCreate + | SessionUpdate + # TODO: gate to enabled users + | UpdateConversationConfig +) + + +AnnotatedClientToServerMessages = Annotated[ClientToServerMessages, Field(discriminator="type")] + + +ServerToClientMessages = ( + ErrorMessage + | InputAudioBufferCleared + | InputAudioBufferCommitted + | InputAudioBufferSpeechStarted + | InputAudioBufferSpeechStopped + | ItemCreated + | ItemDeleted + | ItemInputAudioTranscriptionCompleted + | ItemTruncated + | RateLimitsUpdated + | ResponseAudioDelta + | ResponseAudioDone + | ResponseAudioTranscriptDelta + | ResponseAudioTranscriptDone + | ResponseContenPartAdded + | ResponseContentPartDone + | ResponseCreated + | ResponseDone + | ResponseFunctionCallArgumentsDelta + | ResponseFunctionCallArgumentsDone + | ResponseOutputItemAdded + | ResponseOutputItemDone + | ResponseTextDelta + | ResponseTextDone + | SessionCreated +) + +AnnotatedServerToClientMessages = Annotated[ServerToClientMessages, Field(discriminator="type")] + + +def parse_client_message(unparsed_string: str) -> ClientToServerMessage: + adapter: TypeAdapter[ClientToServerMessages] = TypeAdapter(AnnotatedClientToServerMessages) # type: ignore[arg-type] + return adapter.validate_json(unparsed_string) + + +def parse_server_message(unparsed_string: str) -> ServerToClientMessage: + adapter: TypeAdapter[ServerToClientMessage] = TypeAdapter(AnnotatedServerToClientMessages) # type: ignore[arg-type] + return adapter.validate_json(unparsed_string) diff --git a/agents/ten_packages/extension/openai_v2v_python/property.json b/agents/ten_packages/extension/openai_v2v_python/property.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/property.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/agents/ten_packages/extension/openai_v2v_python/requirements.txt b/agents/ten_packages/extension/openai_v2v_python/requirements.txt new file mode 100644 index 00000000..87050e2e --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/requirements.txt @@ -0,0 +1,6 @@ +asyncio +pydantic +numpy==1.26.4 +sounddevice==0.4.7 +pydub==0.25.1 +aiohttp==3.10.7 \ No newline at end of file From d860ab3b0dc7d6114323dca40ea264133f9eba5d Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 30 Sep 2024 13:13:54 +0000 Subject: [PATCH 14/55] feat: add v2v graph --- agents/property.json | 112 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/agents/property.json b/agents/property.json index 3c89e1fc..06440366 100644 --- a/agents/property.json +++ b/agents/property.json @@ -2158,6 +2158,118 @@ ] } ] + }, + { + "name": "va.openai.v2v", + "auto_start": false, + "nodes": [ + { + "type": "extension", + "extension_group": "rtc", + "addon": "agora_rtc", + "name": "agora_rtc", + "property": { + "app_id": "${env:AGORA_APP_ID}", + "token": "", + "channel": "astra_agents_test", + "stream_id": 1234, + "remote_stream_id": 123, + "subscribe_audio": true, + "publish_audio": true, + "publish_data": true + } + }, + { + "type": "extension", + "extension_group": "llm", + "addon": "openai_v2v_python", + "name": "openai_v2v_python", + "property": { + "api_key": "${env:OPENAI_API_KEY}", + "temperature": 0.9, + "model": "gpt-4o-realtime-preview-2024-10-01", + "stream_id": 1234, + "max_tokens": 2048, + "voice": "alloy", + "server_vad": true + } + }, + { + "type": "extension", + "extension_group": "transcriber", + "addon": "message_collector", + "name": "message_collector" + } + ], + "connections": [ + { + "extension_group": "rtc", + "extension": "agora_rtc", + "audio_frame": [ + { + "name": "pcm_frame", + "dest": [ + { + "extension_group": "llm", + "extension": "openai_v2v_python" + } + ] + } + ] + }, + { + "extension_group": "llm", + "extension": "openai_v2v_python", + "audio_frame": [ + { + "name": "pcm_frame", + "dest": [ + { + "extension_group": "rtc", + "extension": "agora_rtc" + } + ] + } + ], + "data": [ + { + "name": "text_data", + "dest": [ + { + "extension_group": "transcriber", + "extension": "message_collector" + } + ] + } + ], + "cmd": [ + { + "name": "flush", + "dest": [ + { + "extension_group": "rtc", + "extension": "agora_rtc" + } + ] + } + ] + }, + { + "extension_group": "transcriber", + "extension": "message_collector", + "data": [ + { + "name": "data", + "dest": [ + { + "extension_group": "rtc", + "extension": "agora_rtc" + } + ] + } + ] + } + ] } ] } From 26c6bf75eacf23fe35086799497457635dc965f8 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 30 Sep 2024 13:44:10 +0000 Subject: [PATCH 15/55] fix: error --- .../extension/openai_v2v_python/extension.py | 7 +++- .../extension/openai_v2v_python/messages.py | 34 +++++++++---------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index cf6734fb..07e4f4d4 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -115,6 +115,8 @@ def on_audio_frame(self, ten_env: TenEnv, audio_frame: AudioFrame) -> None: logger.info(f"Start session for {stream_id}") frame_buf = audio_frame.get_buf() + with open("audio_stt_in.pcm", "ab") as dump_file: + dump_file.write(frame_buf) asyncio.run_coroutine_threadsafe(self.on_audio(frame_buf), self.loop) except: logger.exception(f"OpenAIV2VExtension on audio frame failed") @@ -321,13 +323,14 @@ def fetch_properties(self, ten_env: TenEnv): def update_session(self) -> SessionUpdate: params = SessionUpdateParams() params.model = self.config.model + params.modalities = set(["audio", "text"]) params.voice = self.config.voice params.input_audio_format = AudioFormats.PCM16 params.output_audio_format = AudioFormats.PCM16 params.turn_detection = DEFAULT_TURN_DETECTION params.input_audio_transcription = InputAudioTranscription(enabled=True, model='whisper-1') params.temperature = self.config.temperature - params.max_response_output_tokens = self.config.max_tokens + # params.max_response_output_tokens = self.config.max_tokens return SessionUpdate(session=params) def update_conversation(self) -> UpdateConversationConfig: @@ -349,6 +352,8 @@ def replace(self, prompt:str) -> str: def on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: audio_data = base64.b64decode(delta) + with open("audio_stt_out.pcm", "ab") as dump_file: + dump_file.write(audio_data) f = AudioFrame.create(AUDIO_PCM_FRAME) f.set_sample_rate(self.sample_rate) f.set_bytes_per_sample(2) diff --git a/agents/ten_packages/extension/openai_v2v_python/messages.py b/agents/ten_packages/extension/openai_v2v_python/messages.py index 2ed55d78..a2e11177 100644 --- a/agents/ten_packages/extension/openai_v2v_python/messages.py +++ b/agents/ten_packages/extension/openai_v2v_python/messages.py @@ -1,7 +1,7 @@ import abc import random import string -from enum import Enum, StrEnum +from enum import Enum from typing import Annotated, Any, Literal, Set from pydantic import BaseModel, PrivateAttr, TypeAdapter @@ -90,19 +90,19 @@ class FunctionToolChoice(BaseModel): ToolChoice = Literal["none", "auto", "required"] | FunctionToolChoice -class ItemType(StrEnum): +class ItemType(Enum): message = "message" function_call = "function_call" function_call_output = "function_call_output" -class MessageRole(StrEnum): +class MessageRole(Enum): system = "system" user = "user" assistant = "assistant" -class ContentType(StrEnum): +class ContentType(Enum): input_text = "input_text" input_audio = "input_audio" text = "text" @@ -110,18 +110,18 @@ class ContentType(StrEnum): class InputTextContentPartParam(BaseModel): - type: Literal[ContentType.input_text] = ContentType.input_text + type: str = ContentType.input_text text: str class InputAudioContentPartParam(BaseModel): - type: Literal[ContentType.input_audio] = ContentType.input_audio + type: str = ContentType.input_audio audio: str transcript: str | None = None class OutputTextContentPartParam(BaseModel): - type: Literal[ContentType.text] = ContentType.text + type: str = ContentType.text text: str @@ -139,7 +139,7 @@ class OutputTextContentPartParam(BaseModel): class SystemMessageItemParam(BaseModel): id: str | None = None type: Literal[ItemType.message] = ItemType.message - role: Literal[MessageRole.system] = MessageRole.system + role: str = MessageRole.system content: list[SystemContentPartParam] status: ItemParamStatus | None = None @@ -147,7 +147,7 @@ class SystemMessageItemParam(BaseModel): class UserMessageItemParam(BaseModel): id: str | None = None type: Literal[ItemType.message] = ItemType.message - role: Literal[MessageRole.user] = MessageRole.user + role: str = MessageRole.user content: list[UserContentPartParam] status: ItemParamStatus | None = None @@ -155,7 +155,7 @@ class UserMessageItemParam(BaseModel): class AssistantMessageItemParam(BaseModel): id: str | None = None type: Literal[ItemType.message] = ItemType.message - role: Literal[MessageRole.assistant] = MessageRole.assistant + role: str = MessageRole.assistant content: list[AssistantContentPartParam] status: ItemParamStatus | None = None @@ -205,22 +205,22 @@ class BaseItem(BaseModel): class InputTextContentPart(BaseModel): - type: Literal[ContentType.input_text] = ContentType.input_text + type: str = ContentType.input_text text: str class InputAudioContentPart(BaseModel): - type: Literal[ContentType.input_audio] = ContentType.input_audio + type: str = ContentType.input_audio transcript: str | None class TextContentPart(BaseModel): - type: Literal[ContentType.text] = ContentType.text + type: str = ContentType.text text: str class AudioContentPart(BaseModel): - type: Literal[ContentType.audio] = ContentType.audio + type: str = ContentType.audio transcript: str | None _audio: str = PrivateAttr(default_factory=str) @@ -229,20 +229,20 @@ class AudioContentPart(BaseModel): class MessageItem(BaseItem): - type: Literal[ItemType.message] = ItemType.message + type: str = ItemType.message role: MessageRole content: list[ContentPart] class FunctionCallItem(BaseItem): - type: Literal[ItemType.function_call] = ItemType.function_call + type: str = ItemType.function_call name: str call_id: str arguments: str class FunctionCallOutputItem(BaseItem): - type: Literal[ItemType.function_call_output] = ItemType.function_call_output + type: str = ItemType.function_call_output call_id: str output: str From 43fba8cf0081054a7a9c3a9c6243c0e5208bb600 Mon Sep 17 00:00:00 2001 From: Tomas Date: Mon, 30 Sep 2024 22:22:46 +0800 Subject: [PATCH 16/55] update playground for new graph --- agents/property.json | 1 + .../ten_packages/extension/openai_v2v_python/extension.py | 1 + demo/src/app/api/agents/start/graph.tsx | 8 ++++++++ demo/src/store/reducers/global.ts | 2 +- playground/src/common/constant.ts | 4 ++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/agents/property.json b/agents/property.json index 06440366..fbd73d61 100644 --- a/agents/property.json +++ b/agents/property.json @@ -2191,6 +2191,7 @@ "stream_id": 1234, "max_tokens": 2048, "voice": "alloy", + "language": "en-US", "server_vad": true } }, diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 07e4f4d4..c3230b8e 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -324,6 +324,7 @@ def update_session(self) -> SessionUpdate: params = SessionUpdateParams() params.model = self.config.model params.modalities = set(["audio", "text"]) + params.instructions = "" params.voice = self.config.voice params.input_audio_format = AudioFormats.PCM16 params.output_audio_format = AudioFormats.PCM16 diff --git a/demo/src/app/api/agents/start/graph.tsx b/demo/src/app/api/agents/start/graph.tsx index 76a4c9a0..fab77e88 100644 --- a/demo/src/app/api/agents/start/graph.tsx +++ b/demo/src/app/api/agents/start/graph.tsx @@ -81,6 +81,14 @@ export const getGraphProperties = (graphName: string, language: string, voiceTyp "azure_synthesis_voice_name": voiceNameMap[language]["azure"][voiceType] } } + } else if (graphName == "va.openai.v2v") { + return { + "openai_v2v_python": { + "model": "gpt-4o-realtime-preview-2024-10-01", + "language": language, + ...localizationOptions + } + } } else if (graphName == "va.openai.azure") { return { "agora_rtc": { diff --git a/demo/src/store/reducers/global.ts b/demo/src/store/reducers/global.ts index b29f0af8..170f6e86 100644 --- a/demo/src/store/reducers/global.ts +++ b/demo/src/store/reducers/global.ts @@ -22,7 +22,7 @@ const getInitialState = (): InitialState => { language: "en-US", voiceType: "male", chatItems: [], - graphName: "camera.va.openai.azure" + graphName: "va.openai.v2v" } } diff --git a/playground/src/common/constant.ts b/playground/src/common/constant.ts index 0fd93c81..fab02655 100644 --- a/playground/src/common/constant.ts +++ b/playground/src/common/constant.ts @@ -37,6 +37,10 @@ export const GRAPH_OPTIONS: GraphOptionItem[] = [ label: "Voice Agent with Knowledge - RAG + Qwen LLM + Cosy TTS", value: "va.qwen.rag" }, + { + label: "Voice Agent with Open Realtime API (Alpha)", + value: "va.openai.v2v" + } ] export const isRagGraph = (graphName: string) => { From da63a50b04f04f5fdc4b359e75139712ce0a0832 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 30 Sep 2024 14:27:14 +0000 Subject: [PATCH 17/55] test: build docker --- .github/workflows/build-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 8f401d9f..10a29e85 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -2,7 +2,7 @@ name: Build Docker on: push: - branches: ["main"] + branches: ["main", "feature/v2v"] # Publish semver tags as releases. tags: ["v*.*.*"] paths-ignore: From 2586a1aab35946a02fdb0651c569df4a14deedc5 Mon Sep 17 00:00:00 2001 From: Tomas Date: Mon, 30 Sep 2024 22:52:24 +0800 Subject: [PATCH 18/55] fix --- demo/src/common/constant.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/demo/src/common/constant.ts b/demo/src/common/constant.ts index fee0c18e..e9d7270b 100644 --- a/demo/src/common/constant.ts +++ b/demo/src/common/constant.ts @@ -38,6 +38,10 @@ export const GRAPH_OPTIONS: GraphOptionItem[] = [ label: "Voice Agent with Knowledge - RAG + Qwen LLM + Cosy TTS", value: "va.qwen.rag" }, + { + label: "Voice Agent with Open Realtime API (Alpha)", + value: "va.openai.v2v" + } ] export const isRagGraph = (graphName: string) => { From 1d7d9bf544117112e625ebb14714f2d3b293ad2a Mon Sep 17 00:00:00 2001 From: Tomas Date: Mon, 30 Sep 2024 23:36:45 +0800 Subject: [PATCH 19/55] fix --- agents/ten_packages/extension/openai_v2v_python/extension.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index c3230b8e..e4ba5c0d 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -163,9 +163,8 @@ def get_time_ms() -> int: case SessionCreated(): logger.info(f"Session is created: {message.session.id}") self.session_id = message.session.id - update_msg = self.update_session() - await self.client.send_message(update_msg) - + # update_msg = self.update_session() + # await self.client.send_message(update_msg) update_conversation = self.update_conversation() await self.client.send_message(update_conversation) case ItemInputAudioTranscriptionCompleted(): From 514ee9614d41c1e5ba7ada1fcea538922d213f46 Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 1 Oct 2024 00:55:51 +0800 Subject: [PATCH 20/55] fix self script --- .../extension/openai_v2v_python/extension.py | 18 +- .../extension/openai_v2v_python/id.py | 20 ++ .../extension/openai_v2v_python/messages.py | 205 +++++++++++------- 3 files changed, 152 insertions(+), 91 deletions(-) create mode 100644 agents/ten_packages/extension/openai_v2v_python/id.py diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index e4ba5c0d..b4f5c380 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -54,6 +54,7 @@ class OpenAIV2VExtension(Extension): # openai related config: RealtimeApiConfig = None session_id: str = "" + session: Session = None # audo related sample_rate : int = 24000 @@ -62,6 +63,7 @@ class OpenAIV2VExtension(Extension): transcript: str = '' # agora related + channel_name: str = "" stream_id: int = 0 remote_stream_id: int = 0 ctx: dict = {} @@ -163,8 +165,9 @@ def get_time_ms() -> int: case SessionCreated(): logger.info(f"Session is created: {message.session.id}") self.session_id = message.session.id - # update_msg = self.update_session() - # await self.client.send_message(update_msg) + self.session = message.session + update_msg = self.update_session() + await self.client.send_message(update_msg) update_conversation = self.update_conversation() await self.client.send_message(update_conversation) case ItemInputAudioTranscriptionCompleted(): @@ -321,16 +324,9 @@ def fetch_properties(self, ten_env: TenEnv): def update_session(self) -> SessionUpdate: params = SessionUpdateParams() - params.model = self.config.model - params.modalities = set(["audio", "text"]) - params.instructions = "" - params.voice = self.config.voice - params.input_audio_format = AudioFormats.PCM16 - params.output_audio_format = AudioFormats.PCM16 - params.turn_detection = DEFAULT_TURN_DETECTION - params.input_audio_transcription = InputAudioTranscription(enabled=True, model='whisper-1') + params.input_audio_transcription = InputAudioTranscription(model='whisper-1') params.temperature = self.config.temperature - # params.max_response_output_tokens = self.config.max_tokens + params.tool_choice = "none" return SessionUpdate(session=params) def update_conversation(self) -> UpdateConversationConfig: diff --git a/agents/ten_packages/extension/openai_v2v_python/id.py b/agents/ten_packages/extension/openai_v2v_python/id.py new file mode 100644 index 00000000..e8fe56c8 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/id.py @@ -0,0 +1,20 @@ +import random +import string + + +def generate_rand_str(prefix: str, len: int = 16) -> str: + # Generate a random string of specified length with the given prefix + random_str = "".join(random.choices(string.ascii_letters + string.digits, k=len)) + return f"{prefix}_{random_str}" + + +def generate_client_event_id() -> str: + return generate_rand_str("cevt") + + +def generate_event_id() -> str: + return generate_rand_str("event") + + +def generate_response_id() -> str: + return generate_rand_str("resp") diff --git a/agents/ten_packages/extension/openai_v2v_python/messages.py b/agents/ten_packages/extension/openai_v2v_python/messages.py index a2e11177..d9d17a04 100644 --- a/agents/ten_packages/extension/openai_v2v_python/messages.py +++ b/agents/ten_packages/extension/openai_v2v_python/messages.py @@ -1,35 +1,38 @@ import abc -import random -import string from enum import Enum from typing import Annotated, Any, Literal, Set from pydantic import BaseModel, PrivateAttr, TypeAdapter from pydantic.fields import Field +from typing_extensions import override + +from .id import generate_event_id, generate_response_id #################################################################################################### -# ID Generation +# Common #################################################################################################### -# Do not use internal libraries for now. - -def generate_rand_str(prefix: str, len: int = 16) -> str: - # Generate a random string of specified length with the given prefix - random_str = "".join(random.choices(string.ascii_letters + string.digits, k=len)) - return f"{prefix}_{random_str}" +class RealtimeError(BaseModel): + type: str + code: str | None = None + message: str + param: str | None = None + event_id: str | None = None -def generate_event_id() -> str: - return generate_rand_str("event") +class ApiError(BaseModel): + type: str + code: str | None = None + message: str + param: str | None = None -def generate_response_id() -> str: - return generate_rand_str("resp") +class ResponseError(BaseModel): + type: str + code: str | None = None + message: str -#################################################################################################### -# Common -#################################################################################################### DEFAULT_CONVERSATION = "default" @@ -39,6 +42,13 @@ def generate_response_id() -> str: class Voices(str, Enum): Alloy = "alloy" Echo = "echo" + Fable = "fable" + Nova = "nova" + Nova_2 = "nova_2" + Nova_3 = "nova_3" + Nova_4 = "nova_4" + Nova_5 = "nova_5" + Onyx = "onyx" Shimmer = "shimmer" @@ -59,10 +69,6 @@ class InputAudioTranscription(BaseModel): model: Literal["whisper-1"] -class NoTurnDetection(BaseModel): - type: Literal["none"] = "none" - - class ServerVAD(BaseModel): type: Literal["server_vad"] = "server_vad" threshold: float | None = None @@ -70,8 +76,6 @@ class ServerVAD(BaseModel): silence_duration_ms: int | None = None -TurnDetection = ServerVAD | NoTurnDetection - VAD_THRESHOLD_DEFAULT = 0.5 VAD_PREFIX_PADDING_MS_DEFAULT = 300 VAD_SILENCE_DURATION_MS_DEFAULT = 200 @@ -82,6 +86,14 @@ class ServerVAD(BaseModel): ) +class ServerVADUpdateParams(BaseModel): + # Always required + type: Literal["server_vad"] + threshold: float | None = None + prefix_padding_ms: int | None = None + silence_duration_ms: int | None = None + + class FunctionToolChoice(BaseModel): type: Literal["function"] = "function" name: str @@ -90,19 +102,19 @@ class FunctionToolChoice(BaseModel): ToolChoice = Literal["none", "auto", "required"] | FunctionToolChoice -class ItemType(Enum): +class ItemType(str, Enum): message = "message" function_call = "function_call" function_call_output = "function_call_output" -class MessageRole(Enum): +class MessageRole(str, Enum): system = "system" user = "user" assistant = "assistant" -class ContentType(Enum): +class ContentType(str, Enum): input_text = "input_text" input_audio = "input_audio" text = "text" @@ -110,18 +122,18 @@ class ContentType(Enum): class InputTextContentPartParam(BaseModel): - type: str = ContentType.input_text + type: Literal[ContentType.input_text] = ContentType.input_text text: str class InputAudioContentPartParam(BaseModel): - type: str = ContentType.input_audio + type: Literal[ContentType.input_audio] = ContentType.input_audio audio: str transcript: str | None = None class OutputTextContentPartParam(BaseModel): - type: str = ContentType.text + type: Literal[ContentType.text] = ContentType.text text: str @@ -129,56 +141,50 @@ class OutputTextContentPartParam(BaseModel): UserContentPartParam = InputTextContentPartParam | InputAudioContentPartParam AssistantContentPartParam = OutputTextContentPartParam -ItemParamStatus = str -""" -The client can only pass items with status `completed` or `incomplete`, -but we're lenient here since actual validation happens further down. -""" +ItemParamStatus = Literal["incomplete", "completed"] class SystemMessageItemParam(BaseModel): id: str | None = None type: Literal[ItemType.message] = ItemType.message - role: str = MessageRole.system - content: list[SystemContentPartParam] status: ItemParamStatus | None = None + role: Literal[MessageRole.system] = MessageRole.system + content: list[SystemContentPartParam] class UserMessageItemParam(BaseModel): id: str | None = None type: Literal[ItemType.message] = ItemType.message - role: str = MessageRole.user - content: list[UserContentPartParam] status: ItemParamStatus | None = None + role: Literal[MessageRole.user] = MessageRole.user + content: list[UserContentPartParam] class AssistantMessageItemParam(BaseModel): id: str | None = None type: Literal[ItemType.message] = ItemType.message - role: str = MessageRole.assistant - content: list[AssistantContentPartParam] status: ItemParamStatus | None = None + role: Literal[MessageRole.assistant] = MessageRole.assistant + content: list[AssistantContentPartParam] class MessageReferenceItemParam(BaseModel): type: Literal[ItemType.message] = ItemType.message id: str - status: ItemParamStatus | None = None class FunctionCallItemParam(BaseModel): id: str | None = None type: Literal[ItemType.function_call] = ItemType.function_call + status: ItemParamStatus | None = None name: str call_id: str arguments: str - status: ItemParamStatus | None = None class FunctionCallOutputItemParam(BaseModel): id: str | None = None type: Literal[ItemType.function_call_output] = ItemType.function_call_output - status: ItemParamStatus | None = None call_id: str output: str @@ -201,26 +207,25 @@ class BaseItem(BaseModel): id: str | None = None object: Literal["realtime.item"] | None = None type: ItemType - status: ItemStatus class InputTextContentPart(BaseModel): - type: str = ContentType.input_text + type: Literal[ContentType.input_text] = ContentType.input_text text: str class InputAudioContentPart(BaseModel): - type: str = ContentType.input_audio + type: Literal[ContentType.input_audio] = ContentType.input_audio transcript: str | None class TextContentPart(BaseModel): - type: str = ContentType.text + type: Literal[ContentType.text] = ContentType.text text: str class AudioContentPart(BaseModel): - type: str = ContentType.audio + type: Literal[ContentType.audio] = ContentType.audio transcript: str | None _audio: str = PrivateAttr(default_factory=str) @@ -229,25 +234,28 @@ class AudioContentPart(BaseModel): class MessageItem(BaseItem): - type: str = ItemType.message + type: Literal[ItemType.message] = ItemType.message + status: ItemStatus role: MessageRole content: list[ContentPart] class FunctionCallItem(BaseItem): - type: str = ItemType.function_call + type: Literal[ItemType.function_call] = ItemType.function_call + status: ItemStatus name: str call_id: str arguments: str class FunctionCallOutputItem(BaseItem): - type: str = ItemType.function_call_output + type: Literal[ItemType.function_call_output] = ItemType.function_call_output call_id: str output: str Item = MessageItem | FunctionCallItem | FunctionCallOutputItem +OutputItem = MessageItem | FunctionCallItem ResponseStatus = Literal["in_progress", "completed", "cancelled", "incomplete", "failed"] @@ -264,16 +272,29 @@ class ResponseIncompleteDetails(BaseModel): class ResponseFailedDetails(BaseModel): type: Literal["failed"] = "failed" - error: Any + error: ResponseError ResponseStatusDetails = ResponseCancelledDetails | ResponseIncompleteDetails | ResponseFailedDetails +class InputTokenDetails(BaseModel): + cached_tokens: int = 0 + text_tokens: int = 0 + audio_tokens: int = 0 + + +class OutputTokenDetails(BaseModel): + text_tokens: int = 0 + audio_tokens: int = 0 + + class Usage(BaseModel): - total_tokens: int - input_tokens: int - output_tokens: int + total_tokens: int = 0 + input_tokens: int = 0 + output_tokens: int = 0 + input_token_details: InputTokenDetails = InputTokenDetails() + output_token_details: OutputTokenDetails = OutputTokenDetails() class RateLimitDetails(BaseModel): @@ -354,25 +375,52 @@ class ClientToServerMessage(RealtimeMessage, abc.ABC): class SessionUpdateParams(BaseModel): + """ + Update Events in the OpenAI API have specific behavior: + - If a field is not provided, it is not updated. + - If a field is provided, the new value is used for the field. + - If a null value is provided for a nullable field, that field is updated to null. + - If a null value is provided for a non-nullable field, the API will return an invalid type error. + - If a nested field is provided, and the parent object's type matches the current parent's type, + only that field is updated (i.e. the API supports sparse updates). If the parent object's type + is different from the current parent's type, the entire object is updated. + """ + model: str | None = None modalities: Set[Literal["text", "audio"]] | None = None - voice: Voices | None = None instructions: str | None = None + voice: Voices | None = None + turn_detection: ServerVADUpdateParams | None = None input_audio_format: AudioFormats | None = None output_audio_format: AudioFormats | None = None input_audio_transcription: InputAudioTranscription | None = None - turn_detection: TurnDetection | None = None tools: list[dict[str, Any]] | None = None tool_choice: ToolChoice | None = None temperature: float | None = None - # FIXME: support -1 - # max_response_output_tokens: int | None = None + max_response_output_tokens: int | Literal["inf"] | None = None class SessionUpdate(ClientToServerMessage): type: Literal[EventType.SESSION_UPDATE] = EventType.SESSION_UPDATE session: SessionUpdateParams + @override + def model_dump(self, **kwargs) -> dict[str, Any]: + """ + Override model_dump to ensure `session` only includes set fields. + """ + dict_value = super().model_dump(**kwargs) + dict_value["session"] = self.session.model_dump(**kwargs, exclude_unset=True) + return dict_value + + @override + def model_dump_json(self, **kwargs) -> str: + """ + Override model_dump_json to ensure `session` only includes set fields. + """ + dict_value = self.model_dump(**kwargs) + return self.__pydantic_serializer__.to_json(value=dict_value, **kwargs).decode() + class InputAudioBufferAppend(ClientToServerMessage): """ @@ -437,18 +485,20 @@ class ResponseCreateParams(BaseModel): # TODO: gate to enabled users commit: bool = True + # TODO: gate to enabled users cancel_previous: bool = True + # TODO: gate to enabled users append_input_items: list[ItemParam] | None = None + # TODO: gate to enabled users input_items: list[ItemParam] | None = None - instructions: str | None = None modalities: Set[Literal["text", "audio"]] | None = None + instructions: str | None = None voice: Voices | None = None - temperature: float | None = None - # FIXME: support -1 - max_output_tokens: int | None = None + output_audio_format: AudioFormats | None = None tools: list[dict[str, Any]] | None = None tool_choice: ToolChoice | None = None - output_audio_format: AudioFormats | None = None + temperature: float | None = None + max_output_tokens: int | Literal["inf"] | None = None class ResponseCreate(ClientToServerMessage): @@ -495,30 +545,25 @@ class ServerToClientMessage(RealtimeMessage, abc.ABC): event_id: str = Field(default_factory=generate_event_id) -class RealtimeError(BaseModel): - message: str - type: str | None = None - code: str | None = None - param: str | None = None - event_id: str | None = None - - class Session(BaseModel): id: str object: Literal["realtime.session"] = "realtime.session" model: str + expires_at: int + """ + The time at which this session will be forceably closed, expressed in seconds since epoch. + """ modalities: Set[Literal["text", "audio"]] = Field(default_factory=lambda: {"text", "audio"}) instructions: str voice: Voices = DEFAULT_VOICE + turn_detection: ServerVAD | None = DEFAULT_TURN_DETECTION # null indicates disabled input_audio_format: AudioFormats = DEFAULT_AUDIO_FORMAT output_audio_format: AudioFormats = DEFAULT_AUDIO_FORMAT - input_audio_transcription: InputAudioTranscription | None = None - turn_detection: TurnDetection = DEFAULT_TURN_DETECTION + input_audio_transcription: InputAudioTranscription | None = None # null indicates disabled tools: list[dict] = [] tool_choice: Literal["auto", "none", "required"] = "auto" temperature: float = DEFAULT_TEMPERATURE - # FIXME: support -1 - # max_response_output_tokens: int | None = None # Null indicates infinity + max_response_output_tokens: int | Literal["inf"] = "inf" class Response(BaseModel): @@ -625,7 +670,7 @@ class ItemInputAudioTranscriptionFailed(ServerToClientMessage): ) item_id: str content_index: int - error: RealtimeError + error: ApiError class ResponseCreated(ServerToClientMessage): @@ -642,17 +687,17 @@ class ResponseOutputItemAdded(ServerToClientMessage): type: Literal[EventType.RESPONSE_OUTPUT_ITEM_ADDED] = EventType.RESPONSE_OUTPUT_ITEM_ADDED response_id: str output_index: int - item: Item + item: OutputItem class ResponseOutputItemDone(ServerToClientMessage): type: Literal[EventType.RESPONSE_OUTPUT_ITEM_DONE] = EventType.RESPONSE_OUTPUT_ITEM_DONE response_id: str output_index: int - item: Item + item: OutputItem -class ResponseContenPartAdded(ServerToClientMessage): +class ResponseContentPartAdded(ServerToClientMessage): type: Literal[EventType.RESPONSE_CONTENT_PART_ADDED] = EventType.RESPONSE_CONTENT_PART_ADDED response_id: str item_id: str @@ -796,7 +841,7 @@ class RateLimitsUpdated(ServerToClientMessage): | ResponseAudioDone | ResponseAudioTranscriptDelta | ResponseAudioTranscriptDone - | ResponseContenPartAdded + | ResponseContentPartAdded | ResponseContentPartDone | ResponseCreated | ResponseDone From b205329e29ef2902b106a7278ca287b25c35f2d5 Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 1 Oct 2024 01:34:36 +0800 Subject: [PATCH 21/55] fix --- .../extension/openai_v2v_python/extension.py | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index b4f5c380..abe07284 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -163,13 +163,14 @@ def get_time_ms() -> int: logger.info(f"Received message: {message.type}") match message: case SessionCreated(): - logger.info(f"Session is created: {message.session.id}") + logger.info(f"Session is created: {message.session}") self.session_id = message.session.id self.session = message.session update_msg = self.update_session() await self.client.send_message(update_msg) - update_conversation = self.update_conversation() - await self.client.send_message(update_conversation) + + #update_conversation = self.update_conversation() + #await self.client.send_message(update_conversation) case ItemInputAudioTranscriptionCompleted(): logger.info(f"On request transript {message.transcript}") self.send_transcript(ten_env, message.transcript, ROLE_USER, True) @@ -323,11 +324,18 @@ def fetch_properties(self, ten_env: TenEnv): self.ctx = self.config.build_ctx() def update_session(self) -> SessionUpdate: - params = SessionUpdateParams() - params.input_audio_transcription = InputAudioTranscription(model='whisper-1') - params.temperature = self.config.temperature - params.tool_choice = "none" - return SessionUpdate(session=params) + prompt = self.replace(self.config.system_message) + return SessionUpdate(session=SessionUpdateParams( + instructions = prompt, + input_audio_transcription = InputAudioTranscription(model="whisper-1"), + temperature = self.config.temperature, + voice = self.config.voice, + model= self.config.model, + input_audio_format="pcm16", + output_audio_format="pcm16", + max_response_output_tokens = "inf", + turn_detection = ServerVADUpdateParams(type="server_vad", threshold=VAD_THRESHOLD_DEFAULT, prefix_padding_ms=VAD_PREFIX_PADDING_MS_DEFAULT, silence_duration_ms=VAD_SILENCE_DURATION_MS_DEFAULT) + )) def update_conversation(self) -> UpdateConversationConfig: prompt = self.replace(self.config.system_message) From 28363f7afa666a39778c5fc00321e8d41a34069c Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 1 Oct 2024 09:54:56 +0800 Subject: [PATCH 22/55] new protocol --- agents/ten_packages/extension/openai_v2v_python/messages.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/agents/ten_packages/extension/openai_v2v_python/messages.py b/agents/ten_packages/extension/openai_v2v_python/messages.py index d9d17a04..f448e035 100644 --- a/agents/ten_packages/extension/openai_v2v_python/messages.py +++ b/agents/ten_packages/extension/openai_v2v_python/messages.py @@ -328,6 +328,7 @@ class EventType(str, Enum): ERROR = "error" SESSION_CREATED = "session.created" + SESSION_UPDATED = "session.updated" INPUT_AUDIO_BUFFER_COMMITTED = "input_audio_buffer.committed" INPUT_AUDIO_BUFFER_CLEARED = "input_audio_buffer.cleared" @@ -587,6 +588,9 @@ class SessionCreated(ServerToClientMessage): type: Literal[EventType.SESSION_CREATED] = EventType.SESSION_CREATED session: Session +class SessionUpdated(ServerToClientMessage): + type: Literal[EventType.SESSION_UPDATED] = EventType.SESSION_UPDATED + session: Session class InputAudioBufferCommitted(ServerToClientMessage): """ @@ -852,6 +856,7 @@ class RateLimitsUpdated(ServerToClientMessage): | ResponseTextDelta | ResponseTextDone | SessionCreated + | SessionUpdated ) AnnotatedServerToClientMessages = Annotated[ServerToClientMessages, Field(discriminator="type")] From f2e8590aea9643c431d199c50b86ec4da24f79d3 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 02:59:02 +0000 Subject: [PATCH 23/55] feat: dump per channel --- .../extension/openai_v2v_python/extension.py | 158 +++++++++++------- 1 file changed, 98 insertions(+), 60 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index abe07284..d36fab6b 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -9,6 +9,7 @@ import threading import base64 from datetime import datetime +import os from ten import ( AudioFrame, @@ -31,8 +32,8 @@ PROPERTY_SYSTEM_MESSAGE = "system_message" # Optional PROPERTY_TEMPERATURE = "temperature" # Optional PROPERTY_MAX_TOKENS = "max_tokens" # Optional -PROPERTY_VOICE = "voice" #Optional -PROPERTY_SERVER_VAD = "server_vad" #Optional +PROPERTY_VOICE = "voice" # Optional +PROPERTY_SERVER_VAD = "server_vad" # Optional PROPERTY_STREAM_ID = "stream_id" PROPERTY_LANGUAGE = "language" @@ -43,6 +44,7 @@ ROLE_ASSISTANT = "assistant" ROLE_USER = "user" + class OpenAIV2VExtension(Extension): # handler queue = asyncio.Queue(maxsize=3000) @@ -50,16 +52,16 @@ class OpenAIV2VExtension(Extension): thread: threading.Thread = None client: RealtimeApiClient = None connected: bool = False - + # openai related config: RealtimeApiConfig = None session_id: str = "" session: Session = None # audo related - sample_rate : int = 24000 + sample_rate: int = 24000 out_audio_buff: bytearray = b'' - audio_len_threshold : int = 10240 + audio_len_threshold: int = 10240 transcript: str = '' # agora related @@ -83,8 +85,9 @@ def on_start(self, ten_env: TenEnv) -> None: def start_event_loop(loop): asyncio.set_event_loop(loop) loop.run_forever() - - self.thread = threading.Thread(target=start_event_loop, args=(self.loop,)) + + self.thread = threading.Thread( + target=start_event_loop, args=(self.loop,)) self.thread.start() asyncio.run_coroutine_threadsafe(self.init_client(), self.loop) @@ -111,15 +114,19 @@ def on_audio_frame(self, ten_env: TenEnv, audio_frame: AudioFrame) -> None: # frame_name = audio_frame.get_name() stream_id = audio_frame.get_property_int("stream_id") # logger.info(f"OpenAIV2VExtension on_audio_frame {frame_name} {stream_id}") + if self.channel_name == "": + self.channel_name = audio_frame.get_property_string("channel") if self.remote_stream_id == 0: self.remote_stream_id = stream_id - asyncio.run_coroutine_threadsafe(self.run_client_loop(ten_env), self.loop) + asyncio.run_coroutine_threadsafe( + self.run_client_loop(ten_env), self.loop) logger.info(f"Start session for {stream_id}") - + frame_buf = audio_frame.get_buf() - with open("audio_stt_in.pcm", "ab") as dump_file: + with open(os.path.join(os.getenv('LOG_PATH', ""), "audio_in_{}.pcm".format(self.channel_name)), "ab") as dump_file: dump_file.write(frame_buf) - asyncio.run_coroutine_threadsafe(self.on_audio(frame_buf), self.loop) + asyncio.run_coroutine_threadsafe( + self.on_audio(frame_buf), self.loop) except: logger.exception(f"OpenAIV2VExtension on audio frame failed") @@ -138,7 +145,8 @@ def on_data(self, ten_env: TenEnv, data: Data) -> None: async def init_client(self): try: - self.client = RealtimeApiClient(base_uri=self.config.base_uri, api_key=self.config.api_key, model=self.config.model) + self.client = RealtimeApiClient( + base_uri=self.config.base_uri, api_key=self.config.api_key, model=self.config.model) logger.info(f"Finish init client {self.config} {self.client}") except: logger.exception(f"Failed to create client {self.config}") @@ -151,7 +159,7 @@ def get_time_ms() -> int: try: await self.client.connect() self.connected = True - item_id = "" # For truncate + item_id = "" # For truncate response_id = "" content_index = 0 relative_start_ms = get_time_ms() @@ -163,77 +171,98 @@ def get_time_ms() -> int: logger.info(f"Received message: {message.type}") match message: case SessionCreated(): - logger.info(f"Session is created: {message.session}") + logger.info( + f"Session is created: {message.session}") self.session_id = message.session.id self.session = message.session update_msg = self.update_session() await self.client.send_message(update_msg) - - #update_conversation = self.update_conversation() - #await self.client.send_message(update_conversation) + + # update_conversation = self.update_conversation() + # await self.client.send_message(update_conversation) case ItemInputAudioTranscriptionCompleted(): - logger.info(f"On request transript {message.transcript}") - self.send_transcript(ten_env, message.transcript, ROLE_USER, True) + logger.info( + f"On request transript {message.transcript}") + self.send_transcript( + ten_env, message.transcript, ROLE_USER, True) case ItemInputAudioTranscriptionFailed(): - logger.warning(f"On request transript failed {message.item_id} {message.error}") + logger.warning( + f"On request transript failed {message.item_id} {message.error}") case ItemCreated(): logger.info(f"On item created {message.item}") case ResponseCreated(): - logger.info(f"On response created {message.response.id}") + logger.info( + f"On response created {message.response.id}") response_id = message.response.id case ResponseDone(): - logger.info(f"On response done {message.response.id} {message.response.status}") + logger.info( + f"On response done {message.response.id} {message.response.status}") if message.response.id == response_id: response_id = "" case ResponseAudioTranscriptDelta(): - logger.info(f"On response transript delta {message.response_id} {message.output_index} {message.content_index} {message.delta}") + logger.info( + f"On response transript delta {message.response_id} {message.output_index} {message.content_index} {message.delta}") if message.response_id in flushed: - logger.warning(f"On flushed transript delta {message.response_id} {message.output_index} {message.content_index} {message.delta}") + logger.warning( + f"On flushed transript delta {message.response_id} {message.output_index} {message.content_index} {message.delta}") continue self.transcript += message.delta - self.send_transcript(ten_env, self.transcript, ROLE_ASSISTANT, False) + self.send_transcript( + ten_env, self.transcript, ROLE_ASSISTANT, False) case ResponseAudioTranscriptDone(): - logger.info(f"On response transript done {message.output_index} {message.content_index} {message.transcript}") + logger.info( + f"On response transript done {message.output_index} {message.content_index} {message.transcript}") if message.response_id in flushed: - logger.warning(f"On flushed transript done {message.response_id}") + logger.warning( + f"On flushed transript done {message.response_id}") continue self.transcript = "" - self.send_transcript(ten_env, message.transcript, ROLE_ASSISTANT, True) + self.send_transcript( + ten_env, message.transcript, ROLE_ASSISTANT, True) case ResponseOutputItemDone(): logger.info(f"Output item done {message.item}") case ResponseOutputItemAdded(): - logger.info(f"Output item added {message.output_index} {message.item.id}") + logger.info( + f"Output item added {message.output_index} {message.item.id}") case ResponseAudioDelta(): if message.response_id in flushed: - logger.warning(f"On flushed audio delta {message.response_id} {message.item_id} {message.content_index}") + logger.warning( + f"On flushed audio delta {message.response_id} {message.item_id} {message.content_index}") continue item_id = message.item_id content_index = message.content_index self.on_audio_delta(ten_env, message.delta) case InputAudioBufferSpeechStarted(): - logger.info(f"On server listening, in response {response_id}, last item {item_id}") + logger.info( + f"On server listening, in response {response_id}, last item {item_id}") # Tuncate the on-going audio stream end_ms = get_time_ms() - relative_start_ms if item_id: - truncate = ItemTruncate(item_id=item_id, content_index=content_index, audio_end_ms=end_ms) + truncate = ItemTruncate( + item_id=item_id, content_index=content_index, audio_end_ms=end_ms) await self.client.send_message(truncate) self.flush(ten_env) if response_id: transcript = self.transcript + "[interrupted]" - self.send_transcript(ten_env, transcript, ROLE_ASSISTANT, True) + self.send_transcript( + ten_env, transcript, ROLE_ASSISTANT, True) self.transcript = "" - flushed.add(response_id) # memory leak, change to lru later + # memory leak, change to lru later + flushed.add(response_id) item_id = "" case InputAudioBufferSpeechStopped(): relative_start_ms = get_time_ms() - message.audio_end_ms - logger.info(f"On server stop listening, {message.audio_end_ms}, relative {relative_start_ms}") + logger.info( + f"On server stop listening, {message.audio_end_ms}, relative {relative_start_ms}") case ErrorMessage(): - logger.error(f"Error message received: {message.error}") + logger.error( + f"Error message received: {message.error}") case _: logger.debug(f"Not handled message {message}") except: - logger.exception(f"Error processing message: {message.type}") - + logger.exception( + f"Error processing message: {message.type}") + logger.info("Client loop finished") except: logger.exception(f"Failed to handle loop") @@ -243,7 +272,8 @@ async def on_audio(self, buff: bytearray): # Buffer audio if len(self.out_audio_buff) >= self.audio_len_threshold and self.session_id != "": await self.client.send_audio_data(self.out_audio_buff) - logger.info(f"Send audio frame to OpenAI: {len(self.out_audio_buff)}") + logger.info( + f"Send audio frame to OpenAI: {len(self.out_audio_buff)}") self.out_audio_buff = b'' def fetch_properties(self, ten_env: TenEnv): @@ -251,7 +281,8 @@ def fetch_properties(self, ten_env: TenEnv): api_key = ten_env.get_property_string(PROPERTY_API_KEY) self.config.api_key = api_key except Exception as err: - logger.info(f"GetProperty required {PROPERTY_API_KEY} failed, err: {err}") + logger.info( + f"GetProperty required {PROPERTY_API_KEY} failed, err: {err}") return try: @@ -262,11 +293,13 @@ def fetch_properties(self, ten_env: TenEnv): logger.info(f"GetProperty optional {PROPERTY_MODEL} error: {err}") try: - system_message = ten_env.get_property_string(PROPERTY_SYSTEM_MESSAGE) + system_message = ten_env.get_property_string( + PROPERTY_SYSTEM_MESSAGE) if system_message: self.config.system_message = system_message except Exception as err: - logger.info(f"GetProperty optional {PROPERTY_SYSTEM_MESSAGE} error: {err}") + logger.info( + f"GetProperty optional {PROPERTY_SYSTEM_MESSAGE} error: {err}") try: temperature = ten_env.get_property_float(PROPERTY_TEMPERATURE) @@ -275,7 +308,7 @@ def fetch_properties(self, ten_env: TenEnv): logger.info( f"GetProperty optional {PROPERTY_TEMPERATURE} failed, err: {err}" ) - + try: max_tokens = ten_env.get_property_int(PROPERTY_MAX_TOKENS) if max_tokens > 0: @@ -284,7 +317,7 @@ def fetch_properties(self, ten_env: TenEnv): logger.info( f"GetProperty optional {PROPERTY_MAX_TOKENS} failed, err: {err}" ) - + try: voice = ten_env.get_property_string(PROPERTY_VOICE) if voice: @@ -298,13 +331,14 @@ def fetch_properties(self, ten_env: TenEnv): self.config.voice = v except Exception as err: logger.info(f"GetProperty optional {PROPERTY_VOICE} error: {err}") - + try: language = ten_env.get_property_string(PROPERTY_LANGUAGE) if language: self.config.language = language except Exception as err: - logger.info(f"GetProperty optional {PROPERTY_LANGUAGE} error: {err}") + logger.info( + f"GetProperty optional {PROPERTY_LANGUAGE} error: {err}") try: server_vad = ten_env.get_property_bool(PROPERTY_SERVER_VAD) @@ -326,15 +360,17 @@ def fetch_properties(self, ten_env: TenEnv): def update_session(self) -> SessionUpdate: prompt = self.replace(self.config.system_message) return SessionUpdate(session=SessionUpdateParams( - instructions = prompt, - input_audio_transcription = InputAudioTranscription(model="whisper-1"), - temperature = self.config.temperature, - voice = self.config.voice, - model= self.config.model, + instructions=prompt, + input_audio_transcription=InputAudioTranscription( + model="whisper-1"), + temperature=self.config.temperature, + voice=self.config.voice, + model=self.config.model, input_audio_format="pcm16", output_audio_format="pcm16", - max_response_output_tokens = "inf", - turn_detection = ServerVADUpdateParams(type="server_vad", threshold=VAD_THRESHOLD_DEFAULT, prefix_padding_ms=VAD_PREFIX_PADDING_MS_DEFAULT, silence_duration_ms=VAD_SILENCE_DURATION_MS_DEFAULT) + max_response_output_tokens="inf", + turn_detection=ServerVADUpdateParams(type="server_vad", threshold=VAD_THRESHOLD_DEFAULT, + prefix_padding_ms=VAD_PREFIX_PADDING_MS_DEFAULT, silence_duration_ms=VAD_SILENCE_DURATION_MS_DEFAULT) )) def update_conversation(self) -> UpdateConversationConfig: @@ -348,7 +384,7 @@ def update_conversation(self) -> UpdateConversationConfig: conf.output_audio_format = AudioFormats.PCM16 return conf - def replace(self, prompt:str) -> str: + def replace(self, prompt: str) -> str: result = prompt for token, value in self.ctx.items(): result = result.replace(f"{token}", value) @@ -356,7 +392,7 @@ def replace(self, prompt:str) -> str: def on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: audio_data = base64.b64decode(delta) - with open("audio_stt_out.pcm", "ab") as dump_file: + with open(os.path.join(os.getenv('LOG_PATH', ""), "audio_out_{}.pcm".format(self.channel_name)), "ab") as dump_file: dump_file.write(audio_data) f = AudioFrame.create(AUDIO_PCM_FRAME) f.set_sample_rate(self.sample_rate) @@ -369,21 +405,23 @@ def on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: buff[:] = audio_data f.unlock_buf(buff) ten_env.send_audio_frame(f) - + def send_transcript(self, ten_env: TenEnv, transcript: str, role: str, is_final: bool) -> None: try: d = Data.create(DATA_TEXT_DATA) d.set_property_string("text", transcript) d.set_property_bool("end_of_segment", is_final) - d.set_property_int("stream_id", self.stream_id if role == ROLE_ASSISTANT else self.remote_stream_id) + d.set_property_int("stream_id", self.stream_id if role == + ROLE_ASSISTANT else self.remote_stream_id) d.set_property_bool("is_final", is_final) ten_env.send_data(d) except: - logger.exception(f"Error send text data {role}: {transcript} {is_final}") - + logger.exception( + f"Error send text data {role}: {transcript} {is_final}") + def flush(self, ten_env: TenEnv) -> None: try: c = Cmd.create(CMD_FLUSH) ten_env.send_cmd(c, lambda ten, result: logger.info("flush done")) except: - logger.exception(f"Error flush") \ No newline at end of file + logger.exception(f"Error flush") From a433fc61b53c4f31599bb47b65095f02556799c7 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 03:08:24 +0000 Subject: [PATCH 24/55] feat: dump local --- agents/ten_packages/extension/openai_v2v_python/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index d36fab6b..73b10738 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -123,7 +123,7 @@ def on_audio_frame(self, ten_env: TenEnv, audio_frame: AudioFrame) -> None: logger.info(f"Start session for {stream_id}") frame_buf = audio_frame.get_buf() - with open(os.path.join(os.getenv('LOG_PATH', ""), "audio_in_{}.pcm".format(self.channel_name)), "ab") as dump_file: + with open("audio_in_{}.pcm".format(self.channel_name), "ab") as dump_file: dump_file.write(frame_buf) asyncio.run_coroutine_threadsafe( self.on_audio(frame_buf), self.loop) @@ -392,7 +392,7 @@ def replace(self, prompt: str) -> str: def on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: audio_data = base64.b64decode(delta) - with open(os.path.join(os.getenv('LOG_PATH', ""), "audio_out_{}.pcm".format(self.channel_name)), "ab") as dump_file: + with open("audio_out_{}.pcm".format(self.channel_name), "ab") as dump_file: dump_file.write(audio_data) f = AudioFrame.create(AUDIO_PCM_FRAME) f.set_sample_rate(self.sample_rate) From 5118f6a917b715e0d3403446491e5ea509320f94 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 05:35:53 +0000 Subject: [PATCH 25/55] feat: voice --- demo/src/app/api/agents/start/graph.tsx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/demo/src/app/api/agents/start/graph.tsx b/demo/src/app/api/agents/start/graph.tsx index fab77e88..880819f4 100644 --- a/demo/src/app/api/agents/start/graph.tsx +++ b/demo/src/app/api/agents/start/graph.tsx @@ -14,6 +14,10 @@ export const voiceNameMap: LanguageMap = { male: "Zhiyu", female: "Zhiyu", }, + openai: { + male: "echo", + female: "shimmer" + } }, "en-US": { azure: { @@ -28,18 +32,30 @@ export const voiceNameMap: LanguageMap = { male: "Matthew", female: "Ruth", }, + openai: { + male: "echo", + female: "shimmer" + } }, "ja-JP": { azure: { male: "ja-JP-KeitaNeural", female: "ja-JP-NanamiNeural", }, + openai: { + male: "echo", + female: "shimmer" + } }, "ko-KR": { azure: { male: "ko-KR-InJoonNeural", female: "ko-KR-JiMinNeural", }, + openai: { + male: "echo", + female: "shimmer" + } }, }; @@ -85,6 +101,7 @@ export const getGraphProperties = (graphName: string, language: string, voiceTyp return { "openai_v2v_python": { "model": "gpt-4o-realtime-preview-2024-10-01", + "voice": voiceNameMap[language]["openai"][voiceType], "language": language, ...localizationOptions } From b7db594548b8ab3c60c00f2e715d79468fff0eac Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 05:44:11 +0000 Subject: [PATCH 26/55] feat: refine codes and properties --- agents/property.json | 4 +- .../extension/openai_v2v_python/extension.py | 159 +++++++++--------- .../extension/openai_v2v_python/manifest.json | 6 +- 3 files changed, 85 insertions(+), 84 deletions(-) diff --git a/agents/property.json b/agents/property.json index fbd73d61..04774e2e 100644 --- a/agents/property.json +++ b/agents/property.json @@ -2188,11 +2188,11 @@ "api_key": "${env:OPENAI_API_KEY}", "temperature": 0.9, "model": "gpt-4o-realtime-preview-2024-10-01", - "stream_id": 1234, "max_tokens": 2048, "voice": "alloy", "language": "en-US", - "server_vad": true + "server_vad": true, + "dump": true } }, { diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 73b10738..28140f95 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -9,7 +9,6 @@ import threading import base64 from datetime import datetime -import os from ten import ( AudioFrame, @@ -36,50 +35,45 @@ PROPERTY_SERVER_VAD = "server_vad" # Optional PROPERTY_STREAM_ID = "stream_id" PROPERTY_LANGUAGE = "language" +PROPERTY_DUMP = "dump" -DATA_TEXT_DATA = "text_data" -CMD_FLUSH = "flush" -AUDIO_PCM_FRAME = "pcm_frame" -ROLE_ASSISTANT = "assistant" -ROLE_USER = "user" +class Role(str, Enum): + User = "user" + Assistant = "assistant" class OpenAIV2VExtension(Extension): - # handler - queue = asyncio.Queue(maxsize=3000) - loop = None - thread: threading.Thread = None - client: RealtimeApiClient = None - connected: bool = False - - # openai related - config: RealtimeApiConfig = None - session_id: str = "" - session: Session = None - - # audo related - sample_rate: int = 24000 - out_audio_buff: bytearray = b'' - audio_len_threshold: int = 10240 - transcript: str = '' - - # agora related - channel_name: str = "" - stream_id: int = 0 - remote_stream_id: int = 0 - ctx: dict = {} - - def on_init(self, ten_env: TenEnv) -> None: - logger.info("OpenAIV2VExtension on_init") - self.config = RealtimeApiConfig() + def __init__(self, name: str): + super().__init__(name) + + # handler self.loop = asyncio.new_event_loop() - ten_env.on_init_done() + self.thread: threading.Thread = None + + # openai related + self.config: RealtimeApiConfig = RealtimeApiConfig() + self.client: RealtimeApiClient = None + self.connected: bool = False + self.session_id: str = "" + self.session: Session = None + self.ctx: dict = {} + + # audo related + self.sample_rate: int = 24000 + self.out_audio_buff: bytearray = b'' + self.audio_len_threshold: int = 10240 + self.transcript: str = '' + + # misc. + self.remote_stream_id: int = 0 + self.channel_name: str = "" + self.dump: bool = False def on_start(self, ten_env: TenEnv) -> None: logger.info("OpenAIV2VExtension on_start") - self.fetch_properties(ten_env) + self._fetch_properties(ten_env) # Start async handler def start_event_loop(loop): @@ -90,7 +84,7 @@ def start_event_loop(loop): target=start_event_loop, args=(self.loop,)) self.thread.start() - asyncio.run_coroutine_threadsafe(self.init_client(), self.loop) + asyncio.run_coroutine_threadsafe(self._init_client(), self.loop) ten_env.on_start_done() @@ -102,31 +96,28 @@ def on_stop(self, ten_env: TenEnv) -> None: if self.thread: self.loop.call_soon_threadsafe(self.loop.stop) self.thread.join() + self.thread = None ten_env.on_stop_done() - def on_deinit(self, ten_env: TenEnv) -> None: - logger.info("OpenAIV2VExtension on_deinit") - ten_env.on_deinit_done() - def on_audio_frame(self, ten_env: TenEnv, audio_frame: AudioFrame) -> None: try: - # frame_name = audio_frame.get_name() stream_id = audio_frame.get_property_int("stream_id") - # logger.info(f"OpenAIV2VExtension on_audio_frame {frame_name} {stream_id}") + # logger.debug(f"on_audio_frame {stream_id}") if self.channel_name == "": self.channel_name = audio_frame.get_property_string("channel") + if self.remote_stream_id == 0: self.remote_stream_id = stream_id asyncio.run_coroutine_threadsafe( - self.run_client_loop(ten_env), self.loop) + self._run_client_loop(ten_env), self.loop) logger.info(f"Start session for {stream_id}") frame_buf = audio_frame.get_buf() - with open("audio_in_{}.pcm".format(self.channel_name), "ab") as dump_file: - dump_file.write(frame_buf) + self._dump_audio_if_need(frame_buf, Role.User) + asyncio.run_coroutine_threadsafe( - self.on_audio(frame_buf), self.loop) + self._on_audio(frame_buf), self.loop) except: logger.exception(f"OpenAIV2VExtension on audio frame failed") @@ -143,7 +134,7 @@ def on_cmd(self, ten_env: TenEnv, cmd: Cmd) -> None: def on_data(self, ten_env: TenEnv, data: Data) -> None: pass - async def init_client(self): + async def _init_client(self): try: self.client = RealtimeApiClient( base_uri=self.config.base_uri, api_key=self.config.api_key, model=self.config.model) @@ -151,7 +142,7 @@ async def init_client(self): except: logger.exception(f"Failed to create client {self.config}") - async def run_client_loop(self, ten_env: TenEnv): + async def _run_client_loop(self, ten_env: TenEnv): def get_time_ms() -> int: current_time = datetime.now() return current_time.microsecond // 1000 @@ -175,7 +166,7 @@ def get_time_ms() -> int: f"Session is created: {message.session}") self.session_id = message.session.id self.session = message.session - update_msg = self.update_session() + update_msg = self._update_session() await self.client.send_message(update_msg) # update_conversation = self.update_conversation() @@ -183,8 +174,8 @@ def get_time_ms() -> int: case ItemInputAudioTranscriptionCompleted(): logger.info( f"On request transript {message.transcript}") - self.send_transcript( - ten_env, message.transcript, ROLE_USER, True) + self._send_transcript( + ten_env, message.transcript, Role.User, True) case ItemInputAudioTranscriptionFailed(): logger.warning( f"On request transript failed {message.item_id} {message.error}") @@ -207,8 +198,8 @@ def get_time_ms() -> int: f"On flushed transript delta {message.response_id} {message.output_index} {message.content_index} {message.delta}") continue self.transcript += message.delta - self.send_transcript( - ten_env, self.transcript, ROLE_ASSISTANT, False) + self._send_transcript( + ten_env, self.transcript, Role.Assistant, False) case ResponseAudioTranscriptDone(): logger.info( f"On response transript done {message.output_index} {message.content_index} {message.transcript}") @@ -217,8 +208,8 @@ def get_time_ms() -> int: f"On flushed transript done {message.response_id}") continue self.transcript = "" - self.send_transcript( - ten_env, message.transcript, ROLE_ASSISTANT, True) + self._send_transcript( + ten_env, message.transcript, Role.Assistant, True) case ResponseOutputItemDone(): logger.info(f"Output item done {message.item}") case ResponseOutputItemAdded(): @@ -231,7 +222,7 @@ def get_time_ms() -> int: continue item_id = message.item_id content_index = message.content_index - self.on_audio_delta(ten_env, message.delta) + self._on_audio_delta(ten_env, message.delta) case InputAudioBufferSpeechStarted(): logger.info( f"On server listening, in response {response_id}, last item {item_id}") @@ -241,11 +232,11 @@ def get_time_ms() -> int: truncate = ItemTruncate( item_id=item_id, content_index=content_index, audio_end_ms=end_ms) await self.client.send_message(truncate) - self.flush(ten_env) + self._flush(ten_env) if response_id: transcript = self.transcript + "[interrupted]" - self.send_transcript( - ten_env, transcript, ROLE_ASSISTANT, True) + self._send_transcript( + ten_env, transcript, Role.Assistant, True) self.transcript = "" # memory leak, change to lru later flushed.add(response_id) @@ -267,7 +258,7 @@ def get_time_ms() -> int: except: logger.exception(f"Failed to handle loop") - async def on_audio(self, buff: bytearray): + async def _on_audio(self, buff: bytearray): self.out_audio_buff += buff # Buffer audio if len(self.out_audio_buff) >= self.audio_len_threshold and self.session_id != "": @@ -276,7 +267,7 @@ async def on_audio(self, buff: bytearray): f"Send audio frame to OpenAI: {len(self.out_audio_buff)}") self.out_audio_buff = b'' - def fetch_properties(self, ten_env: TenEnv): + def _fetch_properties(self, ten_env: TenEnv): try: api_key = ten_env.get_property_string(PROPERTY_API_KEY) self.config.api_key = api_key @@ -349,16 +340,15 @@ def fetch_properties(self, ten_env: TenEnv): ) try: - self.stream_id = ten_env.get_property_int(PROPERTY_STREAM_ID) + self.dump = ten_env.get_property_bool(PROPERTY_DUMP) except Exception as err: logger.info( - f"GetProperty optional {PROPERTY_STREAM_ID} failed, err: {err}" - ) + f"GetProperty optional {PROPERTY_DUMP} error: {err}") self.ctx = self.config.build_ctx() - def update_session(self) -> SessionUpdate: - prompt = self.replace(self.config.system_message) + def _update_session(self) -> SessionUpdate: + prompt = self._replace(self.config.system_message) return SessionUpdate(session=SessionUpdateParams( instructions=prompt, input_audio_transcription=InputAudioTranscription( @@ -373,8 +363,8 @@ def update_session(self) -> SessionUpdate: prefix_padding_ms=VAD_PREFIX_PADDING_MS_DEFAULT, silence_duration_ms=VAD_SILENCE_DURATION_MS_DEFAULT) )) - def update_conversation(self) -> UpdateConversationConfig: - prompt = self.replace(self.config.system_message) + def _update_conversation(self) -> UpdateConversationConfig: + prompt = self._replace(self.config.system_message) conf = UpdateConversationConfig() conf.system_message = prompt conf.temperature = self.config.temperature @@ -384,17 +374,19 @@ def update_conversation(self) -> UpdateConversationConfig: conf.output_audio_format = AudioFormats.PCM16 return conf - def replace(self, prompt: str) -> str: + def _replace(self, prompt: str) -> str: result = prompt for token, value in self.ctx.items(): result = result.replace(f"{token}", value) return result - def on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: + def _on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: audio_data = base64.b64decode(delta) - with open("audio_out_{}.pcm".format(self.channel_name), "ab") as dump_file: - dump_file.write(audio_data) - f = AudioFrame.create(AUDIO_PCM_FRAME) + logger.debug("on_audio_delta audio_data len {} samples {}".format( + len(audio_data), len(audio_data) // 2)) + self._dump_audio_if_need(audio_data, Role.Assistant) + + f = AudioFrame.create("pcm_frame") f.set_sample_rate(self.sample_rate) f.set_bytes_per_sample(2) f.set_number_of_channels(1) @@ -406,22 +398,31 @@ def on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: f.unlock_buf(buff) ten_env.send_audio_frame(f) - def send_transcript(self, ten_env: TenEnv, transcript: str, role: str, is_final: bool) -> None: + def _send_transcript(self, ten_env: TenEnv, transcript: str, role: Role, is_final: bool) -> None: try: - d = Data.create(DATA_TEXT_DATA) + d = Data.create("text_data") d.set_property_string("text", transcript) d.set_property_bool("end_of_segment", is_final) - d.set_property_int("stream_id", self.stream_id if role == - ROLE_ASSISTANT else self.remote_stream_id) + stream_id = self.remote_stream_id if role == Role.User else 0 + d.set_property_int("stream_id", stream_id) d.set_property_bool("is_final", is_final) + logger.debug( + f"send transcript text [{transcript}] stream_id {stream_id} is_final {is_final} end_of_segment {is_final} role {role}") ten_env.send_data(d) except: logger.exception( f"Error send text data {role}: {transcript} {is_final}") - def flush(self, ten_env: TenEnv) -> None: + def _flush(self, ten_env: TenEnv) -> None: try: - c = Cmd.create(CMD_FLUSH) + c = Cmd.create("flush") ten_env.send_cmd(c, lambda ten, result: logger.info("flush done")) except: logger.exception(f"Error flush") + + def _dump_audio_if_need(self, buf: bytearray, role: Role) -> None: + if not self.dump: + return + + with open("{}_{}.pcm".format(role, self.channel_name), "ab") as dump_file: + dump_file.write(buf) diff --git a/agents/ten_packages/extension/openai_v2v_python/manifest.json b/agents/ten_packages/extension/openai_v2v_python/manifest.json index 2e24f7d8..def051df 100644 --- a/agents/ten_packages/extension/openai_v2v_python/manifest.json +++ b/agents/ten_packages/extension/openai_v2v_python/manifest.json @@ -24,9 +24,6 @@ "api_key": { "type": "string" }, - "stream_id": { - "type": "int32" - }, "temperature": { "type": "float64" }, @@ -47,6 +44,9 @@ }, "language": { "type": "string" + }, + "dump": { + "type": "bool" } }, "audio_frame_in": [ From 72427ab7e2d3eeaa35c18184bbb61c4d8a19f5a2 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 07:08:07 +0000 Subject: [PATCH 27/55] fix: exception diffusion --- agents/ten_packages/extension/openai_v2v_python/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 28140f95..36bdd527 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -252,7 +252,7 @@ def get_time_ms() -> int: logger.debug(f"Not handled message {message}") except: logger.exception( - f"Error processing message: {message.type}") + f"Error processing message: {message}") logger.info("Client loop finished") except: From a009e8efdefcbec2d9ef054f419f5f8ab4451d9a Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 07:10:14 +0000 Subject: [PATCH 28/55] fix: excpetion diffusion --- agents/ten_packages/extension/openai_v2v_python/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/client.py b/agents/ten_packages/extension/openai_v2v_python/client.py index 0e446ec7..d58bf0f3 100644 --- a/agents/ten_packages/extension/openai_v2v_python/client.py +++ b/agents/ten_packages/extension/openai_v2v_python/client.py @@ -162,7 +162,7 @@ def handle_server_message(self, message: str) -> messages.ServerToClientMessage: return messages.parse_server_message(message) except Exception as e: logger.error("Error handling message: " + str(e)) - raise e + #raise e async def shutdown(self): # Close the websocket connection if it exists From 052cf7e3b1f4c6aa8f5a6bedf91356ae57ff1376 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 07:26:06 +0000 Subject: [PATCH 29/55] doc: readme --- .../extension/openai_v2v_python/README.md | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/README.md b/agents/ten_packages/extension/openai_v2v_python/README.md index 894643e7..80cc9cc5 100644 --- a/agents/ten_packages/extension/openai_v2v_python/README.md +++ b/agents/ten_packages/extension/openai_v2v_python/README.md @@ -1,12 +1,15 @@ # openai_v2v_python - +An extension for integrating OpenAI's Next Generation of **Multimodal** AI into your application, providing configurable AI-driven features such as conversational agents, task automation, and tool integration. ## Features -- xxx feature +- OpenAI **Multimodal** Integration: Leverage GPT **Multimodal** models for voice to voice as well as text processing. +- Configurable: Easily customize API keys, model settings, prompts, temperature, etc. +- Async Queue Processing: Supports real-time message processing with task cancellation and prioritization. + ## API @@ -14,16 +17,34 @@ Refer to `api` definition in [manifest.json] and default values in [property.jso -## Development - -### Build - - - -### Unit test - - - -## Misc - - +| **Property** | **Type** | **Description** | +|----------------------------|------------|-------------------------------------------| +| `api_key` | `string` | API key for authenticating with OpenAI | +| `temperature` | `float64` | Sampling temperature, higher values mean more randomness | +| `model` | `string` | Model identifier (e.g., GPT-3.5, GPT-4) | +| `max_tokens` | `int64` | Maximum number of tokens to generate | +| `system_message` | `string` | Default system message to send to the model | +| `voice` | `string` | Voice that OpenAI model speeches, such as `alloy`, `echo`, `shimmer`, etc | +| `server_vad` | `bool` | Flag to enable or disable server vad of OpenAI | +| `language` | `string` | Language that OpenAO model reponds, such as `en-US`, `zh-CN`, etc | +| `dump` | `bool` | Flag to enable or disable audio dump for debugging purpose | + +### Data Out: +| **Name** | **Property** | **Type** | **Description** | +|----------------|--------------|------------|-------------------------------| +| `text_data` | `text` | `string` | Outgoing text data | + +### Command Out: +| **Name** | **Description** | +|----------------|---------------------------------------------| +| `flush` | Response after flushing the current state | + +### Audio Frame In: +| **Name** | **Description** | +|------------------|-------------------------------------------| +| `pcm_frame` | Audio frame input for voice processing | + +### Audio Frame Out: +| **Name** | **Description** | +|------------------|-------------------------------------------| +| `pcm_frame` | Audio frame output after voice processing | From ea032fd9d08eb0bd3028ecbcd679c254d1dc3bbb Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Tue, 1 Oct 2024 19:37:52 +0800 Subject: [PATCH 30/55] add verbose --- agents/ten_packages/extension/openai_v2v_python/client.py | 5 +---- agents/ten_packages/extension/openai_v2v_python/extension.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/client.py b/agents/ten_packages/extension/openai_v2v_python/client.py index d58bf0f3..0134b549 100644 --- a/agents/ten_packages/extension/openai_v2v_python/client.py +++ b/agents/ten_packages/extension/openai_v2v_python/client.py @@ -1,7 +1,6 @@ import asyncio import base64 import json -import logging import os from typing import Any, AsyncGenerator @@ -9,9 +8,7 @@ import aiohttp from . import messages -logging.basicConfig(level=logging.INFO) -logger = logging.getLogger(__name__) - +from .log import logger def smart_str(s: str, max_field_len: int = 128) -> str: """parse string as json, truncate data field to 128 characters, reserialize""" diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 36bdd527..fa9c2a43 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -60,7 +60,7 @@ def __init__(self, name: str): self.ctx: dict = {} # audo related - self.sample_rate: int = 24000 + self.sample_rate: int = 16000 self.out_audio_buff: bytearray = b'' self.audio_len_threshold: int = 10240 self.transcript: str = '' @@ -137,7 +137,7 @@ def on_data(self, ten_env: TenEnv, data: Data) -> None: async def _init_client(self): try: self.client = RealtimeApiClient( - base_uri=self.config.base_uri, api_key=self.config.api_key, model=self.config.model) + base_uri=self.config.base_uri, api_key=self.config.api_key, model=self.config.model, verbose=True) logger.info(f"Finish init client {self.config} {self.client}") except: logger.exception(f"Failed to create client {self.config}") From 913a6ce0e46805ced92eb802500d64587fcb34d8 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Tue, 1 Oct 2024 19:49:25 +0800 Subject: [PATCH 31/55] fix --- .../extension/openai_v2v_python/extension.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index fa9c2a43..305c7d6f 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -60,7 +60,7 @@ def __init__(self, name: str): self.ctx: dict = {} # audo related - self.sample_rate: int = 16000 + self.sample_rate: int = 24000 self.out_audio_buff: bytearray = b'' self.audio_len_threshold: int = 10240 self.transcript: str = '' @@ -352,16 +352,8 @@ def _update_session(self) -> SessionUpdate: return SessionUpdate(session=SessionUpdateParams( instructions=prompt, input_audio_transcription=InputAudioTranscription( - model="whisper-1"), - temperature=self.config.temperature, - voice=self.config.voice, - model=self.config.model, - input_audio_format="pcm16", - output_audio_format="pcm16", - max_response_output_tokens="inf", - turn_detection=ServerVADUpdateParams(type="server_vad", threshold=VAD_THRESHOLD_DEFAULT, - prefix_padding_ms=VAD_PREFIX_PADDING_MS_DEFAULT, silence_duration_ms=VAD_SILENCE_DURATION_MS_DEFAULT) - )) + model="whisper-1") + )) def _update_conversation(self) -> UpdateConversationConfig: prompt = self._replace(self.config.system_message) @@ -377,7 +369,7 @@ def _update_conversation(self) -> UpdateConversationConfig: def _replace(self, prompt: str) -> str: result = prompt for token, value in self.ctx.items(): - result = result.replace(f"{token}", value) + result = result.replace("{"+token+"}", value) return result def _on_audio_delta(self, ten_env: TenEnv, delta: bytes) -> None: From ce9790301b03bbfe8cc7c1285f88c8817d5abced Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 12:32:57 +0000 Subject: [PATCH 32/55] fix: sample rate --- agents/property.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/property.json b/agents/property.json index 04774e2e..d4902531 100644 --- a/agents/property.json +++ b/agents/property.json @@ -2176,7 +2176,8 @@ "remote_stream_id": 123, "subscribe_audio": true, "publish_audio": true, - "publish_data": true + "publish_data": true, + "subscribe_audio_sample_rate": 24000 } }, { From d366a6405a4a1a7436fefa1afcd9c3bf4dca7d46 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 12:37:21 +0000 Subject: [PATCH 33/55] feat: change voice --- demo/src/app/api/agents/start/graph.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/src/app/api/agents/start/graph.tsx b/demo/src/app/api/agents/start/graph.tsx index 880819f4..f5e083d3 100644 --- a/demo/src/app/api/agents/start/graph.tsx +++ b/demo/src/app/api/agents/start/graph.tsx @@ -15,7 +15,7 @@ export const voiceNameMap: LanguageMap = { female: "Zhiyu", }, openai: { - male: "echo", + male: "alloy", female: "shimmer" } }, @@ -33,7 +33,7 @@ export const voiceNameMap: LanguageMap = { female: "Ruth", }, openai: { - male: "echo", + male: "alloy", female: "shimmer" } }, @@ -43,7 +43,7 @@ export const voiceNameMap: LanguageMap = { female: "ja-JP-NanamiNeural", }, openai: { - male: "echo", + male: "alloy", female: "shimmer" } }, @@ -53,7 +53,7 @@ export const voiceNameMap: LanguageMap = { female: "ko-KR-JiMinNeural", }, openai: { - male: "echo", + male: "alloy", female: "shimmer" } }, From e2f1464cf02e50c0adf1b525b5dddfc5329725f0 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Tue, 1 Oct 2024 20:42:02 +0800 Subject: [PATCH 34/55] fix --- agents/ten_packages/extension/openai_v2v_python/extension.py | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 305c7d6f..ddb18472 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -351,6 +351,7 @@ def _update_session(self) -> SessionUpdate: prompt = self._replace(self.config.system_message) return SessionUpdate(session=SessionUpdateParams( instructions=prompt, + voice=self.config.voice, input_audio_transcription=InputAudioTranscription( model="whisper-1") )) From 2571d0a7e2c63a87779f7d896c32c05ee91af6aa Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Tue, 1 Oct 2024 20:47:14 +0800 Subject: [PATCH 35/55] fix --- agents/ten_packages/extension/openai_v2v_python/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index ddb18472..cdacf6be 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -233,7 +233,7 @@ def get_time_ms() -> int: item_id=item_id, content_index=content_index, audio_end_ms=end_ms) await self.client.send_message(truncate) self._flush(ten_env) - if response_id: + if response_id and self.transcript: transcript = self.transcript + "[interrupted]" self._send_transcript( ten_env, transcript, Role.Assistant, True) From 8c8bbf09f6539380fb70d90c8e2b6f01cf25d065 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Tue, 1 Oct 2024 20:54:50 +0800 Subject: [PATCH 36/55] fix --- agents/ten_packages/extension/openai_v2v_python/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index cdacf6be..2795fe5b 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -348,9 +348,9 @@ def _fetch_properties(self, ten_env: TenEnv): self.ctx = self.config.build_ctx() def _update_session(self) -> SessionUpdate: - prompt = self._replace(self.config.system_message) + #prompt = self._replace(self.config.system_message) return SessionUpdate(session=SessionUpdateParams( - instructions=prompt, + #instructions=prompt, voice=self.config.voice, input_audio_transcription=InputAudioTranscription( model="whisper-1") From d043b33fec069e9bf1628fcdcab4cea3db3022e0 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 1 Oct 2024 14:26:54 +0000 Subject: [PATCH 37/55] chore: remove testing build --- .github/workflows/build-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 10a29e85..8f401d9f 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -2,7 +2,7 @@ name: Build Docker on: push: - branches: ["main", "feature/v2v"] + branches: ["main"] # Publish semver tags as releases. tags: ["v*.*.*"] paths-ignore: From f11911f8351e21461e68eddecc5b64102655cffa Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Wed, 2 Oct 2024 09:02:10 +0800 Subject: [PATCH 38/55] new model for alpha release --- agents/property.json | 2 +- agents/ten_packages/extension/openai_v2v_python/client.py | 6 ++++-- .../ten_packages/extension/openai_v2v_python/extension.py | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/agents/property.json b/agents/property.json index d4902531..0d81ad35 100644 --- a/agents/property.json +++ b/agents/property.json @@ -2188,7 +2188,7 @@ "property": { "api_key": "${env:OPENAI_API_KEY}", "temperature": 0.9, - "model": "gpt-4o-realtime-preview-2024-10-01", + "model": "gpt-4o-realtime-preview", "max_tokens": 2048, "voice": "alloy", "language": "en-US", diff --git a/agents/ten_packages/extension/openai_v2v_python/client.py b/agents/ten_packages/extension/openai_v2v_python/client.py index 0134b549..471ccede 100644 --- a/agents/ten_packages/extension/openai_v2v_python/client.py +++ b/agents/ten_packages/extension/openai_v2v_python/client.py @@ -10,6 +10,8 @@ from .log import logger +DEFAULT_MODEL = "gpt-4o-realtime-preview" + def smart_str(s: str, max_field_len: int = 128) -> str: """parse string as json, truncate data field to 128 characters, reserialize""" try: @@ -38,7 +40,7 @@ def __init__( api_key: str | None = None, path: str = "/v1/realtime", verbose: bool = False, - model: str="gpt-4o-realtime-preview-2024-10-01", + model: str=DEFAULT_MODEL, language: str = "en-US", system_message: str="You are a helpful assistant, you are professional but lively and friendly. User's input will mainly be {language}, and your response must be {language}.", temperature: float =0.5, @@ -69,7 +71,7 @@ def __init__( base_uri: str, api_key: str | None = None, path: str = "/v1/realtime", - model: str = "gpt-4o-realtime-preview-2024-10-01", + model: str = DEFAULT_MODEL, verbose: bool = False, session: aiohttp.ClientSession | None = None, ): diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 2795fe5b..3ba1bc0e 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -351,6 +351,7 @@ def _update_session(self) -> SessionUpdate: #prompt = self._replace(self.config.system_message) return SessionUpdate(session=SessionUpdateParams( #instructions=prompt, + model=self.config.model, voice=self.config.voice, input_audio_transcription=InputAudioTranscription( model="whisper-1") From b02778f2676e80a6a936201afb2ca1d118e88459 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Wed, 2 Oct 2024 01:13:20 +0000 Subject: [PATCH 39/55] chore: allow build on any branch --- .github/workflows/build-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 8f401d9f..79897e4d 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -2,7 +2,7 @@ name: Build Docker on: push: - branches: ["main"] + branches: [ "**" ] # Publish semver tags as releases. tags: ["v*.*.*"] paths-ignore: From 91b9e48466fcea8beff011a8a252425f4f329df9 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Wed, 2 Oct 2024 01:28:50 +0000 Subject: [PATCH 40/55] feat: update model --- demo/src/app/api/agents/start/graph.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/src/app/api/agents/start/graph.tsx b/demo/src/app/api/agents/start/graph.tsx index f5e083d3..050f8999 100644 --- a/demo/src/app/api/agents/start/graph.tsx +++ b/demo/src/app/api/agents/start/graph.tsx @@ -100,7 +100,7 @@ export const getGraphProperties = (graphName: string, language: string, voiceTyp } else if (graphName == "va.openai.v2v") { return { "openai_v2v_python": { - "model": "gpt-4o-realtime-preview-2024-10-01", + "model": "gpt-4o-realtime-preview", "voice": voiceNameMap[language]["openai"][voiceType], "language": language, ...localizationOptions From f2bc5cdcdb66671ddfe98aed37fa5dfcc3451e70 Mon Sep 17 00:00:00 2001 From: zhangjie02 Date: Wed, 2 Oct 2024 11:22:32 +0000 Subject: [PATCH 41/55] chore: enable docker --- .github/workflows/build-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 68f59b50..036fd5d9 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -2,7 +2,7 @@ name: Build Docker on: push: - branches: ["main"] + branches: [ "**" ] # Publish semver tags as releases. tags: ["v*.*.*"] paths-ignore: From dc93964ee28b18ee97885db49252a540ce61ebd2 Mon Sep 17 00:00:00 2001 From: zhangjie02 Date: Wed, 2 Oct 2024 11:40:00 +0000 Subject: [PATCH 42/55] feat: use new env for realtime api --- .env.example | 4 ++++ agents/property.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index f7b153f3..c9ce51d1 100644 --- a/.env.example +++ b/.env.example @@ -82,6 +82,10 @@ LITELLM_MODEL=gpt-4o-mini # Extension: openai_chatgpt # OpenAI API key OPENAI_API_KEY= + +# OpenAI API key for realtime API +OPENAI_REALTIME_API_KEY= + # OpenAI proxy URL OPENAI_PROXY_URL= diff --git a/agents/property.json b/agents/property.json index 17b4a734..801e93c6 100644 --- a/agents/property.json +++ b/agents/property.json @@ -2186,7 +2186,7 @@ "addon": "openai_v2v_python", "name": "openai_v2v_python", "property": { - "api_key": "${env:OPENAI_API_KEY}", + "api_key": "${env:OPENAI_REALTIME_API_KEY}", "temperature": 0.9, "model": "gpt-4o-realtime-preview", "max_tokens": 2048, From 014d03d9418c58980617191b27e2ccdae9d75dd0 Mon Sep 17 00:00:00 2001 From: zhangjie02 Date: Wed, 2 Oct 2024 12:35:35 +0000 Subject: [PATCH 43/55] fix: env --- agents/property.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/property.json b/agents/property.json index 801e93c6..10371751 100644 --- a/agents/property.json +++ b/agents/property.json @@ -46,7 +46,7 @@ "model": "gpt-4o-mini", "max_tokens": 512, "prompt": "", - "proxy_url": "$OPENAI_PROXY_URL", + "proxy_url": "${env:OPENAI_PROXY_URL}", "greeting": "TEN Agent connected. How can I help you today?", "max_memory_length": 10 } @@ -245,7 +245,7 @@ "model": "gpt-4o-mini", "max_tokens": 512, "prompt": "", - "proxy_url": "$OPENAI_PROXY_URL", + "proxy_url": "${env:OPENAI_PROXY_URL}", "greeting": "TEN Agent connected. How can I help you today?", "max_memory_length": 10 } @@ -608,7 +608,7 @@ "model": "gpt-4o-mini", "max_tokens": 512, "prompt": "", - "proxy_url": "$OPENAI_PROXY_URL", + "proxy_url": "${env:OPENAI_PROXY_URL}", "greeting": "TEN Agent connected. How can I help you today?", "max_memory_length": 10 } @@ -1417,7 +1417,7 @@ "model": "gpt-4o", "max_tokens": 512, "prompt": "", - "proxy_url": "$OPENAI_PROXY_URL", + "proxy_url": "${env:OPENAI_PROXY_URL}", "greeting": "TEN Agent connected. How can I help you today?", "checking_vision_text_items": "[\"Let me take a look...\",\"Let me check your camera...\",\"Please wait for a second...\"]", "max_memory_length": 10, From d57e6934381c7f54a58e5d09f40ea33a425d1762 Mon Sep 17 00:00:00 2001 From: zhangjie02 Date: Wed, 2 Oct 2024 12:42:17 +0000 Subject: [PATCH 44/55] feat: rename --- demo/src/common/constant.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/src/common/constant.ts b/demo/src/common/constant.ts index e9d7270b..b54cdc86 100644 --- a/demo/src/common/constant.ts +++ b/demo/src/common/constant.ts @@ -39,7 +39,7 @@ export const GRAPH_OPTIONS: GraphOptionItem[] = [ value: "va.qwen.rag" }, { - label: "Voice Agent with Open Realtime API (Alpha)", + label: "Voice Agent with OpenAI Realtime API (Beta)", value: "va.openai.v2v" } ] From d390299ee13235b7e19edbd5d9ae768fe1c1cb01 Mon Sep 17 00:00:00 2001 From: EC <2340896+cyfyifanchen@users.noreply.github.com> Date: Wed, 2 Oct 2024 22:14:37 +0800 Subject: [PATCH 45/55] fix: Changing the names from Astra to Ten Agent (#305) At various places. --- demo/bun.lockb | Bin 0 -> 295120 bytes demo/package.json | 2 +- demo/src/app/api/agents/start/graph.tsx | 8 ++++---- demo/src/app/favicon.ico | Bin 15406 -> 47771 bytes demo/src/app/layout.tsx | 4 ++-- demo/src/common/constant.ts | 12 ++++++------ .../components/loginCard/index.module.scss | 12 ++++++------ demo/src/components/loginCard/index.tsx | 4 ++-- demo/src/platform/pc/description/index.tsx | 2 +- demo/src/platform/pc/header/index.module.scss | 5 +++++ demo/src/platform/pc/header/index.tsx | 3 ++- 11 files changed, 29 insertions(+), 23 deletions(-) create mode 100755 demo/bun.lockb diff --git a/demo/bun.lockb b/demo/bun.lockb new file mode 100755 index 0000000000000000000000000000000000000000..e0b23f2b8f48383c4cbee43ec44365392308d6a3 GIT binary patch literal 295120 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 { let localizationOptions = { - "greeting": "ASTRA agent connected. How can i help you today?", + "greeting": "Hey, I\'m TEN Agent with OpenAI Realtime API Beta， anything I can help you with?", "checking_vision_text_items": "[\"Let me take a look...\",\"Let me check your camera...\",\"Please wait for a second...\"]", } if (language === "zh-CN") { localizationOptions = { - "greeting": "Astra已连接，需要我为您提供什么帮助?", + "greeting": "TEN Agent 已连接，需要我为您提供什么帮助?", "checking_vision_text_items": "[\"让我看看你的摄像头...\",\"让我看一下...\",\"我看一下，请稍候...\"]", } } else if (language === "ja-JP") { localizationOptions = { - "greeting": "ASTRAエージェントに接続されました。今日は何をお手伝いしましょうか?", + "greeting": "TEN Agent に接続されました。今日は何をお手伝いしましょうか?", "checking_vision_text_items": "[\"ちょっと見てみます...\",\"カメラをチェックします...\",\"少々お待ちください...\"]", } } else if (language === "ko-KR") { localizationOptions = { - "greeting": "ASTRA 에이전트에 연결되었습니다. 오늘은 무엇을 도와드릴까요?", + "greeting": "TEN Agent 에이전트에 연결되었습니다. 오늘은 무엇을 도와드릴까요?", "checking_vision_text_items": "[\"조금만 기다려 주세요...\",\"카메라를 확인해 보겠습니다...\",\"잠시만 기다려 주세요...\"]", } } diff --git a/demo/src/app/favicon.ico b/demo/src/app/favicon.ico index 21b38b9698bfbc530683c5ca32c676d7afee53f1..92b8b6ba0c4d802bbfe42381be3e83e83f166f72 100644 GIT binary patch literal 47771 zcmeEvd0dX^+xOL7R7z^HWVAAaAt`G`xhb-ibqu1c4WorhP3xVl(1@{wN@2({Vl-MT zbrV9PWiUylLQ|F&N&E7CkMp|jYRvOKpZAaV&++*@zu)h@ zwYBNlo}QjOUWI>>(e;x~Df0iDldRT{5k41- z%!LmZ{`bGQ|75`ZCj;2Se|qqr35|75__;6F_K&lZ>>{D1e2 zpHdN^6#F?R=D)bP_d!uEBeNUw$+A&CJt;;tWInpNV)__;5b?Q8S{P9iumvt{! z&*w6uBx+LQ$8UbWe*JpRYFdhPaq_im8*Z++9?;!Q)Y9FYvnnVm+EYf4BDdpP>*AM0 zJX%*fl=J&qPDf(!?S-f18uYL@FQlA{oh(*#3@P1g=A%HLd4GGoFfMQ7Up_Z=EqZW@ zUu4U9duAq5u;q4s%k|}ft?wL0?Bj0CL$GxzGmQmdu`a)TSNrC1EGBa~mc?u~z2u}n zCf~U6zNBPjtriVi{W9*-r4a|Y8wTSr;-ZL0(M=pu^VAUPHPo#Dn4^4c0h3go=| z@bZy{FL!XrpQdOkq9tw;KGeH@^CmX?YN3lwn8@ufT43bI3L2!kETFNppN5X3F%2>= zzaqh_>cvmGOr$SDT~k{Vo^E*RVXkA*Lz?$nkeYPQ6@NAQUGtCL-rr-yyp7W^;uae5 zpoD*tU$N!Uy7Vlaju_ zxgxc}b((YHGN-F4#cgdV&CSg@tF=!*TK9O%bsdX)^O{P-9j1lRi)~i^_MJyyU{QLQ z9<8NjV~l+Ds&(;sISQ9^cb9V`AElc+{9W{ShTr|#wGofb6uQ6$pin=*d-ubTLb(-3 zAi_OKsi{@1&Go0!8%7Q^=cJD>=Dy1rq&=d2TxwSEY=-jV}f;avkQ{hOYIO=>gs2`y63!Ls%SM~`V5rT5P7XkbK9VxbFEeSk&xORt%N zj5sNOgM$Y2Gl{Ydt2;5rn)J<7FRSsuG(Af{t+vc}FJGQ4-JG{^oMyJ%3JE3`KjGfT ziqyd;X$LM}s@Rghaohmi9OoGM8FUy-bW7|iw!or}7JX0lQv6`>ff?^U zUAu7M!U^|+!b0d+i)weNiaJzaOGfGDS|z)I{D32&$iFL>a}zH>!X-m~t@~hhGWAe- zFAO5}jvmxhUlcgWLk(YQWM8t2w){zVr7Mi_?kWQ|LiL&h4}O74eERe$+pMy(^4g6X z9&0secI1y6Lk=kLG-A^y6*shQY_i8~OS9Cq~=b+yB1e zQiN@+RT<~~j`nXOY$alE*`YZem+?0rN&cQ~kSezF*)4MMTn|l@> zqUQExq#HiF@d<+ZJCfOB^X5#QV&`}$XuRnTe7sIm2Va)>=UFRy=R-M<-#xc;od*Be zi13Vnw#Kp(qk%iYn_$#VCP!yKuh?=b-P!J47cd zV=&9}G)H8WL6udbN%nV1x-> zr)$2`y|NUKqS@eP!I*NwcZN+3A6`N2@Xy<7?@G;^_Dd8RMg!vt0pU!Zt08bSJ%a zbV%Qv*;*DISeX{w%gTu}?GB7Fy$=Cc+|K!J7g@hFW$#+e)^xqVS{D_4=)Jshd8!># zdi?l{oSXR~LQ#3sqP8;Gm@v{tzZZpth1q5|@xobvgMX(-sXvU#D zxR;R$S@rdeKNMDMnc&l#e*QuU`nCEQJ$n4cqhawS*QZaPE`l8~bMN@ZrCDOd;s=qg z?LGht{A)Hp9MV?kRdjXfMNHWC7!Ypa(T^1lRlxncje9S;SY2ih-ih5JM?qFYHsRrq$Z*1-)d!kOGe|dwEHMf{Wn*f_E2bN{$d<_K z5XCv#+XMD1R@7Bj8~cPFc>M#@47HV-FkURT*v@&}fDbL*1Tk9St=<99rND=cb>U@` zNzElzhT$1)ZS|?WqHbLuQG8IToNGDvbi-Jm?eWFJ7yO!P&qYK;oEYsFkO-{bnJHI& zm3({P_wjkP;i)ZaYqgy2R!t*u)7+TRq}{zc6+(RDVeX+Ov7)K;GAn9pg08V|!NvJ$ z`X}bYG+&GvfLES?v((kqg`OSuyQqTiNDc5^?M%GJ;rFE%?|cmE`mrs>+r!91=5fWI z_%^2oWYWH;?8T*gFZk2RyaKo#0Z{o_>NOqD!tzFtsZ}k#`0dL^jSp9i=$F9_CBb@2 zFXb+`w^xlI5sc8tmTOp^nW(4N>r48A_A2uz-8t3{mvYnAao#=1;OObdA(!Z>>78}) z>&Hd(46O2UcYll*nafMVp-#o)BV8xCjAM9ZddFnr$;Bi3?twqd?$4!I)8m#8J}uS^ z>uByRCN%Cynd{v)1XzaAC03?oYSqnzj}C0T&$jXSs0LpGudsai@}5y?gU#JG0^i#9 zNZRUn1J-_7Q*-5$4?ItcA`LvgEWaoL91wo%_3J(unDfnZ0jG%vdhg6EiJai3O7Cz@ z$SO)GbSdN2sBYZR*#r)O(3tkYG11+5dAxsjWMETpFTI_aT;zBRe)cVVb$wM)nC>fC->os*uhhwI<-yUTynKRuUq86!% z31))kl%<<_(X!QOt!kK4q*>s`<9e`t{L_B<-ME}U=s`k$MYfsb@mhJE;y;!PR;Akg zGLLEomH{o#0Ka2AcEZR0_0AJCx?EfO1}f!t4X^iQj~1P`Bn75uQkH z!b$brb2qy`1aSO7Py7Qd|-8Vlcbc*#4) zV7E*i({8}&%xt2QjRS>cudzZgHC1n%e02iczSH-_FoFgR5e$~+ z;kr4okJp31KU0Ah-lDM7m$PmYlraGP+lkoT)DDk)*#bu{= z2@30O-QLz*6`Tp^h&C%xb9))-S~gY?(}}-7{s`l;a>BM>hH}328~fmgE4oA#t9{4rW|g=~Al|X&^iy9s^pE-Ctq?1=dVhdU0Bq zw12a9PE}PE2slvONgV&P@H2X^o%^#nxs;nI?HGvfu+N+Mv}~ z?fCKIt(=l>-t^3jYF}MdnOR_(`MX?r$`4uB`^!m{vUf|KDec_tXsn^M*YT!?x7MvO z1Kmb%?KbGyG=)98BtI$rJ>l~DWqrrWzr55`ajnWKC;Wr%yz@S9{f|unkRLhQ=y&{h zbhLYzTq^u3UMX1sx8-uHySY^1lmEzxP6q`L8WvG59ifyhH~7BF^n0`Uy+60TTzd7K zo8l4uPZicNJf<%==dKuc7eBvq)^$h^-WDU@<`4E+v?y=gvyJ1II8 zO$1`3Un;glyuFq=PTs9QG;8ph>xDhClppX~8@u7yJva^%k%vTiUXksZDa;qyer>I2 zGGmg{QCH6>8I`_y^UcL?FBGiC!a4O&bFX518tUXb^AfWIAF8Wk=8+;x^gy;v z!#N$tf!E?PEJXGP)p<$zspRzAGc}?A_Hy;`9$u1NbBi(;V)^(Sn5xW1!xrlDpM2Z6ER;;l8R#%AS=p@5oiEo|TIhovzq&Aya1>NQKxfA?ur6 z!uZ%#)5DyOzNwt~X$>CldKj3ysbZ+0bFQ&#-txBkbi>t|5swDvS6y%q{s7{oex$;E zrVwK+xau5HSydI^nli^jYowgH*iqy$bBM5OtCe#KKi*C{>!zqQ(|K*|<#OEpT zoMM-{PQx^bntFCXs@?TMqk1i4b3qtS6P%kqRSi5D3o(@p3B316|_beFyLifr$^mm(6L#S2At^&j9yignq|>_yIWvj zRSZp8I^%i597K0ZoVbx@!Ec+C3ih0m>nm0@8DB~uOTGs8zZY-iXSX&s{W_{?n`eI=~u$31rk z!r~U@dR8)bpfoLN!fbNITtfcEYV9~jMqx2z@mJ$=Rvsf^drwx%9n@v#U2m1rlw;!F z{W?}WS0pIp2CbdY=Ep9H8RND!k4RF*-Ve(4jH=dlkqYK{{+&7A{QGx?Y+XiH5;fz^ z%X3S0<#v|{qS;<<+;dog+%#MN2?fWm4X2gap3c-+g$USq)!Tf7UL!q8hNf^JA#?C^ z`b;kvi4c76YwO^og-Pe>_=EUv@jcQtMCfmdB6>dvQQ0R=a3 ziqkGd^~pB$HT@&55#_+^ymbv*Qm+&!wQm$(Vc>%nH%lh=#3 zCMx5}bcx!lQeFUN5P%B_V4DAgJ292iA|i1=>mIxb#%Vk%A_tCvg>bFYY)E9=L&3} zj+yh^CGp((^BYGe6`iz(*=tnm=^HOs>rX3-oEf5)7z};ow%3fy zDXD>p9`ztRbo@%NcdR}9H0)jTQ-w5j0ly>X?#(Z2YiKyaoM$9qO82+w{y#m~qn9R3}bH8r<})2l$JP1uqqB?qzx$COZH*+Q{2HmXyJc(t&gZ`#2p_;5%e2A@e+b{P>mD z6!oZ~K!SphrY*%^JYlIXx4j9@kJHku5{fRJC&KY$%$$V&#baq^ck0aClm*C6-*ENe zwOs+G+JA0Np6y@c6d|{Qc>c5w+p-n}uMNRBL-6A-7garOuCIdUoBanO$oaXR=i=T8 zn7j{bBE#r;)>SdCBqMy}`egevE44N=dMOsaEhwpnSrkYx&0~nOpv}TGX5@OVzq<5v zTFJiBdgqg)2Sc}qFDOzg*eWcv)<61i#%cAam!M%uqp(3E-fx*8!0@l@kNsZgvS87o zB>@gm6IL6D6_c(cIJ<{&y{GWnY zp9yb@8LVyge@Kzz?i)YLZx)ct49Eq`PD|T1VapZb;!`_Z;?RRU{m5LY8TADcBuPJ~ zRP87ee=DrY=JA+wRm}|k9W|qtVfXBJ1)h*!tkFaT2Q_VR+_>d>;iO@SH0@%Wr=HH5Q3HWdam61#nA9tAsUKTf zB1ue4ISzz=ZSAF)HI^i{^;#T|_`XGVsn?>9nd(HcVug!&pTl| z#rb4lL$yJ^YQ&>^_1Vci*wx0X7ti zAk?ZCH!~oGyJva&iW%?@gE!qdp39vgg1kxE2;dwyVC~J#l$w$(0DZ2ltvy&#?{$4S z$oaUOMgw}Yy0P2>(3U?(rndb2JmC>aNccBdIcL{22;wN#`Zeg)OaMeZt6M3Y&Wsw0 z;Ugc^na$k_MDlfyh}jNz3?OW&iV7hGO7aet*e?XGpa_r!1Ob-;X*35B&T!tWw27t zsMp4baz?Eqj-7c>(;Rw$L!kCHUrs<*n~=3uo_z+g@3blv4cQ%p(p<1BGxwg8<-c-<7!~DuYx281*q!!K_s{# zKO7tU$v+y%aJZ=7$piCePP%#H#*NpyBK>0>@tg5XP?iK9Li0d;lI_?1u=S!0;tm%L z83{d^bhgU3#7sJz_~XTIv0VJqKMNz+a{W=tu9QNT_!i3_!9)V~U7RUNl%?^*d6#HM)q z@?7OCxlBhsP<8JNOKRT$LbT5@Z@gWIOu$XzW?;Jep=|bh`3N!-YW4#mmBObAE_|&p z&QB{f3w3g9A^N>E`x;@lhI@rn?)||B?n8UB{{-nL!@he6PM7BjEb*+&kJLZ7{RV?p z?@VysQN}Gs!IOMOn(=F0B2ki<4iYskCl*Y%8XC#vcFxj>uwi(I4T?qnh5SUx=F;CeSC*6ku!UM(r6T~Y7Pq{chVg1b&vCMBk%JcIR zDw9MohiXNP_FA@b7_ZDjw0|tis!ZCd5hLFc#GJ(3iNf$;vOho)!~5bLMZa}8IcbsL z=IwcYb}_S1XR#`5Da8uXO7cFlX&ojTaE*k-m2#m*I2ojJ{ zEcz|KVm@;Ug2Ozh9+iuAw*Az!MY72^Ai$Po1Rzf7gOnZR2wXC%RC3ba#fIZwffW}z zD8Lgm02Tf}Ss~REHi=DBI94 zEG#V9hAURoR#Ox-{WM}6&&tZAdz9QrJ(5-Srm@is=+&Zs$%FBh@Hrmy!CUD_0 z%5-0SHBZm}mxHj3KP+y~nAjIDa)g4S{<^lgH8ysLK~o>)?4Xm_B$SiFDI+6&`lDgZ zc+cgrpM3oHw~yqw7>vChb0xqQgn%PnZu;!$phB0(hAG3oD~l4lI7aQ zgVyNp{p1sclFdQi&|gsqn6a!TqqOFFyL}%^alqSx)c~TYNVLulYuHtQWiUb6%CvSY>U{Gzmuf;A6+w-;s08Jh!Of($m5Vw^J`h8Z=>-mglyXy!vTA z?B)Ss0Jm0Qm@HEVH6YTwtX(?X61b2>-Huzfik8ygFN zBOKJ=(|P#5T<

FY(^(W!z-dH2sN+5^mRx3nzLRqzGA_JC8h+Sl>DSZ#1@Obe+$}a^BmT>QZ3>C5=1#LXtL+mUdq~PQQDvL+!{lY>yRzg*-%- zOTVwzc+NOr(IVySc3V6s>oXePzk6Cutc~gD?+nwMbl$anf}FYfF@C{hOoo=6SXFme zJKTxVBLf-<_K00nz<}I6JO5@^tSFm@Zs7bTkL9s=AW}cxjx4-V2Al9iqb=Oa%V;w* zF?DKXAJ+lo53WT`19YCi;w!PD<-OgH=igY%fbi25JhpI81ia zZ}RHFcNMviTUMn-puz@-GzFNR3e|fxKH?E`y!Svlg7)#7^zM^6LSyY2qz*Bq?~uX} zn=a2~KfIj;owah;$Agqs_8=h(4#&{T%ZpMPt2wvr08N>>tQ;3{`po*xVJ1*CeK=8) zVV#*+yV4mlFZ*@UU`+D^LyWLJIucWeMjboEKHj7xFHDnZCEn(VF?#=VjGY9a+vj0f zE8%xINezh8OJKBEHFL=&`qXs09NA}8)l+N(2rB+d%*kvj^ccjx5((+Njl3J#cTq{$ zMT$O^PLUMd*gO_4g5fIt;+#(e!Nx7qCjvi(H-XV@f+eJPv4kgydNvZZ&=_mZnV#zzQHT23fW2*u1? zLaDG*f2*Uy!X|A4m&fx|>3}DR?OMQ!r9A8{LHq}XJ6$l1KvbQyKp#Q$;A^vi;&UFq zCUTs79SEdQJ_)81dU)|4}|Z%tVy3?EqWT(s@&t zZ7XmDS`r%FRQDM6mcuI&3GdXqYdizyZcO$LFvskM@v~z#$ImVb)*iZ>*)%!G@1T;# z0r7dWB>~;(`wUBop7D#^URH+fJ%utl6pItDw13atIbo*Gt*V~eI1!*XhPNm5M!;>U z-!WEwgHVd0uW`g91U1R&N+?i-?&RM`+ED72xz#6uU0AQt3ft*F0Z)c9%ifzgPPEZ zAa%_*F%Kn20ct{L;H68Tmq-ZkYKqJ%4<#$f1Fb|7O8hPFT+W}zYlHYOrdTO+NjSFU zN{0hH3p@=$N(L2A3?vzU)-@H5Y2PE6h5Xh>jvsfjfAd;w*~ZUYg{jkWAmM#znV`Ag zU0g^B`taW7kDQIwonWgY50(bBBxI_Qk?*<35zy4ePHO!I(8x)DLIq~$N+k6-8ziJV z)ITMl^%%u2_kIBhzf!#$#es*bnzi-!QfiV@mlhUARk!qjT|E*U$3^`P$8ibrEwBge zuz_{Bpe^_`GD);8uPfp5)ngpMJ(A2W9U+t?Z$$Lb1R{Xdx-Iz3I=s*NS%^G}&n!eF zC|-i%FqMixY9AE#5s_|rkozi8E#ge86@T}svQ8O8ehUNNQN?yfqwUr zMrT<61$3b^kriA(OKDBO(%|-KyWrYhy1B{|Y865Q zlfLBPw%-J96C8~`k~N8tc-%ea>oArz_QnjCX;R+wb70nne${S^L^vPGFkfM zaZZA>kGD6O4Cgio2?8oj$VvBi6wJ8lotGR^&s>Xh51aSZ01RefX-Te#OEMsmQ;X^u zNHL?x{bAgD1bD;K}eI4@v)ci+qg`F z=-v>LL}dIu>_p`0DqrT!Zex3R`_UKc^#UdwW+^suw5xubE;w4KqhrhY^Iyb-gi`IC88J%LRX*`O_Cj<+6JLkQWZ2qS2#u2VnMC0rJL3D-p(k z2-Q{=UZ+6P^$0REsYrlr3tTC$V|tVcn#GIEJtbtNgW*Kp`ImbN1MfH8#b(!quo|mc zHMKOlGwAj#m1--V zSJ4I_V-d?r%Up3!8EjQ6;phY3w}auA?f<{S)R+W!GoYV zi@TUVSrJA;ShnIc3x-BTJhFe!DZC_S=9ak|s(a(%@O89rG&7WX;m+jFx`rW`XgQHW z1RFdEY3)i4gku%%EbjPD=8cVQ;Ys|PY6WKuZTP*2s-n{UZ?D-3;mh#z=Vwxae48E) z7ByJ$6W=(MyOTq0BAf`5z+U<-E~@AGHA^5+fHPU58`i_C_& z4pW9ZvmqES_U#|hvB@SZjB^0vc=2U8!BqlxQ`k&3ILR#H>>Dj#aAB<8CPCF9+MUDDjCH z7AV4kz$A46qSL=&Nx?ti9Xk!qpD%=QFD_GHYX`{WjbmRIJCk`l1_S>|wkh6!s zOiwyoB+?O4S!?DX1nPl)AE71zH%0jf7Vu{-c|1rQJmnlGi&yXRu4^oq+|YxaQPIZ4 zW#sQ9O?B(Ph_MRd^-g9eLV&)$=}l>A>DTq@QfD;Q(uqDkuLmRiGk}`WI2)u!bku?w zN;fopy3n&$8E&Rq4WD)+D7_Y^c^qsI6~Egbci~Mdn^Nl8)6gzC3Oh6<4#fv##}wvZ zHqr*iD$1C1VeyhM|Jb+m1HDjzM^V7zE^72%Vv5UY+eAb6~h<};~)#iHq z$y5$;E(;(SCe$_7DrcWi=fh2kkO4Ss2cVNX_>fzsA3%DH89j+|v)~$V>S*PyG)Wo- z{g}c+0v12`Qs&3sw?DQPJ(O_&x?QXzLth*$;*E}`&L9vz4h^RTtKH+gFM>za&oxqoBL*DNaPnYWwc zIY>;(O`sw*?Gk}Hf4&3ytLG-O2cJ+qncaggPI=f}~GKKxo7ylb8u zB^}P4e|T3-tY7KEl0Tc3vsbR-J#f+!xscV@3n6Gm6z8Lkny!!5&(E`oaAtWjSK`+H zAFiY`uKSmPY|Rq~EAyXQ@LisPh+}0V4N-;Qq zEPlaB(^86Gwl!@@LGe{HyTeE*8fHdfw#QYWTs_kDdjx|&lHM{SQ7HF2bz5gE&g7v0 zjx-F2wg&Anqxnw~KVI4xW97zsO_^6?wvo}V9l2&S_EMhgY#)UXz$lU8#>FBJr9Wip z%0K-q8O&(yH1Kb0p(3VqfGiFT1^E=g&j=0)fq~#jUKS~58w{mYSGVU~&rKVXFjyrf zT|+WZyqnVwijteHux^y&sLB0fsMSsNn39WT&@rVWdLJ8f>!1Jr)sxsgONVc5TIS?c zk(r)`3@al-!4F%IUR7AD3|O_N#p88mx?xulxyGTHx=16&O5An=MTy2FQeM}3DAfpu z79IR%4gJP%qAVAK&ho1^j@uzhw1IKlW*jQRu5M*jqgZGS4^yR-#E_GkV=43;hC#=)rYSANN7G*1&T$NI`!M+4%#)U@3 zArOC7vE?d=rw=Ah&(w3vgmKke$AhR^?4jl8r%;-Yt(5^3zC0FNbJ96~^F-Yr5dCqg z(}_T;5t=+&x4>6n8j@9$&ywS@AADff(#aC>jY6c4>I~yBoH{?;L{PpDAIt2pJL;06 zH95#eh-m3tBjrljYM;fILl@+}L%v_XAHMe+Q>FJyY7NA}99!ug8*sh4W`DEjEMbkd z4k8b&LlXsSjRWw2w&(X(VU9c@vqG7aYW` z<9C+m6nupo>lwXU}RttWP zKx;8duD*S%pn)1JTV_NW*hN`x!Jo_l++H;im)HPnoG5lSeS3H|(PZc2k2K&}%Aw z2)ThRmH>=FBmu65i7*W;n_pLPioH?ztO^53`#G*T3mrhT8cyEF-+zQ)5$II<&Ng-d zHbyeMt>vTL90$J;6%Q?C2MR=t(6ZsJrf&Us%x!m0N$Pqfshga6s5n1?;8y?W(+!JY zY(5~H%xbD53|+t<2NgrZ1U;xgG;-N#lM1FS$B&3#^1Sk_YuUFT0ZTf>!D;Qg0A8d` z)tR^X$$jL^7oMTehSw+>Nj=7WxX9z|A4JynWuUeLkt=jDnoYCtbUMNJ>sL+M`f9`4fn81Iw_(&#ZzL@!(!ArC_3|*@k31bT@55PE92i;lF&R1~?SuD^#ryvp^HU(9 z`Y2+N_R)wF>kM5gU^mH6bVZ}k{8!r8NI!rQ;&A($YjK1zW1?)AqqM_*CV!_C_ymWv70M$b%Q3r1r1|{|9>}`cqn-f-V&22QFWaX zRar0Nm9kelHn*-I0er>6Ysw+(i_79+hCv{z$c@a0VsnoAU3X!0vN$;C-v;RPMNFEc z6HB=6RPbk6X^c1;MkvQzR3{EzcKVP9Tb2kDBea)I4CX76(P)&x{3>MG2Iw7a1CHb0k<-=ucq)Xxj1bEro zdL8P&6+dAqz0P?8ujeY1S3kHGH#|7)1lv7{Jq2zAT9=(nP`mOQH4B^i`c#LFaZx9f zvP%w7x=}yewI~HkS30?#@{9!5CMab14J5z1FN{=J(3G8DiG%HUC&wU)3Jw^beVN(t z6?>x$5A%!Q%NAqiERb0tjtz~$ct0mNw=&S~Fli7IE6td+A&jLlw@|$W`Lbv6S}2fN z3QC4q@Jg2A-+U$|>XveLi6)c|j+WMl3dj$r4%Nn_M12VvD6<5%(SZlnP{NQzhP+dI ziaZ(=c&CKZHWapXYC#-qd;|E{PmRHS$;t>~;Uvk*mI_c)d>l6=)U>qN^O}a67(A9Q zCOAE28*7AYtRy#gali6~B_bUc-jMf@$RHrH`g2GuQD=$F>iI31hd4jUfXSD|F4#FV zcVRHc*YB4+`5PnMXOPf2Qk~%jNb0ASmc|9l8sb-6!n(zFH z3wroI!{>XqF^J^fgY3Yz@o+_&CgU!_%tnTuhQg)swglga3iXCCIdL!N{KKz4d#|V;?q|5}Ahrp~<{~V>(Ph`Rc^{r^xh{!>yuuwM3q0MShke zAw}?n7)nzh$GqhpN;g$cJeQkks}X(Ry1%CVWhg2<>_XWnJym^T)M^CPUc6HzQ2G8C zd^M+F9G&$vakRO}!<(f*{$UpP5L;C_GVa&aET++yWo7|NrjXOg)u46v;Nx7MBwXb2 zn8=#U_WIz1)(H%~glLXBkeBe*d<;0BmLVilrZ|*^A z7F`gTXcmlL0|^*GoRpOpyqnU(Br6oy$ia{%!q||MWDe+U{w`>5Z85{vyTmT=HT|9F z8&k?shNE8GVIHg`SAyD*W7fbPeJb7V`rO2gN+WqCU@MDz_Yemz7)yA+#QLR3Cyrls zSCTay8!>?A`hWmN5GhZk9;3OdhgU;SChm-lIMQv2wx?D@WK*uPvXP(XU=C zQJdNg{&5XjTtd?FdGetPIuFJD%*gyJ~P zQA}zo1gS}0B9A{WQ(ucEB1=rKmK^#j(5{=BF$Z=szI`;Stn|Z&-aVS zU@QORsWE44+-m}7f=VZhK>z&`SaO-s63Q!t!#g19B&)JV!MPUbbUI1~c6EkVnl>lf z8(j^SEc-_w-WdaRAyIdcQE<+`CLZ!NrmVwHncR1^3%Dz;+$b?yubiDcoHq^1b+G8U z&T!O%lFa1{fRbsOSmF)~pMX*Nd^QU9)D{Bey#-m946U&0EyD_u2QY&P&)fLz^907W ze|KJnvxQ7o5H{P#xZ6CDKwphI=JhOIEXj<58L(d-{p7Q}YoL4C3EDTIgpXNd(Fy1C zeSU&=7{&OMFNm+fdMEAt%jRwk|u}LVu)YCeH?-$&|lk{2QX9@3Z_^c1Cxz5U+ zm{yf?wlb+H0!PAfo}a1Eq0yCW4M_gYSfBsbS_Lr&=)_@eQWXoFvo3NEvem-oUP~FoSvYR))8NzUN$p7 zp>v8&Tf6~mq2K0uBHzSKzbE6Y$QW0T!z?rY$*&xS2zIC^7zSRfEJ% z9{(^I9FJyHmr^)TwHskvR1P1Z6B03cRBW}@8}9nltIx9>h`A`)*{uq%T!>NAUy)1v zjK*M<^_nrGhw&i}8JwW)H=?J`u9eMG^+wiL?9dh_*qORnX5coTOM&M)_Mq?o#R%h5?ip|~1 zfCKjV2K*xgXV0nG=KT`40V0p{JiftLco4$M^XHb>dNL5!gPp@;EygWu1l(ZiTl3w5 zY&|>dhU`H|Zqqd#=QgAkHB*+NGZjWZnO9;a(VQc>U65FwCt_--lIGL4rF>HM728vQy9#F_5xS>1z ze5c1pa#iqsSnK~So8X5sUbm^l~cK?Hvb^9Oe zBzl%4)A4!2BC23KV8eCfAiA+<{BWe2LK3UkT{*jdD6bp{9e|*?;Dn_m8qgily|b*; zB`tyb4bEAJ3V{0C<}yOpFj7ybOJUY_l1zQWm7j%PtpN_1WfXZ!hQD88jB}0A)VVC= z`W^)_x3tqhT=qEGQs#CT$jZLVL`Vyg?Ntd%a|`D@KKS?zAtR_Tt;r1yL!kGLrb0HM z;L>Mw?y8Izc0@RirbZZuM`s*#M0c#juW&b8ck|0NNdiVpqjr75K?b7Uzp_X&MYGw)ud~27Z4a) z{L?;sz{1>_eS`~Tg&HD=&*EdCmgD(IjFP*orx-ekdFZm!)SlhI!5a+_RLS6k~)5z5?!g0uDdA^%$%m*G#>hc^M<~vGbWbBtcSAz z*QBIqXfWo)yA#}gh6tHuX}aWop-^aG{Be9|I50+0L?sceesbnje=|q=p&jja0=v66 zRg!s~C$b$AfX3n=*o&?tj1@~!P$TXe3h(K)sblS|^o_-!`Sr%04x~YTpB#mpUvu4~ zKe>;vL)GFZcT5qnnD=L_@{!NY!3 z5lwBly0jzi*C((O;%a@he&sFypl-sZf~A%v{=-n{Y?KzxD^zGmjw_V6pl2ISO;kap?=hZ@_F?piMqwR1H zstdCSjU^v2`XGFr=LVQGT4+HfB)YVpLT>?%me(07AsBaH#GjR31ZpxF?Ky1>9N6yg z{II=D{Qwu0`i!rNaoy2yCyUrtb|5R^#+|RlWe#KJywXF<(7w=jur(GM)ES1r-=+#_ z8?O5qia)6MhkZvQV~Ywa1$0HoRhls$+xb1AEoAhNPul9Cyw}ch0W!vgtBc5A!bH@e zx9#kV%I3zpiU>Fy{Tp-;rX$aRAIBb?{}4_8d{YJVjgRN!vJ6s$OyApOT?#Lf6%G!| zr*R6M34?6Jg)c#tzTso6pIByvUQ%b6gc$f?Mq-O!Gjo-5>u7QJPQQw)hP`jTa*@yDNKWekHQN2{If@#eR0F9VSf@)&9coPe(@q z^D@$(l(P@;^%lNthvK{}KA}n}F2h50BFRL~X9_cRJs^X&V2A}n@F}wuCn0&w033m( zr9bjH;m@s%fBk=PF2w=KV!JcW%jjG?FH(UxRfcmG{X3(4Ar+D2AgW#Suhb+;B0`#K zF}P%ka<(RqS5}6R z4ofUOkQF45NDKi_E|?_e^Mx#OkhZj=SwJwC<{@G`-gkH1CT)dsW!{uYs~Bs&E$cIMF=cNNw)8iWuPI~q?6x~OF_g&W+eFK&GSkE z(mQN_71CA{Ei5R&MS-wea*{Z8^}k7;rKolSPr~R$9Tj#9l^P5d+c_BX1+t2kBq&*& zYK7Aqa%g>G`3jbD068{O&aOfM1LDDAbE%AiA;hX8kNY!rH0$8fm{K=WK0XVfiL-|g zYDTxFD0X9-;H=U}Pk?bZAk=$&H5PeIS$zEZ^zGJ6wrlpZYp5qSHhua*p#J+JRB9(s z8XL#0XR-Ql!4Cx+{H!DW3_V+Qss_c|$<1J|W)K;|-lE3Fz0Mc6`2%#duOBrR=IMN=Fu! z#R@8m|0w%dgGL`;RYwJd@>^r)Fr@sM=?pC#Rh{ZUJm6!ViRj26*HhR|Qm~fMaz2ioJVXeDrKy@R zik%9E?l*1~YY60~{mu8=Y)$-!-=JQla1BnbOGco&sc9+8`AIZ31?e8-6O_bt*gFtY zRckk>$oYsn1F68MMuiC={tO>mVsI_erVDeq9ENMYTK()D|ELokm565qJXIq zUDl$_a|9k$2m^{2L!=GV*~ZFlT^heujXL@)UgGdYjN+f3s1&0!uhV?5F3sZ~bx}?s z@^8r$Afgoq@jD8UR2-n3B3c7*X9DB@9R{f39;9n6WYhk}1qrv^g=At}R?rU$<&zuu zHVy(;9{)sf^GbBti7g(u{>hVSOGFl|Yx^Gs{g_^IKB#4q(8&6{sY##ZBqiL!Bt;xS zc*vJ!Ib-z><|*s95OYS^HgPhWp{6ZnGZrf4vm}_zN$S7T=lx@R1X0~yBL?wDLMPj*1<^&{N3d#S-5lGRA zXmg(R`oKlgOBv;27AH0q)$ZT?&v2z-Zh!CLa!u12h3eO_V4TClT_~tdtA}#_+y7xW z6rWOWPg$-}>`Nh3U%Wr56$2D-0Iv zb$V!ApOsPKM!hq{;u@6XnnK{+gqA5(m2Q*CAQjJdJ*gkz{J-LX7Sr!2I>J5p9mEp` zj*KKD{t-AlnIXCzEx%wX-wxM`$k9y&!jTnhI*Z>egH@7t@WeCZeb;nBZBx_RQ6hZ_ zW{fL@m{X9IucSI|K`WLBR>OJ*7=Ie!Aib!RJ^Ulztl7~3eY_iP7`=&84v55%atC;J z?OeI+B$xP=_!8gc6TkE#maD)b0rlhZ^x!@`7%~f8*iF)DVY)ck+jdgIBssYb;Dv7%9Zr^b=l<2!;L5CFT53GE*WmT zD5$)L!ne};S6`Jyy}qYmxU0baj#i&P9GX&odN8(|R0%h?;_ow*?v>*vuEr5#oU5DA z-EFdcjMJ6;ii04e#wJt`Ge)Rw;_W2oIw$D(E@gy5M|Aa2BCe)f$M?qudnpv(KH`@3 zOWeEK>gs(Hko0gH_&0VFmwB|-WQ^y_S{%PFFilGPLVpQm2CE6WE!(4HKz)Q7Q z^i8(iAM{tPW``}28Rv^7(%*(=+ikqLqHHgR>tm15lisK~rQuHgN+s!z`7zN)Y!Exo z-a}9RAnt+Fpg6G$37qI%J_JSH$GBR|9eFg)_WrLzH+T2p4pI}m?kw(?&_MP@^CR|c zC+^X}RVXwmrGT@l+6P3f+xdy#^+Q0KLZQpwxEggqOms*i7|#)1LZ+dVbHVDL;bp6c zg`7zb){$u81Pu-ZkyaZPKS6Q z=~%p-d0&dEZ^TO$czc=R7CtNcYiHIAQ{$w{IPOb^@2Itt-Qk3QP6IX2`AZJtZT&L4 zH7Pexgfx3kBf2YE@-4uIlI@3O1s#|hqj!{_H_d_Oz4P6>cLf@_D;-a$FwYcX6>JaJ z1R7vEjtW@V!rtXJXT*r7*Q1Xgd%d-q(uL53$e%^6A4;75;`ragiY% znuVuEM%hJ(?iU=F=P)!CS)s9aile%{J}C}dJs57z(Z`R6i%Ed`{9YHGSR8@0r#>mvy|1etPc^E#sV|Z!_mJR=lIMC{|;ZXy|?kSHhY1;|K z=cK~mWpFhgX2yjU2S4PWipctytumPZSRpl=7n3>#xAx*_HQUPUt}CU9zAh|r zGkvY5vFPy_{Fx0S-UO-b4w(!bqxNZUV<4r3i+9f%W)zrk^Jf}mJKQBk>bUd|s#6tJ z%2C>6{*P*reY!QN9HkmJ4}h4?s-%<@C~L7@@A8qXKFNav?&Y8p{tz6~;_*Fd`^}G$ zZ6FiIEx!qFd+{Sj9#IH?7|iCDNzHtCP_TCY-;IkIuXeJyeMXw`P$Z8XSJ8Y|QvMGV z8Nj+^eoXsUVayNE=Al{uER<+KJKWdaZXMFOk~C~I{#pt107G{V#0@1Ax=V{T2eoN3 zwX0=n$B^87MKkU2Z4U7^Dg2|+j${4_I4rFMUZL+QHG z8C>LwxoJHhqnaF~7CAw)auDufK?RXiinF~#z>bUd90D4@X1GG<$F^L@ezomasnzHh zoyyRHyV4hRYf}2mpl+o;5DhdgvE0h^tS{z@F3fNj7Z-ZVafmMDcDJU{{Gwq=AuMWz z?OUG^2kvaAvr#;h0O>=pgX%k!>zxp=)uMp}Q{mF>++WCg0VJ9x)Kq~Nv2X5DsSUhb z=yIq`=B!!W3C?=|(Cqf0f2w_9A$j^xdhbbbyJEmyNa!&N@N|lAHD|n)vSPT@fo^)- zD`$L6)T+qO7=Hl;PEyC4P+HP{ zQLC%Rawk&D!K|v!Mtj&#J?DBFE^pR(SukeK0m0Nc+wu<|atQKq+M4e7lui3J1`(VT zVJnXmS|zX2!+@~Ud(@_uUo)cPe^eOJ97SY;Y^gd^bP_7NgZEVJNcHRl(-CxFn(S#O z2r!3@3#t#TJqmr@13|(il9MBChvG@Jpsf3EPC#w8z##MPr%#^OaMe0PvlHp*HvRA? z7T#~UUW;pQFcIcs?Qy{s464vr^&xpnEm9CR5Coj_O?F_J23XT$cVFL#2_kL~&S@}% zqK8M_+M_yNZn7~k-^0`M5P@mv$)SH5t76}7>{h8=!>paL6x=Qa!V`+rS&~8z*#i&@ zQ@`s7%3!0j9B*4N6a8is6lt5FNN(Q@4h%|>u|9Hm%*>#yMt5JUcxXD3AGAbTpoBsv zsF3~c2X;yLdk`I_be|k)S5pGznKkN-N^PM_EM?Vq;TD;P2tKhYu_|uM*vnO~8@xOw zf|L1Y-rhwzNnaf}?lzwJ*Hu&$iF@}a{z9XS^3l0=Ec)n!6)_PEGEpm152h3b{Cd)u z10%8*G}V7n#&mUPx+etJ6u$0Cw0dM)H+nh_+mZaqfi6VyUIxN0mWGX&S@@{YVA#U^$Di^}J$$M7TY`_~Ipp z&sF(`V>RkWh#d-sN6zL=@ACE-!wg(jFl_fguijvy-N;=qxx2W!y4!H3!vMO_T-+2- zN8@#Xb`8qwP*owygVc~;8p&D`E>w;_KV-Cn`As6W)1c@46;GtzENcDSsGj#RU! zdiaoMOYoUTdcYMIym)cu=?1bgu3DZq+j_Z zoD!y6%o%SBY;5>&szzHs1Si&Qz+~V?AG$k^>Ro;bM=fxVIh%(Uy{WpLs-Pes2amV~ z$^-on_K=0)Pnt*`j0T`Fdp#j=RBp&CQEShGYmXuhm^$zEUJ=I~z+WYWGng!csRgIR zfrD@p|0n-T)-b|QMll6yIQu8%`tkTh4j%Wj#OmGOD-QNrJaw3u4@76Q` zmjo-o9M)ic`f5eC=%5Fs=>1K0SaDO6IXa*Sa~V2DXHoxm&wGXya|M3k`H5v%%iJ z>-+WnlV8@%?EUQLS%-VwYwfl25e;A<0~-0zK3LK*{0m!=#T;4Fs@{R40k@GTr|Dpk zR|s&+q8m6`ju!j@mSW|gN%+QJ1{y3@w7cLSv}Kr8aYXOn>*`(K9j~FvyKV^q;*)AM z;4>3S4B@MG_rwIJVF-yj1L==LEzLl#sb=3~Tl&3-3R%E#aG!vlH#?>1z2d{N;z z=**3MqjW>)%i01Qzx1Beja1|Hb7&0l>Md;o1)0gatVgEfZVOOowfAq~82}{)HbN16 zQ55&_kMG`GcM3A;0_C}2ebSLj-dZ|ru6s;@dO$Jcgu1^WO3(uAN}(>vir1|aa3`!k z1rEqpN5@ODK@l$k99Il#q5fQCIbLUq!1#1DP(QD$Pf12^XIT-l>D;N=FB}xvINlsw zmoXK`hIW#qz{2=o7>#O7{Xz>p382pFFC5%!2oJ^-g3?j~LVWoY5*{o;Ta8x&3LI>) znHdZ39~g^?R)Pn#4xURGYIk7gC#!7cZf9$0{!goM61NlXhvC7y(wJCqc=u7ggV+;K zk}zd_$rm#d;&pqAv6|CtXSCVm-B=W>YR*wV%mwt5Z`Xi+Q+gG@ig_c5Tl3NE4>+hX zlEu{MhV*SaKKmNj>LjMElJ{|DU(>wLv2NBI$UIDD55)4&*pilLP_5{I4n+tl$ zPpx`bl^5;6i6dEbhc0W2sWB>+!N)GdHNUJP78?g)$i)*h{z{?gTZZ=X5w1yFfi{M%TD+{Rlb zv}9i-TH1*Gv=%f7pLbUE2&1B?toZw0Lm`iyEiFAveky|Db^zYvK_^~VY$(j5=1Ike5rEjEMfk6sD5`yuP$i991=ny)M;U+h(?blz$9dk8ok+$ zmtf??%es17)cCa|NU?_rS~Ry%ijh8vu{2g71PAL#K?b0b#RQwcphb{w2*skVX}mWo z&(5P;6lUYd#y>Go*)E7LymMKR;p(F6`^LcTnMUCXk`80*()C`q!nU>AYl{K=K|ohd z&6FIsK-V8QgFfE%VcRel2;FdDCB&+p>!L5C`Uh=RWQvL_+ky&aaDSMQ#=erp0&0f! z`@4#N;z1Hx1=*zf2PLkkQ*S7QqofHV*idagWJ$_?{!#qmRFk+C2 zvBkOD*}1F0iUL^BfxsebSK{}?5gFW+5IZ2tHEq%+V8^@j$sGfJWGOoG)nRYpOngye zvUyFt1Z@nygc&<5L>SKvg1xKMYeLI5lF+5-hSY(`|3`%m($!Z^NIFHQ84+I~n<0dJ z=@VVj&J9jF_3Y0a7k1>oiC6ad(N>&avxc7EHuPD>U|L}(DnFBejqN4uJ;NjtYscpl zqZ|!`A_tnA^GV!OBJds?!)?{r`tfpjDqxlbQ_EFg zt4kOi&((rAy>|UN!9yeQK;PlrxSkMS*%~d!ybuz9<_YNIEr#yvA^SAMlJ-CH2Zlv+ zFSStn271cc?Ea^5Kr-7PE>j#a%#GLtOO&L~7%$n28@)we8z_GD_%WjnGfT!m;@`vJzQpX(L z9RvDwqaWdaae-t{jn9+i1Sl2LaJ#iIZotuusKo6?V9=j*6hbh90!*DH{iO7ZX+ps9 ze&A$rG)b^Kj^$FEz<6EI8To6~8_F@c1aT9g@Qf_GMk7VRpX^;%b9#DfL=}PSNfO=a zoj1X%{*FzRQD_)KN7*?89&N#qz{CB3zI(93yjg_AyMbLqDq%6R7Vd9v5Wv4LmXgiF{}pRgx8sVuV$Xab!<(jF z5`ceIrf10d8=iGZtMa$I-4HLbzAVy!_5D6FGj=HK4Ga{F5q}6=y%fg+zTKWHk*7km zH1bl8WR1I<|12}#vp8rGLtg`3N88;Mm9vuQ3eWE~bpM=r-_QJ(lE>)AqE%Vhkz(uU zf4p7Uj_E$Yi@nJ{Ax>|j=TQkosh-ep^ckTG$1KOG1d(D(iMGHjpB@gEHXE)c_hIfg zxyHRuGE=p(P`x1s8o(NR!r-hH@vL11`?#rMXQ*4K&N2u`ov8*2I)A(B&r3^jI#L)7JD2aR30;ke74ku3D}f9_tj6T34N3kCJPeKmXrhm@V#-*6juoKQzl2_`QmhOffw7g6e86wc4zZ z53t$EphbQ=dzNK_>}e~`w!k&5TNxk(&B(!JYJNr02QdPQrgztbZZew_VKt%Ya!f|B zvj~IEMszz{H|G)BA*8>O!XR+Z$XwyxJDKhWUnDImT)Odlm@sj>j6s+YhQ?ow&U9}X zf)K)Lz9*5yF6fqjf#tQh3`3^7IsVihAUW|Mi~v1|MBBE}bsMk7d;2II1DeEh?56lq z;`yNHHS5*-j5f@}?%Q%6_TfV*@4^U1Av~_AIvfotu#T89@j93TDfLeFuvu4c%~foY zc&SbPl&dLJ>m#Ny&Oy>S92Xygyib0(CNy^wtW?P+KNor*SJq^lxMPuFQ6bv3%QRbO zB)SzngM}fBo$(6e(GXpj{y=cTG+Bz)D0_kzq>HLY+%F!C7C8i&Ixir|fh)IWrn#G3fgreXKkc=KGS*A?)vba-w z_J(odM)bKNT|QSV1&rgcOT*yLWQOM)#Z$`dl7s5pXJgcYonDwkIW+RHzROXEG-~Y> zGDMfu`g22JT28%YJ_e&LenZ+}H*@0{v^U}=3)`UobWc)pNrmUMH-tebom=6mjgc6w zR5*)J($ROw6K(CKV9VHtE`a~EvlV%|deifa`{e^4aie&gyckQh=OZ{u^l1Y=AS*1^ zS$s$n+Bv>$tQC${h7@X%Kdydj55+5+4U4+2C+z)e^%ZFYuW1!89{}3mv00mloO) zi@~8Z7>IOdH{(eM|8yfk7hf8@-3DLMR;Q39f*0Ff5iph>UB_ zhDk|z1$v&plq8hxxR1X>qPr$Ef7QMnblnpl+nFOgzo{Q2Vk!bg!ni6faqC7uqSzTr zLDpeBK3>>LHdqX#W;V++XstY7`n2Sel6U~A*|FGf;=Nuwm_hR00sGH>{VgPxdZFU~ zS;#d?K^{Z~bzsno$}U*hUL_C^G;#3$EZn6V%+=Lv(PRzVFaBh=6n38vBIa^Dx&|WL zllD`~ViRU4aG!wHYJHYMEKFh<{6`=h6 z2lPpmJn+1EX?T>(#G+RN+xpi*vW1YNO^K7Y#JQw7Z^d|nyI;bnclf4-lALzxD_~u_ zInFco|5mbX8+kT9n8p9I!??v4uU+$JSvD?GRO{8-Fi@N^$$aos00uisk&J{Z1YVT( zJbbdf(1Td1DG5c@8pK5p@82jRl$5enO8UNzJE9hzB@f}-EHhlvEZTz)|C%U=v?-fP zdq8y+AD=i-6Pk!-kR&T+cuOTCW0@xr&CcS?R(_2?sxUo#N}FVFyv*fs%a7u6n5jNe zO1pGKbrEQWjjb9S1CJ08XZHv(EV07mR;@Qa152SfbMrl9bi*RjmQcDo`u-3U|)FqZ8a+>9fT4)q*`6Iepj04h_P zFSq9$<8%wKquGAPUw=*su*C1t#+R`)Tm*y4NPobtcHe|%t_uB#>`=5)MK>piO8{{Lips{UQ0u#u&OC$R^HlzGZY5z}=6@mK z?8EId&x{()DA`W&XlF^y29u$)fx}(W@^;$kdkeSiC!%k(c0M`sFn1D5Uh+V3uw^U^ zp{k;X_g}ULm-vnoN}?3%UU1b7K{Cr3c^;Ne!%~-EC;d0Cf$?A-#n+bz0H$KJ^P3G$ z&BZ&WpVET!09O86syQz}6Kd_QI8;VJe_iKvq)q1C(9I=HY>`mQAQWIoh66j0*B8GH za(A-&ggVCg{i&YnQ!?^;$pZ9nD6_WRAb@Yfcgc%Lv(rAyna39 z#(0oa5_`u7qjy%i7yP7@T1jMB#g5LcWAQY{fLv%C9hRNglaLGr%1;2Jn;~515SK{- zuJ{~zN~o?}rW97}=hD!VYxcl{mjEO(=@ggEw>6z0MPShUazD--ndx4+H+GHd<-tXS`vRM zWAb&sF%j?y&fJP>DB%#SkHnp6m)fIYJBEgVVBd+_Lrem{N=nc%r%LxurJsY{GUns; z8O8ETa8NvoyY_@hlp@xU>DaBm6*O`M#TYqc_pH1RE-A%lN&y8u}(K zbb>AfQI|cbp?%xxUu&?OwdBmGs*=kc@_+olEQ1!7p&U$rluwL^RA^WOFDI#3Seks z)&aG4L3$k1BP9+w68O#+kdWnAgy>4CgopbU?Mjei%!_suFDTp%SNl)lwIh(MGo}aw z=tQS+0mDX*CjOLR(dN7TxL!DCutrK8%l9li&f;>92zqp<- z9h#97FQ)_z9sV18e??!o9VzGgtSegKg1u-qeB=}2OE~5nB#C_0RE9~l9~hm7r?j^G zy1%$MqBhvAx+1vWx=`Nz&i<^?PQQ=gL&t^gj252uo#Q*l;N<#rhaNk(@|~YA_~qkY zwtc;Lg-_C0)hAbHMDDx$L8e0p)H_;xJaZ1D*Hh2`&v1iNp3~JcD&w>H@DQ7w>xKOw zPZDyt%BY$Ohog%cbX=fE^XlGQuOYCgdqC&Dmzo;<{u7*SIaYV2uCDIW2M->c2g*GG-N3+?KKsME75o(tuwd$xBC z|D8LU4LA|#fqPhgz)vsXrxg?a9fA8eF1gAzVm(3_du}h>6?E?YFTZ>mi+ficDukii z|DR1wA-Ii+I}gEnQypshC}UZDN=i!c7Sv*3SMof{YUTauKr4G`-4Rd&Io~AT(Q&bS zx_h9{{@-TZapXh}C7i|GIjj5pMw`tR_P(Pq6iI(bIP%L8BUGaP0Z6TreU=rdgt2tr zn-%Am7pS<-;=0!|Fu)%F7W!X=Ke=7<=Jmh+dhd=KcWzgCdGH^djoq*eey+u0(blR$ zTvYlZbHp9EOKf}k7Pdlmg0ws19FZM9J) z6W+;bIPhQ=-NO?!UQ3tn@TT+&ue*jH)+x&wxqhzj>0_rFwo;bipms&T{ELM z?hq(ZHmq&q&NDZ`r9U&kfood&O)@syGzwqwK`H_@=&$1jQ)ld%&=087Yf>Q&Vji3< zP}TBb2B#)3tn8<^UdHAJUxo-sH^H||GtQ$2LHLSiRo1njyWnh4w1VRZ3=VIxrK0m; zaSCUB8b3x31iQ)2`zCqUw1ekY&<0)ws210219Wo~y(m zh~~iI38*!o#e7Q-=%Wthj((U9L*R*F=aJZA`HZURjF^@U1Z_)aG8p^W;sgZ@?^@(= z^g|}U5V_$e`;frDg1rexfQNUHNL!ZewOFP}@<9t@S4tm_O@0kU7dVHE@8I7XtyZfD z5O_5E#n-q>I>cTu)=7zpx!9FXI2QRXq$R&XNWAe|3|zqC1M}z@mF*!7l)hlsl-T^g zt2$}Zbg$#8N#B=w&fhgIw?HlUk~T>?j8$~S^Yt1!*eN85SrObI&_mJ=Qx@I4@9@=& z-A!5fPdm!{l6X&Tbi|^a0UFysC1yXO*=X<6*w_dG4jF{ItU_@J%9TjJpI&U&Z_90s z;D--AXZG#nsTUn_|3(a!I(6~lMRuUj4Wka%{~l=-HV!^T0J>!uZcnHaFXwpBm9^}=rV`}0s3l~ZYO>R>#0KBt~*5RlNeZFLKDuxrU5TWkZ)zKw-))`{3B z-!_&h^Lmrn!6Ur+z`{2Quh~X4_kB(X!yj@d)^!6f?rB+uoQu&-r8gF>YwFT4Dn##$ zQcTdU>#4yH`}^s91TM_}_zHu;N&Y8VYi0o38K96a6wvWk!8;PD$8zv^511G{wuz5*feFI@qi?+K<8r1Y;_~omtLaWrLt+Q-c*U6YAFcL-O#lD@ literal 15406 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 diff --git a/demo/src/app/layout.tsx b/demo/src/app/layout.tsx index b6153573..f4587661 100644 --- a/demo/src/app/layout.tsx +++ b/demo/src/app/layout.tsx @@ -6,8 +6,8 @@ import './global.css' export const metadata: Metadata = { - title: "Astra.ai", - description: "A multimodal agent powered by TEN", + title: "TEN Agent", + description: "The World's First Multimodal AI Agent with the OpenAI Realtime API (Beta)", appleWebApp: { capable: true, statusBarStyle: "black", diff --git a/demo/src/common/constant.ts b/demo/src/common/constant.ts index b54cdc86..a483df00 100644 --- a/demo/src/common/constant.ts +++ b/demo/src/common/constant.ts @@ -1,12 +1,12 @@ import { IOptions, ColorItem, LanguageOptionItem, VoiceOptionItem, GraphOptionItem } from "@/types" -export const GITHUB_URL = "https://github.com/TEN-framework/ASTRA.ai" +export const GITHUB_URL = "https://github.com/TEN-framework/TEN-Agent" export const OPTIONS_KEY = "__options__" export const DEFAULT_OPTIONS: IOptions = { channel: "", userName: "", userId: 0 } -export const DESCRIPTION = "This is an AI voice assistant powered by ASTRA.ai framework, Agora, Azure and ChatGPT." +export const DESCRIPTION = "The World's First Multimodal AI Agent with the OpenAI Realtime API (Beta)" export const LANGUAGE_OPTIONS: LanguageOptionItem[] = [ { label: "English", @@ -34,10 +34,10 @@ export const GRAPH_OPTIONS: GraphOptionItem[] = [ label: "Voice Agent with Vision - OpenAI LLM + Azure TTS", value: "camera.va.openai.azure" }, - { - label: "Voice Agent with Knowledge - RAG + Qwen LLM + Cosy TTS", - value: "va.qwen.rag" - }, + // { + // label: "Voice Agent with Knowledge - RAG + Qwen LLM + Cosy TTS", + // value: "va.qwen.rag" + // }, { label: "Voice Agent with OpenAI Realtime API (Beta)", value: "va.openai.v2v" diff --git a/demo/src/components/loginCard/index.module.scss b/demo/src/components/loginCard/index.module.scss index 966ebc20..20f49963 100644 --- a/demo/src/components/loginCard/index.module.scss +++ b/demo/src/components/loginCard/index.module.scss @@ -39,19 +39,19 @@ .content { .title { - margin-bottom: 32px; + color: white; + font-weight: bold; + font-size: 25px; display: flex; flex-direction: column; align-items: center; - justify-content: center; - gap: 12px; - + margin-bottom: 10px; .text { - margin-top: 8px; color: var(--Grey-300, #EAECF0); text-align: center; - font-size: 18px; + font-size: 17px; font-weight: 500; + margin-bottom: 30px; } } diff --git a/demo/src/components/loginCard/index.tsx b/demo/src/components/loginCard/index.tsx index 56a78986..95df81b6 100644 --- a/demo/src/components/loginCard/index.tsx +++ b/demo/src/components/loginCard/index.tsx @@ -55,8 +55,8 @@ const LoginCard = () => {

- - Astra - a multimodal interactive agent + TEN Agent + The World's First Multimodal AI Agent with the OpenAI Realtime API (Beta)
diff --git a/demo/src/platform/pc/description/index.tsx b/demo/src/platform/pc/description/index.tsx index a9a055cd..45633da7 100644 --- a/demo/src/platform/pc/description/index.tsx +++ b/demo/src/platform/pc/description/index.tsx @@ -87,7 +87,7 @@ const Description = () => { return
Description - Astra is a multimodal agent powered by TEN + The World's First Multimodal AI Agent with the OpenAI Realtime API (Beta) {!agentConnected ? "Connect" : "Disconnect"} diff --git a/demo/src/platform/pc/header/index.module.scss b/demo/src/platform/pc/header/index.module.scss index 31138cc7..9e968a55 100644 --- a/demo/src/platform/pc/header/index.module.scss +++ b/demo/src/platform/pc/header/index.module.scss @@ -10,6 +10,11 @@ box-shadow: 0px 12px 16px -4px rgba(8, 15, 52, 0.06), 0px 4px 6px -2px rgba(8, 15, 52, 0.03); box-sizing: border-box; z-index: 999; + + .title { + color: white; + font-weight: bold; + } .logoWrapper { display: flex; diff --git a/demo/src/platform/pc/header/index.tsx b/demo/src/platform/pc/header/index.tsx index a55b3f04..2490da85 100644 --- a/demo/src/platform/pc/header/index.tsx +++ b/demo/src/platform/pc/header/index.tsx @@ -24,7 +24,8 @@ const Header = () => { return
- + {/* */} + TEN Agent From 383a07d5fdee43677f5023dfd4a5759a2c9d107b Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Wed, 2 Oct 2024 23:34:05 +0800 Subject: [PATCH 46/55] fix realtime api --- .../extension/openai_v2v_python/client.py | 170 ---- .../extension/openai_v2v_python/conf.py | 43 + .../extension/openai_v2v_python/extension.py | 39 +- .../extension/openai_v2v_python/messages.py | 872 ------------------ .../openai_v2v_python/realtime/connection.py | 110 +++ .../openai_v2v_python/realtime/struct.py | 684 ++++++++++++++ 6 files changed, 858 insertions(+), 1060 deletions(-) delete mode 100644 agents/ten_packages/extension/openai_v2v_python/client.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/conf.py delete mode 100644 agents/ten_packages/extension/openai_v2v_python/messages.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/realtime/connection.py create mode 100644 agents/ten_packages/extension/openai_v2v_python/realtime/struct.py diff --git a/agents/ten_packages/extension/openai_v2v_python/client.py b/agents/ten_packages/extension/openai_v2v_python/client.py deleted file mode 100644 index 471ccede..00000000 --- a/agents/ten_packages/extension/openai_v2v_python/client.py +++ /dev/null @@ -1,170 +0,0 @@ -import asyncio -import base64 -import json -import os -from typing import Any, AsyncGenerator - -import uuid -import aiohttp -from . import messages - -from .log import logger - -DEFAULT_MODEL = "gpt-4o-realtime-preview" - -def smart_str(s: str, max_field_len: int = 128) -> str: - """parse string as json, truncate data field to 128 characters, reserialize""" - try: - data = json.loads(s) - if "delta" in data: - key = "delta" - elif "audio" in data: - key = "audio" - else: - return s - - if len(data[key]) > max_field_len: - data[key] = data[key][:max_field_len] + "..." - return json.dumps(data) - except json.JSONDecodeError: - return s - - -def generate_client_event_id() -> str: - return str(uuid.uuid4()) - -class RealtimeApiConfig: - def __init__( - self, - base_uri: str = "wss://api.openai.com", - api_key: str | None = None, - path: str = "/v1/realtime", - verbose: bool = False, - model: str=DEFAULT_MODEL, - language: str = "en-US", - system_message: str="You are a helpful assistant, you are professional but lively and friendly. User's input will mainly be {language}, and your response must be {language}.", - temperature: float =0.5, - max_tokens: int =1024, - voice: messages.Voices = messages.Voices.Alloy, - server_vad:bool=True, - ): - self.base_uri = base_uri - self.api_key = api_key - self.path = path - self.verbose = verbose - self.model = model - self.language = language - self.system_message = system_message - self.temperature = temperature - self.max_tokens = max_tokens - self.voice = voice - self.server_vad = server_vad - - def build_ctx(self) -> dict: - return { - "language": self.language - } - -class RealtimeApiClient: - def __init__( - self, - base_uri: str, - api_key: str | None = None, - path: str = "/v1/realtime", - model: str = DEFAULT_MODEL, - verbose: bool = False, - session: aiohttp.ClientSession | None = None, - ): - is_local = ( - base_uri.startswith("localhost") - or base_uri.startswith("127.0.0.1") - or base_uri.startswith("0.0.0.0") - ) - has_scheme = base_uri.startswith("ws://") or base_uri.startswith("wss://") - self.url = f"{base_uri}{path}" - if model: - self.url += f"?model={model}" - if verbose: - logger.info(f"URL: {self.url} {is_local=} {has_scheme=}") - - if not has_scheme: - if is_local: - self.url = f"ws://{self.url}" - else: - self.url = f"wss://{self.url}" - - self.api_key = api_key or os.environ.get("OPENAI_API_KEY") - self.websocket: aiohttp.ClientWebSocketResponse | None = None - self.verbose = verbose - self.session = session or aiohttp.ClientSession() - - async def __aenter__(self) -> "RealtimeApiClient": - await self.connect() - return self - - async def __aexit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> bool: - await self.shutdown() - return False - - async def connect(self): - auth = aiohttp.BasicAuth("", self.api_key) if self.api_key else None - - headers = {"OpenAI-Beta": "realtime=v1"} - if "PROD_COMPLETIONS_API_KEY" in os.environ: - headers["X-Prod-Completions-Api-Key"] = os.environ["PROD_COMPLETIONS_API_KEY"] - elif "OPENAI_API_KEY" in os.environ: - headers["X-Prod-Completions-Api-Key"] = os.environ["OPENAI_API_KEY"] - if "PROD_COMPLETIONS_ORG_ID" in os.environ: - headers["X-Prod-Completions-Org-Id"] = os.environ["PROD_COMPLETIONS_ORG_ID"] - if headers: - logger.debug("Using X-Prod-Completions-* headers for api credentials") - - self.websocket = await self.session.ws_connect( - url=self.url, - auth=auth, - headers=headers, - ) - - async def send_audio_data(self, audio_data: bytes): - """audio_data is assumed to be pcm16 24kHz mono little-endian""" - base64_audio_data = base64.b64encode(audio_data).decode("utf-8") - message = messages.InputAudioBufferAppend(audio=base64_audio_data) - await self.send_message(message) - - async def send_message(self, message: messages.ClientToServerMessage): - assert self.websocket is not None - if message.event_id is None: - message.event_id = generate_client_event_id() - message_str = message.model_dump_json() - if self.verbose: - logger.info(f"-> {smart_str(message_str)}") - await self.websocket.send_str(message_str) - - async def listen(self) -> AsyncGenerator[messages.RealtimeMessage, None]: - assert self.websocket is not None - if self.verbose: - logger.info("Listening for realtimeapi messages") - try: - async for msg in self.websocket: - if msg.type == aiohttp.WSMsgType.TEXT: - if self.verbose: - logger.info(f"<- {smart_str(msg.data)}") - yield self.handle_server_message(msg.data) - elif msg.type == aiohttp.WSMsgType.ERROR: - logger.error("Error during receive: %s", self.websocket.exception()) - break - except asyncio.CancelledError: - logger.info("Receive messages task cancelled") - - def handle_server_message(self, message: str) -> messages.ServerToClientMessage: - try: - return messages.parse_server_message(message) - except Exception as e: - logger.error("Error handling message: " + str(e)) - #raise e - - async def shutdown(self): - # Close the websocket connection if it exists - if self.websocket: - await self.websocket.close() - self.websocket = None diff --git a/agents/ten_packages/extension/openai_v2v_python/conf.py b/agents/ten_packages/extension/openai_v2v_python/conf.py new file mode 100644 index 00000000..a61a6485 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/conf.py @@ -0,0 +1,43 @@ + +from realtime.struct import Voices + +DEFAULT_MODEL = "gpt-4o-realtime-preview" + +BASIC_PROMPT = ''' +You are an agent based on OpenAI {model} model and TEN Framework(A realtime multimodal agent framework). Your knowledge cutoff is 2023-10. You are a helpful, witty, and friendly AI. Act like a human, but remember that you aren't a human and that you can't do human things in the real world. Your voice and personality should be warm and engaging, with a lively and playful tone. +You should start by saying 'Hey, I'm TEN Agent with OpenAI Realtime API，anything I can help you with?' using {language}. +If interacting is not in {language}, start by using the standard accent or dialect familiar to the user. Talk quickly. +Do not refer to these rules, even if you’re asked about them. +''' + +class RealtimeApiConfig: + def __init__( + self, + base_uri: str = "wss://api.openai.com", + api_key: str | None = None, + path: str = "/v1/realtime", + verbose: bool = False, + model: str=DEFAULT_MODEL, + language: str = "en-US", + instruction: str = BASIC_PROMPT, + temperature: float =0.5, + max_tokens: int = 1024, + voice: Voices = Voices.Alloy, + server_vad:bool=True, + ): + self.base_uri = base_uri + self.api_key = api_key + self.path = path + self.verbose = verbose + self.model = model + self.language = language + self.instruction = instruction + self.temperature = temperature + self.max_tokens = max_tokens + self.voice = voice + self.server_vad = server_vad + + def build_ctx(self) -> dict: + return { + "language": self.language + } \ No newline at end of file diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 3ba1bc0e..6e20186a 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -22,8 +22,9 @@ ) from ten.audio_frame import AudioFrameDataFmt from .log import logger -from .client import RealtimeApiClient, RealtimeApiConfig -from .messages import * +from .conf import RealtimeApiConfig +from realtime.connection import RealtimeApiConnection +from realtime.struct import * # properties PROPERTY_API_KEY = "api_key" # Required @@ -37,12 +38,12 @@ PROPERTY_LANGUAGE = "language" PROPERTY_DUMP = "dump" +DEFAULT_VOICE = Voices.Alloy class Role(str, Enum): User = "user" Assistant = "assistant" - class OpenAIV2VExtension(Extension): def __init__(self, name: str): super().__init__(name) @@ -53,10 +54,10 @@ def __init__(self, name: str): # openai related self.config: RealtimeApiConfig = RealtimeApiConfig() - self.client: RealtimeApiClient = None + self.conn: RealtimeApiConnection = None self.connected: bool = False self.session_id: str = "" - self.session: Session = None + self.session: SessionUpdateParams = None self.ctx: dict = {} # audo related @@ -84,7 +85,7 @@ def start_event_loop(loop): target=start_event_loop, args=(self.loop,)) self.thread.start() - asyncio.run_coroutine_threadsafe(self._init_client(), self.loop) + asyncio.run_coroutine_threadsafe(self._init_connection(), self.loop) ten_env.on_start_done() @@ -134,11 +135,11 @@ def on_cmd(self, ten_env: TenEnv, cmd: Cmd) -> None: def on_data(self, ten_env: TenEnv, data: Data) -> None: pass - async def _init_client(self): + async def _init_connection(self): try: - self.client = RealtimeApiClient( - base_uri=self.config.base_uri, api_key=self.config.api_key, model=self.config.model, verbose=True) - logger.info(f"Finish init client {self.config} {self.client}") + self.conn = RealtimeApiConnection( + base_uri=self.config.base_uri, api_key=self.config.api_key, verbose=True) + logger.info(f"Finish init client {self.config} {self.conn}") except: logger.exception(f"Failed to create client {self.config}") @@ -148,7 +149,7 @@ def get_time_ms() -> int: return current_time.microsecond // 1000 try: - await self.client.connect() + await self.conn.connect() self.connected = True item_id = "" # For truncate response_id = "" @@ -157,7 +158,7 @@ def get_time_ms() -> int: flushed = set() logger.info("Client loop started") - async for message in self.client.listen(): + async for message in self.conn.listen(): try: logger.info(f"Received message: {message.type}") match message: @@ -167,10 +168,10 @@ def get_time_ms() -> int: self.session_id = message.session.id self.session = message.session update_msg = self._update_session() - await self.client.send_message(update_msg) + await self.conn.send_request(update_msg) # update_conversation = self.update_conversation() - # await self.client.send_message(update_conversation) + # await self.conn.send_request(update_conversation) case ItemInputAudioTranscriptionCompleted(): logger.info( f"On request transript {message.transcript}") @@ -231,7 +232,7 @@ def get_time_ms() -> int: if item_id: truncate = ItemTruncate( item_id=item_id, content_index=content_index, audio_end_ms=end_ms) - await self.client.send_message(truncate) + await self.conn.send_request(truncate) self._flush(ten_env) if response_id and self.transcript: transcript = self.transcript + "[interrupted]" @@ -262,7 +263,7 @@ async def _on_audio(self, buff: bytearray): self.out_audio_buff += buff # Buffer audio if len(self.out_audio_buff) >= self.audio_len_threshold and self.session_id != "": - await self.client.send_audio_data(self.out_audio_buff) + await self.conn.send_audio_data(self.out_audio_buff) logger.info( f"Send audio frame to OpenAI: {len(self.out_audio_buff)}") self.out_audio_buff = b'' @@ -348,15 +349,16 @@ def _fetch_properties(self, ten_env: TenEnv): self.ctx = self.config.build_ctx() def _update_session(self) -> SessionUpdate: - #prompt = self._replace(self.config.system_message) + prompt = self._replace(self.config.instruction) return SessionUpdate(session=SessionUpdateParams( - #instructions=prompt, + instructions=prompt, model=self.config.model, voice=self.config.voice, input_audio_transcription=InputAudioTranscription( model="whisper-1") )) + ''' def _update_conversation(self) -> UpdateConversationConfig: prompt = self._replace(self.config.system_message) conf = UpdateConversationConfig() @@ -367,6 +369,7 @@ def _update_conversation(self) -> UpdateConversationConfig: conf.disable_audio = False conf.output_audio_format = AudioFormats.PCM16 return conf + ''' def _replace(self, prompt: str) -> str: result = prompt diff --git a/agents/ten_packages/extension/openai_v2v_python/messages.py b/agents/ten_packages/extension/openai_v2v_python/messages.py deleted file mode 100644 index f448e035..00000000 --- a/agents/ten_packages/extension/openai_v2v_python/messages.py +++ /dev/null @@ -1,872 +0,0 @@ -import abc -from enum import Enum -from typing import Annotated, Any, Literal, Set - -from pydantic import BaseModel, PrivateAttr, TypeAdapter -from pydantic.fields import Field -from typing_extensions import override - -from .id import generate_event_id, generate_response_id - -#################################################################################################### -# Common -#################################################################################################### - - -class RealtimeError(BaseModel): - type: str - code: str | None = None - message: str - param: str | None = None - event_id: str | None = None - - -class ApiError(BaseModel): - type: str - code: str | None = None - message: str - param: str | None = None - - -class ResponseError(BaseModel): - type: str - code: str | None = None - message: str - - -DEFAULT_CONVERSATION = "default" - -DEFAULT_TEMPERATURE = 0.8 - - -class Voices(str, Enum): - Alloy = "alloy" - Echo = "echo" - Fable = "fable" - Nova = "nova" - Nova_2 = "nova_2" - Nova_3 = "nova_3" - Nova_4 = "nova_4" - Nova_5 = "nova_5" - Onyx = "onyx" - Shimmer = "shimmer" - - -DEFAULT_VOICE = Voices.Alloy - - -class AudioFormats(str, Enum): - PCM16 = "pcm16" - G711_ULAW = "g711_ulaw" - G711_ALAW = "g711_alaw" - - -DEFAULT_AUDIO_FORMAT = AudioFormats.PCM16 - - -class InputAudioTranscription(BaseModel): - # FIXME: add enabled - model: Literal["whisper-1"] - - -class ServerVAD(BaseModel): - type: Literal["server_vad"] = "server_vad" - threshold: float | None = None - prefix_padding_ms: int | None = None - silence_duration_ms: int | None = None - - -VAD_THRESHOLD_DEFAULT = 0.5 -VAD_PREFIX_PADDING_MS_DEFAULT = 300 -VAD_SILENCE_DURATION_MS_DEFAULT = 200 -DEFAULT_TURN_DETECTION = ServerVAD( - threshold=VAD_THRESHOLD_DEFAULT, - prefix_padding_ms=VAD_PREFIX_PADDING_MS_DEFAULT, - silence_duration_ms=VAD_SILENCE_DURATION_MS_DEFAULT, -) - - -class ServerVADUpdateParams(BaseModel): - # Always required - type: Literal["server_vad"] - threshold: float | None = None - prefix_padding_ms: int | None = None - silence_duration_ms: int | None = None - - -class FunctionToolChoice(BaseModel): - type: Literal["function"] = "function" - name: str - - -ToolChoice = Literal["none", "auto", "required"] | FunctionToolChoice - - -class ItemType(str, Enum): - message = "message" - function_call = "function_call" - function_call_output = "function_call_output" - - -class MessageRole(str, Enum): - system = "system" - user = "user" - assistant = "assistant" - - -class ContentType(str, Enum): - input_text = "input_text" - input_audio = "input_audio" - text = "text" - audio = "audio" - - -class InputTextContentPartParam(BaseModel): - type: Literal[ContentType.input_text] = ContentType.input_text - text: str - - -class InputAudioContentPartParam(BaseModel): - type: Literal[ContentType.input_audio] = ContentType.input_audio - audio: str - transcript: str | None = None - - -class OutputTextContentPartParam(BaseModel): - type: Literal[ContentType.text] = ContentType.text - text: str - - -SystemContentPartParam = InputTextContentPartParam -UserContentPartParam = InputTextContentPartParam | InputAudioContentPartParam -AssistantContentPartParam = OutputTextContentPartParam - -ItemParamStatus = Literal["incomplete", "completed"] - - -class SystemMessageItemParam(BaseModel): - id: str | None = None - type: Literal[ItemType.message] = ItemType.message - status: ItemParamStatus | None = None - role: Literal[MessageRole.system] = MessageRole.system - content: list[SystemContentPartParam] - - -class UserMessageItemParam(BaseModel): - id: str | None = None - type: Literal[ItemType.message] = ItemType.message - status: ItemParamStatus | None = None - role: Literal[MessageRole.user] = MessageRole.user - content: list[UserContentPartParam] - - -class AssistantMessageItemParam(BaseModel): - id: str | None = None - type: Literal[ItemType.message] = ItemType.message - status: ItemParamStatus | None = None - role: Literal[MessageRole.assistant] = MessageRole.assistant - content: list[AssistantContentPartParam] - - -class MessageReferenceItemParam(BaseModel): - type: Literal[ItemType.message] = ItemType.message - id: str - - -class FunctionCallItemParam(BaseModel): - id: str | None = None - type: Literal[ItemType.function_call] = ItemType.function_call - status: ItemParamStatus | None = None - name: str - call_id: str - arguments: str - - -class FunctionCallOutputItemParam(BaseModel): - id: str | None = None - type: Literal[ItemType.function_call_output] = ItemType.function_call_output - call_id: str - output: str - - -ItemParam = ( - SystemMessageItemParam - | UserMessageItemParam - | AssistantMessageItemParam - | FunctionCallItemParam - | FunctionCallOutputItemParam - # Note: it's important this comes after the other item types, so that we accept user-provided - # item IDs. - | MessageReferenceItemParam -) - -ItemStatus = Literal["in_progress", "completed", "incomplete"] - - -class BaseItem(BaseModel): - id: str | None = None - object: Literal["realtime.item"] | None = None - type: ItemType - - -class InputTextContentPart(BaseModel): - type: Literal[ContentType.input_text] = ContentType.input_text - text: str - - -class InputAudioContentPart(BaseModel): - type: Literal[ContentType.input_audio] = ContentType.input_audio - transcript: str | None - - -class TextContentPart(BaseModel): - type: Literal[ContentType.text] = ContentType.text - text: str - - -class AudioContentPart(BaseModel): - type: Literal[ContentType.audio] = ContentType.audio - transcript: str | None - _audio: str = PrivateAttr(default_factory=str) - - -ContentPart = InputTextContentPart | InputAudioContentPart | TextContentPart | AudioContentPart - - -class MessageItem(BaseItem): - type: Literal[ItemType.message] = ItemType.message - status: ItemStatus - role: MessageRole - content: list[ContentPart] - - -class FunctionCallItem(BaseItem): - type: Literal[ItemType.function_call] = ItemType.function_call - status: ItemStatus - name: str - call_id: str - arguments: str - - -class FunctionCallOutputItem(BaseItem): - type: Literal[ItemType.function_call_output] = ItemType.function_call_output - call_id: str - output: str - - -Item = MessageItem | FunctionCallItem | FunctionCallOutputItem -OutputItem = MessageItem | FunctionCallItem - -ResponseStatus = Literal["in_progress", "completed", "cancelled", "incomplete", "failed"] - - -class ResponseCancelledDetails(BaseModel): - type: Literal["cancelled"] = "cancelled" - reason: Literal["turn_detected", "client_cancelled"] - - -class ResponseIncompleteDetails(BaseModel): - type: Literal["incomplete"] = "incomplete" - reason: Literal["max_output_tokens", "content_filter"] - - -class ResponseFailedDetails(BaseModel): - type: Literal["failed"] = "failed" - error: ResponseError - - -ResponseStatusDetails = ResponseCancelledDetails | ResponseIncompleteDetails | ResponseFailedDetails - - -class InputTokenDetails(BaseModel): - cached_tokens: int = 0 - text_tokens: int = 0 - audio_tokens: int = 0 - - -class OutputTokenDetails(BaseModel): - text_tokens: int = 0 - audio_tokens: int = 0 - - -class Usage(BaseModel): - total_tokens: int = 0 - input_tokens: int = 0 - output_tokens: int = 0 - input_token_details: InputTokenDetails = InputTokenDetails() - output_token_details: OutputTokenDetails = OutputTokenDetails() - - -class RateLimitDetails(BaseModel): - name: str - limit: int - remaining: int - reset_seconds: float - - -#################################################################################################### -# Events -#################################################################################################### - - -class EventType(str, Enum): - # Client Events - - SESSION_UPDATE = "session.update" - INPUT_AUDIO_BUFFER_APPEND = "input_audio_buffer.append" - INPUT_AUDIO_BUFFER_COMMIT = "input_audio_buffer.commit" - INPUT_AUDIO_BUFFER_CLEAR = "input_audio_buffer.clear" - # TODO: gate to enabled users - UPDATE_CONVERSATION_CONFIG = "update_conversation_config" - ITEM_CREATE = "conversation.item.create" - ITEM_TRUNCATE = "conversation.item.truncate" - ITEM_DELETE = "conversation.item.delete" - RESPONSE_CREATE = "response.create" - RESPONSE_CANCEL = "response.cancel" - - # Server Events - - ERROR = "error" - SESSION_CREATED = "session.created" - SESSION_UPDATED = "session.updated" - - INPUT_AUDIO_BUFFER_COMMITTED = "input_audio_buffer.committed" - INPUT_AUDIO_BUFFER_CLEARED = "input_audio_buffer.cleared" - INPUT_AUDIO_BUFFER_SPEECH_STARTED = "input_audio_buffer.speech_started" - INPUT_AUDIO_BUFFER_SPEECH_STOPPED = "input_audio_buffer.speech_stopped" - - ITEM_CREATED = "conversation.item.created" - ITEM_DELETED = "conversation.item.deleted" - ITEM_TRUNCATED = "conversation.item.truncated" - ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED = ( - "conversation.item.input_audio_transcription.completed" - ) - ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED = "conversation.item.input_audio_transcription.failed" - - RESPONSE_CREATED = "response.created" - RESPONSE_CANCELLED = "response.cancelled" - RESPONSE_DONE = "response.done" - RESPONSE_OUTPUT_ITEM_ADDED = "response.output_item.added" - RESPONSE_OUTPUT_ITEM_DONE = "response.output_item.done" - RESPONSE_CONTENT_PART_ADDED = "response.content_part.added" - RESPONSE_CONTENT_PART_DONE = "response.content_part.done" - RESPONSE_TEXT_DELTA = "response.text.delta" - RESPONSE_TEXT_DONE = "response.text.done" - RESPONSE_AUDIO_TRANSCRIPT_DELTA = "response.audio_transcript.delta" - RESPONSE_AUDIO_TRANSCRIPT_DONE = "response.audio_transcript.done" - RESPONSE_AUDIO_DELTA = "response.audio.delta" - RESPONSE_AUDIO_DONE = "response.audio.done" - RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA = "response.function_call_arguments.delta" - RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE = "response.function_call_arguments.done" - RATE_LIMITS_UPDATED = "rate_limits.updated" - - -class RealtimeMessage(BaseModel, abc.ABC): - type: EventType - - -#################################################################################################### -# Client Events -# -# NOTE: See `api/params/client_events.py` for the xapi source of truth. -# Keep these classes in sync with the xapi versions for easier client and testing usage. -#################################################################################################### -class ClientToServerMessage(RealtimeMessage, abc.ABC): - event_id: str | None = None - - -class SessionUpdateParams(BaseModel): - """ - Update Events in the OpenAI API have specific behavior: - - If a field is not provided, it is not updated. - - If a field is provided, the new value is used for the field. - - If a null value is provided for a nullable field, that field is updated to null. - - If a null value is provided for a non-nullable field, the API will return an invalid type error. - - If a nested field is provided, and the parent object's type matches the current parent's type, - only that field is updated (i.e. the API supports sparse updates). If the parent object's type - is different from the current parent's type, the entire object is updated. - """ - - model: str | None = None - modalities: Set[Literal["text", "audio"]] | None = None - instructions: str | None = None - voice: Voices | None = None - turn_detection: ServerVADUpdateParams | None = None - input_audio_format: AudioFormats | None = None - output_audio_format: AudioFormats | None = None - input_audio_transcription: InputAudioTranscription | None = None - tools: list[dict[str, Any]] | None = None - tool_choice: ToolChoice | None = None - temperature: float | None = None - max_response_output_tokens: int | Literal["inf"] | None = None - - -class SessionUpdate(ClientToServerMessage): - type: Literal[EventType.SESSION_UPDATE] = EventType.SESSION_UPDATE - session: SessionUpdateParams - - @override - def model_dump(self, **kwargs) -> dict[str, Any]: - """ - Override model_dump to ensure `session` only includes set fields. - """ - dict_value = super().model_dump(**kwargs) - dict_value["session"] = self.session.model_dump(**kwargs, exclude_unset=True) - return dict_value - - @override - def model_dump_json(self, **kwargs) -> str: - """ - Override model_dump_json to ensure `session` only includes set fields. - """ - dict_value = self.model_dump(**kwargs) - return self.__pydantic_serializer__.to_json(value=dict_value, **kwargs).decode() - - -class InputAudioBufferAppend(ClientToServerMessage): - """ - Append audio data to the user audio buffer, this should be in the format specified by - input_audio_format in the session config. - """ - - type: Literal[EventType.INPUT_AUDIO_BUFFER_APPEND] = EventType.INPUT_AUDIO_BUFFER_APPEND - audio: str - - -class InputAudioBufferCommit(ClientToServerMessage): - """ - Commit the pending user audio buffer, which creates a user message item with the audio content - and clears the buffer. - """ - - type: Literal[EventType.INPUT_AUDIO_BUFFER_COMMIT] = EventType.INPUT_AUDIO_BUFFER_COMMIT - - -class InputAudioBufferClear(ClientToServerMessage): - """ - Clear the user audio buffer, discarding any pending audio data. - """ - - type: Literal[EventType.INPUT_AUDIO_BUFFER_CLEAR] = EventType.INPUT_AUDIO_BUFFER_CLEAR - - -class ItemCreate(ClientToServerMessage): - type: Literal[EventType.ITEM_CREATE] = EventType.ITEM_CREATE - previous_item_id: str | None = None - item: ItemParam - - -class ItemTruncate(ClientToServerMessage): - type: Literal[EventType.ITEM_TRUNCATE] = EventType.ITEM_TRUNCATE - item_id: str - content_index: int - audio_end_ms: int - - -class ItemDelete(ClientToServerMessage): - type: Literal[EventType.ITEM_DELETE] = EventType.ITEM_DELETE - item_id: str - - -class ResponseCreateParams(BaseModel): - """ - - commit: If true, the generated messages will be appended to the end of the conversation. - Only valid if conversation_label is set. - - cancel_previous: If True, the generation will cancel any pending generation for that specific - conversation. If False, the generation will be queued and will be generated after the - previous generation has completed. - - append_input_items: If set, these messages will be appended to the end of the conversation before - a response is generated. If commit is false, these messages will be discarded. This can only - be done with an existing conversation, and thus will throw an error if conversation_label is - not set or does not exist. - - input_items: If conversation_label is not set or does not exist, this will be the initial messages - of the conversation, i.e. the context of the generation. If the conversation exists, this will - throw an error. - """ - - # TODO: gate to enabled users - commit: bool = True - # TODO: gate to enabled users - cancel_previous: bool = True - # TODO: gate to enabled users - append_input_items: list[ItemParam] | None = None - # TODO: gate to enabled users - input_items: list[ItemParam] | None = None - modalities: Set[Literal["text", "audio"]] | None = None - instructions: str | None = None - voice: Voices | None = None - output_audio_format: AudioFormats | None = None - tools: list[dict[str, Any]] | None = None - tool_choice: ToolChoice | None = None - temperature: float | None = None - max_output_tokens: int | Literal["inf"] | None = None - - -class ResponseCreate(ClientToServerMessage): - """ - Trigger model inference to generate a model turn, the response will be streamed back with - a series of events, starting with an add_message event and ending with a turn_finished event. - If functions are enabled the response may be two, the second being a tool_call. - """ - - type: Literal[EventType.RESPONSE_CREATE] = EventType.RESPONSE_CREATE - response: ResponseCreateParams | None = None - - -class ResponseCancel(ClientToServerMessage): - type: Literal[EventType.RESPONSE_CANCEL] = EventType.RESPONSE_CANCEL - - -class Conversation(BaseModel): - messages: list[Item] - config: dict[str, Any] - - -# Temporarily leaving this here to support multi-convo path. -class UpdateConversationConfig(ClientToServerMessage): - type: Literal[EventType.UPDATE_CONVERSATION_CONFIG] = EventType.UPDATE_CONVERSATION_CONFIG - label: str = DEFAULT_CONVERSATION - subscribe_to_user_audio: bool | None = None - voice: Voices | None = None - system_message: str | None = None - temperature: float | None = None - max_tokens: int | None = None - tools: list[dict[str, Any]] | None = None - tool_choice: ToolChoice | None = None - disable_audio: bool | None = None - output_audio_format: AudioFormats | None = None - - -#################################################################################################### -# Server Events -#################################################################################################### - - -class ServerToClientMessage(RealtimeMessage, abc.ABC): - event_id: str = Field(default_factory=generate_event_id) - - -class Session(BaseModel): - id: str - object: Literal["realtime.session"] = "realtime.session" - model: str - expires_at: int - """ - The time at which this session will be forceably closed, expressed in seconds since epoch. - """ - modalities: Set[Literal["text", "audio"]] = Field(default_factory=lambda: {"text", "audio"}) - instructions: str - voice: Voices = DEFAULT_VOICE - turn_detection: ServerVAD | None = DEFAULT_TURN_DETECTION # null indicates disabled - input_audio_format: AudioFormats = DEFAULT_AUDIO_FORMAT - output_audio_format: AudioFormats = DEFAULT_AUDIO_FORMAT - input_audio_transcription: InputAudioTranscription | None = None # null indicates disabled - tools: list[dict] = [] - tool_choice: Literal["auto", "none", "required"] = "auto" - temperature: float = DEFAULT_TEMPERATURE - max_response_output_tokens: int | Literal["inf"] = "inf" - - -class Response(BaseModel): - object: Literal["realtime.response"] = "realtime.response" - id: str = Field(default_factory=generate_response_id) - - status: ResponseStatus = "in_progress" - status_details: ResponseStatusDetails | None = None - - output: list[Item] = Field(default_factory=list) - - usage: Usage | None = None - - -class ErrorMessage(ServerToClientMessage): - type: Literal[EventType.ERROR] = EventType.ERROR - error: RealtimeError - - -class SessionCreated(ServerToClientMessage): - type: Literal[EventType.SESSION_CREATED] = EventType.SESSION_CREATED - session: Session - -class SessionUpdated(ServerToClientMessage): - type: Literal[EventType.SESSION_UPDATED] = EventType.SESSION_UPDATED - session: Session - -class InputAudioBufferCommitted(ServerToClientMessage): - """ - Signals the server has received and processed the audio buffer. - """ - - type: Literal[EventType.INPUT_AUDIO_BUFFER_COMMITTED] = EventType.INPUT_AUDIO_BUFFER_COMMITTED - previous_item_id: str | None = None - # TODO: should we make this match conversation.item.created, and add item instead? - item_id: str - - -class InputAudioBufferCleared(ServerToClientMessage): - """ - Signals the server has cleared the audio buffer. - """ - - type: Literal[EventType.INPUT_AUDIO_BUFFER_CLEARED] = EventType.INPUT_AUDIO_BUFFER_CLEARED - - -class InputAudioBufferSpeechStarted(ServerToClientMessage): - """ - If the server VAD is enabled, this event is sent when speech is detected in the user audio buffer. - It tells you where in the audio stream (in milliseconds) the speech started, plus an item_id - which will be used in the corresponding speech_stopped event and the item created in the conversation - when speech stops. - """ - - type: Literal[EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED] = ( - EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED - ) - audio_start_ms: int - item_id: str - - -class InputAudioBufferSpeechStopped(ServerToClientMessage): - """ - If the server VAD is enabled, this event is sent when speech stops in the user audio buffer. - It tells you where in the audio stream (in milliseconds) the speech stopped, plus an item_id - which will be used in the corresponding speech_started event and the item created in the conversation - when speech starts. - """ - - type: Literal[EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED] = ( - EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED - ) - audio_end_ms: int - item_id: str | None = None - - -class ItemCreated(ServerToClientMessage): - type: Literal[EventType.ITEM_CREATED] = EventType.ITEM_CREATED - previous_item_id: str | None - item: Item - - -class ItemTruncated(ServerToClientMessage): - type: Literal[EventType.ITEM_TRUNCATED] = EventType.ITEM_TRUNCATED - item_id: str - content_index: int = 0 - audio_end_ms: int - - -class ItemDeleted(ServerToClientMessage): - type: Literal[EventType.ITEM_DELETED] = EventType.ITEM_DELETED - item_id: str - - -class ItemInputAudioTranscriptionCompleted(ServerToClientMessage): - type: Literal[EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED] = ( - EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED - ) - item_id: str - content_index: int - transcript: str - - -class ItemInputAudioTranscriptionFailed(ServerToClientMessage): - type: Literal[EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED] = ( - EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED - ) - item_id: str - content_index: int - error: ApiError - - -class ResponseCreated(ServerToClientMessage): - type: Literal[EventType.RESPONSE_CREATED] = EventType.RESPONSE_CREATED - response: Response - - -class ResponseDone(ServerToClientMessage): - type: Literal[EventType.RESPONSE_DONE] = EventType.RESPONSE_DONE - response: Response - - -class ResponseOutputItemAdded(ServerToClientMessage): - type: Literal[EventType.RESPONSE_OUTPUT_ITEM_ADDED] = EventType.RESPONSE_OUTPUT_ITEM_ADDED - response_id: str - output_index: int - item: OutputItem - - -class ResponseOutputItemDone(ServerToClientMessage): - type: Literal[EventType.RESPONSE_OUTPUT_ITEM_DONE] = EventType.RESPONSE_OUTPUT_ITEM_DONE - response_id: str - output_index: int - item: OutputItem - - -class ResponseContentPartAdded(ServerToClientMessage): - type: Literal[EventType.RESPONSE_CONTENT_PART_ADDED] = EventType.RESPONSE_CONTENT_PART_ADDED - response_id: str - item_id: str - output_index: int - content_index: int - part: ContentPart - - -class ResponseContentPartDone(ServerToClientMessage): - type: Literal[EventType.RESPONSE_CONTENT_PART_DONE] = EventType.RESPONSE_CONTENT_PART_DONE - response_id: str - item_id: str - output_index: int - content_index: int - part: ContentPart - - -class ResponseTextDelta(ServerToClientMessage): - type: Literal[EventType.RESPONSE_TEXT_DELTA] = EventType.RESPONSE_TEXT_DELTA - response_id: str - item_id: str - output_index: int - content_index: int - delta: str - - -class ResponseTextDone(ServerToClientMessage): - type: Literal[EventType.RESPONSE_TEXT_DONE] = EventType.RESPONSE_TEXT_DONE - response_id: str - item_id: str - output_index: int - content_index: int - text: str - - -class ResponseAudioTranscriptDelta(ServerToClientMessage): - type: Literal[EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA] = ( - EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA - ) - response_id: str - item_id: str - output_index: int - content_index: int - delta: str - - -class ResponseAudioTranscriptDone(ServerToClientMessage): - type: Literal[EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE] = ( - EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE - ) - response_id: str - item_id: str - output_index: int - content_index: int - transcript: str - - -class ResponseAudioDelta(ServerToClientMessage): - type: Literal[EventType.RESPONSE_AUDIO_DELTA] = EventType.RESPONSE_AUDIO_DELTA - response_id: str - item_id: str - output_index: int - content_index: int - delta: str - - -class ResponseAudioDone(ServerToClientMessage): - type: Literal[EventType.RESPONSE_AUDIO_DONE] = EventType.RESPONSE_AUDIO_DONE - response_id: str - item_id: str - output_index: int - content_index: int - - -class ResponseFunctionCallArgumentsDelta(ServerToClientMessage): - type: Literal[EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA] = ( - EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA - ) - response_id: str - item_id: str - output_index: int - call_id: str - delta: str - - -class ResponseFunctionCallArgumentsDone(ServerToClientMessage): - type: Literal[EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE] = ( - EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE - ) - response_id: str - item_id: str - output_index: int - call_id: str - name: str - arguments: str - - -DeltaType = ( - ResponseTextDelta - | ResponseAudioDelta - | ResponseAudioTranscriptDelta - | ResponseFunctionCallArgumentsDelta -) - - -class RateLimitsUpdated(ServerToClientMessage): - type: Literal[EventType.RATE_LIMITS_UPDATED] = EventType.RATE_LIMITS_UPDATED - rate_limits: list[RateLimitDetails] - - -ClientToServerMessages = ( - InputAudioBufferAppend - | InputAudioBufferClear - | InputAudioBufferCommit - | ItemCreate - | ItemDelete - | ItemTruncate - | ResponseCancel - | ResponseCreate - | SessionUpdate - # TODO: gate to enabled users - | UpdateConversationConfig -) - - -AnnotatedClientToServerMessages = Annotated[ClientToServerMessages, Field(discriminator="type")] - - -ServerToClientMessages = ( - ErrorMessage - | InputAudioBufferCleared - | InputAudioBufferCommitted - | InputAudioBufferSpeechStarted - | InputAudioBufferSpeechStopped - | ItemCreated - | ItemDeleted - | ItemInputAudioTranscriptionCompleted - | ItemTruncated - | RateLimitsUpdated - | ResponseAudioDelta - | ResponseAudioDone - | ResponseAudioTranscriptDelta - | ResponseAudioTranscriptDone - | ResponseContentPartAdded - | ResponseContentPartDone - | ResponseCreated - | ResponseDone - | ResponseFunctionCallArgumentsDelta - | ResponseFunctionCallArgumentsDone - | ResponseOutputItemAdded - | ResponseOutputItemDone - | ResponseTextDelta - | ResponseTextDone - | SessionCreated - | SessionUpdated -) - -AnnotatedServerToClientMessages = Annotated[ServerToClientMessages, Field(discriminator="type")] - - -def parse_client_message(unparsed_string: str) -> ClientToServerMessage: - adapter: TypeAdapter[ClientToServerMessages] = TypeAdapter(AnnotatedClientToServerMessages) # type: ignore[arg-type] - return adapter.validate_json(unparsed_string) - - -def parse_server_message(unparsed_string: str) -> ServerToClientMessage: - adapter: TypeAdapter[ServerToClientMessage] = TypeAdapter(AnnotatedServerToClientMessages) # type: ignore[arg-type] - return adapter.validate_json(unparsed_string) diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py b/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py new file mode 100644 index 00000000..17803f5a --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py @@ -0,0 +1,110 @@ +import asyncio +import base64 +import json +import os +import aiohttp +import uuid + +from typing import Any, AsyncGenerator +from .struct import InputAudioBufferAppend, ClientToServerMessage, ServerToClientMessage, parse_server_message, to_json +from ..log import logger + +DEFAULT_VIRTUAL_MODEL = "gpt-4o-realtime-preview" + +def generate_client_event_id() -> str: + return str(uuid.uuid4()) + +def smart_str(s: str, max_field_len: int = 128) -> str: + """parse string as json, truncate data field to 128 characters, reserialize""" + try: + data = json.loads(s) + if "delta" in data: + key = "delta" + elif "audio" in data: + key = "audio" + else: + return s + + if len(data[key]) > max_field_len: + data[key] = data[key][:max_field_len] + "..." + return json.dumps(data) + except json.JSONDecodeError: + return s + + +class RealtimeApiConnection: + def __init__( + self, + base_uri: str, + api_key: str | None = None, + path: str = "/v1/realtime", + verbose: bool = False, + ): + self.url = f"wss://{base_uri}{path}" + + self.api_key = api_key or os.environ.get("OPENAI_API_KEY") + self.websocket: aiohttp.ClientWebSocketResponse | None = None + self.verbose = verbose + self.session = aiohttp.ClientSession() + + async def __aenter__(self) -> "RealtimeApiConnection": + await self.connect() + return self + + async def __aexit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> bool: + await self.shutdown() + return False + + async def connect(self): + auth = aiohttp.BasicAuth("", self.api_key) if self.api_key else None + + headers = {"OpenAI-Beta": "realtime=v1"} + + self.websocket = await self.session.ws_connect( + url=self.url, + auth=auth, + headers=headers, + ) + + async def send_audio_data(self, audio_data: bytes): + """audio_data is assumed to be pcm16 24kHz mono little-endian""" + base64_audio_data = base64.b64encode(audio_data).decode("utf-8") + message = InputAudioBufferAppend(audio=base64_audio_data) + await self.send_request(message) + + async def send_request(self, message: ClientToServerMessage): + assert self.websocket is not None + if message.event_id is None: + message.event_id = generate_client_event_id() + message_str = to_json(message) + if self.verbose: + logger.info(f"-> {smart_str(message_str)}") + await self.websocket.send_str(message_str) + + async def listen(self) -> AsyncGenerator[ServerToClientMessage, None]: + assert self.websocket is not None + if self.verbose: + logger.info("Listening for realtimeapi messages") + try: + async for msg in self.websocket: + if msg.type == aiohttp.WSMsgType.TEXT: + if self.verbose: + logger.info(f"<- {smart_str(msg.data)}") + yield self.handle_server_message(msg.data) + elif msg.type == aiohttp.WSMsgType.ERROR: + logger.error("Error during receive: %s", self.websocket.exception()) + break + except asyncio.CancelledError: + logger.info("Receive messages task cancelled") + + def handle_server_message(self, message: str) -> ServerToClientMessage: + try: + return parse_server_message(message) + except Exception as e: + logger.error("Error handling message: " + str(e)) + + async def close(self): + # Close the websocket connection if it exists + if self.websocket: + await self.websocket.close() + self.websocket = None diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py new file mode 100644 index 00000000..bbcac827 --- /dev/null +++ b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py @@ -0,0 +1,684 @@ +import json + +from dataclasses import dataclass, asdict, field +from typing import Any, Dict, Literal, Optional, List, Set, Union +from enum import Enum + +# Enums +class Voices(str, Enum): + Alloy = "alloy" + Echo = "echo" + Fable = "fable" + Nova = "nova" + Nova_2 = "nova_2" + Nova_3 = "nova_3" + Nova_4 = "nova_4" + Nova_5 = "nova_5" + Onyx = "onyx" + Shimmer = "shimmer" + +class AudioFormats(str, Enum): + PCM16 = "pcm16" + G711_ULAW = "g711_ulaw" + G711_ALAW = "g711_alaw" + +class ItemType(str, Enum): + Message = "message" + FunctionCall = "function_call" + FunctionCallOutput = "function_call_output" + +class MessageRole(str, Enum): + System = "system" + User = "user" + Assistant = "assistant" + +class ContentType(str, Enum): + InputText = "input_text" + InputAudio = "input_audio" + Text = "text" + Audio = "audio" + +@dataclass +class FunctionToolChoice: + type: str = "function" # Fixed value for type + name: str # Name of the function + +# ToolChoice can be either a literal string or FunctionToolChoice +ToolChoice = Union[str, FunctionToolChoice] # "none", "auto", "required", or FunctionToolChoice + +@dataclass +class RealtimeError: + type: str # The type of the error + code: Optional[str] = None # Optional error code + message: str # The error message + param: Optional[str] = None # Optional parameter related to the error + event_id: Optional[str] = None # Optional event ID for tracing + +@dataclass +class InputAudioTranscription: + model: str = "whisper-1" # Default transcription model is "whisper-1" + +@dataclass +class ServerVADUpdateParams: + type: str = "server_vad" # Fixed value for VAD type + threshold: Optional[float] = None # Threshold for voice activity detection + prefix_padding_ms: Optional[int] = None # Amount of padding before the voice starts (in milliseconds) + silence_duration_ms: Optional[int] = None # Duration of silence before considering speech stopped (in milliseconds) + +@dataclass +class SessionUpdateParams: + model: Optional[str] = None # Optional string to specify the model + modalities: Optional[Set[str]] = None # Set of allowed modalities (e.g., "text", "audio") + instructions: Optional[str] = None # Optional instructions string + voice: Optional[Voices] = None # Voice selection, can be `None` or from `Voices` Enum + turn_detection: Optional[ServerVADUpdateParams] = None # Server VAD update params + input_audio_format: Optional[AudioFormats] = None # Input audio format from `AudioFormats` Enum + output_audio_format: Optional[AudioFormats] = None # Output audio format from `AudioFormats` Enum + input_audio_transcription: Optional[InputAudioTranscription] = None # Optional transcription model + tools: Optional[List[Dict[str, Union[str, any]]]] = None # List of tools (e.g., dictionaries) + tool_choice: Optional[ToolChoice] = None # ToolChoice, either string or `FunctionToolChoice` + temperature: Optional[float] = None # Optional temperature for response generation + max_response_output_tokens: Optional[Union[int, str]] = None # Max response tokens, "inf" for infinite + +# Define individual message item param types +@dataclass +class SystemMessageItemParam: + id: Optional[str] = None + type: str = "message" + status: Optional[str] = None + role: str = "system" + content: List[dict] # This can be more specific based on content structure + +@dataclass +class UserMessageItemParam: + id: Optional[str] = None + type: str = "message" + status: Optional[str] = None + role: str = "user" + content: List[dict] # Similarly, content can be more specific + +@dataclass +class AssistantMessageItemParam: + id: Optional[str] = None + type: str = "message" + status: Optional[str] = None + role: str = "assistant" + content: List[dict] # Content structure here depends on your schema + +@dataclass +class FunctionCallItemParam: + id: Optional[str] = None + type: str = "function_call" + status: Optional[str] = None + name: str + call_id: str + arguments: str + +@dataclass +class FunctionCallOutputItemParam: + id: Optional[str] = None + type: str = "function_call_output" + call_id: str + output: str + +# Union of all possible item types +ItemParam = Union[ + SystemMessageItemParam, + UserMessageItemParam, + AssistantMessageItemParam, + FunctionCallItemParam, + FunctionCallOutputItemParam +] + + +# Assuming the EventType and other enums are already defined +# For reference: +class EventType(str, Enum): + SESSION_UPDATE = "session.update" + INPUT_AUDIO_BUFFER_APPEND = "input_audio_buffer.append" + INPUT_AUDIO_BUFFER_COMMIT = "input_audio_buffer.commit" + INPUT_AUDIO_BUFFER_CLEAR = "input_audio_buffer.clear" + UPDATE_CONVERSATION_CONFIG = "update_conversation_config" + ITEM_CREATE = "conversation.item.create" + ITEM_TRUNCATE = "conversation.item.truncate" + ITEM_DELETE = "conversation.item.delete" + RESPONSE_CREATE = "response.create" + RESPONSE_CANCEL = "response.cancel" + + ERROR = "error" + SESSION_CREATED = "session.created" + SESSION_UPDATED = "session.updated" + + INPUT_AUDIO_BUFFER_COMMITTED = "input_audio_buffer.committed" + INPUT_AUDIO_BUFFER_CLEARED = "input_audio_buffer.cleared" + INPUT_AUDIO_BUFFER_SPEECH_STARTED = "input_audio_buffer.speech_started" + INPUT_AUDIO_BUFFER_SPEECH_STOPPED = "input_audio_buffer.speech_stopped" + + ITEM_CREATED = "conversation.item.created" + ITEM_DELETED = "conversation.item.deleted" + ITEM_TRUNCATED = "conversation.item.truncated" + ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED = "conversation.item.input_audio_transcription.completed" + ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED = "conversation.item.input_audio_transcription.failed" + + RESPONSE_CREATED = "response.created" + RESPONSE_CANCELLED = "response.cancelled" + RESPONSE_DONE = "response.done" + RESPONSE_OUTPUT_ITEM_ADDED = "response.output_item.added" + RESPONSE_OUTPUT_ITEM_DONE = "response.output_item.done" + RESPONSE_CONTENT_PART_ADDED = "response.content_part.added" + RESPONSE_CONTENT_PART_DONE = "response.content_part.done" + RESPONSE_TEXT_DELTA = "response.text.delta" + RESPONSE_TEXT_DONE = "response.text.done" + RESPONSE_AUDIO_TRANSCRIPT_DELTA = "response.audio_transcript.delta" + RESPONSE_AUDIO_TRANSCRIPT_DONE = "response.audio_transcript.done" + RESPONSE_AUDIO_DELTA = "response.audio.delta" + RESPONSE_AUDIO_DONE = "response.audio.done" + RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA = "response.function_call_arguments.delta" + RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE = "response.function_call_arguments.done" + RATE_LIMITS_UPDATED = "rate_limits.updated" + +# Base class for all ServerToClientMessages +@dataclass +class ServerToClientMessage: + event_id: str + + +@dataclass +class ErrorMessage(ServerToClientMessage): + type: str = EventType.ERROR + error: RealtimeError + + +@dataclass +class SessionCreated(ServerToClientMessage): + type: str = EventType.SESSION_CREATED + session: SessionUpdateParams + + +@dataclass +class SessionUpdated(ServerToClientMessage): + type: str = EventType.SESSION_UPDATED + session: SessionUpdateParams + + +@dataclass +class InputAudioBufferCommitted(ServerToClientMessage): + type: str = EventType.INPUT_AUDIO_BUFFER_COMMITTED + previous_item_id: Optional[str] = None + item_id: str + + +@dataclass +class InputAudioBufferCleared(ServerToClientMessage): + type: str = EventType.INPUT_AUDIO_BUFFER_CLEARED + + +@dataclass +class InputAudioBufferSpeechStarted(ServerToClientMessage): + type: str = EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED + audio_start_ms: int + item_id: str + + +@dataclass +class InputAudioBufferSpeechStopped(ServerToClientMessage): + type: str = EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED + audio_end_ms: int + item_id: Optional[str] = None + + +@dataclass +class ItemCreated(ServerToClientMessage): + type: str = EventType.ITEM_CREATED + previous_item_id: Optional[str] = None + item: ItemParam + + +@dataclass +class ItemTruncated(ServerToClientMessage): + type: str = EventType.ITEM_TRUNCATED + item_id: str + content_index: int + audio_end_ms: int + + +@dataclass +class ItemDeleted(ServerToClientMessage): + type: str = EventType.ITEM_DELETED + item_id: str + + +# Assuming the necessary enums, ItemParam, and other classes are defined above +# ResponseStatus could be a string or an enum, depending on your schema + +# Enum or Literal for ResponseStatus (could be more extensive) +ResponseStatus = Union[str, Literal["in_progress", "completed", "cancelled", "incomplete", "failed"]] + +# Define status detail classes +@dataclass +class ResponseCancelledDetails: + type: str = "cancelled" + reason: str # e.g., "turn_detected", "client_cancelled" + +@dataclass +class ResponseIncompleteDetails: + type: str = "incomplete" + reason: str # e.g., "max_output_tokens", "content_filter" + +@dataclass +class ResponseError: + type: str # The type of the error, e.g., "validation_error", "server_error" + code: Optional[str] = None # Optional error code, e.g., HTTP status code, API error code + message: str # The error message describing what went wrong + +@dataclass +class ResponseFailedDetails: + type: str = "failed" + error: ResponseError # Assuming ResponseError is already defined + +# Union of possible status details +ResponseStatusDetails = Union[ResponseCancelledDetails, ResponseIncompleteDetails, ResponseFailedDetails] + +# Define Usage class to handle token usage +@dataclass +class InputTokenDetails: + cached_tokens: int + text_tokens: int + audio_tokens: int + +@dataclass +class OutputTokenDetails: + text_tokens: int + audio_tokens: int + +@dataclass +class Usage: + total_tokens: int + input_tokens: int + output_tokens: int + input_token_details: InputTokenDetails + output_token_details: OutputTokenDetails + +# The Response dataclass definition +@dataclass +class Response: + object: str = "realtime.response" # Fixed value for object type + id: str # Unique ID for the response + status: ResponseStatus = "in_progress" # Status of the response + status_details: Optional[ResponseStatusDetails] = None # Additional details based on status + output: List[ItemParam] = field(default_factory=list) # List of items in the response + usage: Optional[Usage] = None # Token usage information + + + +@dataclass +class ResponseCreated(ServerToClientMessage): + type: str = EventType.RESPONSE_CREATED + response: Response + + +@dataclass +class ResponseDone(ServerToClientMessage): + type: str = EventType.RESPONSE_DONE + response: Response + + +@dataclass +class ResponseTextDelta(ServerToClientMessage): + type: str = EventType.RESPONSE_TEXT_DELTA + response_id: str + item_id: str + output_index: int + content_index: int + delta: str + + +@dataclass +class ResponseTextDone(ServerToClientMessage): + type: str = EventType.RESPONSE_TEXT_DONE + response_id: str + item_id: str + output_index: int + content_index: int + text: str + + +@dataclass +class ResponseAudioTranscriptDelta(ServerToClientMessage): + type: str = EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA + response_id: str + item_id: str + output_index: int + content_index: int + delta: str + + +@dataclass +class ResponseAudioTranscriptDone(ServerToClientMessage): + type: str = EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE + response_id: str + item_id: str + output_index: int + content_index: int + transcript: str + + +@dataclass +class ResponseAudioDelta(ServerToClientMessage): + type: str = EventType.RESPONSE_AUDIO_DELTA + response_id: str + item_id: str + output_index: int + content_index: int + delta: str + + +@dataclass +class ResponseAudioDone(ServerToClientMessage): + type: str = EventType.RESPONSE_AUDIO_DONE + response_id: str + item_id: str + output_index: int + content_index: int + + +@dataclass +class ResponseFunctionCallArgumentsDelta(ServerToClientMessage): + type: str = EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA + response_id: str + item_id: str + output_index: int + call_id: str + delta: str + + +@dataclass +class ResponseFunctionCallArgumentsDone(ServerToClientMessage): + type: str = EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE + response_id: str + item_id: str + output_index: int + call_id: str + name: str + arguments: str + + +@dataclass +class RateLimitDetails: + name: str # Name of the rate limit, e.g., "api_requests", "message_generation" + limit: int # The maximum number of allowed requests in the current time window + remaining: int # The number of requests remaining in the current time window + reset_seconds: float # The number of seconds until the rate limit resets + +@dataclass +class RateLimitsUpdated(ServerToClientMessage): + type: str = EventType.RATE_LIMITS_UPDATED + rate_limits: List[RateLimitDetails] + + +@dataclass +class ResponseOutputItemAdded(ServerToClientMessage): + type: str = "response.output_item.added" # Fixed event type + response_id: str # The ID of the response + output_index: int # Index of the output item in the response + item: Union[ItemParam, None] # The added item (can be a message, function call, etc.) + +@dataclass +class ResponseContentPartAdded(ServerToClientMessage): + type: str = "response.content_part.added" # Fixed event type + response_id: str # The ID of the response + item_id: str # The ID of the item to which the content part was added + output_index: int # Index of the output item in the response + content_index: int # Index of the content part in the output + part: Union[ItemParam, None] # The added content part + +@dataclass +class ResponseContentPartDone(ServerToClientMessage): + type: str = "response.content_part.done" # Fixed event type + response_id: str # The ID of the response + item_id: str # The ID of the item to which the content part belongs + output_index: int # Index of the output item in the response + content_index: int # Index of the content part in the output + part: Union[ItemParam, None] # The content part that was completed + +@dataclass +class ResponseOutputItemDone(ServerToClientMessage): + type: str = "response.output_item.done" # Fixed event type + response_id: str # The ID of the response + output_index: int # Index of the output item in the response + item: Union[ItemParam, None] # The output item that was completed + +@dataclass +class ItemInputAudioTranscriptionCompleted(ServerToClientMessage): + type: str = "conversation.item.input_audio_transcription.completed" # Fixed event type + item_id: str # The ID of the item for which transcription was completed + content_index: int # Index of the content part that was transcribed + transcript: str # The transcribed text + +@dataclass +class ItemInputAudioTranscriptionFailed(ServerToClientMessage): + type: str = "conversation.item.input_audio_transcription.failed" # Fixed event type + item_id: str # The ID of the item for which transcription failed + content_index: int # Index of the content part that failed to transcribe + error: ResponseError # Error details explaining the failure + +# Union of all server-to-client message types +ServerToClientMessages = Union[ + ErrorMessage, + SessionCreated, + SessionUpdated, + InputAudioBufferCommitted, + InputAudioBufferCleared, + InputAudioBufferSpeechStarted, + InputAudioBufferSpeechStopped, + ItemCreated, + ItemTruncated, + ItemDeleted, + ResponseCreated, + ResponseDone, + ResponseTextDelta, + ResponseTextDone, + ResponseAudioTranscriptDelta, + ResponseAudioTranscriptDone, + ResponseAudioDelta, + ResponseAudioDone, + ResponseFunctionCallArgumentsDelta, + ResponseFunctionCallArgumentsDone, + RateLimitsUpdated, + ResponseOutputItemAdded, + ResponseContentPartAdded, + ResponseContentPartDone, + ResponseOutputItemDone, + ItemInputAudioTranscriptionCompleted, + ItemInputAudioTranscriptionFailed +] + + + +# Base class for all ClientToServerMessages +@dataclass +class ClientToServerMessage: + event_id: Optional[str] = None # Optional since some messages may not need it + + +@dataclass +class InputAudioBufferAppend(ClientToServerMessage): + type: str = EventType.INPUT_AUDIO_BUFFER_APPEND + audio: str + + +@dataclass +class InputAudioBufferCommit(ClientToServerMessage): + type: str = EventType.INPUT_AUDIO_BUFFER_COMMIT + + +@dataclass +class InputAudioBufferClear(ClientToServerMessage): + type: str = EventType.INPUT_AUDIO_BUFFER_CLEAR + + +@dataclass +class ItemCreate(ClientToServerMessage): + type: str = EventType.ITEM_CREATE + previous_item_id: Optional[str] = None + item: ItemParam # Assuming `ItemParam` is already defined + + +@dataclass +class ItemTruncate(ClientToServerMessage): + type: str = EventType.ITEM_TRUNCATE + item_id: str + content_index: int + audio_end_ms: int + + +@dataclass +class ItemDelete(ClientToServerMessage): + type: str = EventType.ITEM_DELETE + item_id: str + +@dataclass +class ResponseCreateParams: + commit: bool = True # Whether the generated messages should be appended to the conversation + cancel_previous: bool = True # Whether to cancel the previous pending generation + append_input_items: Optional[List[ItemParam]] = None # Messages to append before response generation + input_items: Optional[List[ItemParam]] = None # Initial messages to use for generation + modalities: Optional[Set[str]] = None # Allowed modalities (e.g., "text", "audio") + instructions: Optional[str] = None # Instructions or guidance for the model + voice: Optional[Voices] = None # Voice setting for audio output + output_audio_format: Optional[AudioFormats] = None # Format for the audio output + tools: Optional[List[Dict[str, Any]]] = None # Tools available for this response + tool_choice: Optional[ToolChoice] = None # How to choose the tool ("auto", "required", etc.) + temperature: Optional[float] = None # The randomness of the model's responses + max_response_output_tokens: Optional[Union[int, str]] = None # Max number of tokens for the output, "inf" for infinite + + +@dataclass +class ResponseCreate(ClientToServerMessage): + type: str = EventType.RESPONSE_CREATE + response: Optional[ResponseCreateParams] = None # Assuming `ResponseCreateParams` is defined + + +@dataclass +class ResponseCancel(ClientToServerMessage): + type: str = EventType.RESPONSE_CANCEL + +DEFAULT_CONVERSATION = "default" + +@dataclass +class UpdateConversationConfig(ClientToServerMessage): + type: str = EventType.UPDATE_CONVERSATION_CONFIG + label: str = DEFAULT_CONVERSATION + subscribe_to_user_audio: Optional[bool] = None + voice: Optional[Voices] = None + system_message: Optional[str] = None + temperature: Optional[float] = None + max_tokens: Optional[int] = None + tools: Optional[List[dict]] = None + tool_choice: Optional[ToolChoice] = None + disable_audio: Optional[bool] = None + output_audio_format: Optional[AudioFormats] = None + + +@dataclass +class SessionUpdate(ClientToServerMessage): + type: str = EventType.SESSION_UPDATE + session: SessionUpdateParams # Assuming `SessionUpdateParams` is defined + + +# Union of all client-to-server message types +ClientToServerMessages = Union[ + InputAudioBufferAppend, + InputAudioBufferCommit, + InputAudioBufferClear, + ItemCreate, + ItemTruncate, + ItemDelete, + ResponseCreate, + ResponseCancel, + UpdateConversationConfig, + SessionUpdate +] + + +def parse_client_message(unparsed_string: str) -> ClientToServerMessage: + data = json.loads(unparsed_string) + + if data["type"] == EventType.INPUT_AUDIO_BUFFER_APPEND: + return InputAudioBufferAppend(**data) + elif data["type"] == EventType.INPUT_AUDIO_BUFFER_COMMIT: + return InputAudioBufferCommit(**data) + elif data["type"] == EventType.INPUT_AUDIO_BUFFER_CLEAR: + return InputAudioBufferClear(**data) + elif data["type"] == EventType.ITEM_CREATE: + return ItemCreate(**data) + elif data["type"] == EventType.ITEM_TRUNCATE: + return ItemTruncate(**data) + elif data["type"] == EventType.ITEM_DELETE: + return ItemDelete(**data) + elif data["type"] == EventType.RESPONSE_CREATE: + return ResponseCreate(**data) + elif data["type"] == EventType.RESPONSE_CANCEL: + return ResponseCancel(**data) + elif data["type"] == EventType.UPDATE_CONVERSATION_CONFIG: + return UpdateConversationConfig(**data) + elif data["type"] == EventType.SESSION_UPDATE: + return SessionUpdate(**data) + + raise ValueError(f"Unknown message type: {data['type']}") + + +# Assuming all necessary classes and enums (EventType, ServerToClientMessages, etc.) are imported +# Here’s how you can dynamically parse a server-to-client message based on the `type` field: + +def parse_server_message(unparsed_string: str) -> ServerToClientMessage: + data = json.loads(unparsed_string) + + # Dynamically select the correct message class based on the `type` field + if data["type"] == EventType.ERROR: + return ErrorMessage(**data) + elif data["type"] == EventType.SESSION_CREATED: + return SessionCreated(**data) + elif data["type"] == EventType.SESSION_UPDATED: + return SessionUpdated(**data) + elif data["type"] == EventType.INPUT_AUDIO_BUFFER_COMMITTED: + return InputAudioBufferCommitted(**data) + elif data["type"] == EventType.INPUT_AUDIO_BUFFER_CLEARED: + return InputAudioBufferCleared(**data) + elif data["type"] == EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED: + return InputAudioBufferSpeechStarted(**data) + elif data["type"] == EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED: + return InputAudioBufferSpeechStopped(**data) + elif data["type"] == EventType.ITEM_CREATED: + return ItemCreated(**data) + elif data["type"] == EventType.ITEM_TRUNCATED: + return ItemTruncated(**data) + elif data["type"] == EventType.ITEM_DELETED: + return ItemDeleted(**data) + elif data["type"] == EventType.RESPONSE_CREATED: + return ResponseCreated(**data) + elif data["type"] == EventType.RESPONSE_DONE: + return ResponseDone(**data) + elif data["type"] == EventType.RESPONSE_TEXT_DELTA: + return ResponseTextDelta(**data) + elif data["type"] == EventType.RESPONSE_TEXT_DONE: + return ResponseTextDone(**data) + elif data["type"] == EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA: + return ResponseAudioTranscriptDelta(**data) + elif data["type"] == EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE: + return ResponseAudioTranscriptDone(**data) + elif data["type"] == EventType.RESPONSE_AUDIO_DELTA: + return ResponseAudioDelta(**data) + elif data["type"] == EventType.RESPONSE_AUDIO_DONE: + return ResponseAudioDone(**data) + elif data["type"] == EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA: + return ResponseFunctionCallArgumentsDelta(**data) + elif data["type"] == EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE: + return ResponseFunctionCallArgumentsDone(**data) + elif data["type"] == EventType.RATE_LIMITS_UPDATED: + return RateLimitsUpdated(**data) + + raise ValueError(f"Unknown message type: {data['type']}") + +def to_json(obj: Union[ClientToServerMessage, ServerToClientMessage]) -> str: + return json.dumps(asdict(obj)) \ No newline at end of file From fbb215f928b2868f2792de3d999a37bfa59ee25f Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 00:36:02 +0800 Subject: [PATCH 47/55] fix bugs --- .../extension/openai_v2v_python/conf.py | 2 +- .../extension/openai_v2v_python/extension.py | 20 +-- .../openai_v2v_python/realtime/connection.py | 9 +- .../openai_v2v_python/realtime/struct.py | 133 +++++++++++------- 4 files changed, 93 insertions(+), 71 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/conf.py b/agents/ten_packages/extension/openai_v2v_python/conf.py index a61a6485..efc23c46 100644 --- a/agents/ten_packages/extension/openai_v2v_python/conf.py +++ b/agents/ten_packages/extension/openai_v2v_python/conf.py @@ -1,5 +1,5 @@ -from realtime.struct import Voices +from .realtime.struct import Voices DEFAULT_MODEL = "gpt-4o-realtime-preview" diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 6e20186a..9ead5faf 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -22,9 +22,9 @@ ) from ten.audio_frame import AudioFrameDataFmt from .log import logger -from .conf import RealtimeApiConfig -from realtime.connection import RealtimeApiConnection -from realtime.struct import * +from .conf import RealtimeApiConfig, BASIC_PROMPT +from .realtime.connection import RealtimeApiConnection +from .realtime.struct import * # properties PROPERTY_API_KEY = "api_key" # Required @@ -165,7 +165,7 @@ def get_time_ms() -> int: case SessionCreated(): logger.info( f"Session is created: {message.session}") - self.session_id = message.session.id + self.session_id = message.session["id"] self.session = message.session update_msg = self._update_session() await self.conn.send_request(update_msg) @@ -183,13 +183,15 @@ def get_time_ms() -> int: case ItemCreated(): logger.info(f"On item created {message.item}") case ResponseCreated(): + response_id = message.response["id"] logger.info( - f"On response created {message.response.id}") - response_id = message.response.id + f"On response created {response_id}") case ResponseDone(): + id = message.response["id"] + status = message.response["status"] logger.info( - f"On response done {message.response.id} {message.response.status}") - if message.response.id == response_id: + f"On response done {id} {status}") + if id == response_id: response_id = "" case ResponseAudioTranscriptDelta(): logger.info( @@ -288,7 +290,7 @@ def _fetch_properties(self, ten_env: TenEnv): system_message = ten_env.get_property_string( PROPERTY_SYSTEM_MESSAGE) if system_message: - self.config.system_message = system_message + self.config.instruction = BASIC_PROMPT + "\n" + system_message except Exception as err: logger.info( f"GetProperty optional {PROPERTY_SYSTEM_MESSAGE} error: {err}") diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py b/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py index 17803f5a..5c99bebb 100644 --- a/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py +++ b/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py @@ -11,9 +11,6 @@ DEFAULT_VIRTUAL_MODEL = "gpt-4o-realtime-preview" -def generate_client_event_id() -> str: - return str(uuid.uuid4()) - def smart_str(s: str, max_field_len: int = 128) -> str: """parse string as json, truncate data field to 128 characters, reserialize""" try: @@ -40,7 +37,7 @@ def __init__( path: str = "/v1/realtime", verbose: bool = False, ): - self.url = f"wss://{base_uri}{path}" + self.url = f"{base_uri}{path}" self.api_key = api_key or os.environ.get("OPENAI_API_KEY") self.websocket: aiohttp.ClientWebSocketResponse | None = None @@ -52,7 +49,7 @@ async def __aenter__(self) -> "RealtimeApiConnection": return self async def __aexit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> bool: - await self.shutdown() + await self.close() return False async def connect(self): @@ -74,8 +71,6 @@ async def send_audio_data(self, audio_data: bytes): async def send_request(self, message: ClientToServerMessage): assert self.websocket is not None - if message.event_id is None: - message.event_id = generate_client_event_id() message_str = to_json(message) if self.verbose: logger.info(f"-> {smart_str(message_str)}") diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py index bbcac827..81e9671f 100644 --- a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py +++ b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py @@ -1,9 +1,13 @@ import json +import uuid from dataclasses import dataclass, asdict, field from typing import Any, Dict, Literal, Optional, List, Set, Union from enum import Enum +def generate_client_event_id() -> str: + return str(uuid.uuid4()) + # Enums class Voices(str, Enum): Alloy = "alloy" @@ -40,8 +44,8 @@ class ContentType(str, Enum): @dataclass class FunctionToolChoice: - type: str = "function" # Fixed value for type name: str # Name of the function + type: str = "function" # Fixed value for type # ToolChoice can be either a literal string or FunctionToolChoice ToolChoice = Union[str, FunctionToolChoice] # "none", "auto", "required", or FunctionToolChoice @@ -49,8 +53,8 @@ class FunctionToolChoice: @dataclass class RealtimeError: type: str # The type of the error - code: Optional[str] = None # Optional error code message: str # The error message + code: Optional[str] = None # Optional error code param: Optional[str] = None # Optional parameter related to the error event_id: Optional[str] = None # Optional event ID for tracing @@ -60,10 +64,28 @@ class InputAudioTranscription: @dataclass class ServerVADUpdateParams: - type: str = "server_vad" # Fixed value for VAD type threshold: Optional[float] = None # Threshold for voice activity detection prefix_padding_ms: Optional[int] = None # Amount of padding before the voice starts (in milliseconds) silence_duration_ms: Optional[int] = None # Duration of silence before considering speech stopped (in milliseconds) + type: str = "server_vad" # Fixed value for VAD type +@dataclass +class Session: + id: str # The unique identifier for the session + model: str # The model associated with the session (e.g., "gpt-3") + expires_at: int # Expiration time of the session in seconds since the epoch (UNIX timestamp) + object: str = "realtime.session" # Fixed value indicating the object type + modalities: Set[str] = field(default_factory=lambda: {"text", "audio"}) # Set of allowed modalities (e.g., "text", "audio") + instructions: Optional[str] = None # Instructions or guidance for the session + voice: Voices = Voices.Alloy # Voice configuration for audio responses, defaulting to "Alloy" + turn_detection: Optional[ServerVADUpdateParams] = None # Voice activity detection (VAD) settings + input_audio_format: AudioFormats = AudioFormats.PCM16 # Audio format for input (e.g., "pcm16") + output_audio_format: AudioFormats = AudioFormats.PCM16 # Audio format for output (e.g., "pcm16") + input_audio_transcription: Optional[InputAudioTranscription] = None # Audio transcription model settings (e.g., "whisper-1") + tools: List[Dict[str, Union[str, Any]]] = field(default_factory=list) # List of tools available during the session + tool_choice: Literal["auto", "none", "required"] = "auto" # How tools should be used in the session + temperature: float = 0.8 # Temperature setting for model creativity + max_response_output_tokens: Union[int, Literal["inf"]] = "inf" # Maximum number of tokens in the response, or "inf" for unlimited + @dataclass class SessionUpdateParams: @@ -80,46 +102,47 @@ class SessionUpdateParams: temperature: Optional[float] = None # Optional temperature for response generation max_response_output_tokens: Optional[Union[int, str]] = None # Max response tokens, "inf" for infinite + # Define individual message item param types @dataclass class SystemMessageItemParam: + content: List[dict] # This can be more specific based on content structure id: Optional[str] = None - type: str = "message" status: Optional[str] = None + type: str = "message" role: str = "system" - content: List[dict] # This can be more specific based on content structure @dataclass class UserMessageItemParam: + content: List[dict] # Similarly, content can be more specific id: Optional[str] = None - type: str = "message" status: Optional[str] = None + type: str = "message" role: str = "user" - content: List[dict] # Similarly, content can be more specific @dataclass class AssistantMessageItemParam: + content: List[dict] # Content structure here depends on your schema id: Optional[str] = None - type: str = "message" status: Optional[str] = None + type: str = "message" role: str = "assistant" - content: List[dict] # Content structure here depends on your schema @dataclass class FunctionCallItemParam: - id: Optional[str] = None - type: str = "function_call" - status: Optional[str] = None name: str call_id: str arguments: str + type: str = "function_call" + id: Optional[str] = None + status: Optional[str] = None @dataclass class FunctionCallOutputItemParam: - id: Optional[str] = None - type: str = "function_call_output" call_id: str output: str + id: Optional[str] = None + type: str = "function_call_output" # Union of all possible item types ItemParam = Union[ @@ -185,27 +208,27 @@ class ServerToClientMessage: @dataclass class ErrorMessage(ServerToClientMessage): - type: str = EventType.ERROR error: RealtimeError + type: str = EventType.ERROR @dataclass class SessionCreated(ServerToClientMessage): + session: Session type: str = EventType.SESSION_CREATED - session: SessionUpdateParams @dataclass class SessionUpdated(ServerToClientMessage): + session: Session type: str = EventType.SESSION_UPDATED - session: SessionUpdateParams @dataclass class InputAudioBufferCommitted(ServerToClientMessage): + item_id: str type: str = EventType.INPUT_AUDIO_BUFFER_COMMITTED previous_item_id: Optional[str] = None - item_id: str @dataclass @@ -215,37 +238,37 @@ class InputAudioBufferCleared(ServerToClientMessage): @dataclass class InputAudioBufferSpeechStarted(ServerToClientMessage): - type: str = EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED audio_start_ms: int item_id: str + type: str = EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED @dataclass class InputAudioBufferSpeechStopped(ServerToClientMessage): - type: str = EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED audio_end_ms: int + type: str = EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED item_id: Optional[str] = None @dataclass class ItemCreated(ServerToClientMessage): + item: ItemParam type: str = EventType.ITEM_CREATED previous_item_id: Optional[str] = None - item: ItemParam @dataclass class ItemTruncated(ServerToClientMessage): - type: str = EventType.ITEM_TRUNCATED item_id: str content_index: int audio_end_ms: int + type: str = EventType.ITEM_TRUNCATED @dataclass class ItemDeleted(ServerToClientMessage): - type: str = EventType.ITEM_DELETED item_id: str + type: str = EventType.ITEM_DELETED # Assuming the necessary enums, ItemParam, and other classes are defined above @@ -257,24 +280,24 @@ class ItemDeleted(ServerToClientMessage): # Define status detail classes @dataclass class ResponseCancelledDetails: - type: str = "cancelled" reason: str # e.g., "turn_detected", "client_cancelled" + type: str = "cancelled" @dataclass class ResponseIncompleteDetails: - type: str = "incomplete" reason: str # e.g., "max_output_tokens", "content_filter" + type: str = "incomplete" @dataclass class ResponseError: type: str # The type of the error, e.g., "validation_error", "server_error" - code: Optional[str] = None # Optional error code, e.g., HTTP status code, API error code message: str # The error message describing what went wrong + code: Optional[str] = None # Optional error code, e.g., HTTP status code, API error code @dataclass class ResponseFailedDetails: - type: str = "failed" error: ResponseError # Assuming ResponseError is already defined + type: str = "failed" # Union of possible status details ResponseStatusDetails = Union[ResponseCancelledDetails, ResponseIncompleteDetails, ResponseFailedDetails] @@ -302,105 +325,105 @@ class Usage: # The Response dataclass definition @dataclass class Response: - object: str = "realtime.response" # Fixed value for object type id: str # Unique ID for the response + output: List[ItemParam] = field(default_factory=list) # List of items in the response + object: str = "realtime.response" # Fixed value for object type status: ResponseStatus = "in_progress" # Status of the response status_details: Optional[ResponseStatusDetails] = None # Additional details based on status - output: List[ItemParam] = field(default_factory=list) # List of items in the response usage: Optional[Usage] = None # Token usage information @dataclass class ResponseCreated(ServerToClientMessage): - type: str = EventType.RESPONSE_CREATED response: Response + type: str = EventType.RESPONSE_CREATED @dataclass class ResponseDone(ServerToClientMessage): - type: str = EventType.RESPONSE_DONE response: Response + type: str = EventType.RESPONSE_DONE @dataclass class ResponseTextDelta(ServerToClientMessage): - type: str = EventType.RESPONSE_TEXT_DELTA response_id: str item_id: str output_index: int content_index: int delta: str + type: str = EventType.RESPONSE_TEXT_DELTA @dataclass class ResponseTextDone(ServerToClientMessage): - type: str = EventType.RESPONSE_TEXT_DONE response_id: str item_id: str output_index: int content_index: int text: str + type: str = EventType.RESPONSE_TEXT_DONE @dataclass class ResponseAudioTranscriptDelta(ServerToClientMessage): - type: str = EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA response_id: str item_id: str output_index: int content_index: int delta: str + type: str = EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA @dataclass class ResponseAudioTranscriptDone(ServerToClientMessage): - type: str = EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE response_id: str item_id: str output_index: int content_index: int transcript: str + type: str = EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE @dataclass class ResponseAudioDelta(ServerToClientMessage): - type: str = EventType.RESPONSE_AUDIO_DELTA response_id: str item_id: str output_index: int content_index: int delta: str + type: str = EventType.RESPONSE_AUDIO_DELTA @dataclass class ResponseAudioDone(ServerToClientMessage): - type: str = EventType.RESPONSE_AUDIO_DONE response_id: str item_id: str output_index: int content_index: int + type: str = EventType.RESPONSE_AUDIO_DONE @dataclass class ResponseFunctionCallArgumentsDelta(ServerToClientMessage): - type: str = EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA response_id: str item_id: str output_index: int call_id: str delta: str + type: str = EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA @dataclass class ResponseFunctionCallArgumentsDone(ServerToClientMessage): - type: str = EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE response_id: str item_id: str output_index: int call_id: str name: str arguments: str + type: str = EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE @dataclass @@ -412,55 +435,55 @@ class RateLimitDetails: @dataclass class RateLimitsUpdated(ServerToClientMessage): - type: str = EventType.RATE_LIMITS_UPDATED rate_limits: List[RateLimitDetails] + type: str = EventType.RATE_LIMITS_UPDATED @dataclass class ResponseOutputItemAdded(ServerToClientMessage): - type: str = "response.output_item.added" # Fixed event type response_id: str # The ID of the response output_index: int # Index of the output item in the response item: Union[ItemParam, None] # The added item (can be a message, function call, etc.) + type: str = "response.output_item.added" # Fixed event type @dataclass class ResponseContentPartAdded(ServerToClientMessage): - type: str = "response.content_part.added" # Fixed event type response_id: str # The ID of the response item_id: str # The ID of the item to which the content part was added output_index: int # Index of the output item in the response content_index: int # Index of the content part in the output part: Union[ItemParam, None] # The added content part + type: str = "response.content_part.added" # Fixed event type @dataclass class ResponseContentPartDone(ServerToClientMessage): - type: str = "response.content_part.done" # Fixed event type response_id: str # The ID of the response item_id: str # The ID of the item to which the content part belongs output_index: int # Index of the output item in the response content_index: int # Index of the content part in the output part: Union[ItemParam, None] # The content part that was completed + type: str = "response.content_part.done" # Fixed event type @dataclass class ResponseOutputItemDone(ServerToClientMessage): - type: str = "response.output_item.done" # Fixed event type response_id: str # The ID of the response output_index: int # Index of the output item in the response item: Union[ItemParam, None] # The output item that was completed + type: str = "response.output_item.done" # Fixed event type @dataclass class ItemInputAudioTranscriptionCompleted(ServerToClientMessage): - type: str = "conversation.item.input_audio_transcription.completed" # Fixed event type item_id: str # The ID of the item for which transcription was completed content_index: int # Index of the content part that was transcribed transcript: str # The transcribed text + type: str = "conversation.item.input_audio_transcription.completed" # Fixed event type @dataclass class ItemInputAudioTranscriptionFailed(ServerToClientMessage): - type: str = "conversation.item.input_audio_transcription.failed" # Fixed event type item_id: str # The ID of the item for which transcription failed content_index: int # Index of the content part that failed to transcribe error: ResponseError # Error details explaining the failure + type: str = "conversation.item.input_audio_transcription.failed" # Fixed event type # Union of all server-to-client message types ServerToClientMessages = Union[ @@ -498,14 +521,16 @@ class ItemInputAudioTranscriptionFailed(ServerToClientMessage): # Base class for all ClientToServerMessages @dataclass class ClientToServerMessage: - event_id: Optional[str] = None # Optional since some messages may not need it + event_id: str + + def __init__(self): + self.event_id = generate_client_event_id() @dataclass class InputAudioBufferAppend(ClientToServerMessage): - type: str = EventType.INPUT_AUDIO_BUFFER_APPEND - audio: str - + type: str = EventType.INPUT_AUDIO_BUFFER_APPEND # Default argument (has a default value) + audio: str # Non-default argument (no default value) @dataclass class InputAudioBufferCommit(ClientToServerMessage): @@ -519,23 +544,23 @@ class InputAudioBufferClear(ClientToServerMessage): @dataclass class ItemCreate(ClientToServerMessage): + item: ItemParam # Assuming `ItemParam` is already defined type: str = EventType.ITEM_CREATE previous_item_id: Optional[str] = None - item: ItemParam # Assuming `ItemParam` is already defined @dataclass class ItemTruncate(ClientToServerMessage): - type: str = EventType.ITEM_TRUNCATE item_id: str content_index: int audio_end_ms: int + type: str = EventType.ITEM_TRUNCATE @dataclass class ItemDelete(ClientToServerMessage): - type: str = EventType.ITEM_DELETE item_id: str + type: str = EventType.ITEM_DELETE @dataclass class ResponseCreateParams: @@ -582,8 +607,8 @@ class UpdateConversationConfig(ClientToServerMessage): @dataclass class SessionUpdate(ClientToServerMessage): - type: str = EventType.SESSION_UPDATE session: SessionUpdateParams # Assuming `SessionUpdateParams` is defined + type: str = EventType.SESSION_UPDATE # Union of all client-to-server message types From 2e82a0e9c182a377fb40c23577b2a839f0a04331 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 00:47:09 +0800 Subject: [PATCH 48/55] fix --- .../extension/openai_v2v_python/extension.py | 2 +- .../openai_v2v_python/realtime/connection.py | 3 + .../openai_v2v_python/realtime/struct.py | 86 +++++++++++-------- 3 files changed, 56 insertions(+), 35 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index 9ead5faf..b31fd894 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -138,7 +138,7 @@ def on_data(self, ten_env: TenEnv, data: Data) -> None: async def _init_connection(self): try: self.conn = RealtimeApiConnection( - base_uri=self.config.base_uri, api_key=self.config.api_key, verbose=True) + base_uri=self.config.base_uri, api_key=self.config.api_key, model=self.config.model, verbose=True) logger.info(f"Finish init client {self.config} {self.conn}") except: logger.exception(f"Failed to create client {self.config}") diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py b/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py index 5c99bebb..1f8fbdfc 100644 --- a/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py +++ b/agents/ten_packages/extension/openai_v2v_python/realtime/connection.py @@ -35,9 +35,12 @@ def __init__( base_uri: str, api_key: str | None = None, path: str = "/v1/realtime", + model: str = DEFAULT_VIRTUAL_MODEL, verbose: bool = False, ): self.url = f"{base_uri}{path}" + if "model=" not in self.url: + self.url += f"?model={model}" self.api_key = api_key or os.environ.get("OPENAI_API_KEY") self.websocket: aiohttp.ClientWebSocketResponse | None = None diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py index 81e9671f..0abec93c 100644 --- a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py +++ b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py @@ -1,7 +1,7 @@ import json import uuid -from dataclasses import dataclass, asdict, field +from dataclasses import dataclass, asdict, field, is_dataclass from typing import Any, Dict, Literal, Optional, List, Set, Union from enum import Enum @@ -529,8 +529,8 @@ def __init__(self): @dataclass class InputAudioBufferAppend(ClientToServerMessage): - type: str = EventType.INPUT_AUDIO_BUFFER_APPEND # Default argument (has a default value) audio: str # Non-default argument (no default value) + type: str = EventType.INPUT_AUDIO_BUFFER_APPEND # Default argument (has a default value) @dataclass class InputAudioBufferCommit(ClientToServerMessage): @@ -625,30 +625,40 @@ class SessionUpdate(ClientToServerMessage): SessionUpdate ] +def from_dict(data_class, data): + """Recursively convert a dictionary to a dataclass instance.""" + if is_dataclass(data_class): # Check if the target class is a dataclass + fieldtypes = {f.name: f.type for f in data_class.__dataclass_fields__.values()} + return data_class(**{f: from_dict(fieldtypes[f], data[f]) for f in data}) + elif isinstance(data, list): # Handle lists of nested dataclass objects + return [from_dict(data_class.__args__[0], item) for item in data] + else: # For primitive types (str, int, float, etc.), return the value as-is + return data def parse_client_message(unparsed_string: str) -> ClientToServerMessage: data = json.loads(unparsed_string) + # Dynamically select the correct message class based on the `type` field, using from_dict if data["type"] == EventType.INPUT_AUDIO_BUFFER_APPEND: - return InputAudioBufferAppend(**data) + return from_dict(InputAudioBufferAppend, data) elif data["type"] == EventType.INPUT_AUDIO_BUFFER_COMMIT: - return InputAudioBufferCommit(**data) + return from_dict(InputAudioBufferCommit, data) elif data["type"] == EventType.INPUT_AUDIO_BUFFER_CLEAR: - return InputAudioBufferClear(**data) + return from_dict(InputAudioBufferClear, data) elif data["type"] == EventType.ITEM_CREATE: - return ItemCreate(**data) + return from_dict(ItemCreate, data) elif data["type"] == EventType.ITEM_TRUNCATE: - return ItemTruncate(**data) + return from_dict(ItemTruncate, data) elif data["type"] == EventType.ITEM_DELETE: - return ItemDelete(**data) + return from_dict(ItemDelete, data) elif data["type"] == EventType.RESPONSE_CREATE: - return ResponseCreate(**data) + return from_dict(ResponseCreate, data) elif data["type"] == EventType.RESPONSE_CANCEL: - return ResponseCancel(**data) + return from_dict(ResponseCancel, data) elif data["type"] == EventType.UPDATE_CONVERSATION_CONFIG: - return UpdateConversationConfig(**data) + return from_dict(UpdateConversationConfig, data) elif data["type"] == EventType.SESSION_UPDATE: - return SessionUpdate(**data) + return from_dict(SessionUpdate, data) raise ValueError(f"Unknown message type: {data['type']}") @@ -659,49 +669,57 @@ def parse_client_message(unparsed_string: str) -> ClientToServerMessage: def parse_server_message(unparsed_string: str) -> ServerToClientMessage: data = json.loads(unparsed_string) - # Dynamically select the correct message class based on the `type` field + # Dynamically select the correct message class based on the `type` field, using from_dict if data["type"] == EventType.ERROR: - return ErrorMessage(**data) + return from_dict(ErrorMessage, data) elif data["type"] == EventType.SESSION_CREATED: - return SessionCreated(**data) + return from_dict(SessionCreated, data) elif data["type"] == EventType.SESSION_UPDATED: - return SessionUpdated(**data) + return from_dict(SessionUpdated, data) elif data["type"] == EventType.INPUT_AUDIO_BUFFER_COMMITTED: - return InputAudioBufferCommitted(**data) + return from_dict(InputAudioBufferCommitted, data) elif data["type"] == EventType.INPUT_AUDIO_BUFFER_CLEARED: - return InputAudioBufferCleared(**data) + return from_dict(InputAudioBufferCleared, data) elif data["type"] == EventType.INPUT_AUDIO_BUFFER_SPEECH_STARTED: - return InputAudioBufferSpeechStarted(**data) + return from_dict(InputAudioBufferSpeechStarted, data) elif data["type"] == EventType.INPUT_AUDIO_BUFFER_SPEECH_STOPPED: - return InputAudioBufferSpeechStopped(**data) + return from_dict(InputAudioBufferSpeechStopped, data) elif data["type"] == EventType.ITEM_CREATED: - return ItemCreated(**data) + return from_dict(ItemCreated, data) elif data["type"] == EventType.ITEM_TRUNCATED: - return ItemTruncated(**data) + return from_dict(ItemTruncated, data) elif data["type"] == EventType.ITEM_DELETED: - return ItemDeleted(**data) + return from_dict(ItemDeleted, data) elif data["type"] == EventType.RESPONSE_CREATED: - return ResponseCreated(**data) + return from_dict(ResponseCreated, data) elif data["type"] == EventType.RESPONSE_DONE: - return ResponseDone(**data) + return from_dict(ResponseDone, data) elif data["type"] == EventType.RESPONSE_TEXT_DELTA: - return ResponseTextDelta(**data) + return from_dict(ResponseTextDelta, data) elif data["type"] == EventType.RESPONSE_TEXT_DONE: - return ResponseTextDone(**data) + return from_dict(ResponseTextDone, data) elif data["type"] == EventType.RESPONSE_AUDIO_TRANSCRIPT_DELTA: - return ResponseAudioTranscriptDelta(**data) + return from_dict(ResponseAudioTranscriptDelta, data) elif data["type"] == EventType.RESPONSE_AUDIO_TRANSCRIPT_DONE: - return ResponseAudioTranscriptDone(**data) + return from_dict(ResponseAudioTranscriptDone, data) elif data["type"] == EventType.RESPONSE_AUDIO_DELTA: - return ResponseAudioDelta(**data) + return from_dict(ResponseAudioDelta, data) elif data["type"] == EventType.RESPONSE_AUDIO_DONE: - return ResponseAudioDone(**data) + return from_dict(ResponseAudioDone, data) elif data["type"] == EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DELTA: - return ResponseFunctionCallArgumentsDelta(**data) + return from_dict(ResponseFunctionCallArgumentsDelta, data) elif data["type"] == EventType.RESPONSE_FUNCTION_CALL_ARGUMENTS_DONE: - return ResponseFunctionCallArgumentsDone(**data) + return from_dict(ResponseFunctionCallArgumentsDone, data) elif data["type"] == EventType.RATE_LIMITS_UPDATED: - return RateLimitsUpdated(**data) + return from_dict(RateLimitsUpdated, data) + elif data["type"] == EventType.RESPONSE_OUTPUT_ITEM_ADDED: + return from_dict(ResponseOutputItemAdded, data) + elif data["type"] == EventType.RESPONSE_CONTENT_PART_ADDED: + return from_dict(ResponseContentPartAdded, data) + elif data["type"] == EventType.RESPONSE_CONTENT_PART_DONE: + return from_dict(ResponseContentPartDone, data) + elif data["type"] == EventType.RESPONSE_OUTPUT_ITEM_DONE: + return from_dict(ResponseOutputItemDone, data) raise ValueError(f"Unknown message type: {data['type']}") From bc0bdf3e9e3c7f63cf6501dadaddbee548d5b9a8 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 00:51:09 +0800 Subject: [PATCH 49/55] fxi --- .../ten_packages/extension/openai_v2v_python/extension.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index b31fd894..dd16c8d0 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -165,7 +165,7 @@ def get_time_ms() -> int: case SessionCreated(): logger.info( f"Session is created: {message.session}") - self.session_id = message.session["id"] + self.session_id = message.session.id self.session = message.session update_msg = self._update_session() await self.conn.send_request(update_msg) @@ -183,12 +183,12 @@ def get_time_ms() -> int: case ItemCreated(): logger.info(f"On item created {message.item}") case ResponseCreated(): - response_id = message.response["id"] + response_id = message.response.id logger.info( f"On response created {response_id}") case ResponseDone(): - id = message.response["id"] - status = message.response["status"] + id = message.response.id + status = message.response.status logger.info( f"On response done {id} {status}") if id == response_id: From f4b54bb0b827bddf1789e9692bf4f04ad98867a3 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 00:59:40 +0800 Subject: [PATCH 50/55] fix --- .../openai_v2v_python/realtime/struct.py | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py index 0abec93c..9d8c708b 100644 --- a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py +++ b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py @@ -5,7 +5,7 @@ from typing import Any, Dict, Literal, Optional, List, Set, Union from enum import Enum -def generate_client_event_id() -> str: +def generate_event_id() -> str: return str(uuid.uuid4()) # Enums @@ -521,15 +521,12 @@ class ItemInputAudioTranscriptionFailed(ServerToClientMessage): # Base class for all ClientToServerMessages @dataclass class ClientToServerMessage: - event_id: str - - def __init__(self): - self.event_id = generate_client_event_id() + event_id: str = field(default_factory=generate_event_id) @dataclass class InputAudioBufferAppend(ClientToServerMessage): - audio: str # Non-default argument (no default value) + audio: Optional[str] = field(default=None) type: str = EventType.INPUT_AUDIO_BUFFER_APPEND # Default argument (has a default value) @dataclass @@ -544,22 +541,22 @@ class InputAudioBufferClear(ClientToServerMessage): @dataclass class ItemCreate(ClientToServerMessage): - item: ItemParam # Assuming `ItemParam` is already defined + item: Optional[ItemParam] = field(default=None) # Assuming `ItemParam` is already defined type: str = EventType.ITEM_CREATE previous_item_id: Optional[str] = None @dataclass class ItemTruncate(ClientToServerMessage): - item_id: str - content_index: int - audio_end_ms: int + item_id: Optional[str] = field(default=None) + content_index: Optional[int] = field(default=None) + audio_end_ms: Optional[int] = field(default=None) type: str = EventType.ITEM_TRUNCATE @dataclass class ItemDelete(ClientToServerMessage): - item_id: str + item_id: Optional[str] = field(default=None) type: str = EventType.ITEM_DELETE @dataclass @@ -607,7 +604,7 @@ class UpdateConversationConfig(ClientToServerMessage): @dataclass class SessionUpdate(ClientToServerMessage): - session: SessionUpdateParams # Assuming `SessionUpdateParams` is defined + session: Optional[SessionUpdateParams] = field(default=None) # Assuming `SessionUpdateParams` is defined type: str = EventType.SESSION_UPDATE From 1a13dc4d69013a00c34d8bac387319248fbe6c67 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 01:28:45 +0800 Subject: [PATCH 51/55] fix --- .../openai_v2v_python/realtime/struct.py | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py index 9d8c708b..78ba077a 100644 --- a/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py +++ b/agents/ten_packages/extension/openai_v2v_python/realtime/struct.py @@ -1,9 +1,10 @@ import json -import uuid from dataclasses import dataclass, asdict, field, is_dataclass from typing import Any, Dict, Literal, Optional, List, Set, Union from enum import Enum +import uuid + def generate_event_id() -> str: return str(uuid.uuid4()) @@ -444,7 +445,7 @@ class ResponseOutputItemAdded(ServerToClientMessage): response_id: str # The ID of the response output_index: int # Index of the output item in the response item: Union[ItemParam, None] # The added item (can be a message, function call, etc.) - type: str = "response.output_item.added" # Fixed event type + type: str = EventType.RESPONSE_OUTPUT_ITEM_ADDED # Fixed event type @dataclass class ResponseContentPartAdded(ServerToClientMessage): @@ -453,7 +454,7 @@ class ResponseContentPartAdded(ServerToClientMessage): output_index: int # Index of the output item in the response content_index: int # Index of the content part in the output part: Union[ItemParam, None] # The added content part - type: str = "response.content_part.added" # Fixed event type + type: str = EventType.RESPONSE_CONTENT_PART_ADDED # Fixed event type @dataclass class ResponseContentPartDone(ServerToClientMessage): @@ -462,28 +463,28 @@ class ResponseContentPartDone(ServerToClientMessage): output_index: int # Index of the output item in the response content_index: int # Index of the content part in the output part: Union[ItemParam, None] # The content part that was completed - type: str = "response.content_part.done" # Fixed event type + type: str = EventType.RESPONSE_CONTENT_PART_ADDED # Fixed event type @dataclass class ResponseOutputItemDone(ServerToClientMessage): response_id: str # The ID of the response output_index: int # Index of the output item in the response item: Union[ItemParam, None] # The output item that was completed - type: str = "response.output_item.done" # Fixed event type + type: str = EventType.RESPONSE_OUTPUT_ITEM_DONE # Fixed event type @dataclass class ItemInputAudioTranscriptionCompleted(ServerToClientMessage): item_id: str # The ID of the item for which transcription was completed content_index: int # Index of the content part that was transcribed transcript: str # The transcribed text - type: str = "conversation.item.input_audio_transcription.completed" # Fixed event type + type: str = EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED # Fixed event type @dataclass class ItemInputAudioTranscriptionFailed(ServerToClientMessage): item_id: str # The ID of the item for which transcription failed content_index: int # Index of the content part that failed to transcribe error: ResponseError # Error details explaining the failure - type: str = "conversation.item.input_audio_transcription.failed" # Fixed event type + type: str = EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED # Fixed event type # Union of all server-to-client message types ServerToClientMessages = Union[ @@ -717,8 +718,13 @@ def parse_server_message(unparsed_string: str) -> ServerToClientMessage: return from_dict(ResponseContentPartDone, data) elif data["type"] == EventType.RESPONSE_OUTPUT_ITEM_DONE: return from_dict(ResponseOutputItemDone, data) + elif data["type"] == EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_COMPLETED: + return from_dict(ItemInputAudioTranscriptionCompleted, data) + elif data["type"] == EventType.ITEM_INPUT_AUDIO_TRANSCRIPTION_FAILED: + return from_dict(ItemInputAudioTranscriptionFailed, data) raise ValueError(f"Unknown message type: {data['type']}") def to_json(obj: Union[ClientToServerMessage, ServerToClientMessage]) -> str: - return json.dumps(asdict(obj)) \ No newline at end of file + # ignore none value + return json.dumps(asdict(obj, dict_factory=lambda x: {k: v for (k, v) in x if v is not None})) \ No newline at end of file From 00643797329e66b1b11889323f7a4967fd2ee881 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 01:39:42 +0800 Subject: [PATCH 52/55] fix init package --- agents/ten_packages/extension/openai_v2v_python/conf.py | 3 ++- .../extension/openai_v2v_python/realtime/__init__.py | 0 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 agents/ten_packages/extension/openai_v2v_python/realtime/__init__.py diff --git a/agents/ten_packages/extension/openai_v2v_python/conf.py b/agents/ten_packages/extension/openai_v2v_python/conf.py index efc23c46..9295910d 100644 --- a/agents/ten_packages/extension/openai_v2v_python/conf.py +++ b/agents/ten_packages/extension/openai_v2v_python/conf.py @@ -39,5 +39,6 @@ def __init__( def build_ctx(self) -> dict: return { - "language": self.language + "language": self.language, + "model": self.model, } \ No newline at end of file diff --git a/agents/ten_packages/extension/openai_v2v_python/realtime/__init__.py b/agents/ten_packages/extension/openai_v2v_python/realtime/__init__.py new file mode 100644 index 00000000..e69de29b From de2e279bd5f16c740f58d46ee98445a1b181dc83 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 01:47:43 +0800 Subject: [PATCH 53/55] expose realtime --- agents/ten_packages/extension/openai_v2v_python/manifest.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/manifest.json b/agents/ten_packages/extension/openai_v2v_python/manifest.json index def051df..b4374bfd 100644 --- a/agents/ten_packages/extension/openai_v2v_python/manifest.json +++ b/agents/ten_packages/extension/openai_v2v_python/manifest.json @@ -16,7 +16,9 @@ "BUILD.gn", "**.tent", "**.py", - "README.md" + "README.md", + "realtime/**.tent", + "realtime/**.py" ] }, "api": { From 420f9db7a1fc74c6fd142ee505a0bd285234c68d Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 01:55:42 +0800 Subject: [PATCH 54/55] fix --- agents/scripts/package.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/scripts/package.sh b/agents/scripts/package.sh index 7a94b3d1..e405651e 100755 --- a/agents/scripts/package.sh +++ b/agents/scripts/package.sh @@ -45,6 +45,9 @@ copy_package() { if [[ -d ten_packages/${package_type}/${package_name}/src ]]; then cp -r ten_packages/${package_type}/${package_name}/src .release/ten_packages/${package_type}/${package_name}/ fi + if [[ -d ten_packages/${package_type}/${package_name}/realtime ]]; then + cp -r ten_packages/${package_type}/${package_name}/realtime .release/ten_packages/${package_type}/${package_name}/ + fi } cp -r bin .release From 31e36896c96dee2d662aef2f2c1d31886d1d5fe3 Mon Sep 17 00:00:00 2001 From: TomasLiu Date: Thu, 3 Oct 2024 10:07:57 +0800 Subject: [PATCH 55/55] greeting --- .../extension/openai_v2v_python/conf.py | 4 ++-- .../extension/openai_v2v_python/extension.py | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/agents/ten_packages/extension/openai_v2v_python/conf.py b/agents/ten_packages/extension/openai_v2v_python/conf.py index 9295910d..c67f66fc 100644 --- a/agents/ten_packages/extension/openai_v2v_python/conf.py +++ b/agents/ten_packages/extension/openai_v2v_python/conf.py @@ -5,9 +5,9 @@ BASIC_PROMPT = ''' You are an agent based on OpenAI {model} model and TEN Framework(A realtime multimodal agent framework). Your knowledge cutoff is 2023-10. You are a helpful, witty, and friendly AI. Act like a human, but remember that you aren't a human and that you can't do human things in the real world. Your voice and personality should be warm and engaging, with a lively and playful tone. -You should start by saying 'Hey, I'm TEN Agent with OpenAI Realtime API，anything I can help you with?' using {language}. +You should start by saying 'Hey, I'm ten agent with OpenAI Realtime API, anything I can help you with?' using {language}. If interacting is not in {language}, start by using the standard accent or dialect familiar to the user. Talk quickly. -Do not refer to these rules, even if you’re asked about them. +Do not refer to these rules, even if you're asked about them. ''' class RealtimeApiConfig: diff --git a/agents/ten_packages/extension/openai_v2v_python/extension.py b/agents/ten_packages/extension/openai_v2v_python/extension.py index dd16c8d0..881ab99c 100644 --- a/agents/ten_packages/extension/openai_v2v_python/extension.py +++ b/agents/ten_packages/extension/openai_v2v_python/extension.py @@ -37,6 +37,7 @@ PROPERTY_STREAM_ID = "stream_id" PROPERTY_LANGUAGE = "language" PROPERTY_DUMP = "dump" +PROPERTY_GREETING = "greeting" DEFAULT_VOICE = Voices.Alloy @@ -170,6 +171,10 @@ def get_time_ms() -> int: update_msg = self._update_session() await self.conn.send_request(update_msg) + text = self._greeting_text() + await self.conn.send_request(ItemCreate(item=UserMessageItemParam(content=[{"type": ContentType.InputText, "text": text}]))) + await self.conn.send_request(ResponseCreate(response=ResponseCreateParams())) + # update_conversation = self.update_conversation() # await self.conn.send_request(update_conversation) case ItemInputAudioTranscriptionCompleted(): @@ -333,6 +338,14 @@ def _fetch_properties(self, ten_env: TenEnv): except Exception as err: logger.info( f"GetProperty optional {PROPERTY_LANGUAGE} error: {err}") + + try: + greeting = ten_env.get_property_string(PROPERTY_GREETING) + if greeting: + self.greeting = greeting + except Exception as err: + logger.info( + f"GetProperty optional {PROPERTY_GREETING} error: {err}") try: server_vad = ten_env.get_property_bool(PROPERTY_SERVER_VAD) @@ -425,3 +438,13 @@ def _dump_audio_if_need(self, buf: bytearray, role: Role) -> None: with open("{}_{}.pcm".format(role, self.channel_name), "ab") as dump_file: dump_file.write(buf) + + def _greeting_text(self) -> str: + text = "Hi, there." + if self.config.language == "zh-CN": + text = "你好。" + elif self.config.language == "ja-JP": + text = "こんにちは" + elif self.config.language == "ko-KR": + text = "안녕하세요" + return text \ No newline at end of file