diff --git a/configs/client_configs/cases/example/bob.yaml b/configs/client_configs/cases/example/bob.yaml new file mode 100644 index 0000000..52691a3 --- /dev/null +++ b/configs/client_configs/cases/example/bob.yaml @@ -0,0 +1,26 @@ +server: + port: + hostname: + +tool_agent: + agent_type: ReAct + agent_name: Bob + desc: |- + Bob can leverage third-party tools to help manage resources. + tools_config: tools_code_executor.yaml # simply an example + image_name: react-agent + container_name: bob-agent + port: 7070 + model: gpt-4-1106-preview + max_num_steps: 8 + +comm: + name: Bob + desc: Bob is a strategic intelligent assistant specializing in logistics and resource management. He excels at analyzing complex supply chains, predicting potential disruptions, and optimizing the flow of goods. Bob can work with other assistants to dynamically reallocate resources, ensuring efficiency and minimizing delays. His strong problem-solving skills and collaborative nature make him an invaluable asset in any logistical operation. + type: Thing Assistant + support_nested_teams: true + max_team_up_attempts: 10 + llm: + llm_type: openai-chat + model: gpt-4-1106-preview + temperature: 0. diff --git a/configs/client_configs/cases/gaia/code_executor.yaml b/configs/client_configs/cases/gaia/code_executor.yaml index bf4fae1..deb5e6b 100644 --- a/configs/client_configs/cases/gaia/code_executor.yaml +++ b/configs/client_configs/cases/gaia/code_executor.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -22,8 +21,6 @@ comm: type: Thing Assistant support_nested_teams: false max_team_up_attempts: 10 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/configs/client_configs/cases/gaia/web_browser.yaml b/configs/client_configs/cases/gaia/web_browser.yaml index 49403b6..5590f01 100644 --- a/configs/client_configs/cases/gaia/web_browser.yaml +++ b/configs/client_configs/cases/gaia/web_browser.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -27,8 +26,6 @@ comm: type: Thing Assistant support_nested_teams: false max_team_up_attempts: 5 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/configs/client_configs/cases/gaia/wikidata.yaml b/configs/client_configs/cases/gaia/wikidata.yaml index 98824ac..3c99fd2 100644 --- a/configs/client_configs/cases/gaia/wikidata.yaml +++ b/configs/client_configs/cases/gaia/wikidata.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -22,8 +21,6 @@ comm: type: Thing Assistant support_nested_teams: false max_team_up_attempts: 10 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/configs/client_configs/cases/gaia/youtube.yaml b/configs/client_configs/cases/gaia/youtube.yaml index 6fccd80..6c24b58 100644 --- a/configs/client_configs/cases/gaia/youtube.yaml +++ b/configs/client_configs/cases/gaia/youtube.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -22,8 +21,6 @@ comm: type: Thing Assistant support_nested_teams: false max_team_up_attempts: 10 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/configs/client_configs/cases/open_instruction/autogpt.yaml b/configs/client_configs/cases/open_instruction/autogpt.yaml index ff1affb..fe166f9 100644 --- a/configs/client_configs/cases/open_instruction/autogpt.yaml +++ b/configs/client_configs/cases/open_instruction/autogpt.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server diff --git a/configs/client_configs/cases/open_instruction/open_interpreter.yaml b/configs/client_configs/cases/open_instruction/open_interpreter.yaml index 7408703..84a0425 100644 --- a/configs/client_configs/cases/open_instruction/open_interpreter.yaml +++ b/configs/client_configs/cases/open_instruction/open_interpreter.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server diff --git a/configs/client_configs/cases/paper_writing/arxiv.yaml b/configs/client_configs/cases/paper_writing/arxiv.yaml index 97f2d31..055c666 100644 --- a/configs/client_configs/cases/paper_writing/arxiv.yaml +++ b/configs/client_configs/cases/paper_writing/arxiv.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server diff --git a/configs/client_configs/cases/paper_writing/chengyang.yaml b/configs/client_configs/cases/paper_writing/chengyang.yaml index c9cb3cb..84af6dd 100644 --- a/configs/client_configs/cases/paper_writing/chengyang.yaml +++ b/configs/client_configs/cases/paper_writing/chengyang.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server diff --git a/configs/client_configs/cases/paper_writing/chenqian.yaml b/configs/client_configs/cases/paper_writing/chenqian.yaml index 1c4d438..dc537ed 100644 --- a/configs/client_configs/cases/paper_writing/chenqian.yaml +++ b/configs/client_configs/cases/paper_writing/chenqian.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server diff --git a/configs/client_configs/cases/paper_writing/formatCraft_printer.yaml b/configs/client_configs/cases/paper_writing/formatCraft_printer.yaml index c598d9b..63b502c 100644 --- a/configs/client_configs/cases/paper_writing/formatCraft_printer.yaml +++ b/configs/client_configs/cases/paper_writing/formatCraft_printer.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server diff --git a/configs/client_configs/cases/paper_writing/google_scholar.yaml b/configs/client_configs/cases/paper_writing/google_scholar.yaml index 3f29c2b..06fb2cb 100644 --- a/configs/client_configs/cases/paper_writing/google_scholar.yaml +++ b/configs/client_configs/cases/paper_writing/google_scholar.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server diff --git a/configs/client_configs/cases/paper_writing/weizechen.yaml b/configs/client_configs/cases/paper_writing/weizechen.yaml index a65222c..24cd1d2 100644 --- a/configs/client_configs/cases/paper_writing/weizechen.yaml +++ b/configs/client_configs/cases/paper_writing/weizechen.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server diff --git a/configs/client_configs/cases/rocobench/alice.yaml b/configs/client_configs/cases/rocobench/alice.yaml index 2ed519c..519931e 100644 --- a/configs/client_configs/cases/rocobench/alice.yaml +++ b/configs/client_configs/cases/rocobench/alice.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -11,8 +10,6 @@ comm: type: Thing Assistant support_nested_teams: false max_team_up_attempts: 10 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/configs/client_configs/cases/rocobench/bob.yaml b/configs/client_configs/cases/rocobench/bob.yaml index f9bb26c..1d4490e 100644 --- a/configs/client_configs/cases/rocobench/bob.yaml +++ b/configs/client_configs/cases/rocobench/bob.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -11,8 +10,6 @@ comm: type: Thing Assistant support_nested_teams: false max_team_up_attempts: 10 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/configs/client_configs/cases/rocobench/chad.yaml b/configs/client_configs/cases/rocobench/chad.yaml index f4c2818..dda24c3 100644 --- a/configs/client_configs/cases/rocobench/chad.yaml +++ b/configs/client_configs/cases/rocobench/chad.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -11,8 +10,6 @@ comm: type: Thing Assistant support_nested_teams: false max_team_up_attempts: 10 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/configs/client_configs/cases/rocobench/dave.yaml b/configs/client_configs/cases/rocobench/dave.yaml index 3df122a..0a71306 100644 --- a/configs/client_configs/cases/rocobench/dave.yaml +++ b/configs/client_configs/cases/rocobench/dave.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -11,8 +10,6 @@ comm: type: Thing Assistant support_nested_teams: false max_team_up_attempts: 10 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/configs/client_configs/default_config.yaml b/configs/client_configs/default_config.yaml index b1618aa..63f3f1c 100644 --- a/configs/client_configs/default_config.yaml +++ b/configs/client_configs/default_config.yaml @@ -1,5 +1,4 @@ server: - host: http://ioa-server port: 7788 hostname: ioa-server @@ -25,8 +24,6 @@ comm: type: Human Assistant support_nested_teams: false max_team_up_attempts: 10 - tools: - team_up_tools: configs/tools/tools_team_up.yaml llm: llm_type: openai-chat model: gpt-4-1106-preview diff --git a/dockerfiles/compose/client_only.yaml b/dockerfiles/compose/client_only.yaml new file mode 100644 index 0000000..d583dc4 --- /dev/null +++ b/dockerfiles/compose/client_only.yaml @@ -0,0 +1,28 @@ +# Set the current version of compose yml file +version: "3" + +services: + Agent1: + image: ioa-client:latest + build: + context: ../../ + dockerfile: dockerfiles/client.Dockerfile + container_name: react-agent-1 + env_file: + - .env + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ../../configs/client_configs:/app/configs + environment: + - OPENAI_API_KEY + - CUSTOM_CONFIG=configs/cases/example/bob.yaml + ports: + - 5050:5050 + stdin_open: true + tty: true + +networks: + default: + name: agent_network + driver: bridge + external: true diff --git a/dockerfiles/compose/paper_writing.yml b/dockerfiles/compose/paper_writing.yaml similarity index 100% rename from dockerfiles/compose/paper_writing.yml rename to dockerfiles/compose/paper_writing.yaml diff --git a/dockerfiles/compose/server_only.yaml b/dockerfiles/compose/server_only.yaml new file mode 100644 index 0000000..96e7191 --- /dev/null +++ b/dockerfiles/compose/server_only.yaml @@ -0,0 +1,38 @@ +version: "3" + +services: + Server: + image: ioa-server:latest + build: + context: ../../ + dockerfile: dockerfiles/server.Dockerfile + container_name: ioa-server + volumes: + - ../../configs/server_configs:/app/configs + env_file: + - .env + environment: + - OPENAI_API_KEY + ports: + - 7788:7788 + stdin_open: true + tty: true + + ServerFrontend: + image: ioa-server-frontend:latest + build: + context: ../../ + dockerfile: dockerfiles/server_frontend.Dockerfile + container_name: server_frontend + ports: + - 80:80 + depends_on: + - Server + stdin_open: true + tty: true + +networks: + default: + name: agent_network + driver: bridge + external: true diff --git a/im_client/server_helper.py b/im_client/server_helper.py index b798f07..03d3da6 100644 --- a/im_client/server_helper.py +++ b/im_client/server_helper.py @@ -19,7 +19,7 @@ class ServerHelper: Helper functions that help communicate with the server. """ - host = global_config["server"]["host"] + host = "http://" + global_config["server"]["hostname"] port = global_config["server"]["port"] url = f"{host}:{port}"