Skip to content

Commit

Permalink
Merge pull request #376 from TEN-framework/dev/0.6.1
Browse files Browse the repository at this point in the history
Dev/0.6.1
  • Loading branch information
wangyoucao577 authored Nov 15, 2024
2 parents 653e9f0 + 0853a9d commit a9655f2
Show file tree
Hide file tree
Showing 107 changed files with 3,189 additions and 693 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
{
"name": "ten_agent_dev",
"image": "ghcr.io/ten-framework/ten_agent_build:0.2.1",
"image": "ghcr.io/ten-framework/ten_agent_build:0.2.2",
"customizations": {
"vscode": {
"extensions": [
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*.log
addon/extension_group/
agoradns.dat
agorartmdns.dat
agora_rtm_cache.db
agorareport.dat
bin/
/BUILD.gn
Expand All @@ -31,4 +33,4 @@ speechsdk/
SpeechSDK-Linux.tar.gz
pyvenv.cfg
xdump_config
.idea
.idea
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"python.analysis.extraPaths": [
"./agents/ten_packages/system/ten_runtime_python/interface",
"./agents/ten_packages/system/ten_ai_base/interface",
],
"C_Cpp.intelliSenseEngine": "disabled",
"editor.formatOnSave": true,
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/ten-framework/ten_agent_build:0.2.1 AS builder
FROM ghcr.io/ten-framework/ten_agent_build:0.2.2 AS builder

ARG SESSION_CONTROL_CONF=session_control.conf

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ clean: clean-agents

clean-agents:
@echo ">> clean agents"
rm -rf agents/bin/worker agents/out agents/interface agents/include agents/lib agents/lib64 agents/ten_packages/system agents/ten_packages/extension_group agents/.release
rm -rf agents/bin/worker agents/out agents/interface agents/include agents/lib agents/lib64 agents/ten_packages/system/ten_runtime* agents/ten_packages/system/agora_rtc_sdk agents/ten_packages/system/azure_speech_sdk agents/ten_packages/system/nlohmann_json agents/.release
@echo ">> done"

docker-build-playground:
Expand Down
5 changes: 4 additions & 1 deletion agents/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ ten_packages/extension/azure_tts
ten_packages/extension/agora_sess_ctrl
ten_packages/extension/agora_rtm
ten_packages/extension/py_init_extension_cpp
ten_packages/system
ten_packages/system/agora_rtc_sdk
ten_packages/system/azure_speech_sdk
ten_packages/system/nlohmann_json
ten_packages/system/ten_runtime*
.ten
agoradns.dat
agorareport.dat
Expand Down
1 change: 1 addition & 0 deletions agents/bin/start
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

cd "$(dirname "${BASH_SOURCE[0]}")/.."

export PYTHONPATH=$(pwd)/ten_packages/system/ten_ai_base/interface:$PYTHONPATH
export LD_LIBRARY_PATH=$(pwd)/ten_packages/system/agora_rtc_sdk/lib:$(pwd)/ten_packages/extension/agora_rtm/lib:$(pwd)/ten_packages/system/azure_speech_sdk/lib

exec bin/worker "$@"
36 changes: 18 additions & 18 deletions agents/manifest-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
{
"type": "system",
"name": "ten_runtime_go",
"version": "0.3.1",
"hash": "304075ff197ad241fcb2fe066bb0096e5fc7ecc3ba163e463b38e950f31586d2",
"version": "0.4.1",
"hash": "716a281c46e58939d5f91599d095840290790d1dd34b0296df8db4422907e053",
"dependencies": [
{
"type": "system",
Expand All @@ -22,8 +22,8 @@
{
"type": "extension",
"name": "py_init_extension_cpp",
"version": "0.3.1",
"hash": "5b232d51213657fc2977be6d7de379a04bf4dcb955f555ac8a55baaab4c20b30",
"version": "0.4.1",
"hash": "8fdc759b3d64920362cb1cd9daa0a85826a6e084ca7cd595afe8db16aeb352f7",
"dependencies": [
{
"type": "system",
Expand All @@ -44,8 +44,8 @@
{
"type": "extension",
"name": "agora_rtc",
"version": "0.8.0-rc2",
"hash": "7b43c050cbec4f14e01df2e08f4ad9a99ef7ac37879affbff07693136a19cd2d",
"version": "0.9.0-rc1",
"hash": "1e779f354007dbda307b00b7a23798c82805ee0fb1ab7ed4dd90f913b4e8579c",
"dependencies": [
{
"type": "system",
Expand All @@ -70,8 +70,8 @@
{
"type": "extension",
"name": "agora_sess_ctrl",
"version": "0.2.0",
"hash": "52f26dee2fb8fbd22d55ecc6bb197176a51f4a3bd2268788f75582f68cf1270b",
"version": "0.3.0-rc1",
"hash": "47e9adcbe209b5c736c1b2d78b59819ca32ea5fdea23669ba79d47d00568046d",
"dependencies": [
{
"type": "system",
Expand Down Expand Up @@ -100,8 +100,8 @@
{
"type": "extension",
"name": "azure_tts",
"version": "0.5.1",
"hash": "3876cd46a618658d980a71704e475fc7e3019d85a8ce6012653a7b12ff006a5c",
"version": "0.6.0",
"hash": "6b4ef21b16c9931721def16a71b0a478fc97317027a14e1a13f255b7f291338b",
"dependencies": [
{
"type": "system",
Expand All @@ -117,8 +117,8 @@
{
"type": "extension",
"name": "agora_rtm",
"version": "0.1.5",
"hash": "a4230fbe477ff2cc6c4eee033138e4f19a3c742c41e1a15533d02d39bd46c4ad",
"version": "0.3.0",
"hash": "0a266486736ae3b25158237028d33ab6132d43e36d2a69c4307c51a56b76c209",
"dependencies": [
{
"type": "system",
Expand All @@ -134,8 +134,8 @@
{
"type": "system",
"name": "ten_runtime",
"version": "0.3.1",
"hash": "b39bd74b9ceedfcd356596890c62c239c2dce8d3d83bbca2dcff9912a1b21a88",
"version": "0.4.1",
"hash": "2d87b932a07f2375ca5fa019d0e518af55ac17de5d41ca82d66102a18cdc5d3f",
"supports": [
{
"os": "linux",
Expand All @@ -153,8 +153,8 @@
{
"type": "system",
"name": "agora_rtc_sdk",
"version": "4.1.38+build376742",
"hash": "c57acf53d90fbee04d06aa3fd48b0425dd4cca1bee62666c5c01699044b43288",
"version": "4.1.39+build397657",
"hash": "b2e9f4cfc93e3fb15108fc285b8162ccf36b6d7fd2bbefe4d4374290badf8d4e",
"supports": [
{
"os": "linux",
Expand All @@ -165,8 +165,8 @@
{
"type": "system",
"name": "ten_runtime_python",
"version": "0.3.1",
"hash": "949915b3385da478fe7f30c583aa6adb7b33f07f2278e063d5d733d77e4f0cec",
"version": "0.4.1",
"hash": "b805a787aa3f0bf4b499d7a1f5c8af503d1ade1db284a6159a9c971dd1be642c",
"dependencies": [
{
"type": "system",
Expand Down
12 changes: 6 additions & 6 deletions agents/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
{
"type": "system",
"name": "ten_runtime_go",
"version": "0.3"
"version": "0.4"
},
{
"type": "extension",
"name": "py_init_extension_cpp",
"version": "0.3"
"version": "0.4"
},
{
"type": "extension",
"name": "agora_rtc",
"version": "=0.8.0-rc2"
"version": "=0.9.0-rc1"
},
{
"type": "extension",
"name": "agora_sess_ctrl",
"version": "0.2.0"
"version": "0.3.0-rc1"
},
{
"type": "system",
Expand All @@ -31,12 +31,12 @@
{
"type": "extension",
"name": "azure_tts",
"version": "=0.5.1"
"version": "=0.6.0"
},
{
"type": "extension",
"name": "agora_rtm",
"version": "=0.1.5"
"version": "=0.3.0"
}
]
}
Loading

0 comments on commit a9655f2

Please sign in to comment.