chore(ray): build user defined grpc protos in image

Author: pinglin

instill/helpers/cli.py

@@ -141,10 +141,6 @@ def init(_):
         __file__.replace("cli.py", "init-templates/model.py"),
         f"{os.getcwd()}/model.py",
     )
-    shutil.copyfile(
-        __file__.replace("cli.py", "init-templates/.dockerignore"),
-        f"{os.getcwd()}/.dockerignore",
-    )
 
 
 def find_project_root(start_path):
@@ -237,8 +233,8 @@ def process_arm64_packages(python_pkg_list, target_arch):
                 filtered_pkg_list.append(pkg)
 
         python_pkg_list = filtered_pkg_list
-        if vllm_version is not None:
-            dockerfile = "Dockerfile.arm"
+        if vllm_version is not None and target_arch == "arm64":
+            dockerfile = "Dockerfile.vllm"
 
     python_pkg_str = " ".join(python_pkg_list)
     target_arch_suffix = "-aarch64" if target_arch == "arm64" else ""
@@ -343,12 +339,18 @@ def build(args):
         ) = process_arm64_packages(python_pkg_list, args.target_arch)
 
         with tempfile.TemporaryDirectory() as tmpdir:
+
             # Copy files to tmpdir
-            shutil.copyfile(
-                __file__.replace("cli.py", f"docker/{dockerfile}"),
-                f"{tmpdir}/{dockerfile}",
+            docker_dir = __file__.replace("cli.py", "docker")
+            shutil.copyfile(f"{docker_dir}/{dockerfile}", f"{tmpdir}/Dockerfile")
+            shutil.copyfile(f"{docker_dir}/.dockerignore", f"{tmpdir}/.dockerignore")
+            shutil.copytree(
+                os.getcwd(),
+                tmpdir,
+                ignore=shutil.ignore_patterns("model.py"),
+                dirs_exist_ok=True,
             )
-            shutil.copytree(os.getcwd(), tmpdir, dirs_exist_ok=True)
+            shutil.copyfile(f"{os.getcwd()}/model.py", f"{tmpdir}/_model.py")
 
             # Handle SDK wheel if provided
             if args.sdk_wheel is not None:

instill/helpers/docker/.dockerignore

@@ -18,3 +18,6 @@ __pycache__
 
 # Exclude model config file
 instill.yaml
+
+# Exclude Dockerfile
+Dockerfile*

instill/helpers/docker/Dockerfile

@@ -27,7 +27,7 @@ RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
     pip install --default-timeout=1000 $package; \
     done
 
-COPY --chown=ray:users --exclude=model.py . .
+COPY --chown=ray:users . .
 
 ARG INSTILL_PYTHON_SDK_PROJECT_NAME
 ARG INSTILL_PYTHON_SDK_VERSION
@@ -40,4 +40,8 @@ RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
     pip install --default-timeout=1000 instill-sdk==${INSTILL_PYTHON_SDK_VERSION}; \
     fi;
 
-COPY --chown=ray:users model.py _model.py
+# Download protobuf definition from GitHub
+RUN curl -L https://raw.githubusercontent.com/instill-ai/protobufs/1427cfe974daf443987b08a97fe4ff1cd9fcd7c8/model/ray/v1alpha/user_defined.proto -o user_defined.proto
+
+RUN python -m grpc_tools.protoc -I=. --python_out=. --pyi_out=. --grpc_python_out=. ./user_defined.proto
+ENV PYTHONPATH=/home/ray

instill/helpers/docker/Dockerfile.arm renamed to instill/helpers/docker/Dockerfile.vllm

@@ -75,8 +75,7 @@ RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
     done
 
 WORKDIR /home/ray
-COPY --chown=ray:users --exclude=model.py . .
-COPY --chown=ray:users model.py _model.py
+COPY --chown=ray:users . .
 
 ARG INSTILL_PYTHON_SDK_PROJECT_NAME
 ARG INSTILL_PYTHON_SDK_VERSION
@@ -90,3 +89,13 @@ RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
     fi;
 
 USER ray
+
+COPY --chown=ray:users requirements.txt .
+RUN pip install --upgrade pip setuptools wheel
+RUN pip install -r requirements.txt
+
+# Download protobuf definition from GitHub
+RUN curl -L https://raw.githubusercontent.com/instill-ai/protobufs/1427cfe974daf443987b08a97fe4ff1cd9fcd7c8/model/ray/v1alpha/user_defined.proto -o user_defined.proto
+
+RUN python -m grpc_tools.protoc -I=. --python_out=. --pyi_out=. --grpc_python_out=. ./user_defined.proto
+ENV PYTHONPATH=/home/ray