fix: copy models to bento directory (#210)

* chore: switch to PDM Signed-off-by: Frost Ming <me@frostming.com> * automated release workflow Signed-off-by: Frost Ming <me@frostming.com> * ignore certain patterns Signed-off-by: Frost Ming <me@frostming.com> * fix lint errors Signed-off-by: Frost Ming <me@frostming.com> * fix: copy models to bento dir Signed-off-by: Frost Ming <me@frostming.com> --------- Signed-off-by: Frost Ming <me@frostming.com> Co-authored-by: Aaron Pham <29749331+aarnphm@users.noreply.github.com>
bentoml · Jul 22, 2023 · e1b572a · e1b572a
1 parent fdb8fae
commit e1b572a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 16 deletions.
diff --git a/bentoctl/cli/__init__.py b/bentoctl/cli/__init__.py
@@ -31,13 +31,13 @@
 
 logger = logging.getLogger(__name__)
 try:
-    from bentoml_cli.utils import validate_docker_tag
+    from bentoml_cli.utils import validate_container_tag
 except ImportError:
     logger.warning(
         "'bentoml._internal.utils.docker.validate_tag' not imported. "
         "Validation dissabled."
     )
-    validate_docker_tag = None
+    validate_container_tag = None
 
 
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
@@ -143,7 +143,7 @@ def generate(deployment_config_file, values_only, save_path):
     "--docker-image-tag",
     help="Name and optionally a tag (format: 'name:tag'), defaults to bento tag.",
     required=False,
-    callback=validate_docker_tag,
+    callback=validate_container_tag,
     multiple=True,
 )
 @click.option(

diff --git a/bentoctl/deployment_config.py b/bentoctl/deployment_config.py
@@ -2,14 +2,17 @@
 import logging
 import os
 import typing as t
+from contextlib import contextmanager
 from pathlib import Path
 
 import bentoml
 import cerberus
 import fs
+import fs.mirror
 import yaml
 from bentoml import Bento
 from bentoml.exceptions import NotFound
+from bentoml.models import get as get_model
 
 from bentoctl.exceptions import (
     BentoNotFound,
@@ -241,6 +244,18 @@ def generate(self, destination_dir=os.curdir, values_only=False):
 
         return generated_files
 
+    @contextmanager
+    def _prepare_bento_dir(self) -> t.Generator[str, None, None]:
+        assert self.bento is not None
+        with fs.open_fs("temp://") as temp_fs, fs.open_fs(self.bento.path) as bento_fs:
+            fs.mirror.mirror(bento_fs, temp_fs)
+            models_fs = temp_fs.makedirs("models", recreate=True)
+            for model_info in self.bento.info.models:
+                model = get_model(model_info.tag)
+                model_fs = models_fs.makedirs(model_info.tag.path())
+                fs.mirror.mirror(model.path, model_fs)
+            yield temp_fs.getsyspath("/")
+
     def create_deployable(self, destination_dir=os.curdir) -> str:
         """
         Creates the deployable in the destination_dir and returns
@@ -249,12 +264,13 @@ def create_deployable(self, destination_dir=os.curdir) -> str:
         # NOTE: In the case of debug mode, we want to keep the deployable
         # for debugging purpose. So by setting overwrite_deployable to false,
         # we don't delete the deployable after the build.
-        return self.operator.create_deployable(
-            bento_path=self.bento.path,
-            destination_dir=destination_dir,
-            bento_metadata=get_bento_metadata(self.bento.path),
-            overwrite_deployable=not is_debug_mode(),
-        )
+        with self._prepare_bento_dir() as bento_path:
+            return self.operator.create_deployable(
+                bento_path=bento_path,
+                destination_dir=destination_dir,
+                bento_metadata=get_bento_metadata(bento_path),
+                overwrite_deployable=not is_debug_mode(),
+            )
 
     def create_repository(self):
         (

diff --git a/bentoctl/docker_utils.py b/bentoctl/docker_utils.py
@@ -4,7 +4,7 @@
 from collections import OrderedDict
 
 import docker
-from bentoml._internal.utils import buildx
+from bentoml import container
 from rich.live import Live
 
 from bentoctl.console import console
@@ -78,12 +78,12 @@ def generate_deployable_container(
             console.print(
                 f"In debug mode. Intermediate bento saved to [b]{dist_dir}[/b]"
             )
-        env = {"DOCKER_BUILDKIT": "1", "DOCKER_SCAN_SUGGEST": "false"}
         buildx_args = {
-            "subprocess_env": env,
-            "cwd": deployment_config.create_deployable(destination_dir=str(dist_dir)),
+            "context_path": deployment_config.create_deployable(
+                destination_dir=str(dist_dir)
+            ),
             "file": DOCKERFILE_PATH,
-            "tags": tags,
+            "tag": tags,
             "add_host": None,
             "allow": allow,
             "build_args": build_args,
@@ -112,10 +112,12 @@ def generate_deployable_container(
             "target": target,
             "ulimit": None,
         }
+        buildx_args = {k: v or None for k, v in buildx_args.items()}
 
         # run health check whether buildx is install locally
-        buildx.health()
-        buildx.build(**buildx_args)
+        container.health("buildx")
+        backend = container.get_backend("buildx")
+        backend.build(**buildx_args)
 
 
 def tag_docker_image(image_name, image_tag):