Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade ten runtime to 0.3 #364

Merged
merged 18 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.1.0",
"image": "ghcr.io/ten-framework/ten_agent_build:0.2.1",
"customizations": {
"vscode": {
"extensions": [
Expand Down
9 changes: 9 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,12 @@ OPENAI_PROXY_URL=
# Extension: qwen_llm
# Qwen API key
QWEN_API_KEY=


# Extension: weatherapi_tool_python
# Weathers API key
WEATHERAPI_API_KEY=

# Extension: bingsearch_tool_python
# Bing search API key
BING_API_KEY=
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.1.0 AS builder
FROM ghcr.io/ten-framework/ten_agent_build:0.2.1 AS builder

ARG SESSION_CONTROL_CONF=session_control.conf

Expand Down
6 changes: 3 additions & 3 deletions agents/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ type defaultApp struct {
cfg *appConfig
}

func (p *defaultApp) OnInit(
func (p *defaultApp) OnConfigure(
tenEnv ten.TenEnv,
) {
// Using the default property.json if not specified.
if len(p.cfg.PropertyFilePath) > 0 {
if b, err := os.ReadFile(p.cfg.PropertyFilePath); err != nil {
log.Fatalf("Failed to read property file %s, err %v\n", p.cfg.PropertyFilePath, err)
}else{
} else {
tenEnv.InitPropertyFromJSONBytes(b)
}
}

tenEnv.OnInitDone()
tenEnv.OnConfigureDone()
}

func startAppBlocking(cfg *appConfig) {
Expand Down
46 changes: 14 additions & 32 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.2.0",
"hash": "8b582de5dfaa38983104143fbb6c530b3aeb463ad9e9ef51f2c72fba9862b8cc",
"version": "0.3.1",
"hash": "304075ff197ad241fcb2fe066bb0096e5fc7ecc3ba163e463b38e950f31586d2",
"dependencies": [
{
"type": "system",
Expand All @@ -22,8 +22,8 @@
{
"type": "extension",
"name": "py_init_extension_cpp",
"version": "0.2.0",
"hash": "e1858dfd83d18a69901cefb2edfd52e57ee326a3d306e799ff1d661f3195bb6b",
"version": "0.3.1",
"hash": "5b232d51213657fc2977be6d7de379a04bf4dcb955f555ac8a55baaab4c20b30",
"dependencies": [
{
"type": "system",
Expand All @@ -41,29 +41,11 @@
}
]
},
{
"type": "extension_group",
"name": "default_extension_group",
"version": "0.2.0",
"hash": "117ed3e747654fc1282129a160eaecc2cd16548e70aa22128efee21f10e185c8",
"dependencies": [
{
"type": "system",
"name": "ten_runtime"
}
],
"supports": [
{
"os": "linux",
"arch": "x64"
}
]
},
{
"type": "extension",
"name": "agora_rtc",
"version": "0.7.0-rc2",
"hash": "89d7af8f84d06afbd79901e0057182280f3f430227ad6fae98ec154067ffa82c",
"version": "0.8.0-rc2",
"hash": "7b43c050cbec4f14e01df2e08f4ad9a99ef7ac37879affbff07693136a19cd2d",
"dependencies": [
{
"type": "system",
Expand Down Expand Up @@ -100,8 +82,8 @@
{
"type": "extension",
"name": "azure_tts",
"version": "0.4.2",
"hash": "f1f3e58bd67ff45d537703690fe15f37f37b1e5754c29c483e74f15ee8fde7c8",
"version": "0.5.1",
"hash": "3876cd46a618658d980a71704e475fc7e3019d85a8ce6012653a7b12ff006a5c",
"dependencies": [
{
"type": "system",
Expand All @@ -117,8 +99,8 @@
{
"type": "system",
"name": "ten_runtime",
"version": "0.2.0",
"hash": "7effdb036d5bf91894060a9230775ff8ec2598f202b8238578f99a14dbf11632",
"version": "0.3.1",
"hash": "b39bd74b9ceedfcd356596890c62c239c2dce8d3d83bbca2dcff9912a1b21a88",
"supports": [
{
"os": "linux",
Expand All @@ -129,8 +111,8 @@
{
"type": "system",
"name": "agora_rtc_sdk",
"version": "4.1.36+build331418",
"hash": "74115dd35822dc3b09fbadb577b31146af704d60435ca401c0b305cce80b2ba4",
"version": "4.1.38+build376742",
"hash": "c57acf53d90fbee04d06aa3fd48b0425dd4cca1bee62666c5c01699044b43288",
"supports": [
{
"os": "linux",
Expand All @@ -148,8 +130,8 @@
{
"type": "system",
"name": "ten_runtime_python",
"version": "0.2.0",
"hash": "b44d3767f364583f8bb8e8995f6f7f49e3af27b3c9a8ddf62fa319f1fc39910e",
"version": "0.3.1",
"hash": "949915b3385da478fe7f30c583aa6adb7b33f07f2278e063d5d733d77e4f0cec",
"dependencies": [
{
"type": "system",
Expand Down
13 changes: 4 additions & 9 deletions agents/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,17 @@
{
"type": "system",
"name": "ten_runtime_go",
"version": "0.2"
"version": "0.3"
},
{
"type": "extension",
"name": "py_init_extension_cpp",
"version": "0.2"
},
{
"type": "extension_group",
"name": "default_extension_group",
"version": "0.2"
"version": "0.3"
},
{
"type": "extension",
"name": "agora_rtc",
"version": "=0.7.0-rc2"
"version": "=0.8.0-rc2"
},
{
"type": "system",
Expand All @@ -31,7 +26,7 @@
{
"type": "extension",
"name": "azure_tts",
"version": "0.4.2"
"version": "=0.5.1"
}
]
}
Loading