chore(tool): add settings.model.api_key in builtin tools (#238)

* Update _convert_message

* Update _convert_message

* Add settings.model.api_key in builtin tools

---------

Co-authored-by: wangjiaju <[email protected]>

Author: doraemonlove

veadk/tools/builtin_tools/generate_image.py

@@ -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,
@@ -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),
 )
 

veadk/tools/builtin_tools/image_edit.py

@@ -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,
@@ -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),
 )
 

veadk/tools/builtin_tools/image_generate.py

@@ -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,
@@ -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),
 )
 

veadk/tools/builtin_tools/video_generate.py

@@ -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),
 )