Merge branch 'main' into feat/vanna

Author: BhAem

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "veadk-python"
-version = "0.5.19"
+version = "0.5.22"
 description = "Volcengine agent development kit, integrations with Volcengine cloud services."
 readme = "README.md"
 requires-python = ">=3.10"

tests/tools/mcp_tool/test_trusted_mcp_components.py

@@ -170,7 +170,7 @@ async def aclose(self):
                     connection_params=self.mock_http_params, errlog=sys.stderr
                 )
                 manager._sessions = {}
-                manager._session_lock = asyncio.Lock()
+                # manager._session_lock = asyncio.Lock()
 
                 # Call create_session
                 headers = {"x-trusted-mcp": "true"}
@@ -207,7 +207,7 @@ async def run_test():
                     connection_params=self.mock_http_params, errlog=sys.stderr
                 )
                 manager._sessions = {}
-                manager._session_lock = asyncio.Lock()
+                # manager._session_lock = asyncio.Lock()
 
                 # Set up an existing session
                 existing_session = mock.MagicMock()

veadk/agent.py

@@ -86,6 +86,7 @@ class Agent(LlmAgent):
         skills (list[str]): List of skills that equip the agent with specific capabilities.
         example_store (Optional[BaseExampleProvider]): Example store for providing example Q/A.
         enable_shadowchar (bool): Whether to enable shadow character for the agent.
