veadk-python 0.2.14__py3-none-any.whl → 0.2.15__py3-none-any.whl

veadk/cli/cli_web.py

@@ -12,99 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Optional
+from functools import wraps
 
 import click
 
-from veadk.memory.long_term_memory import LongTermMemory
-from veadk.memory.short_term_memory import ShortTermMemory
+from veadk.utils.logger import get_logger
 
-
-def _get_stm_from_module(module) -> ShortTermMemory:
-    return module.agent_run_config.short_term_memory
-
-
-def _get_stm_from_env() -> ShortTermMemory:
-    import os
-
-    from veadk.utils.logger import get_logger
-
-    logger = get_logger(__name__)
-
-    short_term_memory_backend = os.getenv("SHORT_TERM_MEMORY_BACKEND")
-    if not short_term_memory_backend:  # prevent None or empty string
-        short_term_memory_backend = "local"
-    logger.info(f"Short term memory: backend={short_term_memory_backend}")
-
-    return ShortTermMemory(backend=short_term_memory_backend)  # type: ignore
-
-
-def _get_ltm_from_module(module) -> LongTermMemory | None:
-    agent = module.agent_run_config.agent
-
-    if not hasattr(agent, "long_term_memory"):
-        return None
-    else:
-        return agent.long_term_memory
-
-
-def _get_ltm_from_env() -> LongTermMemory | None:
-    import os
-
-    from veadk.utils.logger import get_logger
-
-    logger = get_logger(__name__)
-
-    long_term_memory_backend = os.getenv("LONG_TERM_MEMORY_BACKEND")
-    app_name = os.getenv("VEADK_WEB_APP_NAME", "")
-    user_id = os.getenv("VEADK_WEB_USER_ID", "")
-
-    if long_term_memory_backend:
-        logger.info(f"Long term memory: backend={long_term_memory_backend}")
-        return LongTermMemory(
-            backend=long_term_memory_backend, app_name=app_name, user_id=user_id
-        )  # type: ignore
-    else:
-        logger.warning("No long term memory backend settings detected.")
-        return None
-
-
-def _get_memory(
-    module_path: str,
-) -> tuple[ShortTermMemory, LongTermMemory | None]:
-    from veadk.utils.logger import get_logger
-    from veadk.utils.misc import load_module_from_file
-
-    logger = get_logger(__name__)
-
-    # 1. load user module
-    try:
-        module_file_path = module_path
-        module = load_module_from_file(
-            module_name="agent_and_mem", file_path=f"{module_file_path}/agent.py"
-        )
-    except Exception as e:
-        logger.error(
-            f"Failed to get memory config from `agent.py`: {e}. Fallback to get memory from environment variables."
-        )
-        return _get_stm_from_env(), _get_ltm_from_env()
-
-    if not hasattr(module, "agent_run_config"):
-        logger.error(
-            "You must export `agent_run_config` as a global variable in `agent.py`. Fallback to get memory from environment variables."
-        )
-        return _get_stm_from_env(), _get_ltm_from_env()
-
-    # 2. try to get short term memory
-    # short term memory must exist in user code, as we use `default_factory` to init it
-    short_term_memory = _get_stm_from_module(module)
-
-    # 3. try to get long term memory
-    long_term_memory = _get_ltm_from_module(module)
-    if not long_term_memory:
-        long_term_memory = _get_ltm_from_env()
-
-    return short_term_memory, long_term_memory
+logger = get_logger(__name__)
 
 
 def patch_adkwebserver_disable_openapi():
@@ -133,71 +47,66 @@ def patch_adkwebserver_disable_openapi():
     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")
