Skip to content

Commit 7c5edce

Browse files
authored
Merge pull request #275 from inclusionAI/feature/api-server
new web ui
2 parents b209674 + a62598b commit 7c5edce

File tree

10 files changed

+53
-81
lines changed

10 files changed

+53
-81
lines changed
Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,33 @@
1-
LLM_PROVIDER_GAIA = openai
2-
LLM_MODEL_NAME_GAIA = xxx
3-
LLM_API_KEY_GAIA = xxx
4-
LLM_BASE_URL_GAIA = xxx
5-
LLM_TEMPERATURE_GAIA = 0.0
1+
# LLM Model Config
2+
LLM_PROVIDER = {YOUR_CONFIG:ant/openai}
3+
LLM_MODEL_NAME = {YOUR_CONFIG}
4+
LLM_API_KEY = {YOUR_CONFIG}
5+
LLM_BASE_URL = {YOUR_CONFIG}
6+
LLM_TEMPERATURE = 0.0
67

8+
# ===============Path Configurations=================
9+
# GAIA_DATASET_PATH="/path/to/your/gaia-benchmark/GAIA/2023"
10+
# AWORLD_WORKSPACE="/path/to/your/workspace_dir"
711

812
# ===============MCP Server Configurations=================
9-
# Google Search
10-
GOOGLE_API_KEY=xxx
11-
GOOGLE_SEARCH_ENGINE_ID=xxx
12-
GOOGLE_CSE_ID=xxx
13+
# [Google Search API](https://developers.google.com/custom-search/v1/introduction)
14+
GOOGLE_API_KEY={YOUR_CONFIG}
15+
GOOGLE_CSE_ID={YOUR_CONFIG}
1316

14-
# Google Map Server
15-
GOOGLE_MAPS_SECRET=xxx
16-
17-
# GitHub Server
18-
GITHUB_ACCESS_TOKEN=xxx
19-
20-
# E2B Server
21-
E2B_API_KEY=xxx
22-
23-
# Filesystem Server
24-
FILESYSTEM_SERVER_WORKDIR=/tmp/
25-
26-
# Browser Use: skip verfication
17+
# [Browser Use](https://github.com/browser-use/browser-use)
2718
SKIP_LLM_API_KEY_VERIFICATION=true
28-
OPENAI_API_KEY=xxx
29-
30-
# Apify Server
31-
APIFY_API_TOKEN=xxx
19+
OPENAI_API_KEY={YOUR_CONFIG}
20+
COOKIES_FILE_PATH={YOUR_CONFIG}
3221

3322
# Audio Server
34-
AUDIO_LLM_API_KEY=xxx
35-
AUDIO_LLM_BASE_URL=xxx
36-
AUDIO_LLM_MODEL_NAME=xxx
23+
AUDIO_LLM_API_KEY={YOUR_CONFIG}
24+
AUDIO_LLM_BASE_URL=https://api.zhizengzeng.com/v1
25+
AUDIO_LLM_MODEL_NAME=gpt-4o-transcribe
3726

3827
# Image Server
39-
IMAGE_LLM_API_KEY=xxx
40-
IMAGE_LLM_BASE_URL=xxx
41-
IMAGE_LLM_MODEL_NAME=xxx
42-
43-
# Video Server
44-
VIDEO_LLM_API_KEY=xxx
45-
VIDEO_LLM_BASE_URL=xxx
46-
VIDEO_LLM_MODEL_NAME=xxx
47-
48-
# - Zhizengzeng LLM ModelConfig
49-
LLM_API_KEY_ZZZ=xxx
50-
LLM_BASE_URL_ZZZ=xxx
51-
52-
# Weather Agent MCP API KEY, https://home.openweathermap.org/api_keys
53-
OPENWEATHER_API_KEY=xxx
54-
# AccWeather API, https://developer.accuweather.com/user/me/apps
55-
ACCUWEATHER_API_KEY=xxx
28+
IMAGE_LLM_API_KEY={YOUR_CONFIG}
29+
IMAGE_LLM_BASE_URL=https://openrouter.ai/api/v1
30+
IMAGE_LLM_MODEL_NAME=anthropic/claude-3.7-sonnet
5631

57-
# Playwright MCP for Aworld
58-
OSS_ENDPOINT=xxx
59-
OSS_ACCESS_KEY_ID=xxx
60-
OSS_ACCESS_KEY_SECRET=xxx
61-
OSS_BUCKET=xxx
32+
# [E2B Server](https://e2b.dev/docs/quickstart)
33+
E2B_API_KEY={YOUR_CONFIG}

