Skip to content

fix(ray): fix dynamic package loading issue #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 17, 2025
Merged

fix(ray): fix dynamic package loading issue #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d1cea
fix(ray): point PYTHONPATH to protogen directly
pinglin May 17, 2025
9bfcc96
ci(workflows): remove unused workflows
pinglin May 17, 2025
8e12508
chore(protogen): update git submodule
pinglin May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/labeler.yml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/add-label-to-pr.yml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/add-pr-to-prj.yml
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions instill/helpers/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# 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
11 changes: 6 additions & 5 deletions instill/helpers/docker/Dockerfile.vllm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# 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
2 changes: 1 addition & 1 deletion instill/protogen
Open in desktop
Submodule protogen updated 5 files
+222 −190 agent/agent/v1alpha/table_pb2.py
+154 −8 agent/agent/v1alpha/table_pb2.pyi
+3 −3 model/ray/v1alpha/user_defined_pb2.py
+10 −10 model/ray/v1alpha/user_defined_pb2_grpc.py
+7 −7 model/ray/v1alpha/user_defined_pb2_grpc.pyi