feat(vefaas): yaml deploy test

Author: floritange

veadk/cli/cli_deploy.py

@@ -20,6 +20,7 @@
 from yaml import safe_load
 
 import veadk.integrations.ve_faas as vefaas
+from veadk.integrations.ve_faas.ve_faas import VeFaaS
 from veadk.configs.deploy_config import VeDeployConfig
 from veadk.utils.logger import get_logger
 
@@ -84,9 +85,7 @@ def _get_user_configs() -> dict:
     help="Volcengine secret key",
 )
 @click.option("--project-path", default=".", help="Local project path")
-@click.option(
-    "--deploy-config-file", default="./deploy.yaml", help="Deploy config file path"
-)
+@click.option("--deploy-config-file", default=None, help="Deploy config file path")
 def deploy(
     volcengine_access_key: str,
     volcengine_secret_key: str,
@@ -98,6 +97,9 @@ def deploy(
     if not volcengine_access_key or not volcengine_secret_key:
         raise Exception("Volcengine access key and secret key must be set.")
 
+    deploy_config_file = (
+        deploy_config_file if deploy_config_file else Path(project_path) / "deploy.yaml"
+    )
     if not Path(deploy_config_file).exists():
         click.echo(f"Deployment configuration file not found in {deploy_config_file}.")
 
@@ -124,23 +126,16 @@ def deploy(
         click.echo("Deployment configuration file generated.")
 
     # read deploy.yaml
-    with open(output_path, "r", encoding="utf-8") as yaml_file:
+    # with open(output_path, "r", encoding="utf-8") as yaml_file:
+    #     deploy_config_dict = safe_load(yaml_file)
+    with open(deploy_config_file, "r", encoding="utf-8") as yaml_file:
         deploy_config_dict = safe_load(yaml_file)
 
     deploy_config = VeDeployConfig(**deploy_config_dict)
+    import veadk.config
+
+    deploy_config.vefaas.function_envs.update(veadk.config.veadk_environments)
+
+    vefaas_client = VeFaaS(deploy_config=deploy_config)
 
-    # vefaas_client = VeFaaS(
-    #     access_key=volcengine_access_key,
-    #     secret_key=volcengine_secret_key,
-    #     region="cn-beijing",
-    # )
-
-    print(deploy_config)
-
-    # vefaas_client.deploy(
-    #     name=deploy_config.vefaas.application_name,
-    #     path=project_path,
-    #     gateway_name=deploy_config.veapig.gateway_name,
-    #     gateway_service_name=deploy_config.veapig.gateway_service_name,
-    #     gateway_upstream_name=deploy_config.veapig.gateway_upstream_name,
-    # )
+    vefaas_client.deploy()

veadk/cloud/cloud_agent_engine.py

@@ -22,25 +22,19 @@
 from pydantic import BaseModel
 
 from veadk.cloud.cloud_app import CloudApp
-from veadk.config import getenv
 from veadk.integrations.ve_faas.ve_faas import VeFaaS
 from veadk.utils.logger import get_logger
 from veadk.utils.misc import formatted_timestamp
+from veadk.configs.deploy_config import VeDeployConfig
 
 logger = get_logger(__name__)
 
 
 class CloudAgentEngine(BaseModel):
-    volcengine_access_key: str = getenv("VOLCENGINE_ACCESS_KEY")
-    volcengine_secret_key: str = getenv("VOLCENGINE_SECRET_KEY")
-    region: str = "cn-beijing"
+    deploy_config: VeDeployConfig = VeDeployConfig()
 
     def model_post_init(self, context: Any, /) -> None:
-        self._vefaas_service = VeFaaS(
-            access_key=self.volcengine_access_key,
-            secret_key=self.volcengine_secret_key,
-            region=self.region,
-        )
+        self._vefaas_service = VeFaaS(deploy_config=self.deploy_config)
 
     def _prepare(self, path: str, name: str):
         # basic check

veadk/cloud/cloud_app.py

@@ -14,7 +14,7 @@
 
 import json
 import time
-from typing import Any
+from typing import Any, Optional
 from uuid import uuid4
 
 import httpx
@@ -48,6 +48,12 @@ def __init__(
         self.vefaas_application_name = vefaas_application_name
         self.use_agent_card = use_agent_card
 
+        from veadk.configs.deploy_config import VeDeployConfig
+        import veadk.config
+
+        self.deploy_config = VeDeployConfig()
+        self.deploy_config.vefaas.function_envs.update(veadk.config.veadk_environments)
+
         # vefaas must be set one of three
         if (
             not vefaas_endpoint
@@ -79,12 +85,12 @@ def __init__(
 
     def _get_vefaas_endpoint(
         self,
-        volcengine_ak: str = getenv("VOLCENGINE_ACCESS_KEY"),
-        volcengine_sk: str = getenv("VOLCENGINE_SECRET_KEY"),
+        volcengine_ak: Optional[str] = getenv("VOLCENGINE_ACCESS_KEY"),
+        volcengine_sk: Optional[str] = getenv("VOLCENGINE_SECRET_KEY"),
     ) -> str:
         from veadk.integrations.ve_faas.ve_faas import VeFaaS
 
-        vefaas_client = VeFaaS(access_key=volcengine_ak, secret_key=volcengine_sk)
+        vefaas_client = VeFaaS(self.deploy_config)
 
         app = vefaas_client.get_application_details(
             app_id=self.vefaas_application_id,
@@ -111,10 +117,7 @@ def _get_vefaas_application_id_by_name(self) -> str:
             )
         from veadk.integrations.ve_faas.ve_faas import VeFaaS
 
-        vefaas_client = VeFaaS(
-            access_key=getenv("VOLCENGINE_ACCESS_KEY"),
-            secret_key=getenv("VOLCENGINE_SECRET_KEY"),
-        )
+        vefaas_client = VeFaaS(self.deploy_config)
         vefaas_application_id = vefaas_client.find_app_id_by_name(
             self.vefaas_application_name
         )
@@ -151,8 +154,8 @@ def update_self(
 
     def delete_self(
         self,
-        volcengine_ak: str = getenv("VOLCENGINE_ACCESS_KEY"),
-        volcengine_sk: str = getenv("VOLCENGINE_SECRET_KEY"),
+        volcengine_ak: Optional[str] = getenv("VOLCENGINE_ACCESS_KEY"),
+        volcengine_sk: Optional[str] = getenv("VOLCENGINE_SECRET_KEY"),
     ):
         if not volcengine_ak or not volcengine_sk:
             raise ValueError("Volcengine access key and secret key must be set.")
@@ -169,7 +172,7 @@ def delete_self(
         else:
             from veadk.integrations.ve_faas.ve_faas import VeFaaS
 
-            vefaas_client = VeFaaS(access_key=volcengine_ak, secret_key=volcengine_sk)
+            vefaas_client = VeFaaS(self.deploy_config)
             vefaas_client.delete(self.vefaas_application_id)
             print(
                 f"Cloud app {self.vefaas_application_id} delete request has been sent to VeFaaS"

veadk/configs/deploy_config.py

@@ -5,7 +5,7 @@
 
 
 class CreateVeFaaSConfig(BaseModel):
-    region: Optional[str] = ""
+    region: Optional[str] = "cn-beijing"
 
     application_name: Optional[str] = ""
 
@@ -15,14 +15,9 @@ class CreateVeFaaSConfig(BaseModel):
         "Created by Volcengine Agent Development Kit (VeADK)"
     )
 
-    function_startup_command: str = "bash ./run.sh"
+    function_startup_command: str = "bash run.sh"
 
-    function_envs: list[dict[str, Any]] = Field(
-        default_factory=lambda: [
-            {"VOLCENGINE_ACCESS_KEY": None},
-            {"VOLCENGINE_SECRET_KEY": None},
-        ]
-    )
+    function_envs: dict[str, Any] = Field(default_factory=dict)
     """Environment variables for the function instance."""
 
     function_tags: dict[str, str] = {"provider": "veadk"}
@@ -55,7 +50,7 @@ class VeDeployConfig(BaseModel):
 
     entrypoint_agent: Optional[str] = ""
 
-    ignore_files: list[str] = Field(default_factory=lambda: ["*.pyc", "__pycache__"])
+    ignore_files: list[str] = Field(default_factory=list)
 
     deploy_mode: Union[Literal["A2A/MCP", "WEB"], int] = "A2A/MCP"
     """0 for `A2A/MCP` mode, 1 for `WEB` mode. Or, use literal to define this attribute."""