From 15d1cea42d191c25ab6f0c8be4442d7499b5911b Mon Sep 17 00:00:00 2001 From: Ping-Lin Chang Date: Sat, 17 May 2025 01:25:49 +0100 Subject: [PATCH 1/3] fix(ray): point PYTHONPATH to protogen directly --- instill/helpers/docker/Dockerfile | 11 ++++++----- instill/helpers/docker/Dockerfile.vllm | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/instill/helpers/docker/Dockerfile b/instill/helpers/docker/Dockerfile index 1c03837..becb3a6 100644 --- a/instill/helpers/docker/Dockerfile +++ b/instill/helpers/docker/Dockerfile @@ -40,8 +40,9 @@ RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \ pip install --default-timeout=1000 instill-sdk==${INSTILL_PYTHON_SDK_VERSION}; \ fi; -# 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 \ No newline at end of file +# The python-sdk is a local module that is not installed in the Ray worker environment. +# Ray workers need to deserialize model configurations and deployment settings that were +# created in the runtime environment. These objects may depend on this python-sdk. +# Instead of installing the SDK in the Ray image, we copy +# the entire SDK to /home/ray and set PYTHONPATH to allow dynamic importing. +ENV PYTHONPATH=/home/ray/python-sdk/instill/protogen/model/ray/v1alpha diff --git a/instill/helpers/docker/Dockerfile.vllm b/instill/helpers/docker/Dockerfile.vllm index 46245ee..62c514f 100644 --- a/instill/helpers/docker/Dockerfile.vllm +++ b/instill/helpers/docker/Dockerfile.vllm @@ -90,8 +90,9 @@ RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \ USER ray -# 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 \ No newline at end of file +# The python-sdk is a local module that is not installed in the Ray worker environment. +# Ray workers need to deserialize model configurations and deployment settings that were +# created in the runtime environment. These objects may depend on this python-sdk. +# Instead of installing the SDK in the Ray image, we copy +# the entire SDK to /home/ray and set PYTHONPATH to allow dynamic importing. +ENV PYTHONPATH=/home/ray/python-sdk/instill/protogen/model/ray/v1alpha From 9bfcc96414a0e63a3c491cedd2cf0477637a855e Mon Sep 17 00:00:00 2001 From: Ping-Lin Chang Date: Sat, 17 May 2025 01:26:09 +0100 Subject: [PATCH 2/3] ci(workflows): remove unused workflows --- .github/labeler.yml | 2 -- .github/workflows/add-label-to-pr.yml | 13 ------------- .github/workflows/add-pr-to-prj.yml | 14 -------------- 3 files changed, 29 deletions(-) delete mode 100644 .github/labeler.yml delete mode 100644 .github/workflows/add-label-to-pr.yml delete mode 100644 .github/workflows/add-pr-to-prj.yml diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index 053732a..0000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,2 +0,0 @@ -instill core: - - "**" diff --git a/.github/workflows/add-label-to-pr.yml b/.github/workflows/add-label-to-pr.yml deleted file mode 100644 index 5c09272..0000000 --- a/.github/workflows/add-label-to-pr.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Add Label to PR - -on: - pull_request_target: - types: - - opened - - synchronize - -jobs: - triage: - uses: instill-ai/.github/.github/workflows/add-label-to-pr.yml@main - secrets: - botGitHubToken: ${{ secrets.botGitHubToken }} diff --git a/.github/workflows/add-pr-to-prj.yml b/.github/workflows/add-pr-to-prj.yml deleted file mode 100644 index ff338ef..0000000 --- a/.github/workflows/add-pr-to-prj.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Add PR to Project - -on: - pull_request_target: - types: - - opened - -jobs: - track_pr: - uses: instill-ai/.github/.github/workflows/add-to-prj.yml@main - with: - project_number: 5 - secrets: - botGitHubToken: ${{ secrets.botGitHubToken }} From 8e125086b845ba351070ddca6ec2273b3333aca8 Mon Sep 17 00:00:00 2001 From: Ping-Lin Chang Date: Sat, 17 May 2025 01:26:49 +0100 Subject: [PATCH 3/3] chore(protogen): update git submodule --- instill/protogen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instill/protogen b/instill/protogen index 9993552..1b2fc90 160000 --- a/instill/protogen +++ b/instill/protogen @@ -1 +1 @@ -Subproject commit 9993552dabb80d25a0f62eb030d55e7022de11f0 +Subproject commit 1b2fc90180d1875cb10bc6957f300e32e6ae71c1