veadk-python 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

veadk/agent.py

@@ -40,6 +40,7 @@ from veadk.prompts.agent_default_prompt import DEFAULT_DESCRIPTION, DEFAULT_INST
 from veadk.tracing.base_tracer import BaseTracer
 from veadk.utils.logger import get_logger
 from veadk.utils.patches import patch_asyncio
+from veadk.version import VERSION
 
 patch_asyncio()
 logger = get_logger(__name__)
@@ -60,7 +61,6 @@ class Agent(LlmAgent):
     instruction: str = DEFAULT_INSTRUCTION
     """The instruction for the agent, such as principles of function calling."""
 
-    # factory
     model_name: str = getenv("MODEL_AGENT_NAME", DEFAULT_MODEL_AGENT_NAME)
     """The name of the model for agent running."""
 
@@ -113,16 +113,9 @@ class Agent(LlmAgent):
 
             self.tools.append(load_memory)
 
-        if self.tracers:
-            self.before_model_callback = []
-            self.after_model_callback = []
-            self.after_tool_callback = []
-            for tracer in self.tracers:
-                self.before_model_callback.append(tracer.tracer_hook_before_model)
-                self.after_model_callback.append(tracer.tracer_hook_after_model)
-                self.after_tool_callback.append(tracer.tracer_hook_after_tool)
+        logger.info(f"VeADK version: {VERSION}")
 
-        logger.info(f"Agent `{self.name}` init done.")
+        logger.info(f"{self.__class__.__name__} `{self.name}` init done.")
         logger.debug(
             f"Agent: {self.model_dump(include={'name', 'model_name', 'model_api_base', 'tools', 'serve_url'})}"
         )
@@ -221,9 +214,6 @@ class Agent(LlmAgent):
             session_service=session_service,
             memory_service=self.long_term_memory,
         )
-        if getattr(self, "tracers", None):
-            for tracer in self.tracers:
-                tracer.set_app_name(app_name)
 
         logger.info(f"Begin to process prompt {prompt}")
         # run

veadk/agents/loop_agent.py

@@ -0,0 +1,55 @@
+# Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+from google.adk.agents import LoopAgent as GoogleADKLoopAgent
+from google.adk.agents.base_agent import BaseAgent
+from pydantic import ConfigDict, Field
+from typing_extensions import Any
+
+from veadk.prompts.agent_default_prompt import DEFAULT_DESCRIPTION, DEFAULT_INSTRUCTION
+from veadk.tracing.base_tracer import BaseTracer
+from veadk.utils.logger import get_logger
+from veadk.utils.patches import patch_asyncio
+
+patch_asyncio()
+logger = get_logger(__name__)
+
+
+class LoopAgent(GoogleADKLoopAgent):
+    """Loop Agent with Volcengine capabilities."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow")
+    """The model config"""
+
+    name: str = "veLoopAgent"
+    """The name of the agent."""
+
+    description: str = DEFAULT_DESCRIPTION
+    """The description of the agent. This will be helpful in A2A scenario."""
+
+    instruction: str = DEFAULT_INSTRUCTION
+    """The instruction for the agent, such as principles of function calling."""
+
+    sub_agents: list[BaseAgent] = Field(default_factory=list, exclude=True)
+    """The sub agents provided to agent."""
+
+    tracers: list[BaseTracer] = []
+    """The tracers provided to agent."""
+
+    def model_post_init(self, __context: Any) -> None:
+        super().model_post_init(None)  # for sub_agents init
+
+        logger.info(f"{self.__class__.__name__} `{self.name}` init done.")

veadk/agents/parallel_agent.py

@@ -0,0 +1,60 @@
+# Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+from google.adk.agents import ParallelAgent as GoogleADKParallelAgent
+from google.adk.agents.base_agent import BaseAgent
+from pydantic import ConfigDict, Field
+from typing_extensions import Any
+
+from veadk.prompts.agent_default_prompt import DEFAULT_DESCRIPTION, DEFAULT_INSTRUCTION
+from veadk.tracing.base_tracer import BaseTracer
+from veadk.utils.logger import get_logger
+from veadk.utils.patches import patch_asyncio
+
+patch_asyncio()
+logger = get_logger(__name__)
+
+
+class ParallelAgent(GoogleADKParallelAgent):
+    """LLM-based Agent with Volcengine capabilities."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow")
+    """The model config"""
+
+    name: str = "veParallelAgent"
+    """The name of the agent."""
+
+    description: str = DEFAULT_DESCRIPTION
+    """The description of the agent. This will be helpful in A2A scenario."""
+
+    instruction: str = DEFAULT_INSTRUCTION
+    """The instruction for the agent, such as principles of function calling."""
+
+    sub_agents: list[BaseAgent] = Field(default_factory=list, exclude=True)
+    """The sub agents provided to agent."""
+
+    tracers: list[BaseTracer] = []
+    """The tracers provided to agent."""
+
+    def model_post_init(self, __context: Any) -> None:
+        super().model_post_init(None)  # for sub_agents init
+
+        if self.tracers:
+            logger.warning(
+                "Enable tracing in ParallelAgent may cause OpenTelemetry context error. Issue see https://github.com/google/adk-python/issues/1670"
+            )
+
+        logger.info(f"{self.__class__.__name__} `{self.name}` init done.")

