Skip to content
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

Update uv and remove pip workaround in default image builder #2674

Merged
merged 1 commit into from
Aug 10, 2024
Merged

Update uv and remove pip workaround in default image builder #2674

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
33 changes: 2 additions & 31 deletions flytekit/image_spec/default_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import json
import os
import re
import shutil
import subprocess
Expand Down Expand Up @@ -28,13 +27,6 @@
--requirement requirements_uv.txt
""")

PIP_PYTHON_INSTALL_COMMAND_TEMPLATE = Template("""\
RUN --mount=type=cache,sharing=locked,mode=0777,target=/root/.cache/pip,id=pip \
--mount=type=bind,target=requirements_pip.txt,src=requirements_pip.txt \
/opt/micromamba/envs/runtime/bin/python -m pip install $PIP_EXTRA \
--requirement requirements_pip.txt
""")

APT_INSTALL_COMMAND_TEMPLATE = Template(
"""\
RUN --mount=type=cache,sharing=locked,mode=0777,target=/var/cache/apt,id=apt \
Expand All @@ -46,7 +38,7 @@
DOCKER_FILE_TEMPLATE = Template(
"""\
#syntax=docker/dockerfile:1.5
FROM ghcr.io/astral-sh/uv:0.2.13 as uv
FROM ghcr.io/astral-sh/uv:0.2.35 as uv
FROM mambaorg/micromamba:1.5.8-bookworm-slim as micromamba

FROM $BASE_IMAGE
Expand All @@ -66,7 +58,6 @@
python=$PYTHON_VERSION $CONDA_PACKAGES

$UV_PYTHON_INSTALL_COMMAND
$PIP_PYTHON_INSTALL_COMMAND

# Configure user space
ENV PATH="/opt/micromamba/envs/runtime/bin:$$PATH" \
Expand Down Expand Up @@ -149,19 +140,8 @@
if not any(_is_flytekit(package) for package in requirements):
requirements.append(get_flytekit_for_pypi())

uv_requirements = []

# uv does not support git + subdirectory, so we use pip to install them instead
pip_requirements = []

for requirement in requirements:
if "git" in requirement and "subdirectory" in requirement:
pip_requirements.append(requirement)
else:
uv_requirements.append(requirement)

requirements_uv_path = tmp_dir / "requirements_uv.txt"
requirements_uv_path.write_text("\n".join(uv_requirements))
requirements_uv_path.write_text("\n".join(requirements))

Check warning on line 144 in flytekit/image_spec/default_builder.py

View check run for this annotation

Codecov / codecov/patch

flytekit/image_spec/default_builder.py#L144 

Added line #L144 was not covered by tests

pip_extra_args = ""

Expand All @@ -173,14 +153,6 @@

uv_python_install_command = UV_PYTHON_INSTALL_COMMAND_TEMPLATE.substitute(PIP_EXTRA=pip_extra_args)

if pip_requirements:
requirements_uv_path = tmp_dir / "requirements_pip.txt"
requirements_uv_path.write_text(os.linesep.join(pip_requirements))

pip_python_install_command = PIP_PYTHON_INSTALL_COMMAND_TEMPLATE.substitute(PIP_EXTRA=pip_extra_args)
else:
pip_python_install_command = ""

env_dict = {"PYTHONPATH": "/root", _F_IMG_ID: image_spec.image_name()}

if image_spec.env:
Expand Down Expand Up @@ -239,7 +211,6 @@
docker_content = DOCKER_FILE_TEMPLATE.substitute(
PYTHON_VERSION=python_version,
UV_PYTHON_INSTALL_COMMAND=uv_python_install_command,
PIP_PYTHON_INSTALL_COMMAND=pip_python_install_command,
CONDA_PACKAGES=conda_packages_concat,
CONDA_CHANNELS=conda_channels_concat,
APT_INSTALL_COMMAND=apt_install_command,
Expand Down
4 changes: 2 additions & 2 deletions tests/flytekit/unit/core/image_spec/test_default_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ def test_create_docker_context_with_git_subfolder(tmp_path):
assert dockerfile_path.exists()
dockerfile_content = dockerfile_path.read_text()

assert "--requirement requirements_pip.txt" in dockerfile_content
requirements_path = docker_context_path / "requirements_pip.txt"
assert "--requirement requirements_uv.txt" in dockerfile_content
requirements_path = docker_context_path / "requirements_uv.txt"
assert requirements_path.exists()


Expand Down
Loading