examples/gaia/cmd/agent_deploy/gaia_agent/agent.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ def __init__(self, *args, **kwargs):
1313
os.makedirs(os.path.join(os.getcwd(), "static"), exist_ok=True)
1414

1515
async def run(self, prompt: str = None, request: ChatCompletionRequest = None):
16-
llm_provider = os.getenv("LLM_PROVIDER_GAIA", "openai")
17-
llm_model_name = os.getenv("LLM_MODEL_NAME_GAIA")
18-
llm_api_key = os.getenv("LLM_API_KEY_GAIA")
19-
llm_base_url = os.getenv("LLM_BASE_URL_GAIA")
20-
llm_temperature = float(os.getenv("LLM_TEMPERATURE_GAIA", 0.0))
16+
llm_provider = os.getenv("LLM_PROVIDER", "openai")
17+
llm_model_name = os.getenv("LLM_MODEL_NAME")
18+
llm_api_key = os.getenv("LLM_API_KEY")
19+
llm_base_url = os.getenv("LLM_BASE_URL")
20+
llm_temperature = float(os.getenv("LLM_TEMPERATURE", 0.0))
2121

2222
if not llm_model_name or not llm_api_key or not llm_base_url:
2323
raise ValueError(

examples/gaia/gaia_agent_server.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ def __init__(self):
1616

1717
def _get_model_config(self):
1818
try:
19-
llm_provider = os.getenv("LLM_PROVIDER_GAIA")
20-
llm_model_name = os.getenv("LLM_MODEL_NAME_GAIA")
21-
llm_api_key = os.getenv("LLM_API_KEY_GAIA")
22-
llm_base_url = os.getenv("LLM_BASE_URL_GAIA")
23-
llm_temperature = os.getenv("LLM_TEMPERATURE_GAIA", 0.0)
19+
llm_provider = os.getenv("LLM_PROVIDER")
20+
llm_model_name = os.getenv("LLM_MODEL_NAME")
21+
llm_api_key = os.getenv("LLM_API_KEY")
22+
llm_base_url = os.getenv("LLM_BASE_URL")
23+
llm_temperature = float(os.getenv("LLM_TEMPERATURE", 0.0))
2424
return {
2525
"provider": llm_provider,
2626
"model": llm_model_name,

examples/gaia/mcp.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"examples.gaia.mcp_collections.tools.browser"
1818
],
1919
"env": {
20-
"LLM_MODEL_NAME": "${LLM_MODEL_NAME_GAIA}",
21-
"LLM_API_KEY": "${LLM_API_KEY_GAIA}",
22-
"LLM_BASE_URL": "${LLM_BASE_URL_GAIA}",
20+
"LLM_MODEL_NAME": "${LLM_MODEL_NAME}",
21+
"LLM_API_KEY": "${LLM_API_KEY}",
22+
"LLM_BASE_URL": "${LLM_BASE_URL}",
2323
"SESSION_REQUEST_CONNECT_TIMEOUT": "120"
2424
}
2525
},

