Skip to content

fix(ray): make non-editable work with dynamic pkg import #277

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 1 commit into from
May 17, 2025
Merged

fix(ray): make non-editable work with dynamic pkg import #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions instill/helpers/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def cli():
build_parser.add_argument(
"-a",
"--target-arch",
help="target platform architecture for the model image, default to host",
help="target platform architecture for the model image, default to host architecture",
default=default_platform,
choices=["arm64", "amd64"],
required=False,
Expand Down Expand Up @@ -298,11 +298,23 @@ def prepare_build_command(args, tmpdir, dockerfile, build_vars):

command.extend(
[
# editable mode
"--build-arg",
f"INSTILL_PYTHON_SDK_PROJECT_NAME={instill_python_sdk_project_name}",
"--build-arg",
(
"PYTHONPATH_USER_DEFINED_PROTO=/home/ray/"
f"{instill_python_sdk_project_name}/instill/protogen/model/ray/v1alpha"
),
]
if instill_python_sdk_project_name
else []
else [
"--build-arg",
(
"PYTHONPATH_USER_DEFINED_PROTO=/home/ray/"
"anaconda3/lib/python3.11/site-packages/instill/protogen/model/ray/v1alpha"
),
]
)

return command
Expand Down
5 changes: 3 additions & 2 deletions instill/helpers/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ COPY --chown=ray:users . .

ARG INSTILL_PYTHON_SDK_PROJECT_NAME
ARG INSTILL_PYTHON_SDK_VERSION
RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
if [ ! -z "$INSTILL_PYTHON_SDK_PROJECT_NAME" ]; then \
pip install -e ${INSTILL_PYTHON_SDK_PROJECT_NAME}; \
elif [ -f instill_sdk-${INSTILL_PYTHON_SDK_VERSION}dev-py3-none-any.whl ]; then \
Expand All @@ -45,4 +45,5 @@ RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
# 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
ARG PYTHONPATH_USER_DEFINED_PROTO
ENV PYTHONPATH=${PYTHONPATH_USER_DEFINED_PROTO}
3 changes: 2 additions & 1 deletion instill/helpers/docker/Dockerfile.vllm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,5 @@ USER ray
# 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
ARG PYTHONPATH_USER_DEFINED_PROTO
ENV PYTHONPATH=${PYTHONPATH_USER_DEFINED_PROTO}