indexify 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

indexify/cli/cli.py

@@ -6,6 +6,8 @@ from indexify.utils.logging import (
 
 configure_logging_early()
 
+import importlib.metadata
+import json
 import os
 import shutil
 import signal
@@ -17,6 +19,7 @@ from importlib.metadata import version
 from pathlib import Path
 from typing import Annotated, List, Optional, Tuple
 
+import docker
 import nanoid
 import structlog
 import typer
@@ -294,7 +297,57 @@ def _create_image(image: Image, python_sdk_path):
 
 
 def _build_image(image: Image, python_sdk_path: Optional[str] = None):
-    built_image, output = image.build(python_sdk_path=python_sdk_path)
-    for line in output:
-        print(line)
-    print(f"built image: {built_image.tags[0]}")
+    docker_file = _generate_dockerfile(image, python_sdk_path=python_sdk_path)
+    image_name = f"{image._image_name}:{image._tag}"
+
+    # low_level_client = docker.APIClient(base_url=docker_client.api.base_url)
+    docker_host = os.getenv("DOCKER_HOST", "unix:///var/run/docker.sock")
+    low_level_client = docker.APIClient(base_url=docker_host)
+    docker.api.build.process_dockerfile = lambda dockerfile, path: (
+        "Dockerfile",
+        dockerfile,
+    )
+    generator = low_level_client.build(
+        dockerfile=docker_file,
+        rm=True,
+        path=".",
+        tag=image_name,
+    )
+
+    for output in generator:
+        for line in output.decode().splitlines():
+            json_line = json.loads(line)
+            if "stream" in json_line:
+                print(json_line["stream"], end="")
+
+            elif "errorDetail" in json_line:
+                print(json_line["errorDetail"]["message"])
+
+
+def _generate_dockerfile(image, python_sdk_path: Optional[str] = None):
+    docker_contents = [
+        f"FROM {image._base_image}",
+        "RUN mkdir -p ~/.indexify",
+        f"RUN echo {image._image_name} > ~/.indexify/image_name",  # TODO: Do we still use this in executors?
+        f"RUN echo {image.hash()} > ~/.indexify/image_hash",  # TODO: Do we still use this in executors?
+        "WORKDIR /app",
+    ]
+
+    for build_op in image._build_ops:
+        docker_contents.append(build_op.render())
+
+    if python_sdk_path is not None:
+        print(f"Building image {image._image_name} with local version of the SDK")
+
+        if not os.path.exists(python_sdk_path):
+            print(f"error: {python_sdk_path} does not exist")
+            os.exit(1)
+        docker_contents.append(f"COPY {python_sdk_path} /app/python-sdk")
+        docker_contents.append("RUN (cd /app/python-sdk && pip install .)")
+    else:
+        docker_contents.append(
+            f"RUN pip install indexify=={importlib.metadata.version('indexify')}"
+        )
+
+    docker_file = "\n".join(docker_contents)
+    return docker_file

{indexify-0.3.2.dist-info → indexify-0.3.3.dist-info}/METADATA

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

{indexify-0.3.2.dist-info → indexify-0.3.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-indexify/cli/cli.py,sha256=3HU3fz4mcE-yuKij3rRb7gS99SVaMzVN8Z-9Y4UpqT8,9510
+indexify/cli/cli.py,sha256=y6JNaMd5by7_v3jE1iah1krlvfzbN4r5A2WkgGTy1Ts,11427
 indexify/executor/README.md,sha256=ozC6_hMkhQQNVCMEpBxwiUALz6lwErPQxNxQfQDqnG4,2029
 indexify/executor/api_objects.py,sha256=k5tKYxaWml0sSECoEDzamCYeJnlD7zO2M7E_qGwyMrg,1032
 indexify/executor/downloader.py,sha256=Vrq1dAW4BifG62tlqFnImiMxdezIgOZcByTRnhDsnnw,6457
@@ -38,7 +38,7 @@ indexify/function_executor/service.py,sha256=i3bI7RSKSr3cDiNFoZdl4TSY_SMKlXBXPdE
 indexify/utils/README.md,sha256=2g8-H9GopacOW4YrViZc0QsaJPtK-Fox7GyfX01kcDk,86
 indexify/utils/http_client.py,sha256=deMlmAu4E_ZXV3blCdWNag3uO_cyD-GsMZjFFmO5r7s,3541
 indexify/utils/logging.py,sha256=c6NwzY7uVHMRJc8f2w2KF36rNkeZVoQfGdq7suIg9s8,2025
-indexify-0.3.2.dist-info/METADATA,sha256=YqG6aAKrJhBV7YQal0ojM9HnpdvuIb0aGbHTTOjePS4,1383
-indexify-0.3.2.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-indexify-0.3.2.dist-info/entry_points.txt,sha256=pJG0YRnypesbiNJHuObfHEkjk0p_ZvEDTyyTH0kGVTY,108
-indexify-0.3.2.dist-info/RECORD,,
+indexify-0.3.3.dist-info/METADATA,sha256=VLMu3g8ZamLGLCjjqwPrBxqg8ZStvSZooP9ITl-BbHw,1383
+indexify-0.3.3.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+indexify-0.3.3.dist-info/entry_points.txt,sha256=pJG0YRnypesbiNJHuObfHEkjk0p_ZvEDTyyTH0kGVTY,108
+indexify-0.3.3.dist-info/RECORD,,