+        enable_dynamic_load_skills (bool): Whether to enable dynamic loading of skills.
     """
 
     model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow")
@@ -154,6 +155,12 @@ class Agent(LlmAgent):
 
     enable_ghostchar: bool = False
 
+    enable_dataset_gen: bool = False
+
+    enable_dynamic_load_skills: bool = False
+    enable_skills_checklist: bool = False
+    _skills_with_checklist: Dict[str, Any] = {}
+
     def model_post_init(self, __context: Any) -> None:
         super().model_post_init(None)  # for sub_agents init
 
@@ -225,6 +232,8 @@ def model_post_init(self, __context: Any) -> None:
 
         self._prepare_tracers()
 
+        self._validate_tool_dependencies()
+
         if self.knowledgebase:
             from veadk.tools.builtin_tools.load_knowledgebase import (
                 LoadKnowledgebaseTool,
@@ -298,6 +307,23 @@ def model_post_init(self, __context: Any) -> None:
 
         if self.skills:
             self.load_skills()
+            if self.enable_skills_checklist:
+                logger.info("Skills checklist enabled")
+                from veadk.skills.utils import create_init_skill_check_list_callback
+
+                init_callback = create_init_skill_check_list_callback(
+                    self._skills_with_checklist
+                )
+                if self.before_tool_callback:
+                    if isinstance(self.before_tool_callback, list):
+                        self.before_tool_callback.append(init_callback)
+                    else:
+                        self.before_tool_callback = [
+                            self.before_tool_callback,
+                            init_callback,
+                        ]
+                else:
+                    self.before_tool_callback = init_callback
 
         if self.example_store:
             from google.adk.tools.example_tool import ExampleTool
@@ -312,6 +338,22 @@ def model_post_init(self, __context: Any) -> None:
 
             self.instruction += "Please add a character `< at the beginning of you each text-based response."
 
+        if self.enable_dataset_gen:
+            from veadk.toolkits.dataset_auto_gen_callback import (
+                dataset_auto_gen_callback,
+            )
+
+            if self.after_agent_callback:
+                if isinstance(self.after_agent_callback, list):
+                    self.after_agent_callback.append(dataset_auto_gen_callback)
+                else:
+                    self.after_agent_callback = [
+                        self.after_agent_callback,
+                        dataset_auto_gen_callback,
+                    ]
+            else:
+                self.after_agent_callback = dataset_auto_gen_callback
+
         logger.info(f"VeADK version: {VERSION}")
 
         logger.info(f"{self.__class__.__name__} `{self.name}` init done.")
@@ -329,13 +371,14 @@ def load_skills(self):
         from pathlib import Path
 
         from veadk.skills.skill import Skill
+        from veadk.skills.check_skills_callback import check_skills
         from veadk.skills.utils import (
             load_skills_from_cloud,
             load_skills_from_directory,
         )
         from veadk.tools.skills_tools.skills_toolset import SkillsToolset
 
-        skills: Dict[str, Skill] = {}
+        self.skills_dict: Dict[str, Skill] = {}
 
         # Determine skills_mode if not set
         if not self.skills_mode:
@@ -361,9 +404,19 @@ def load_skills(self):
                 else:
                     logger.debug("Successfully get AK/SK from environment variables.")
 
+                provider = (os.getenv("CLOUD_PROVIDER") or "").lower()
+                if provider == "byteplus":
+                    sld = "byteplusapi"
+                    default_region = "ap-southeast-1"
+                else:
+                    sld = "volcengineapi"
+                    default_region = "cn-beijing"
+
                 service = os.getenv("AGENTKIT_TOOL_SERVICE_CODE", "agentkit")
-                region = os.getenv("AGENTKIT_TOOL_REGION", "cn-beijing")
-                host = service + "." + region + ".volcengineapi.com"
+                region = os.getenv("AGENTKIT_TOOL_REGION", default_region)
+                host = os.getenv(
+                    "AGENTKIT_SKILL_HOST", service + "." + region + f".{sld}.com"
+                )
 
                 res = ve_request(
                     request_body={"ToolId": tool_id},
@@ -400,17 +453,28 @@ def load_skills(self):
             path = Path(item)
             if path.exists() and path.is_dir():
                 for skill in load_skills_from_directory(path):
-                    skills[skill.name] = skill
+                    self.skills_dict[skill.name] = skill
             else:
                 for skill in load_skills_from_cloud(item):
-                    skills[skill.name] = skill
-        if skills:
+                    self.skills_dict[skill.name] = skill
+        if self.skills_dict:
             self.instruction += "\nYou have the following skills:\n"
 
-            for skill in skills.values():
+            self._skills_with_checklist = self.skills_dict
+
+            has_checklist = False
+            for skill in self.skills_dict.values():
                 self.instruction += (
                     f"- name: {skill.name}\n- description: {skill.description}\n\n"
                 )
+                if skill.checklist:
+                    has_checklist = True
+
+            if has_checklist:
+                self.instruction += (
+                    "Some skills have a checklist that you must complete step by step. "
+                    "Use the `update_check_list` tool to mark each item as completed.\n\n"
+                )
 
             if self.skills_mode not in [
                 "skills_sandbox",
@@ -431,10 +495,52 @@ def load_skills(self):
                     "You can use the skills by calling the `skills_tool` tool.\n\n"
                 )
 
-            self.tools.append(SkillsToolset(skills, self.skills_mode))
         else:
             logger.warning("No skills loaded.")
 
+        self.tools.append(SkillsToolset(self.skills_dict, self.skills_mode))
+
+        if self.enable_dynamic_load_skills:
+            if self.before_agent_callback:
+                if isinstance(self.before_agent_callback, list):
+                    self.before_agent_callback.append(check_skills)
+                else:
+                    self.before_agent_callback = [
+                        self.before_agent_callback,
+                        check_skills,
+                    ]
+            else:
+                self.before_agent_callback = check_skills
+
+    def _validate_tool_dependencies(self):
+        tool_names = set()
+        for tool in self.tools:
+            if hasattr(tool, "__name__"):
+                tool_names.add(tool.__name__)
+            elif hasattr(tool, "name"):
+                tool_names.add(tool.name)
+
+        has_video_generate = "video_generate" in tool_names
+        has_video_task_query = "video_task_query" in tool_names
+
+        if has_video_generate and not has_video_task_query:
+            from veadk.tools.builtin_tools.video_generate import video_task_query
+
+            logger.warning(
+                "video_generate tool is mounted but video_task_query is not. "
+                "video_task_query is required for querying video generation status. "
+                "Automatically adding video_task_query to tools."
+            )
+            self.tools.append(video_task_query)
+        elif has_video_task_query and not has_video_generate:
+            from veadk.tools.builtin_tools.video_generate import video_generate
+
+            logger.warning(
+                "video_task_query tool is mounted but video_generate is not. "
+                "Automatically adding video_generate to tools."
+            )
+            self.tools.append(video_generate)
+
     def _prepare_tracers(self):
         enable_apmplus_tracer = os.getenv("ENABLE_APMPLUS", "false").lower() == "true"
         enable_cozeloop_tracer = os.getenv("ENABLE_COZELOOP", "false").lower() == "true"

veadk/consts.py

@@ -65,10 +65,10 @@
 DEFAULT_IMAGE_EDIT_MODEL_NAME = "doubao-seededit-3-0-i2i-250628"
 DEFAULT_IMAGE_EDIT_MODEL_API_BASE = "https://ark.cn-beijing.volces.com/api/v3/"
 
-DEFAULT_VIDEO_MODEL_NAME = "doubao-seedance-1-5-pro-251215"
+DEFAULT_VIDEO_MODEL_NAME = "doubao-seedance-2-0-260128"
 DEFAULT_VIDEO_MODEL_API_BASE = "https://ark.cn-beijing.volces.com/api/v3/"
 
-DEFAULT_IMAGE_GENERATE_MODEL_NAME = "doubao-seedream-4-5-251128"
+DEFAULT_IMAGE_GENERATE_MODEL_NAME = "doubao-seedream-5-0-260128"
 DEFAULT_IMAGE_GENERATE_MODEL_API_BASE = "https://ark.cn-beijing.volces.com/api/v3/"
 
 VEFAAS_IAM_CRIDENTIAL_PATH = "/var/run/secrets/iam/credential"

veadk/memory/long_term_memory_backends/vikingdb_memory_backend.py

@@ -152,7 +152,8 @@ def _get_client(self) -> VikingDBMemoryClient:
         ak, sk, sts_token = self._get_ak_sk_sts()
         if self.cloud_provider.lower() == "byteplus":
             host = f"api-knowledgebase.mlp.{self.region}.bytepluses.com"
-
+        else:
+            host = f"api-knowledgebase.mlp.{self.region}.volces.com"
         logger.info(f"Cloud provider: {self.cloud_provider.lower()}")
         logger.info(f"VikingDBLTMBackend: region={self.region}, host={host}")
 
@@ -168,7 +169,8 @@ def _get_sdk_client(self) -> VikingMem:
         ak, sk, sts_token = self._get_ak_sk_sts()
         if self.cloud_provider.lower() == "byteplus":
             host = f"api-knowledgebase.mlp.{self.region}.bytepluses.com"
-
+        else:
+            host = f"api-knowledgebase.mlp.{self.region}.volces.com"
         logger.info(f"Cloud provider: {self.cloud_provider.lower()}")
         logger.info(f"VikingDBLTMBackend: region={self.region}, host={host}")