veadk-python 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

veadk/cli/services/vefaas/vefaas.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import importlib.util
 import json
 import time
 
@@ -27,8 +26,8 @@ from volcenginesdkvefaas.models.tag_for_create_function_input import (
     TagForCreateFunctionInput,
 )
 
+import veadk.config
 from veadk.cli.services.veapig.apig import APIGateway
-from veadk.config import veadk_environments
 from veadk.utils.logger import get_logger
 from veadk.utils.misc import formatted_timestamp
 from veadk.utils.volcengine_sign import ve_request
@@ -60,78 +59,20 @@ class VeFaaS:
 
         self.template_id = "6874f3360bdbc40008ecf8c7"
 
-    def _pre_check(self, path: str):
-        if not path.exists():
-            raise ValueError(f"Path {path} does not exist.")
+    def _upload_and_mount_code(self, function_id: str, path: str):
+        """Upload code to VeFaaS temp bucket and mount to function instance.
 
-        index_py_path = path / "index.py"
-        if not index_py_path.exists():
-            raise ValueError(
-                "The project directory must include the `index.py` file. See: https://www.volcengine.com/docs/6662/107432"
-            )
-        typer.echo(
-            typer.style(
-                "Check `index.py` file pass.",
-                fg=typer.colors.BRIGHT_BLACK,
-            ),
-        )
-
-        spec = importlib.util.spec_from_file_location("index", index_py_path)
-        module = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(module)
-        if not (hasattr(module, "handler") and callable(module.handler)):
-            raise ValueError(
-                "The `index.py` file must include a `handler` function. See: https://www.volcengine.com/docs/6662/107432"
-            )
-        typer.echo(
-            typer.style(
-                "Check `handler` function pass.",
-                fg=typer.colors.BRIGHT_BLACK,
-            ),
-        )
-
-    def _create_function(self, name: str, path: str):
-        function_name = f"{name}-fn-{formatted_timestamp()}"
-
-        # 1. Create a function instance in cloud
-        typer.echo(
-            typer.style("Runtime: native-python3.10/v1", fg=typer.colors.BRIGHT_BLACK)
-        )
-
-        envs = []
-        for key, value in veadk_environments.items():
-            envs.append(EnvForCreateFunctionInput(key=key, value=value))
-        typer.echo(
-            typer.style(
-                f"Fetch {len(envs)} environment variables.",
-                fg=typer.colors.BRIGHT_BLACK,
-            )
-        )
-
-        res = self.client.create_function(
-            volcenginesdkvefaas.CreateFunctionRequest(
-                command="./run.sh",
-                name=function_name,
-                description="Created by VeADK (Volcengine Agent Development Kit)",
-                tags=[TagForCreateFunctionInput(key="provider", value="veadk")],
-                runtime="native-python3.10/v1",
-                request_timeout=1800,
-                envs=envs,
-                # tls_config=TlsConfigForCreateFunctionInput(enable_log=True),
-            )
-        )
-        function_id = res.id
-
-        # 2. Get a temp bucket to store code
-        # proj_path = get_project_path()
+        Args:
+            function_id (str): Target function ID.
+            path (str): Local project path.
+        """
+        # Get zipped code data
         code_zip_data, code_zip_size, error = zip_and_encode_folder(path)
-        typer.echo(
-            typer.style(
-                f"Zipped project size: {code_zip_size / 1024 / 1024:.2f} MB",
-                fg=typer.colors.BRIGHT_BLACK,
-            )
+        logger.info(
+            f"Zipped project size: {code_zip_size / 1024 / 1024:.2f} MB",
         )
 
+        # Upload code to VeFaaS temp bucket
         req = volcenginesdkvefaas.GetCodeUploadAddressRequest(
             function_id=function_id, content_length=code_zip_size
         )
@@ -142,14 +83,11 @@ class VeFaaS:
             "Content-Type": "application/zip",
         }
         response = requests.put(url=upload_url, data=code_zip_data, headers=headers)
-        if 200 <= response.status_code < 300:
-            # print(f"Upload successful! Size: {code_zip_size / 1024 / 1024:.2f} MB")
-            pass
-        else:
+        if not (200 <= response.status_code < 300):
             error_message = f"Upload failed to {upload_url} with status code {response.status_code}: {response.text}"
             raise ValueError(error_message)
 
