indexify 0.4.30__py3-none-any.whl → 0.4.31__py3-none-any.whl

indexify/cli/build_image.py

@@ -4,8 +4,7 @@ from typing import Any, Generator, Tuple
 import click
 import docker
 import docker.api.build
-import docker.models
-import docker.models.images
+from docker.errors import BuildError
 from tensorlake.functions_sdk.image import Image
 from tensorlake.functions_sdk.workflow_module import (
     WorkflowModuleInfo,
@@ -16,7 +15,6 @@ from tensorlake.functions_sdk.workflow_module import (
 @click.command(
     short_help="Build images for graphs/workflows defined in the workflow file"
 )
-# Path to the file where the graphs/workflows are defined as global variables
 @click.argument(
     "workflow-file-path",
     type=click.Path(exists=True, file_okay=True, dir_okay=False),
@@ -31,6 +29,11 @@ def build_image(
     workflow_file_path: str,
     image_names: tuple[str, ...] = None,
 ):
+    """
+    Build the images associated to an Indexify workflow
+
+    A workflow is defined in a Python file, and the images are built using the local Docker daemon.
+    """
     try:
         workflow_module_info: WorkflowModuleInfo = load_workflow_module_info(
             workflow_file_path
@@ -48,7 +51,7 @@ def build_image(
     indexify_version: str = importlib.metadata.version("indexify")
     for image in workflow_module_info.images.keys():
         image: Image
-        if image_names is not None and image.image_name not in image_names:
+        if len(image_names) > 0 and image.image_name not in image_names:
             click.echo(
                 f"Skipping image `{image.image_name}` as it is not in the provided image names."
             )
@@ -57,28 +60,65 @@ def build_image(
         click.echo(f"Building image `{image.image_name}`")
 
         image.run(f"pip install 'indexify=={indexify_version}'")
-        built_image, logs_generator = image.build()
-        built_image: docker.models.images.Image
-        for output in logs_generator:
-            click.secho(output)
+        built_image, logs_generator = _build(image=image, docker_client=docker_client)
+        try:
+            built_image, logs_generator = _build(
+                image=image, docker_client=docker_client
+            )
+            _print_build_log(logs_generator)
+            click.secho(f"built image: {built_image.tags[0]}", fg="green")
+        except BuildError as e:
+            raise click.Abort() from e
 
         click.secho(f"built image: {built_image.tags[0]}", fg="green")
 
 
-def build(
+def _build(
     image: Image, docker_client: docker.DockerClient
 ) -> Tuple[docker.models.images.Image, Generator[str, Any, None]]:
     docker_file = image.dockerfile()
-    image_name = f"{image.image_name}:{image.image_tag}"
+    image_name = (
+        image.image_name
+        if ":" in image.image_name
+        else f"{image.image_name}:{image.image_tag}"
+    )
 
     docker.api.build.process_dockerfile = lambda dockerfile, path: (
         "Dockerfile",
         dockerfile,
     )
 
-    return docker_client.images.build(
-        path=".",
-        dockerfile=docker_file,
-        tag=image_name,
-        rm=True,
-    )
+    try:
+        built_image, logs_generator = docker_client.images.build(
+            path=".",
+            dockerfile=docker_file,
+            tag=image_name,
+            rm=True,
+            # pull=True,  # optional: ensures fresh base images
+            # forcerm=True,  # optional: always remove intermediate containers
+        )
+        return built_image, logs_generator
+    except BuildError as e:
+        click.secho("Docker build failed:", fg="red")
+        _print_build_log(e.build_log or [])
+        click.secho(str(e), fg="red")
+        raise
+
+
+def _print_build_log(build_logs):
+    for log_entry in build_logs:
+        if isinstance(log_entry, dict):
+            if "stream" in log_entry:
+                click.echo(log_entry["stream"].rstrip("\n"))
+            elif "status" in log_entry:
+                if "id" in log_entry:
+                    click.echo(f"{log_entry['status']}: {log_entry['id']}")
+                else:
+                    click.echo(log_entry["status"])
+            if "errorDetail" in log_entry:
+                # This is the most useful bit when a RUN command fails
+                msg = log_entry["errorDetail"].get("message") or log_entry.get("error")
+                if msg:
+                    click.secho(msg.rstrip("\n"), fg="red")
+        elif isinstance(log_entry, str):
+            click.echo(log_entry.rstrip("\n"))

indexify/cli/deploy.py

@@ -18,7 +18,7 @@ from tensorlake.functions_sdk.workflow_module import (
 )
 @click.option(
     "-u",
-    "--upgrade-queued-requests",
+    "--upgrade-queued-invocations",
     is_flag=True,
     default=False,
     help="Upgrade invocations that are already queued or running to use the deployed version of the graphs/workflows",

{indexify-0.4.30.dist-info → indexify-0.4.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: indexify
-Version: 0.4.30
+Version: 0.4.31
 Summary: Open Source Indexify components and helper tools
 Home-page: https://github.com/tensorlakeai/indexify
 License: Apache 2.0

{indexify-0.4.30.dist-info → indexify-0.4.31.dist-info}/RECORD

@@ -1,6 +1,6 @@
 indexify/cli/__init__.py,sha256=ELFLx_Z_oWm30jwOpYjbD6Ori3Nzz4ldkvmGVK7QMgw,426
-indexify/cli/build_image.py,sha256=QLhhYz8WZtOL_xm1LvviTNJucGnYjksnMIVmeEQ8zzA,2505
-indexify/cli/deploy.py,sha256=0cs68KXH4Cw0KmYAoqYZ60oErQ5J9LI0KbohSG_Mj8g,1847
+indexify/cli/build_image.py,sha256=FPP8hdj0E5IsEKokS4IBWKSx9PWZ66ZY5GqEI9oHj7k,4139
+indexify/cli/deploy.py,sha256=f3CX1PhnkrbNzrqv4BY_C6YZHYxSJKr0sAjDsw1rKBs,1850
 indexify/cli/executor.py,sha256=0go8YUPFCwg77pYbCaoWuPraqW7KBgZ6Fyx6sQzT4aM,6286
 indexify/executor/README.md,sha256=ozC6_hMkhQQNVCMEpBxwiUALz6lwErPQxNxQfQDqnG4,2029
 indexify/executor/blob_store/blob_store.py,sha256=lrSGTZa_H4Cs1BFwADp-aluvD3LpmE1XO76ZJMX5alU,5798
@@ -69,7 +69,7 @@ indexify/proto/executor_api.proto,sha256=YwLeLjyLHhs5qoWLA50uHY2KdKRGfBQBKZwE8VX
 indexify/proto/executor_api_pb2.py,sha256=vTG1-2Pp4OnTWFD4GYphgJ3cUbTbDjCOKstKrLBXB-E,16472
 indexify/proto/executor_api_pb2.pyi,sha256=-6P-ef-fBJF0CTc4UucIzrDLCBVZpIEhEz2qhexvwjk,23175
 indexify/proto/executor_api_pb2_grpc.py,sha256=u9GEQV4nm_GvApRxjVo806CkgBMBVReb5IVrcaDaliY,7520
-indexify-0.4.30.dist-info/METADATA,sha256=rtJwA6hJc1w8kSC0HTsesyum276C4gH1iXKg_jK45rY,1390
-indexify-0.4.30.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-indexify-0.4.30.dist-info/entry_points.txt,sha256=rMJqbE5KPZIXTPIfAtVIM4zpUElqYVgEYd6i7N23zzg,49
-indexify-0.4.30.dist-info/RECORD,,
+indexify-0.4.31.dist-info/METADATA,sha256=XQZTmN_xg_dU5OBebaGknra6fs4JPBwKlotK5211Hxw,1390
+indexify-0.4.31.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+indexify-0.4.31.dist-info/entry_points.txt,sha256=rMJqbE5KPZIXTPIfAtVIM4zpUElqYVgEYd6i7N23zzg,49
+indexify-0.4.31.dist-info/RECORD,,