-@click.option(
-    "--app_name", default="", help="The `app_name` for initializing long term memory"
-)
-@click.option(
-    "--user_id", default="", help="The `user_id` for initializing long term memory"
+@click.command(
+    context_settings=dict(ignore_unknown_options=True, allow_extra_args=True)
 )
-def web(host: str, app_name: str, user_id: str) -> None:
+@click.pass_context
+def web(ctx, *args, **kwargs) -> None:
     """Launch web with long term and short term memory."""
-    import os
-    from typing import Any
-
-    from google.adk.cli.utils.shared_value import SharedValue
-
-    from veadk.utils.logger import get_logger
-
-    logger = get_logger(__name__)
-
-    def init_for_veadk(
-        self,
-        *,
-        agent_loader: Any,
-        session_service: Any,
-        memory_service: Any,
-        artifact_service: Any,
-        credential_service: Any,
-        eval_sets_manager: Any,
-        eval_set_results_manager: Any,
-        agents_dir: str,
-        extra_plugins: Optional[list[str]] = None,
-        **kwargs: Any,
-    ):
-        self.agent_loader = agent_loader
-        self.artifact_service = artifact_service
-        self.credential_service = credential_service
-        self.eval_sets_manager = eval_sets_manager
-        self.eval_set_results_manager = eval_set_results_manager
-        self.agents_dir = agents_dir
-        self.runners_to_clean = set()
-        self.current_app_name_ref = SharedValue(value="")
-        self.runner_dict = {}
-        self.extra_plugins = extra_plugins or []
-
-        for key, value in kwargs.items():
-            setattr(self, key, value)
-
-        # parse VeADK memories
-        short_term_memory, long_term_memory = _get_memory(module_path=agents_dir)
-        self.session_service = short_term_memory.session_service
-        self.memory_service = long_term_memory
-
-    os.environ["VEADK_WEB_APP_NAME"] = app_name
-    os.environ["VEADK_WEB_USER_ID"] = user_id
-
-    import google.adk.cli.adk_web_server
+    from google.adk.cli import adk_web_server
+    from google.adk.runners import Runner as ADKRunner
+
+    from veadk import Agent
+    from veadk.agents.loop_agent import LoopAgent
+    from veadk.agents.parallel_agent import ParallelAgent
+    from veadk.agents.sequential_agent import SequentialAgent
+
+    def before_get_runner_async(func):
+        logger.info("Hook before `get_runner_async`")
+
+        @wraps(func)
+        async def wrapper(*args, **kwargs) -> ADKRunner:
+            self: adk_web_server.AdkWebServer = args[0]
+            app_name: str = args[1]
+            """Returns the cached runner for the given app."""
+            agent_or_app = self.agent_loader.load_agent(app_name)
+
+            if isinstance(agent_or_app, (SequentialAgent, LoopAgent, ParallelAgent)):
+                logger.warning(
+                    "Detect VeADK workflow agent, the short-term memory and long-term memory of each sub agent are useless."
+                )
+
+            if isinstance(agent_or_app, Agent):
+                logger.info("Detect VeADK Agent.")
+
+                if agent_or_app.short_term_memory:
+                    self.session_service = (
+                        agent_or_app.short_term_memory.session_service
+                    )
+
+                if agent_or_app.long_term_memory:
+                    self.memory_service = agent_or_app.long_term_memory
+                    logger.info(
+                        f"Long term memory backend is {self.memory_service.backend}"
+                    )
+
+                logger.info(
+                    f"Current session_service={self.session_service.__class__.__name__}, memory_service={self.memory_service.__class__.__name__}"
+                )
+
+            runner = await func(*args, **kwargs)
+            return runner
+
+        return wrapper
+
+    adk_web_server.AdkWebServer.get_runner_async = before_get_runner_async(
+        adk_web_server.AdkWebServer.get_runner_async
+    )
 
-    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
-
-    agents_dir = os.getcwd()
-    logger.info(f"Load agents from {agents_dir}")
+    from google.adk.cli.cli_tools_click import cli_web
 
-    cli_tools_click.cli_web.main(
-        args=[agents_dir, "--host", host, "--log_level", "ERROR"]
-    )
+    extra_args = ctx.args
+    logger.debug(f"User args: {ctx.args}")
+    cli_web.main(args=extra_args, standalone_mode=False)

veadk/tools/builtin_tools/generate_image.py

@@ -0,0 +1,23 @@
+# 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 veadk.tools.builtin_tools.image_generate import image_generate  # noqa: F401
+from veadk.utils.logger import get_logger
+
+logger = get_logger(__name__)
+
+
+logger.warning(
+    "The 'generate_image' tool is deprecated and will be removed in future versions. Use `image_generate` tool from `veadk.tools.builtin_tools.image_generate` instead."
+)

veadk/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = "0.2.14"
+VERSION = "0.2.15"

{veadk_python-0.2.14.dist-info → veadk_python-0.2.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veadk-python
-Version: 0.2.14
+Version: 0.2.15
 Summary: Volcengine agent development kit, integrations with Volcengine cloud services.
 Author-email: Yaozheng Fang <fangyozheng@gmail.com>, Guodong Li <cu.eric.lee@gmail.com>, Zhi Han <sliverydayday@gmail.com>, Meng Wang <mengwangwm@gmail.com>
 License:                                  Apache License

{veadk_python-0.2.14.dist-info → veadk_python-0.2.15.dist-info}/RECORD

@@ -5,7 +5,7 @@ veadk/config.py,sha256=Ezl9Lna9iriC_Uf7m1ZXTWzylLyd7YspUFAQqh94Ong,3203
 veadk/consts.py,sha256=8FcwnvKxQM50r8HDQxnhI-Ml_mjyfYdkGDxbyPBrW5Q,2679
 veadk/runner.py,sha256=_DGNwX-t3sHJFJvHs-rRHXbjCZza8I_zU8AN3Fw5nRY,14217
 veadk/types.py,sha256=zOOzG-QJy-MkzHeicWJzy2_L5U4ERrWziPubIUEbd8c,1656
-veadk/version.py,sha256=AKkIbQyneK3kC3HOfdbOb8RMQ58A-Ly6yj_PKz8jElQ,654
+veadk/version.py,sha256=-EVFW0QaHo8J5OMZ85ZjabO4mH-EANB98VS91-Dnab8,654
 veadk/a2a/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
 veadk/a2a/agent_card.py,sha256=lhtgW1acMpxYUdULHEZwVFXOi6Xh4lNkf4S7QIhbFFI,1525
 veadk/a2a/remote_ve_agent.py,sha256=L2nzT8PlDI-lLtcaTJqk-D2Uvw9beKl8OEUqp-8qCbA,3510
@@ -37,7 +37,7 @@ veadk/cli/cli_kb.py,sha256=SmLz3g6o2LiPa6WzkdyAOExuboHkpAIrN-4qaH4rxn8,1962
 veadk/cli/cli_pipeline.py,sha256=6FV4WyoapFPAy_P3dzrRm07m6aGjrtLiY4aCFT7CEHs,7510
 veadk/cli/cli_prompt.py,sha256=atw6O3zkjD1tOsFOOg7rs9HbS4exwaNe_Pces6CoyFY,2582
 veadk/cli/cli_uploadevalset.py,sha256=RdelvbXEBalXGxHnPJ-8ZQ1PRiex39328yhAWgZ5mAI,4342
-veadk/cli/cli_web.py,sha256=wPuLoG57s3E3GOQQ7wnDJ923LgIEG4pcO_pNjkd9ynE,6732
+veadk/cli/cli_web.py,sha256=B8VQVqEH05XoJYYcGT9FKBHItQ1Wd6BhWuNZv9_1YEA,3992
 veadk/cloud/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
 veadk/cloud/cloud_agent_engine.py,sha256=u-v-kkAhRgZY1r82CQRwfkYnj0n7ft8qIW_r-yhnMSI,8461
 veadk/cloud/cloud_app.py,sha256=2bmEf7RH1Kwz8HLZ0aY3pVn0R8xi1T7kcGRTRyaWawY,8746
@@ -144,6 +144,7 @@ veadk/tools/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
 veadk/tools/demo_tools.py,sha256=Gu3sxygcYVS2cv3WqUOl-Gq4JhMlDAktoCHOFT0gbFQ,2216
 veadk/tools/load_knowledgebase_tool.py,sha256=UUTv0Za9GkEXAkl1SXmyq0HGCKGvSlH_f8Ok6O6e52M,4704
 veadk/tools/builtin_tools/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
+veadk/tools/builtin_tools/generate_image.py,sha256=b80yMziV0PR9_1oAd5HyDbZGAi3OMpUgL1xMyxW35m8,979
 veadk/tools/builtin_tools/image_edit.py,sha256=KslsuabBchAYR3ZrWSO5viEe5ORUAe0GI1qQ6mxoIU0,11588
 veadk/tools/builtin_tools/image_generate.py,sha256=frBUYEmizq6B4cRIUTfWKpLF2RywposJf-hZ8kkZvV8,18075
 veadk/tools/builtin_tools/lark.py,sha256=b2IWsN8fZFh9aweSGznaOqA30TCOLpVjNCDNa1LHZl4,2046
@@ -181,9 +182,9 @@ veadk/utils/mcp_utils.py,sha256=aET7pX3LXmRe2-Jh7_xRvxrVyl1dN7uPAUk16luwMlQ,1525
 veadk/utils/misc.py,sha256=ghEqrqoDfKrW9ZD3IB0bwcfyyB0gRWN2yEP9eRxQ4nE,4953
 veadk/utils/patches.py,sha256=dcHdlJ8IciyMjDuMy6-_6McUqJYyLz0yHmJ0xH8lWOw,2752
 veadk/utils/volcengine_sign.py,sha256=3xn6ca2OAg_AFyP2dqFTSioqkeDel_BoKURUtCcO-EQ,6736
-veadk_python-0.2.14.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-veadk_python-0.2.14.dist-info/METADATA,sha256=Gk-dXheONF6hhaRA3yMsOON7aqet5oSPXV9bZe2ehY4,18428
-veadk_python-0.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-veadk_python-0.2.14.dist-info/entry_points.txt,sha256=-g28D6dNV-2UvAiRP9VF0oOVSDSJ5zlLUIZ34ArAqF8,46
-veadk_python-0.2.14.dist-info/top_level.txt,sha256=Qqi3ycJ4anKiZWBXtUBIy8zK9ZuXJsFa05oFq8O8qqY,6
-veadk_python-0.2.14.dist-info/RECORD,,
+veadk_python-0.2.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+veadk_python-0.2.15.dist-info/METADATA,sha256=GSnIw39xRYJXY34NDHHG7CfDy2vRQlHkQN57FR6RzNo,18428
+veadk_python-0.2.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+veadk_python-0.2.15.dist-info/entry_points.txt,sha256=-g28D6dNV-2UvAiRP9VF0oOVSDSJ5zlLUIZ34ArAqF8,46
+veadk_python-0.2.15.dist-info/top_level.txt,sha256=Qqi3ycJ4anKiZWBXtUBIy8zK9ZuXJsFa05oFq8O8qqY,6
+veadk_python-0.2.15.dist-info/RECORD,,