fix: use user-template to generate dockerfile (#40)

* usertemplate for aws-lambda

* generate docker template

* update return statements

* remove dockerfile template

* Update bentoctl_lambda/aws_lambda/bentoctl_user_template.j2

Co-authored-by: Aaron Pham <[email protected]>

* fix: lambda fits with bentoml rc1

Signed-off-by: Aaron Pham <[email protected]>

* chore: fixes

Signed-off-by: Aaron Pham <[email protected]>

* chore: cleanup

Signed-off-by: Aaron Pham <[email protected]>

* chore: types

Signed-off-by: Aaron Pham <[email protected]>

* chore: update types

Signed-off-by: Aaron Pham <[email protected]>

Co-authored-by: Bozhao <[email protected]>
Co-authored-by: Aaron Pham <[email protected]>

Author: 3 people

bentoctl_lambda/aws_lambda/Dockerfile.template

@@ -4,7 +4,7 @@
 from bentoml._internal.configuration.containers import DeploymentContainer
 from mangum import Mangum
 
-API_GATEWAY_STAGE = os.environ.get('API_GATEWAY_STAGE', None)
+API_GATEWAY_STAGE = os.environ.get("API_GATEWAY_STAGE", None)
 print("Loading from dir...")
 bento_service = load("./")
 print("bento service", bento_service)

bentoctl_lambda/aws_lambda/app.py

@@ -0,0 +1,12 @@
+{% extends bento_base_template %}
+{% set bento__home = "/tmp" %}
+{% block SETUP_BENTO_ENTRYPOINT %}
+EXPOSE 3000
+
+RUN --mount=type=cache,from=cached,mode=0777,target=/root/.cache/pip \
+	pip install awslambdaric==2.0.0 mangum==0.12.3
+
+USER root
+
+ENTRYPOINT [ "/usr/local/bin/python", "-m", "awslambdaric" ]
+{% endblock %}

bentoctl_lambda/aws_lambda/template.j2

@@ -1,38 +1,26 @@
+from __future__ import annotations
+
 import os
 import shutil
+from pathlib import Path
+from typing import Any
 
-path_to_aws_lambda_files = os.path.join(os.path.dirname(__file__), "./aws_lambda/")
-DOCKERFILE_TEMPLATE = os.path.join(path_to_aws_lambda_files, "Dockerfile.template")
-APP_FILE = os.path.join(path_to_aws_lambda_files, "app.py")
-
-
-def generate_lambda_deployable(bento_path, bento_metadata, deployable_path):
-    # copy bento_bundle to project_path
-    shutil.copytree(bento_path, deployable_path)
-
-    # Make docker file with dockerfile template
-    dockerfile = os.path.join(deployable_path, "Dockerfile")
-    with open(DOCKERFILE_TEMPLATE, "r", encoding="utf-8") as f, open(
-        dockerfile, "w"
-    ) as dockerfile:
-        dockerfile_template = f.read()
-        dockerfile.write(
-            dockerfile_template.format(
-                bentoml_version=bento_metadata["bentoml_version"],
-                python_version=bento_metadata["python_version"],
-            )
-        )
+from bentoml._internal.bento.bento import BentoInfo
+from bentoml._internal.bento.build_config import DockerOptions
+from bentoml._internal.bento.gen import generate_dockerfile
+from bentoml._internal.utils import bentoml_cattr
 
-    # copy over app.py file
-    shutil.copy(
-        APP_FILE,
-        os.path.join(deployable_path, "app.py"),
-    )
+LAMBDA_DIR = Path(os.path.dirname(__file__), "aws_lambda")
+TEMPLATE_PATH = LAMBDA_DIR.joinpath("template.j2")
+APP_PATH = LAMBDA_DIR.joinpath("app.py")
 
 
 def create_deployable(
-    bento_path, destination_dir, bento_metadata, overwrite_deployable
-):
+    bento_path: str,
+    destination_dir: str,
+    bento_metadata: dict[str, Any],
+    overwrite_deployable: bool,
+) -> str:
     """
     The deployable is the bento along with all the modifications (if any)
     requried to deploy to the cloud service.
@@ -48,33 +36,39 @@ def create_deployable(
 
     Returns
     -------
-    dockerfile_path : str
-        path to the dockerfile.
     docker_context_path : str
         path to the docker context.
-    additional_build_args : dict
-        Any addition build arguments that need to be passed to the
-        docker build command
     """
 