veadk/agents/sequential_agent.py

@@ -0,0 +1,55 @@
+# Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+from google.adk.agents import SequentialAgent as GoogleADKSequentialAgent
+from google.adk.agents.base_agent import BaseAgent
+from pydantic import ConfigDict, Field
+from typing_extensions import Any
+
+from veadk.prompts.agent_default_prompt import DEFAULT_DESCRIPTION, DEFAULT_INSTRUCTION
+from veadk.tracing.base_tracer import BaseTracer
+from veadk.utils.logger import get_logger
+from veadk.utils.patches import patch_asyncio
+
+patch_asyncio()
+logger = get_logger(__name__)
+
+
+class SequentialAgent(GoogleADKSequentialAgent):
+    """Sequential Agent with Volcengine capabilities."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow")
+    """The model config"""
+
+    name: str = "veSequentialAgent"
+    """The name of the agent."""
+
+    description: str = DEFAULT_DESCRIPTION
+    """The description of the agent. This will be helpful in A2A scenario."""
+
+    instruction: str = DEFAULT_INSTRUCTION
+    """The instruction for the agent, such as principles of function calling."""
+
+    sub_agents: list[BaseAgent] = Field(default_factory=list, exclude=True)
+    """The sub agents provided to agent."""
+
+    tracers: list[BaseTracer] = []
+    """The tracers provided to agent."""
+
+    def model_post_init(self, __context: Any) -> None:
+        super().model_post_init(None)  # for sub_agents init
+
+        logger.info(f"{self.__class__.__name__} `{self.name}` init done.")

veadk/cli/cli_deploy.py

@@ -131,6 +131,17 @@ def deploy(
             "No requirements.txt found in the user project, we will use a default one."
         )
 
+    # avoid upload user's config.yaml
+    if (user_proj_abs_path / "config.yaml").exists():
+        logger.warning(
+            f"Find a config.yaml in {user_proj_abs_path}/config.yaml, we will not upload it by default."
+        )
+        shutil.move(agent_dir / "config.yaml", Path(TEMP_PATH) / tmp_dir_name)
+    else:
+        logger.info(
+            "No config.yaml found in the user project. Some environment variables may not be set."
+        )
+
     # load
     logger.debug(
         f"Load deploy module from {Path(TEMP_PATH) / tmp_dir_name / 'deploy.py'}"

veadk/cli/cli_web.py

@@ -102,6 +102,32 @@ def _get_memory(
     return short_term_memory, long_term_memory
 
 
+def patch_adkwebserver_disable_openapi():
+    """
+    Monkey patch AdkWebServer.get_fast_api to remove openapi.json route.
+    """
+    import google.adk.cli.adk_web_server
+    from fastapi.routing import APIRoute
+    from starlette.routing import Route
+
+    original_get_fast_api = google.adk.cli.adk_web_server.AdkWebServer.get_fast_api_app
+
+    def wrapped_get_fast_api(self, *args, **kwargs):
+        app = original_get_fast_api(self, *args, **kwargs)
+
+        paths = ["/openapi.json", "/docs", "/redoc"]
+        new_routes = []
+        for route in app.router.routes:
+            if isinstance(route, (APIRoute, Route)) and route.path in paths:
+                continue
+            new_routes.append(route)
+        app.router.routes = new_routes
+
+        return app
+
+    google.adk.cli.adk_web_server.AdkWebServer.get_fast_api_app = wrapped_get_fast_api
+
+
 @click.command()
 @click.option("--host", default="127.0.0.1", help="Host to run the web server on")
 def web(host: str) -> None:
@@ -145,6 +171,7 @@ def web(host: str) -> None:
     import google.adk.cli.adk_web_server
 
     google.adk.cli.adk_web_server.AdkWebServer.__init__ = init_for_veadk
+    patch_adkwebserver_disable_openapi()
 
     import google.adk.cli.cli_tools_click as cli_tools_click
 

veadk/evaluation/adk_evaluator/__init__.py

@@ -11,3 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+from .adk_evaluator import ADKEvaluator
+
+__all__ = ["ADKEvaluator"]