diff --git a/.devcontainer/devcontainer.env b/.devcontainer/devcontainer.env deleted file mode 100644 index 38c8c428e4..0000000000 --- a/.devcontainer/devcontainer.env +++ /dev/null @@ -1,10 +0,0 @@ -AZURE_API_ENDPOINT=${AZURE_API_ENDPOINT} -AZURE_API_VERSION=${AZURE_API_VERSION} - -# LLM keys -OAI_CONFIG_LIST='[{"model": "gpt-4o","api_key": "","tags": ["gpt-4o", "tool", "vision"]}]' -ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY} -AZURE_OPENAI_API_KEY=${AZURE_OPENAI_API_KEY} -OPENAI_API_KEY=${OPENAI_API_KEY} -TOGETHER_API_KEY=${TOGETHER_API_KEY} -GEMINI_API_KEY=${GEMINI_API_KEY} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a03df8f7f8..ed4d53236d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -33,11 +33,18 @@ "workspaceFolder": "/workspaces/ag2", "runArgs": [ "--name", - "python-3.9-ag2", - "--env-file", - "${localWorkspaceFolder}/.devcontainer/devcontainer.env" + "python-3.9-ag2" ], - "remoteEnv": {}, + "remoteEnv": { + "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}", + "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}", + "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}", + "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}", + "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}", + "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}", + "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}", + "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}", + }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { "installZsh": true, diff --git a/.devcontainer/python-3.10/devcontainer.json b/.devcontainer/python-3.10/devcontainer.json index 2607ac6ffe..8242b4f4bf 100644 --- a/.devcontainer/python-3.10/devcontainer.json +++ b/.devcontainer/python-3.10/devcontainer.json @@ -33,11 +33,18 @@ "workspaceFolder": "/workspaces/ag2", "runArgs": [ "--name", - "python-3.10-ag2", - "--env-file", - "${localWorkspaceFolder}/.devcontainer/devcontainer.env" + "python-3.10-ag2" ], - "remoteEnv": {}, + "remoteEnv": { + "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}", + "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}", + "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}", + "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}", + "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}", + "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}", + "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}", + "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}", + }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { "installZsh": true, diff --git a/.devcontainer/python-3.11/devcontainer.json b/.devcontainer/python-3.11/devcontainer.json index 2003dbd269..c099e5c784 100644 --- a/.devcontainer/python-3.11/devcontainer.json +++ b/.devcontainer/python-3.11/devcontainer.json @@ -33,11 +33,18 @@ "workspaceFolder": "/workspaces/ag2", "runArgs": [ "--name", - "python-3.11-ag2", - "--env-file", - "${localWorkspaceFolder}/.devcontainer/devcontainer.env" + "python-3.11-ag2" ], - "remoteEnv": {}, + "remoteEnv": { + "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}", + "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}", + "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}", + "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}", + "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}", + "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}", + "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}", + "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}", + }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { "installZsh": true, diff --git a/.devcontainer/python-3.12/devcontainer.json b/.devcontainer/python-3.12/devcontainer.json index 5b51f87460..6dbaedba84 100644 --- a/.devcontainer/python-3.12/devcontainer.json +++ b/.devcontainer/python-3.12/devcontainer.json @@ -33,11 +33,18 @@ "workspaceFolder": "/workspaces/ag2", "runArgs": [ "--name", - "python-3.12-ag2", - "--env-file", - "${localWorkspaceFolder}/.devcontainer/devcontainer.env" + "python-3.12-ag2" ], - "remoteEnv": {}, + "remoteEnv": { + "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}", + "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}", + "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}", + "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}", + "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}", + "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}", + "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}", + "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}", + }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { "installZsh": true, diff --git a/.devcontainer/python-3.13/devcontainer.json b/.devcontainer/python-3.13/devcontainer.json index 674684efb4..3e32aa6708 100644 --- a/.devcontainer/python-3.13/devcontainer.json +++ b/.devcontainer/python-3.13/devcontainer.json @@ -33,11 +33,18 @@ "workspaceFolder": "/workspaces/ag2", "runArgs": [ "--name", - "python-3.13-ag2", - "--env-file", - "${localWorkspaceFolder}/.devcontainer/devcontainer.env" + "python-3.13-ag2" ], - "remoteEnv": {}, + "remoteEnv": { + "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}", + "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}", + "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}", + "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}", + "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}", + "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}", + "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}", + "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}", + }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { "installZsh": true, diff --git a/scripts/devcontainer/templates/devcontainer.json.jinja b/scripts/devcontainer/templates/devcontainer.json.jinja index c08e324021..503ed063f4 100644 --- a/scripts/devcontainer/templates/devcontainer.json.jinja +++ b/scripts/devcontainer/templates/devcontainer.json.jinja @@ -33,11 +33,18 @@ "workspaceFolder": "/workspaces/ag2", "runArgs": [ "--name", - "python-{{ python_version }}-ag2", - "--env-file", - "${localWorkspaceFolder}/.devcontainer/devcontainer.env" + "python-{{ python_version }}-ag2" ], - "remoteEnv": {}, + "remoteEnv": { + "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}", + "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}", + "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}", + "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}", + "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}", + "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}", + "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}", + "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}", + }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { "installZsh": true,