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.

Sign up for GitHub

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: rename images and agent #321

Merged
merged 6 commits into from
Oct 11, 2024
Merged

feat: rename images and agent #321

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ba812f
feat: rename docker image
wangyoucao577 Oct 10, 2024
c2d0bba
feat: rename in compose
wangyoucao577 Oct 10, 2024
01fed64
refactor: rename in graph
wangyoucao577 Oct 10, 2024
9c8fa9a
fix: use latest for new images
wangyoucao577 Oct 10, 2024
70f165f
fix: rename project name
wangyoucao577 Oct 10, 2024
ac8865e
Merge branch 'main' into feature/name
wangyoucao577 Oct 11, 2024
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 .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# ------------------------------

# Log path
LOG_PATH=/tmp/astra
LOG_PATH=/tmp/ten_agent
LOG_STDOUT=true
# Graph designer server port
GRAPH_DESIGNER_SERVER_PORT=49483
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ on:
workflow_dispatch:

env:
SERVER_IMAGE_NAME: astra_agents_server
PLAYGROUND_IMAGE_NAME: astra_playground
DEMO_IMAGE_NAME: agent_demo
SERVER_IMAGE_NAME: ten_agent_server
PLAYGROUND_IMAGE_NAME: ten_agent_playground
DEMO_IMAGE_NAME: ten_agent_demo

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PROJECT_NAME := astra
PROJECT_NAME := ten_agent
PROJECT_VERSION ?= "0.1."$(shell date -u +'%Y%m%d%H')
REGISTRY ?= agoraio/

Expand Down Expand Up @@ -35,7 +35,7 @@ docker-build-playground:

docker-build-server:
@echo ">> docker build server"
docker build -t $(REGISTRY)$(PROJECT_NAME)_agents_server:$(PROJECT_VERSION) --platform linux/amd64 -f Dockerfile .
docker build -t $(REGISTRY)$(PROJECT_NAME)_server:$(PROJECT_VERSION) --platform linux/amd64 -f Dockerfile .
@echo ">> done"

run-gd-server:
Expand Down
2 changes: 1 addition & 1 deletion agents/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "app",
"name": "astra_agents",
"name": "ten_agent",
"version": "0.4.0",
"dependencies": [
{
Expand Down
22 changes: 11 additions & 11 deletions agents/property.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -213,7 +213,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -418,7 +418,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -582,7 +582,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -802,7 +802,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -1005,7 +1005,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -1173,7 +1173,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -1403,7 +1403,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -1637,7 +1637,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -1836,7 +1836,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "<agora_token>",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down Expand Up @@ -2211,7 +2211,7 @@
"property": {
"app_id": "${env:AGORA_APP_ID}",
"token": "",
"channel": "astra_agents_test",
"channel": "ten_agent_test",
"stream_id": 1234,
"remote_stream_id": 123,
"subscribe_audio": true,
Expand Down
38 changes: 19 additions & 19 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
astra_agents_dev:
ten_agent_dev:
image: ghcr.io/ten-framework/ten_agent_build:0.1.0
container_name: astra_agents_dev
container_name: ten_agent_dev
platform: linux/amd64
tty: true
stdin_open: true
Expand All @@ -17,33 +17,33 @@ services:
env_file:
- .env
networks:
- astra_network
astra_playground:
image: ghcr.io/ten-framework/astra_playground:v0.4.1-9-g09a1df2
container_name: astra_playground
- ten_agent_network
ten_agent_playground:
image: ghcr.io/ten-framework/ten_agent_playground
container_name: ten_agent_playground
restart: always
ports:
- "3000:3000"
networks:
- astra_network
- ten_agent_network
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
- AGENT_SERVER_URL=http://ten_agent_dev:8080
- TEN_DEV_SERVER_URL=http://ten_agent_dev:49483
ten_agent_demo:
image: ghcr.io/ten-framework/agent_demo
container_name: ten_agent_demo
restart: always
ports:
- "3002:3000"
wangyoucao577 marked this conversation as resolved.
Show resolved Hide resolved
networks:
- astra_network
- ten_agent_network
environment:
- AGENT_SERVER_URL=http://astra_agents_dev:8080
- AGENT_SERVER_URL=http://ten_agent_dev:8080

# use this when you want to run the playground in local development mode
# astra_playground_dev:
# ten_agent_playground_dev:
# image: node:20-alpine
# container_name: astra_playground_dev
# container_name: ten_agent_playground_dev
# restart: always
# command: sh -c "cd /app/playground && npm i && npm run dev" #build && npm run start"
# ports:
Expand All @@ -57,9 +57,9 @@ services:
ports:
- "3001:3000"
networks:
- astra_network
- ten_agent_network
environment:
- TEN_DEV_SERVER_URL=http://astra_agents_dev:49483
- TEN_DEV_SERVER_URL=http://ten_agent_dev:49483
networks:
astra_network:
ten_agent_network:
driver: bridge