kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pip fallback overwrite UV's cache

Browse Source
This commit is contained in:
pyranota
2024-10-22 14:27:32 +00:00
parent 5805554ac8
commit a0c86ef4c7
1 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
backend/windmill-worker/src/python_executor.rs
View File

@@ -1059,7 +1059,45 @@ pub async fn handle_python_reqs(
req.replace(' ', "").replace('/', "").replace(':', "")
);
if metadata(&venv_p).await.is_ok() {
req_paths.push(venv_p);
// TODO: remove (Deperecated)
if no_uv_install {
// e.g.: /tmp/windmill/cache/pip/wmill==1.408.1/wmill-1.408.1.dist-info/INSTALLER
let installer_file_path = format!(
"{PIP_CACHE_DIR}/{}/{}.dist-info/INSTALLER",
req.replace(' ', "").replace('/', "").replace(':', ""),
req.replace(' ', "")
.replace('/', "")
.replace(':', "")
// We want this form of dependency (with _ )
// typing_extensions-4.12.2.dist-info
.replace('-', "_")
.replace("==", "-")
);
append_logs(
&job_id,
w_id,
format!("\nLooking into: {}", installer_file_path),
db,
)
.await;
// There is metadata which package manager downloaded library
// It is stored in *.dist-info/INSTALLER
// So if we fallback to pip and we see library installed by uv
// we want to override this installation
// TODO: If error, override anyway
if "uv" == std::fs::read_to_string(installer_file_path)? {
// Rmdir to make it pure
std::fs::remove_dir_all(&venv_p)?;
// Push it for installation
req_with_penv.push((req.to_string(), venv_p));
} else {
req_paths.push(venv_p);
}
} else {
req_paths.push(venv_p);
}
} else {
req_with_penv.push((req.to_string(), venv_p));
}