-        # 3. Mount the TOS bucket to function instance
+        # Mount the TOS bucket to function instance
         res = signed_request(
             ak=self.ak,
             sk=self.sk,
@@ -157,17 +95,35 @@ class VeFaaS:
             body={"FunctionId": function_id},
         )
 
-        typer.echo(
-            typer.style(
-                f"Function ID on VeFaaS service: {function_id}",
-                fg=typer.colors.BRIGHT_BLACK,
+        return res
+
+    def _create_function(self, function_name: str, path: str):
+        # Read envs
+        envs = []
+        for key, value in veadk.config.veadk_environments.items():
+            envs.append(EnvForCreateFunctionInput(key=key, value=value))
+        logger.info(
+            f"Fetch {len(envs)} environment variables.",
+        )
+
+        # Create function
+        res = self.client.create_function(
+            volcenginesdkvefaas.CreateFunctionRequest(
+                command="./run.sh",
+                name=function_name,
+                description="Created by VeADK (Volcengine Agent Development Kit)",
+                tags=[TagForCreateFunctionInput(key="provider", value="veadk")],
+                runtime="native-python3.10/v1",
+                request_timeout=1800,
+                envs=envs,
             )
         )
+        function_id = res.id
 
-        return function_name, function_id
+        # Upload and mount code using extracted method
+        self._upload_and_mount_code(function_id, path)
 
-    def _get_template(self):
-        pass
+        return function_name, function_id
 
     def _create_application(
         self,
@@ -215,23 +171,21 @@ class VeFaaS:
             host="open.volcengineapi.com",
         )
 
+        logger.info(f"Start to release VeFaaS application {app_id}.")
         status, full_response = self._get_application_status(app_id)
         while status not in ["deploy_success", "deploy_fail"]:
             time.sleep(10)
-            typer.echo(
-                typer.style(
-                    f"Current status: {status}",
-                    fg=typer.colors.BRIGHT_BLACK,
-                )
-            )
             status, full_response = self._get_application_status(app_id)
 
         assert status == "deploy_success", (
             f"Release application failed. Response: {full_response}"
         )
+
         cloud_resource = full_response["Result"]["CloudResource"]
         cloud_resource = json.loads(cloud_resource)
+
         url = cloud_resource["framework"]["url"]["system_url"]
+
         return url
 
     def _get_application_status(self, app_id: str):
@@ -260,6 +214,91 @@ class VeFaaS:
         )
         return response["Result"]["Items"]
 
+    def _update_function_code(
+        self,
+        application_name: str,  # application name
+        path: str,
+    ) -> tuple[str, str, str]:
+        """Update existing application function code while preserving URL.
+
+        Args:
+            application_name (str): Application name to update.
+            path (str): Local project path.
+
+        Returns:
+            tuple[str, str, str]: URL, app_id, function_id
+        """
+        # Naming check
+        if "_" in application_name:
+            raise ValueError("Function or Application name cannot contain '_'.")
+
+        # Find existing application
+        app_id = self.find_app_id_by_name(application_name)
+        if not app_id:
+            raise ValueError(
+                f"Application '{application_name}' not found. Use deploy() for new applications."
+            )
+
+        # Get application status and extract function info
+        status, full_response = self._get_application_status(app_id)
+        if status == "deploy_fail":
+            raise ValueError(
+                f"Cannot update failed application. Current status: {status}"
+            )
+
+        # Extract function name from application config
+        cloud_resource = full_response["Result"]["CloudResource"]
+        cloud_resource = json.loads(cloud_resource)
+        function_name = cloud_resource["framework"]["function"]["Name"]
+        # existing_url = cloud_resource["framework"]["url"]["system_url"]
+        function_id = cloud_resource["framework"]["function"]["Id"]
+        if not function_id:
+            raise ValueError(f"Function '{function_name}' not found for update")
+
+        logger.info(
+            f"Start to update VeFaaS function {function_name} with path {path}."
+        )
+
+        # Upload and mount code using extracted method
+        self._upload_and_mount_code(function_id, path)
+
+        # Use update_function client method to apply changes
+        self.client.update_function(
+            volcenginesdkvefaas.UpdateFunctionRequest(
+                id=function_id,
+                request_timeout=1800,  # Keep same timeout as deploy
+            )
+        )
+
+        logger.info(f"Function updated successfully: {function_id}")
+
+        logger.info(f"VeFaaS function {function_name} with ID {function_id} updated.")
+
+        # Release the application to apply changes
+        url = self._release_application(app_id)
+
+        logger.info(f"VeFaaS application {application_name} with ID {app_id} released.")
+
+        logger.info(
+            f"VeFaaS application {application_name} with ID {app_id} updated on {url}."
+        )
+
+        return url, app_id, function_id
+
+    def get_application_details(self, app_id: str = None, app_name: str = None):
+        if not app_id and not app_name:
+            raise ValueError("app_id and app_name cannot be both empty.")
+        apps = self._list_application()
+        if app_id:
+            for app in apps:
+                if app["Id"] == app_id:
+                    return app
+            return None
+        else:
+            for app in apps:
+                if app["Name"] == app_name:
+                    return app
+
     def find_app_id_by_name(self, name: str):
         apps = self._list_application()
         for app in apps:
@@ -289,15 +328,29 @@ class VeFaaS:
 
     def deploy(
         self,
-        name: str,  # application name
+        name: str,
         path: str,
         gateway_name: str = "",
         gateway_service_name: str = "",
         gateway_upstream_name: str = "",
     ) -> tuple[str, str, str]:
+        """Deploy an agent project to VeFaaS service.
+
+        Args:
+            name (str): Application name (warning: not function name).
+            path (str): Project path.
+            gateway_name (str, optional): Gateway name. Defaults to "".
+            gateway_service_name (str, optional): Gateway service name. Defaults to "".
+            gateway_upstream_name (str, optional): Gateway upstream name. Defaults to "".
+
+        Returns:
+            tuple[str, str, str]: (url, app_id, function_id)
+        """
+        # Naming check
         if "_" in name:
             raise ValueError("Function or Application name cannot contain '_'.")
 
+        # Give default names
         if not gateway_name:
             gateway_name = f"{name}-gw-{formatted_timestamp()}"
 
@@ -318,14 +371,15 @@ class VeFaaS:
         if not gateway_upstream_name:
             gateway_upstream_name = f"{name}-gw-us-{formatted_timestamp()}"
 
-        typer.echo(
-            typer.style("[1/3] ", fg=typer.colors.GREEN)
-            + "Create VeFaaS service on cloud."
+        function_name = f"{name}-fn"
+
+        logger.info(
+            f"Start to create VeFaaS function {function_name} with path {path}. Gateway: {gateway_name}, Gateway Service: {gateway_service_name}, Gateway Upstream: {gateway_upstream_name}."
         )
-        typer.echo(typer.style(f"Project path: {path}", fg=typer.colors.BRIGHT_BLACK))
-        function_name, function_id = self._create_function(name, path)
+        function_name, function_id = self._create_function(function_name, path)
+        logger.info(f"VeFaaS function {function_name} with ID {function_id} created.")
 
-        typer.echo(typer.style("[2/3] ", fg=typer.colors.GREEN) + "Create application.")
+        logger.info(f"Start to create VeFaaS application {name}.")
         app_id = self._create_application(
             name,
             function_name,
@@ -334,13 +388,11 @@ class VeFaaS:
             gateway_service_name,
         )
 
-        typer.echo(
-            typer.style("[3/3] ", fg=typer.colors.GREEN) + "Release application."
-        )
+        logger.info(f"VeFaaS application {name} with ID {app_id} created.")
+        logger.info(f"Start to release VeFaaS application {app_id}.")
         url = self._release_application(app_id)
+        logger.info(f"VeFaaS application {name} with ID {app_id} released.")
 
-        typer.echo(
-            typer.style(f"\nSuccessfully deployed on:\n\n{url}", fg=typer.colors.BLUE)
-        )
+        logger.info(f"VeFaaS application {name} with ID {app_id} deployed on {url}.")
 
         return url, app_id, function_id