veadk-python 0.2.24__tar.gz → 0.2.25__tar.gz

{veadk_python-0.2.24/veadk_python.egg-info → veadk_python-0.2.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veadk-python
-Version: 0.2.24
+Version: 0.2.25
 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.24 → veadk_python-0.2.25}/pyproject.toml

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

{veadk_python-0.2.24 → veadk_python-0.2.25}/veadk/config.py

@@ -15,7 +15,7 @@
 import os
 from typing import Any
 
-from dotenv import find_dotenv, load_dotenv
+from dotenv import find_dotenv, load_dotenv, dotenv_values
 from pydantic import BaseModel, Field
 
 from veadk.configs.auth_configs import VeIdentityConfig
@@ -39,10 +39,14 @@ from veadk.utils.misc import set_envs
 
 logger = get_logger(__name__)
 
-if load_dotenv(find_dotenv(usecwd=True)):
-    logger.info(f"Find `.env` file in {find_dotenv(usecwd=True)}, load envs.")
+env_file_path = os.path.join(os.getcwd(), ".env")
+if os.path.isfile(env_file_path):
+    load_dotenv(env_file_path)
+    env_from_dotenv = dotenv_values(env_file_path)
+    logger.info(f"Find `.env` file in {env_file_path}, load envs.")
 else:
-    logger.info("No env file found.")
+    env_from_dotenv = {}
+    logger.info("No `.env` file found.")
 
 
 class VeADKConfig(BaseModel):
@@ -97,11 +101,13 @@ def getenv(
 
 config_yaml_path = find_dotenv(filename="config.yaml", usecwd=True)
 
-veadk_environments = {}
+veadk_environments = dict(env_from_dotenv)
 
 if config_yaml_path:
     logger.info(f"Find `config.yaml` file in {config_yaml_path}")
-    config_dict, _veadk_environments = set_envs(config_yaml_path=config_yaml_path)
+    config_dict, _veadk_environments = set_envs(
+        config_yaml_path=config_yaml_path, env_from_dotenv=env_from_dotenv
+    )
     veadk_environments.update(_veadk_environments)
 else:
     logger.warning("No `config.yaml` file found.")

{veadk_python-0.2.24 → veadk_python-0.2.25}/veadk/knowledgebase/backends/vikingdb_knowledge_backend.py

@@ -124,6 +124,7 @@ class VikingDBKnowledgeBackend(BaseKnowledgebaseBackend):
             logger.warning(
                 f"VikingDB knowledgebase collection {self.index} does not exist, please create it first..."
             )
+            self.create_collection()
 
     def precheck_index_naming(self):
         if not (
@@ -443,6 +444,9 @@ class VikingDBKnowledgeBackend(BaseKnowledgebaseBackend):
             path=CREATE_COLLECTION_PATH,
             method="POST",
         )
+        logger.debug(
+            f"Create collection {self.index} using project {self.volcengine_project} response: {response}"
+        )
 
         if response.get("code") != 0:
             raise ValueError(

{veadk_python-0.2.24 → veadk_python-0.2.25}/veadk/memory/long_term_memory_backends/vikingdb_memory_backend.py

@@ -62,7 +62,8 @@ class VikingDBLTMBackend(BaseLongTermMemoryBackend):
                 # "event_1, event_2" -> ["event_1", "event_2"]
                 self.memory_type = [x.strip() for x in env_memory_type.split(",")]
             else:
-                self.memory_type = ["sys_event_v1", "event_v1"]
+                # self.memory_type = ["sys_event_v1", "event_v1"]
+                self.memory_type = ["sys_event_v1"]
 
         logger.info(f"Using memory type: {self.memory_type}")
 

{veadk_python-0.2.24 → veadk_python-0.2.25}/veadk/runner.py

@@ -303,9 +303,9 @@ class Runner(ADKRunner):
 
     def __init__(
         self,
-        agent: BaseAgent | Agent,
+        agent: BaseAgent | Agent | None = None,
         short_term_memory: ShortTermMemory | None = None,
-        app_name: str = "veadk_default_app",
+        app_name: str | None = None,
         user_id: str = "veadk_default_user",
         upload_inline_data_to_tos: bool = False,
         run_processor: "BaseRunProcessor | None" = None,
@@ -324,15 +324,15 @@ class Runner(ADKRunner):
             agent (google.adk.agents.base_agent.BaseAgent | veadk.agent.Agent):
                 The agent instance used to run interactions.
             short_term_memory (ShortTermMemory | None): Optional short-term memory; if
-                not provided and no external ``session_service`` is supplied, an in-memory
+                not provided and no external `session_service` is supplied, an in-memory
                 session service will be created.
-            app_name (str): Application name. Defaults to ``"veadk_default_app"``.
-            user_id (str): Default user ID. Defaults to ``"veadk_default_user"``.
-            upload_inline_data_to_tos (bool): Whether to enable inline media upload. Defaults to ``False``.
+            app_name (str): Application name. Defaults to `veadk_default_app`.
+            user_id (str): Default user ID. Defaults to `veadk_default_user`.
+            upload_inline_data_to_tos (bool): Whether to enable inline media upload. Defaults to `False`.
             run_processor (BaseRunProcessor | None): Optional run processor for intercepting agent execution.
                 If not provided, will try to get from agent. If agent doesn't have one, uses NoOpRunProcessor.
-            *args: Positional args passed through to ``ADKRunner``.
-            **kwargs: Keyword args passed through to ``ADKRunner``; may include
+            *args: Positional args passed through to `ADKRunner`.
+            **kwargs: Keyword args passed through to `ADKRunner`; may include
                 ``session_service`` and ``memory_service`` to override defaults.
 
         Returns:
@@ -393,6 +393,10 @@ class Runner(ADKRunner):
             else:
                 logger.info("No long term memory provided.")
 
+        # For forward compatibility, we pass app_name to ADKRunner.
+        if not kwargs.get("app") and not app_name:
+            app_name = "veadk_default_app"
+
         super().__init__(
             agent=agent,
             session_service=session_service,

{veadk_python-0.2.24 → veadk_python-0.2.25}/veadk/utils/misc.py

@@ -128,7 +128,7 @@ def getenv(
         )
 
 
-def set_envs(config_yaml_path: str) -> tuple[dict, dict]:
+def set_envs(config_yaml_path: str, env_from_dotenv: dict = None) -> tuple[dict, dict]:
     from veadk.utils.logger import get_logger
 
     logger = get_logger(__name__)
@@ -138,15 +138,14 @@ def set_envs(config_yaml_path: str) -> tuple[dict, dict]:
 
     flatten_config_dict = flatten_dict(config_dict)
 
-    veadk_environments = {}
+    veadk_environments = dict(env_from_dotenv)
     for k, v in flatten_config_dict.items():
         k = k.upper()
 
-        if k in os.environ:
+        if k in env_from_dotenv:
             logger.info(
-                f"Environment variable {k} has been set, value in `config.yaml` will be ignored."
+                f"Environment variable {k} has been set in .env, value in `config.yaml` will be ignored."
             )
-            veadk_environments[k] = os.environ[k]
             continue
         veadk_environments[k] = str(v)
         os.environ[k] = str(v)

{veadk_python-0.2.24 → veadk_python-0.2.25}/veadk/version.py

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

{veadk_python-0.2.24 → veadk_python-0.2.25/veadk_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veadk-python
-Version: 0.2.24
+Version: 0.2.25
 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