@vercel/python 5.0.7 → 5.0.8

package/dist/index.js

@@ -3224,6 +3224,47 @@ function isFastapiEntrypoint(file) {
     return false;
   }
 }
+var FLASK_ENTRYPOINT_FILENAMES = ["app", "index", "server", "main"];
+var FLASK_ENTRYPOINT_DIRS = ["", "src", "app"];
+var FLASK_CONTENT_REGEX = /(from\s+flask\s+import\s+Flask|import\s+flask|Flask\s*\()/;
+var FLASK_CANDIDATE_ENTRYPOINTS = FLASK_ENTRYPOINT_FILENAMES.flatMap(
+  (filename) => FLASK_ENTRYPOINT_DIRS.map(
+    (dir) => import_path2.posix.join(dir, `${filename}.py`)
+  )
+);
+function isFlaskEntrypoint(file) {
+  try {
+    const fsPath = file.fsPath;
+    if (!fsPath)
+      return false;
+    const contents = import_fs2.default.readFileSync(fsPath, "utf8");
+    return FLASK_CONTENT_REGEX.test(contents);
+  } catch {
+    return false;
+  }
+}
+async function detectFlaskEntrypoint(workPath, configuredEntrypoint) {
+  const entry = configuredEntrypoint.endsWith(".py") ? configuredEntrypoint : `${configuredEntrypoint}.py`;
+  try {
+    const fsFiles = await (0, import_build_utils3.glob)("**", workPath);
+    if (fsFiles[entry])
+      return entry;
+    const candidates = FLASK_CANDIDATE_ENTRYPOINTS.filter(
+      (c) => !!fsFiles[c]
+    );
+    if (candidates.length > 0) {
+      const flaskEntrypoint = candidates.find(
+        (c) => isFlaskEntrypoint(fsFiles[c])
+      ) || candidates[0];
+      (0, import_build_utils3.debug)(`Detected Flask entrypoint: ${flaskEntrypoint}`);
+      return flaskEntrypoint;
+    }
+    return null;
+  } catch {
+    (0, import_build_utils3.debug)("Failed to discover entrypoint for Flask");
+    return null;
+  }
+}
 async function detectFastapiEntrypoint(workPath, configuredEntrypoint) {
   const entry = configuredEntrypoint.endsWith(".py") ? configuredEntrypoint : `${configuredEntrypoint}.py`;
   try {
@@ -3645,6 +3686,20 @@ var build = async ({
         message: `No FastAPI entrypoint found. Searched for: ${searchedList}`
       });
     }
+  } else if (!fsFiles[entrypoint] && config?.framework === "flask") {
+    const detected = await detectFlaskEntrypoint(workPath, entrypoint);
+    if (detected) {
+      (0, import_build_utils5.debug)(
+        `Resolved Python entrypoint to "${detected}" (configured "${entrypoint}" not found).`
+      );
+      entrypoint = detected;
+    } else {
+      const searchedList = FLASK_CANDIDATE_ENTRYPOINTS.join(", ");
+      throw new import_build_utils5.NowBuildError({
+        code: "FLASK_ENTRYPOINT_NOT_FOUND",
+        message: `No Flask entrypoint found. Searched for: ${searchedList}`
+      });
+    }
   }
   const entryDirectory = (0, import_path5.dirname)(entrypoint);
   const hasReqLocal = !!fsFiles[(0, import_path5.join)(entryDirectory, "requirements.txt")];
@@ -3915,6 +3970,12 @@ var shouldServe = (opts) => {
       return false;
     }
     return true;
+  } else if (framework === "flask") {
+    const requestPath = opts.requestPath.replace(/\/$/, "");
+    if (requestPath.startsWith("api") && opts.hasMatched) {
+      return false;
+    }
+    return true;
   }
   return defaultShouldServe(opts);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -20,7 +20,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
     "@types/which": "3.0.0",
-    "@vercel/build-utils": "12.1.0",
+    "@vercel/build-utils": "12.1.2",
     "cross-env": "7.0.3",
     "execa": "^1.0.0",
     "fs-extra": "11.1.1",

package/vc_init.py

@@ -434,6 +434,8 @@ if 'VERCEL_IPC_PATH' in os.environ:
 
                     # Event to signal that the response has been fully sent
                     response_done = threading.Event()
+                    # Event to signal the ASGI app has fully completed (incl. background tasks)
+                    app_done = threading.Event()
 
                     # Propagate request context to background thread for logging & metrics
                     request_context = storage.get()
@@ -488,6 +490,8 @@ if 'VERCEL_IPC_PATH' in os.environ:
                                 # Run ASGI app (includes background tasks)
                                 asgi_instance = app(scope, receive, send)
                                 await asgi_instance
+                                # Mark app completion when the ASGI callable returns
+                                app_done.set()
 
                             asyncio.run(runner())
                         except Exception:
@@ -504,10 +508,9 @@ if 'VERCEL_IPC_PATH' in os.environ:
                                 pass
                         finally:
                             # Always unblock the waiting thread to avoid hangs
-                            try:
-                                response_done.set()
-                            except Exception:
-                                pass
+                            response_done.set()
+                            # Ensure app completion is always signaled
+                            app_done.set()
                             if token is not None:
                                 storage.reset(token)
 
@@ -517,6 +520,8 @@ if 'VERCEL_IPC_PATH' in os.environ:
 
                     # Wait until final body chunk has been flushed to client
                     response_done.wait()
+                    # Also wait until the ASGI app finishes (includes background tasks)
+                    app_done.wait()
 
     if 'Handler' in locals():
         server = ThreadingHTTPServer(('127.0.0.1', 0), Handler)