@vercel/python 6.22.0 → 6.22.1

package/dist/index.js

@@ -2862,7 +2862,6 @@ __export(src_exports, {
   downloadFilesInWorkPath: () => downloadFilesInWorkPath,
   installRequirement: () => installRequirement,
   installRequirementsFile: () => installRequirementsFile,
-  prepareCache: () => prepareCache,
   runFrameworkHook: () => runFrameworkHook,
   shouldServe: () => shouldServe,
   startDevServer: () => startDevServer,
@@ -2904,19 +2903,14 @@ var import_build_utils = require("@vercel/build-utils");
 var UV_VERSION = "0.9.22";
 var UV_PYTHON_PATH_PREFIX = "/uv/python/";
 var UV_PYTHON_DOWNLOADS_MODE = "automatic";
-var UV_CACHE_DIR_SUBPATH = [".vercel", "python", "cache", "uv"];
 var isWin = process.platform === "win32";
 var uvExec = isWin ? "uv.exe" : "uv";
 function findUvInPath() {
   return import_which.default.sync("uv", { nothrow: true });
 }
-function getUvCacheDir(workPath) {
-  return (0, import_path.join)(workPath, ...UV_CACHE_DIR_SUBPATH);
-}
 var UvRunner = class {
-  constructor(uvPath, uvCacheDir) {
+  constructor(uvPath) {
     this.uvPath = uvPath;
-    this.uvCacheDir = uvCacheDir;
   }
   getPath() {
     return this.uvPath;
@@ -2993,7 +2987,7 @@ var UvRunner = class {
     try {
       await (0, import_execa.default)(this.uvPath, args, {
         cwd: projectDir,
-        env: getProtectedUvEnv(process.env, this.uvCacheDir)
+        env: getProtectedUvEnv(process.env)
       });
     } catch (err) {
       const error = new Error(
@@ -3058,7 +3052,7 @@ var UvRunner = class {
     const binDir = isWin ? (0, import_path.join)(venvPath, "Scripts") : (0, import_path.join)(venvPath, "bin");
     const existingPath = process.env.PATH || "";
     return {
-      ...getProtectedUvEnv(process.env, this.uvCacheDir),
+      ...getProtectedUvEnv(process.env),
       VIRTUAL_ENV: venvPath,
       PATH: existingPath ? `${binDir}${import_path2.delimiter}${existingPath}` : binDir
     };
@@ -3165,15 +3159,11 @@ async function getUvBinaryOrInstall(pythonPath) {
 function filterUnsafeUvPipArgs(args) {
   return args.filter((arg) => arg !== "--no-warn-script-location");
 }
-function getProtectedUvEnv(baseEnv = process.env, uvCacheDir) {
-  const env = {
+function getProtectedUvEnv(baseEnv = process.env) {
+  return {
     ...baseEnv,
     UV_PYTHON_DOWNLOADS: UV_PYTHON_DOWNLOADS_MODE
   };
-  if (uvCacheDir) {
-    env.UV_CACHE_DIR = uvCacheDir;
-  }
-  return env;
 }
 var UV_BUNDLE_DIR = "_uv";
 async function getUvBinaryForBundling(pythonPath) {
@@ -3212,9 +3202,9 @@ function useVirtualEnv(workPath, env, systemPython) {
   }
   return { pythonCmd };
 }
-function createVenvEnv(venvPath, baseEnv = process.env, uvCacheDir) {
+function createVenvEnv(venvPath, baseEnv = process.env) {
   const env = {
-    ...getProtectedUvEnv(baseEnv, uvCacheDir),
+    ...getProtectedUvEnv(baseEnv),
     VIRTUAL_ENV: venvPath
   };
   const binDir = getVenvBinDir(venvPath);
@@ -3226,7 +3216,6 @@ async function ensureVenv({
   pythonPath,
   venvPath,
   uvPath,
-  uvCacheDir,
   quiet
 }) {
   const marker = (0, import_path3.join)(venvPath, "pyvenv.cfg");
@@ -3240,9 +3229,7 @@ async function ensureVenv({
     console.log(`Creating virtual environment at "${venvPath}"...`);
   }
   if (uvPath) {
-    await (0, import_execa2.default)(uvPath, ["venv", venvPath], {
-      env: getProtectedUvEnv(process.env, uvCacheDir)
-    });
+    await (0, import_execa2.default)(uvPath, ["venv", venvPath]);
   } else {
     await (0, import_execa2.default)(pythonPath, ["-m", "venv", venvPath]);
   }
@@ -3749,7 +3736,7 @@ async function pipInstall(pipPath, uvPath, workPath, args, targetDir) {
     try {
       await (0, import_execa3.default)(uvPath, uvArgs, {
         cwd: workPath,
-        env: getProtectedUvEnv(process.env, getUvCacheDir(workPath))
+        env: getProtectedUvEnv()
       });
       return;
     } catch (err) {
@@ -4716,12 +4703,7 @@ async function getMultiServicePythonRunner(workPath, env, systemPython, uvPath)
     return { command: pythonCmd, args: [] };
   }
   const venvPath = (0, import_path8.join)(workPath, ".venv");
-  await ensureVenv({
-    pythonPath: systemPython,
-    venvPath,
-    uvPath,
-    quiet: true
-  });
+  await ensureVenv({ pythonPath: systemPython, venvPath, uvPath, quiet: true });
   (0, import_build_utils8.debug)(`Created virtualenv at ${venvPath} for multi-service dev`);
   const pythonBin = getVenvPythonBin(venvPath);
   const binDir = getVenvBinDir(venvPath);
@@ -5584,12 +5566,10 @@ var build = async ({
   }
   fsFiles = await (0, import_build_utils13.glob)("**", workPath);
   const venvPath = (0, import_path12.join)(workPath, ".vercel", "python", ".venv");
-  const uvCacheDir = getUvCacheDir(workPath);
   await builderSpan.child("vc.builder.python.venv").trace(async () => {
     await ensureVenv({
       pythonPath: pythonVersion.pythonPath,
-      venvPath,
-      uvCacheDir
+      venvPath
     });
   });
   if ((0, import_build_utils13.isPythonFramework)(framework)) {
@@ -5618,14 +5598,14 @@ var build = async ({
     }
   }
   const baseEnv = spawnEnv || process.env;
-  const pythonEnv = createVenvEnv(venvPath, baseEnv, uvCacheDir);
+  const pythonEnv = createVenvEnv(venvPath, baseEnv);
   pythonEnv.VERCEL_PYTHON_VENV_PATH = venvPath;
   let assumeDepsInstalled = false;
   let uv;
   try {
     const uvPath = await getUvBinaryOrInstall(pythonVersion.pythonPath);
     console.log(`Using uv at "${uvPath}"`);
-    uv = new UvRunner(uvPath, uvCacheDir);
+    uv = new UvRunner(uvPath);
   } catch (err) {
     console.log("Failed to install or locate uv");
     throw new Error(
@@ -5882,41 +5862,6 @@ from vercel_runtime.vc_init import vc_handler
   });
   return { output };
 };
-async function readBuildOutputV3Config(workPath) {
-  try {
-    const configPath = (0, import_path12.join)(workPath, ".vercel", "output", "config.json");
-    return JSON.parse(await import_fs10.default.promises.readFile(configPath, "utf8"));
-  } catch (err) {
-    if (err.code !== "ENOENT") {
-      throw err;
-    }
-  }
-  return void 0;
-}
-var prepareCache = async ({
-  repoRootPath,
-  workPath
-}) => {
-  const cacheFiles = {};
-  const root = repoRootPath || workPath;
-  const ignore = ["**/*.pyc", "**/__pycache__/**"];
-  const configV3 = await readBuildOutputV3Config(workPath);
-  if (configV3?.cache && Array.isArray(configV3.cache)) {
-    for (const cacheGlob of configV3.cache) {
-      Object.assign(cacheFiles, await (0, import_build_utils13.glob)(cacheGlob, workPath));
-    }
-    return cacheFiles;
-  }
-  Object.assign(
-    cacheFiles,
-    await (0, import_build_utils13.glob)("**/.vercel/python/.venv/**", { cwd: root, ignore })
-  );
-  Object.assign(
-    cacheFiles,
-    await (0, import_build_utils13.glob)("**/.vercel/python/cache/uv/**", { cwd: root, ignore })
-  );
-  return cacheFiles;
-};
 var shouldServe = (opts) => {
   const framework = opts.config.framework;
   if ((0, import_build_utils13.isPythonFramework)(framework)) {
@@ -5954,7 +5899,6 @@ function hasProp(obj, key) {
   downloadFilesInWorkPath,
   installRequirement,
   installRequirementsFile,
-  prepareCache,
   runFrameworkHook,
   shouldServe,
   startDevServer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.22.0",
+  "version": "6.22.1",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -35,9 +35,9 @@
     "which": "3.0.0",
     "get-port": "5.1.1",
     "is-port-reachable": "3.1.0",
-    "@vercel/python-runtime": "0.7.0",
     "@vercel/build-utils": "13.8.0",
-    "@vercel/error-utils": "2.0.3"
+    "@vercel/error-utils": "2.0.3",
+    "@vercel/python-runtime": "0.7.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",