examples/gaia/mcp_collections/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def _obtain_valid_workspace(self, workspace: str | None = None) -> Path:
6767
2. environment variable AWORLD_WORKSPACE
6868
3. home directory
6969
"""
70-
path = Path(workspace) if workspace else os.getenv("AWORLD_WORKSPACE")
70+
path = Path(workspace) if workspace else os.getenv("AWORLD_WORKSPACE", "~")
7171
if path and path.expanduser().is_dir():
7272
return path.expanduser().resolve()
7373

examples/gaia/mcp_collections/intelligence/code.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def __init__(self, arguments: ActionArguments) -> None:
4949
self._llm_config = AgentConfig(
5050
llm_provider="openai",
5151
llm_model_name="anthropic/claude-sonnet-4",
52-
llm_api_key=os.getenv("LLM_API_KEY", "your_openai_api_key"),
53-
llm_base_url=os.getenv("LLM_BASE_URL", "your_openai_base_url"),
52+
llm_api_key=os.getenv("LLM_API_KEY"),
53+
llm_base_url=os.getenv("LLM_BASE_URL"),
5454
)
5555

5656
self._color_log("Code Generation Service initialized", Color.green, "debug")

examples/gaia/mcp_collections/intelligence/think.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def __init__(self, arguments: ActionArguments) -> None:
3232
llm_provider="openai",
3333
# llm_model_name="google/gemini-2.5-flash-preview-05-20:thinking",
3434
llm_model_name="deepseek/deepseek-r1-0528:free",
35-
llm_api_key=os.getenv("LLM_API_KEY", "your_openai_api_key"),
36-
llm_base_url=os.getenv("LLM_BASE_URL", "your_openai_base_url"),
35+
llm_api_key=os.getenv("LLM_API_KEY"),
36+
llm_base_url=os.getenv("LLM_BASE_URL"),
3737
)
3838

3939
self._color_log("Intelligence Reasoning Service initialized", Color.green, "debug")

examples/gaia/mcp_collections/media/image.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ def __init__(self, arguments: ActionArguments) -> None:
7070
self._llm_config = AgentConfig(
7171
llm_provider="openai",
7272
llm_model_name=os.getenv("IMAGE_LLM_MODEL_NAME", "gpt-4o"),
73-
llm_api_key=os.getenv("IMAGE_LLM_API_KEY", "your_openai_api_key"),
74-
llm_base_url=os.getenv("IMAGE_LLM_BASE_URL", "your_openai_base_url"),
73+
llm_api_key=os.getenv("IMAGE_LLM_API_KEY"),
74+
llm_base_url=os.getenv("IMAGE_LLM_BASE_URL"),
7575
)
7676

7777
self._color_log("Image Processing Service initialized", Color.green, "debug")

examples/gaia/mcp_collections/media/video.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ def _analyze_frame_chunk(self, chunk_data: tuple[int, list, str]) -> tuple[int,
372372
conf=AgentConfig(
373373
llm_provider="openai",
374374
llm_model_name=os.getenv("LLM_MODEL_NAME", "gpt-4o"),
375-
llm_api_key=os.getenv("LLM_API_KEY", "your_openai_api_key"),
376-
llm_base_url=os.getenv("LLM_BASE_URL", "your_openai_base_url"),
375+
llm_api_key=os.getenv("LLM_API_KEY"),
376+
llm_base_url=os.getenv("LLM_BASE_URL"),
377377
)
378378
),
379379
inputs,

examples/gaia/run.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
)
2424

2525
# Create log directory if it doesn't exist
26-
if not os.path.exists(os.getenv("AWORLD_WORKSPACE")):
27-
os.makedirs(os.getenv("AWORLD_WORKSPACE"))
26+
if not os.path.exists(os.getenv("AWORLD_WORKSPACE", "~")):
27+
os.makedirs(os.getenv("AWORLD_WORKSPACE", "~"))
2828

2929
parser = argparse.ArgumentParser()
3030
parser.add_argument(
@@ -70,7 +70,7 @@ def setup_logging():
7070

7171
log_file_name = f"/super_agent_{args.q}.log" if args.q else f"/super_agent_{args.start}_{args.end}.log"
7272
file_handler = logging.FileHandler(
73-
os.getenv("AWORLD_WORKSPACE") + log_file_name,
73+
os.getenv("AWORLD_WORKSPACE", "~") + log_file_name,
7474
mode="a",
7575
encoding="utf-8",
7676
)
@@ -102,8 +102,8 @@ def setup_logging():
102102
agent_config = AgentConfig(
103103
llm_provider="openai",
104104
llm_model_name=os.getenv("LLM_MODEL_NAME", "gpt-4o"),
105-
llm_api_key=os.getenv("LLM_API_KEY", "your_openai_api_key"),
106-
llm_base_url=os.getenv("LLM_BASE_URL", "your_openai_base_url"),
105+
llm_api_key=os.getenv("LLM_API_KEY"),
106+
llm_base_url=os.getenv("LLM_BASE_URL"),
107107
)
108108
super_agent = Agent(
109109
conf=agent_config,
@@ -114,8 +114,8 @@ def setup_logging():
114114
)
115115

116116
# load results from the checkpoint file
117-
if os.path.exists(os.getenv("AWORLD_WORKSPACE") + "/results.json"):
118-
with open(os.getenv("AWORLD_WORKSPACE") + "/results.json", "r", encoding="utf-8") as results_f:
117+
if os.path.exists(os.getenv("AWORLD_WORKSPACE", "~") + "/results.json"):
118+
with open(os.getenv("AWORLD_WORKSPACE", "~") + "/results.json", "r", encoding="utf-8") as results_f:
119119
results: List[Dict[str, Any]] = json.load(results_f)
120120
else:
121121
results: List[Dict[str, Any]] = []
@@ -223,5 +223,5 @@ def setup_logging():
223223
finally:
224224
# report
225225
report_results(results)
226-
with open(os.getenv("AWORLD_WORKSPACE") + "/results.json", "w", encoding="utf-8") as f:
226+
with open(os.getenv("AWORLD_WORKSPACE", "~") + "/results.json", "w", encoding="utf-8") as f:
227227
json.dump(results, f, indent=4, ensure_ascii=False)

0 commit comments

Comments
 (0)