veadk-python 0.5.0__tar.gz → 0.5.1__tar.gz

{veadk_python-0.5.0/veadk_python.egg-info → veadk_python-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veadk-python
-Version: 0.5.0
+Version: 0.5.1
 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
@@ -236,7 +236,7 @@ Requires-Dist: aiomysql==0.3.2
 Requires-Dist: opensearch-py==2.8.0
 Requires-Dist: filetype==1.2.0
 Requires-Dist: vikingdb-python-sdk==0.1.3
-Requires-Dist: agentkit-sdk-python==0.2.0
+Requires-Dist: agentkit-sdk-python>=0.2.0
 Provides-Extra: extensions
 Requires-Dist: redis>=5.0; extra == "extensions"
 Requires-Dist: tos>=2.8.4; extra == "extensions"

{veadk_python-0.5.0 → veadk_python-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "veadk-python"
-version = "0.5.0"
+version = "0.5.1"
 description = "Volcengine agent development kit, integrations with Volcengine cloud services."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -40,7 +40,7 @@ dependencies = [
     "opensearch-py==2.8.0",
     "filetype==1.2.0",
     "vikingdb-python-sdk==0.1.3",
-    "agentkit-sdk-python==0.2.0"
+    "agentkit-sdk-python>=0.2.0"
 ]
 
 [project.scripts]

{veadk_python-0.5.0 → veadk_python-0.5.1}/veadk/agent.py

@@ -74,7 +74,7 @@ class Agent(LlmAgent):
         name (str): The name of the agent.
         description (str): A description of the agent, useful in A2A scenarios.
         instruction (Union[str, InstructionProvider]): The instruction or instruction provider.
-        model_name (str): Name of the model used by the agent.
+        model_name (Union[str, List[str]]): Name of the model used by the agent.
         model_provider (str): Provider of the model (e.g., openai).
         model_api_base (str): The base URL of the model API.
         model_api_key (str): The API key for accessing the model.
@@ -93,7 +93,9 @@ class Agent(LlmAgent):
     description: str = DEFAULT_DESCRIPTION
     instruction: Union[str, InstructionProvider] = DEFAULT_INSTRUCTION
 
-    model_name: str = Field(default_factory=lambda: settings.model.name)
+    model_name: Union[str, list[str]] = Field(
+        default_factory=lambda: settings.model.name
+    )
     model_provider: str = Field(default_factory=lambda: settings.model.provider)
     model_api_base: str = Field(default_factory=lambda: settings.model.api_base)
     model_api_key: str = Field(default_factory=lambda: settings.model.api_key)
@@ -183,10 +185,29 @@ class Agent(LlmAgent):
                         min_tokens=0,
                     )
             else:
+                fallbacks = None
+                if isinstance(self.model_name, list):
+                    if self.model_name:
+                        model_name = self.model_name[0]
+                        fallbacks = [
+                            f"{self.model_provider}/{m}" for m in self.model_name[1:]
+                        ]
+                        logger.info(
+                            f"Using primary model: {model_name}, with fallbacks: {self.model_name[1:]}"
+                        )
+                    else:
+                        model_name = settings.model.name
+                        logger.warning(
+                            f"Empty model_name list provided, using default model from settings: {model_name}"
+                        )
+                else:
+                    model_name = self.model_name
+
                 self.model = LiteLlm(
-                    model=f"{self.model_provider}/{self.model_name}",
+                    model=f"{self.model_provider}/{model_name}",
                     api_key=self.model_api_key,
                     api_base=self.model_api_base,
+                    fallbacks=fallbacks,
                     **self.model_extra_config,
                 )
             logger.debug(

{veadk_python-0.5.0 → veadk_python-0.5.1}/veadk/configs/database_configs.py

@@ -28,6 +28,10 @@ class OpensearchConfig(BaseSettings):
 
     port: int = 9200
 
+    cert_path: str = ""
+
+    use_ssl: bool = True
+
     username: str = ""
 
     password: str = ""

{veadk_python-0.5.0 → veadk_python-0.5.1}/veadk/knowledgebase/backends/opensearch_backend.py

@@ -27,9 +27,13 @@ from typing_extensions import Any, override
 
 import veadk.config  # noqa E401
 from veadk.configs.database_configs import OpensearchConfig
-from veadk.configs.model_configs import EmbeddingModelConfig, NormalEmbeddingModelConfig
+from veadk.configs.model_configs import (
+    EmbeddingModelConfig,
+    NormalEmbeddingModelConfig,
+)
 from veadk.knowledgebase.backends.base_backend import BaseKnowledgebaseBackend
 from veadk.knowledgebase.backends.utils import get_llama_index_splitter
+from veadk.utils.logger import get_logger
 
 try:
     from llama_index.vector_stores.opensearch import (
@@ -42,6 +46,9 @@ except ImportError:
     )
 
 
+logger = get_logger(__name__)
+
+
 class OpensearchKnowledgeBackend(BaseKnowledgebaseBackend):
     """Opensearch-based backend for knowledgebase.
 
@@ -79,6 +86,12 @@ class OpensearchKnowledgeBackend(BaseKnowledgebaseBackend):
 
     def model_post_init(self, __context: Any) -> None:
         self.precheck_index_naming()
+
+        if not self.opensearch_config.cert_path:
+            logger.warning(
+                "OpenSearch cert_path is not set, which may lead to security risks"
+            )
+
         self._opensearch_client = OpensearchVectorClient(
             endpoint=self.opensearch_config.host,
             port=self.opensearch_config.port,
@@ -86,8 +99,9 @@ class OpensearchKnowledgeBackend(BaseKnowledgebaseBackend):
                 self.opensearch_config.username,
                 self.opensearch_config.password,
             ),
-            use_ssl=True,
-            verify_certs=False,
+            use_ssl=self.opensearch_config.use_ssl,
+            verify_certs=False if not self.opensearch_config.cert_path else True,
+            ca_certs=self.opensearch_config.cert_path,
             dim=self.embedding_config.dim,
             index=self.index,  # collection name
         )

{veadk_python-0.5.0 → veadk_python-0.5.1}/veadk/memory/long_term_memory_backends/opensearch_backend.py

@@ -22,7 +22,10 @@ from typing_extensions import Any, override
 
 import veadk.config  # noqa E401
 from veadk.configs.database_configs import OpensearchConfig
-from veadk.configs.model_configs import EmbeddingModelConfig, NormalEmbeddingModelConfig
+from veadk.configs.model_configs import (
+    EmbeddingModelConfig,
+    NormalEmbeddingModelConfig,
+)
 from veadk.knowledgebase.backends.utils import get_llama_index_splitter
 from veadk.memory.long_term_memory_backends.base_backend import (
     BaseLongTermMemoryBackend,
@@ -74,6 +77,11 @@ class OpensearchLTMBackend(BaseLongTermMemoryBackend):
 
         self.precheck_index_naming(index)
 
+        if not self.opensearch_config.cert_path:
+            logger.warning(
+                "OpenSearch cert_path is not set, which may lead to security risks"
+            )
+
         opensearch_client = OpensearchVectorClient(
             endpoint=self.opensearch_config.host,
             port=self.opensearch_config.port,
@@ -81,8 +89,9 @@ class OpensearchLTMBackend(BaseLongTermMemoryBackend):
                 self.opensearch_config.username,
                 self.opensearch_config.password,
             ),
-            use_ssl=True,
-            verify_certs=False,
+            use_ssl=self.opensearch_config.use_ssl,
+            verify_certs=False if not self.opensearch_config.cert_path else True,
+            ca_certs=self.opensearch_config.cert_path,
             dim=self.embedding_config.dim,
             index=index,
         )

{veadk_python-0.5.0 → veadk_python-0.5.1}/veadk/tools/builtin_tools/image_generate.py

@@ -122,25 +122,23 @@ def handle_single_task_sync(
                 and sequential_image_generation == "auto"
                 and max_images
             ):
-                response = (
-                    client.images.generate(
-                        model=getenv(
-                            "MODEL_IMAGE_NAME",
-                            DEFAULT_IMAGE_GENERATE_MODEL_NAME,
-                        ),
-                        **inputs,
-                        sequential_image_generation_options=SequentialImageGenerationOptions(
-                            max_images=max_images
-                        ),
-                        extra_headers={
-                            "veadk-source": "veadk",
-                            "veadk-version": VERSION,
-                            "User-Agent": f"VeADK/{VERSION}",
-                            "X-Client-Request-Id": getenv(
-                                "MODEL_AGENT_CLIENT_REQ_ID", f"veadk/{VERSION}"
-                            ),
-                        },
+                response = client.images.generate(
+                    model=getenv(
+                        "MODEL_IMAGE_NAME",
+                        DEFAULT_IMAGE_GENERATE_MODEL_NAME,
                     ),
+                    **inputs,
+                    sequential_image_generation_options=SequentialImageGenerationOptions(
+                        max_images=max_images
+                    ),
+                    extra_headers={
+                        "veadk-source": "veadk",
+                        "veadk-version": VERSION,
+                        "User-Agent": f"VeADK/{VERSION}",
+                        "X-Client-Request-Id": getenv(
+                            "MODEL_AGENT_CLIENT_REQ_ID", f"veadk/{VERSION}"
+                        ),
+                    },
                 )
             else:
                 response = client.images.generate(

{veadk_python-0.5.0 → veadk_python-0.5.1}/veadk/tools/builtin_tools/web_search.py

@@ -38,7 +38,12 @@ def web_search(query: str, tool_context: ToolContext | None = None) -> list[str]
     """
     ak = None
     sk = None
-    if tool_context:
+    # First try to get tool-specific AK/SK
+    ak = os.getenv("TOOL_WEB_SEARCH_ACCESS_KEY")
+    sk = os.getenv("TOOL_WEB_SEARCH_SECRET_KEY")
+    if ak and sk:
+        logger.debug("Successfully get tool-specific AK/SK.")
+    elif tool_context:
         ak = tool_context.state.get("VOLCENGINE_ACCESS_KEY")
         sk = tool_context.state.get("VOLCENGINE_SECRET_KEY")
     session_token = ""

{veadk_python-0.5.0 → veadk_python-0.5.1}/veadk/version.py

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

{veadk_python-0.5.0 → veadk_python-0.5.1/veadk_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veadk-python
-Version: 0.5.0
+Version: 0.5.1
 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
@@ -236,7 +236,7 @@ Requires-Dist: aiomysql==0.3.2
 Requires-Dist: opensearch-py==2.8.0
 Requires-Dist: filetype==1.2.0
 Requires-Dist: vikingdb-python-sdk==0.1.3
-Requires-Dist: agentkit-sdk-python==0.2.0
+Requires-Dist: agentkit-sdk-python>=0.2.0
 Provides-Extra: extensions
 Requires-Dist: redis>=5.0; extra == "extensions"
 Requires-Dist: tos>=2.8.4; extra == "extensions"

{veadk_python-0.5.0 → veadk_python-0.5.1}/veadk_python.egg-info/requires.txt

@@ -26,7 +26,7 @@ aiomysql==0.3.2
 opensearch-py==2.8.0
 filetype==1.2.0
 vikingdb-python-sdk==0.1.3
-agentkit-sdk-python==0.2.0
+agentkit-sdk-python>=0.2.0
 
 [cli]