-    deployable_path = os.path.join(destination_dir, "bentoctl_deployable")
-    docker_context_path = deployable_path
-    dockerfile_path = os.path.join(deployable_path, "Dockerfile")
+    deployable_path = Path(destination_dir)
+    shutil.copytree(bento_path, deployable_path, dirs_exist_ok=True)
 
-    if os.path.exists(deployable_path):
-        if overwrite_deployable:
-            print(f"Overwriting existing deployable [{deployable_path}]")
-            shutil.rmtree(deployable_path)
-        else:
+    if deployable_path.exists():
+        if not overwrite_deployable:
             print("Using existing deployable")
-            return dockerfile_path, docker_context_path, additional_build_args
+            return str(deployable_path)
+
+    bento_metafile = Path(bento_path, "bento.yaml")
+    with bento_metafile.open("r", encoding="utf-8") as metafile:
+        info = BentoInfo.from_yaml_file(metafile)
 
-    generate_lambda_deployable(
-        bento_path=bento_path,
-        bento_metadata=bento_metadata,
-        deployable_path=deployable_path,
-    )
+    options = bentoml_cattr.unstructure(info.docker)
+    options["dockerfile_template"] = TEMPLATE_PATH
 
-    additional_build_args = None
+    dockerfile_path = deployable_path.joinpath("env", "docker", "Dockerfile")
+    with dockerfile_path.open("w", encoding="utf-8") as dockerfile:
+        dockerfile.write(
+            generate_dockerfile(
+                DockerOptions(**options).with_defaults(),
+                str(deployable_path),
+                use_conda=any(
+                    i is not None
+                    for i in bentoml_cattr.unstructure(info.conda).values()
+                ),
+            )
+        )
+
+    # copy over app.py file
+    shutil.copy(str(APP_PATH), os.path.join(deployable_path, "app.py"))
 
-    return dockerfile_path, docker_context_path, additional_build_args
+    return str(deployable_path)

bentoctl_lambda/create_deployable.py

@@ -1,7 +1,5 @@
 from collections import UserDict
 
-from bentoctl_lambda.schemas import OPERATOR_SCHEMA
-
 DEPLOYMENT_PARAMS_WARNING = """# This file is maintained automatically by 
 # "bentoctl generate" and "bentoctl build" commands. 
 # Manual edits may be lost the next time these commands are run.

bentoctl_lambda/parameters.py

@@ -1,7 +1,7 @@
 import os
 
-import fs
 import boto3
+import fs
 from bentoml.bentos import Bento
 
 

bentoctl_lambda/schemas.py

@@ -1,4 +1,25 @@
-from bentoctl_lambda.schemas import OPERATOR_SCHEMA
+OPERATOR_SCHEMA = {
+    "region": {
+        "required": True,
+        "type": "string",
+        "default": "us-west-1",
+        "help_message": "AWS region for Lambda deployment",
+    },
+    "timeout": {
+        "required": False,
+        "type": "integer",
+        "coerce": int,
+        "default": 10,
+        "help_message": "Timeout per request",
+    },
+    "memory_size": {
+        "required": False,
+        "type": "integer",
+        "coerce": int,
+        "default": 512,
+        "help_message": "The memory for your function, set a value between 128 MB and 10,240 MB in 1-MB increments",
+    },
+}
 
 OPERATOR_NAME = "aws-lambda"
 

bentoctl_lambda/utils.py

@@ -1,12 +1,11 @@
 # iris_classifier.py
-from bentoml import env, api, BentoService
-from bentoml.adapters import DataframeInput, JsonInput, FileInput
-from bentoml.types import JsonSerializable, FileLike
+from bentoml import BentoService, api, env
+from bentoml.adapters import DataframeInput, FileInput, JsonInput
+from bentoml.types import FileLike, JsonSerializable
 
 
 @env(infer_pip_packages=True)
 class TestService(BentoService):
-
     @api(input=DataframeInput(), batch=True)
     def dfapi(self, df):
         print(df)

operator_config.py

@@ -1,18 +1,17 @@
 import os
-import sys
 import shutil
+import sys
 import tempfile
 import time
 
 import requests
-from pandas import DataFrame
-
 from classifier import TestService
+from pandas import DataFrame
 
 sys.path.append("./")
+from delete import delete
 from deploy import deploy
 from describe import describe
-from delete import delete
 
 
 class Setup: