Skip to content

Add settings.model.api_key in builtin tools. #238

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

Merged
yaozheng-fang merged 5 commits into from
Oct 21, 2025
Merged

Add settings.model.api_key in builtin tools. #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54237cc
Update _convert_message
Oct 17, 2025
2351d9b
Update _convert_message
Oct 17, 2025
e9426ed
Merge branch 'volcengine:main' into main
doraemonlove Oct 21, 2025
da37188
Merge branch 'volcengine:main' into main
doraemonlove Oct 21, 2025
bddafa1
Add settings.model.api_key in builtin tools
Oct 21, 2025
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
6 changes: 4 additions & 2 deletions veadk/tools/builtin_tools/generate_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from volcenginesdkarkruntime import Ark
from volcenginesdkarkruntime.types.images.images import SequentialImageGenerationOptions

from veadk.config import getenv
from veadk.config import getenv, settings
from veadk.consts import (
DEFAULT_IMAGE_GENERATE_MODEL_NAME,
DEFAULT_IMAGE_GENERATE_MODEL_API_BASE,
Expand All @@ -37,7 +37,9 @@
logger = get_logger(__name__)

client = Ark(
api_key=getenv("MODEL_IMAGE_API_KEY", getenv("MODEL_AGENT_API_KEY")),
api_key=getenv(
"MODEL_IMAGE_API_KEY", getenv("MODEL_AGENT_API_KEY", settings.model.api_key)
),
base_url=getenv("MODEL_IMAGE_API_BASE", DEFAULT_IMAGE_GENERATE_MODEL_API_BASE),
)

Expand Down
6 changes: 4 additions & 2 deletions veadk/tools/builtin_tools/image_edit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from typing import Dict
from google.adk.tools import ToolContext
from volcenginesdkarkruntime import Ark
from veadk.config import getenv
from veadk.config import getenv, settings
from veadk.consts import (
DEFAULT_IMAGE_EDIT_MODEL_API_BASE,
DEFAULT_IMAGE_EDIT_MODEL_NAME,
Expand All @@ -31,7 +31,9 @@
logger = get_logger(__name__)

client = Ark(
api_key=getenv("MODEL_EDIT_API_KEY", getenv("MODEL_AGENT_API_KEY")),
api_key=getenv(
"MODEL_EDIT_API_KEY", getenv("MODEL_AGENT_API_KEY", settings.model.api_key)
),
base_url=getenv("MODEL_EDIT_API_BASE", DEFAULT_IMAGE_EDIT_MODEL_API_BASE),
)

Expand Down
6 changes: 4 additions & 2 deletions veadk/tools/builtin_tools/image_generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from typing import Dict

from google.adk.tools import ToolContext
from veadk.config import getenv
from veadk.config import getenv, settings
from veadk.consts import (
DEFAULT_TEXT_TO_IMAGE_MODEL_NAME,
DEFAULT_TEXT_TO_IMAGE_MODEL_API_BASE,
Expand All @@ -32,7 +32,9 @@
logger = get_logger(__name__)

client = Ark(
api_key=getenv("MODEL_IMAGE_API_KEY", getenv("MODEL_AGENT_API_KEY")),
api_key=getenv(
"MODEL_IMAGE_API_KEY", getenv("MODEL_AGENT_API_KEY", settings.model.api_key)
),
base_url=getenv("MODEL_IMAGE_API_BASE", DEFAULT_TEXT_TO_IMAGE_MODEL_API_BASE),
)

Expand Down
6 changes: 4 additions & 2 deletions veadk/tools/builtin_tools/video_generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@
CreateTaskContentParam,
)

from veadk.config import getenv
from veadk.config import getenv, settings
from veadk.consts import DEFAULT_VIDEO_MODEL_API_BASE, DEFAULT_VIDEO_MODEL_NAME
from veadk.utils.logger import get_logger
from veadk.version import VERSION

logger = get_logger(__name__)

client = Ark(
api_key=getenv("MODEL_VIDEO_API_KEY", getenv("MODEL_AGENT_API_KEY")),
api_key=getenv(
"MODEL_VIDEO_API_KEY", getenv("MODEL_AGENT_API_KEY", settings.model.api_key)
),
base_url=getenv("MODEL_VIDEO_API_BASE", DEFAULT_VIDEO_MODEL_API_BASE),
)

Expand Down