plumbing

Signed-off-by: Ayush Kamat <ayush@latch.bio>

Author: ayushkamat

src/latch_cli/main.py

@@ -543,6 +543,106 @@ def execute(
     _exec(execution_id=execution_id, egn_id=egn_id, container_index=container_index)
 
 
+@main.group()
+def image():
+    """Manage Private Image Uploads"""
+
+
+@image.command("build")
+@click.argument("root", type=click.Path(exists=True, file_okay=False))
+@click.option("-n", "--image-name", is_flag=False, type=str)
+@click.option("-v", "--version", is_flag=False, type=str)
+@click.option(
+    "-d",
+    "--dockerfile-path",
+    is_flag=False,
+    type=click.Path(exists=True, dir_okay=False),
+    help="Path to Dockerfile, defaults to the Dockerfile in specified root directory.",
+)
+@click.option(
+    "--remote/--no-remote",
+    is_flag=True,
+    default=True,
+    type=bool,
+    help="Use a remote server to build workflow.",
+)
+@click.option(
+    "-y",
+    "--yes",
+    is_flag=True,
+    default=False,
+    type=bool,
+    help="Skip the confirmation dialog.",
+)
+@click.option(
+    "--docker-progress",
+    type=click.Choice(["plain", "tty", "auto"], case_sensitive=False),
+    default="auto",
+    help=(
+        "`tty` shows only the last N lines of the build log. `plain` does no special"
+        " handling. `auto` chooses `tty` when stdout is a terminal and `plain`"
+        " otherwise. Equivalent to Docker's `--progress` flag."
+    ),
+)
+@requires_login
+def build_and_upload_image(
+    root: Path,
+    *,
+    image_name: str,
+    version: Optional[str] = None,
+    dockerfile_path: Optional[Path] = None,
+    remote: bool = True,
+    yes: bool = False,
+    docker_progress: str,
+):
+    """Builds and uploads a Docker image to Latch ECR"""
+
+    from .services.private_images import build_and_upload_image
+
+    build_and_upload_image(
+        root,
+        image_name=image_name,
+        version=version,
+        dockerfile_path=dockerfile_path,
+        remote=remote,
+        skip_confirmation=yes,
+        progress_plain=(docker_progress == "auto" and not sys.stdout.isatty())
+        or docker_progress == "plain",
+    )
+
+
+@image.command("upload")
+@click.argument("image-reference", type=str, help="The image you wish to upload")
+@click.option("-n", "--image-name", is_flag=False, type=str)
+@click.option("-v", "--version", is_flag=False, type=str)
+@click.option(
+    "-y",
+    "--yes",
+    is_flag=True,
+    default=False,
+    type=bool,
+    help="Skip the confirmation dialog.",
+)
+@requires_login
+def upload_image(
+    image_reference: str,
+    *,
+    image_name: Optional[str] = None,
+    version: Optional[str] = None,
+    yes: bool = False,
+):
+    """Uploads an existing Docker image to Latch ECR"""
+
+    from .services.private_images import upload_image
+
+    upload_image(
+        image_ref=image_reference,
+        image_name=image_name,
+        version=version,
+        skip_confirmation=yes,
+    )
+
+
 @main.command("register")
 @click.argument("pkg_root", type=click.Path(exists=True, file_okay=False))
 @click.option(

src/latch_cli/services/private_images.py

@@ -59,7 +59,7 @@ def record_in_db(ws_id: str, image_name: str, version: str):
 )
 valid_version_expr = re.compile(r"[\w][\w.-]{0,127}")
 image_ref_expr = re.compile(
-    r"((?P<registry>[^/:]+)/)?(?P<image>[^:]+):(?P<version>[^:/])"
+    r"((?P<registry>[^/:]+)/)?(?P<image>[^:]+)(:(?P<version>[^:/]))?"
 )
 
 
@@ -106,17 +106,17 @@ def validate_version(version: str):
 def upload_image(
     image_ref: str,
     *,
-    new_image_name: Optional[str] = None,
-    new_version: Optional[str] = None,
+    image_name: Optional[str] = None,
+    version: Optional[str] = None,
     skip_confirmation: bool = False,
 ):
     click.secho("Beginning image upload:")
     match = image_ref_expr.match(image_ref)
 
-    if new_image_name is not None:
-        validate_image_name(new_image_name)
+    if image_name is not None:
+        validate_image_name(image_name)
     elif match is not None:
-        new_image_name = match["image"]
+        image_name = match["image"]
     else:
         click.secho(
             dedent(f"""\
@@ -131,10 +131,12 @@ def upload_image(
 
         raise click.exceptions.Exit(1)
 
-    if new_version is not None:
-        validate_version(new_version)
+    if version is not None:
+        validate_version(version)
+    elif match is not None and match["version"] is not None:
+        version = match["version"]
     elif match is not None:
-        new_version = match["version"]
+        version = "latest"
     else:
         click.secho(
             dedent(f"""\
@@ -149,14 +151,14 @@ def upload_image(
 
         raise click.exceptions.Exit(1)
 
-    assert new_image_name is not None
-    assert new_version is not None
+    assert image_name is not None
+    assert version is not None
 
     ws_id = current_workspace()
 
-    namespaced_image_name = f"{ws_id}_{new_image_name}"
+    namespaced_image_name = f"{ws_id}_{image_name}"
 
-    full_image_ref = f"{ecr_base}/{namespaced_image_name}:{new_version}"
+    full_image_ref = f"{ecr_base}/{namespaced_image_name}:{version}"
 
     click.secho(f"Image Destination: {full_image_ref}")
 
@@ -172,9 +174,7 @@ def upload_image(
         print_header=False,
     )
 
-    client.tag(
-        image_ref, repository=f"{ecr_base}/{namespaced_image_name}", tag=new_version
-    )
+    client.tag(image_ref, repository=f"{ecr_base}/{namespaced_image_name}", tag=version)
 
     client._auth_configs = docker.auth.AuthConfig({  # noqa: SLF001
         "auths": {ecr_base: asdict(credentials)}
@@ -183,15 +183,15 @@ def upload_image(
     print_upload_logs(
         client.push(
             repository=f"{ecr_base}/{namespaced_image_name}",
-            tag=new_version,
+            tag=version,
             stream=True,
             decode=True,
             auth_config=asdict(credentials),
         ),
         namespaced_image_name,
     )
 
-    # record_in_db(ws_id, namespaced_image_name, new_version)
+    record_in_db(ws_id, namespaced_image_name, version)
 
     click.secho(f"Successfully built and tagged {full_image_ref}", fg="green")