@vercel/python 6.51.0 → 6.52.0

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@vercel/python",
-  "version": "6.51.0",
+  "version": "6.52.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
   "files": [
     "dist",
-    "templates",
-    "vc_init.py"
+    "templates"
   ],
   "repository": {
     "type": "git",
@@ -36,18 +35,18 @@
     "smol-toml": "1.5.2",
     "vitest": "2.1.4",
     "which": "3.0.0",
+    "@vercel/build-utils": "13.35.0",
     "@vercel/error-utils": "2.2.0",
-    "@vercel/build-utils": "13.34.0",
     "@vercel/python-runtime": "0.16.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
     "type-check": "tsc --noEmit",
     "test": "cross-env VERCEL_FORCE_PYTHON_STREAMING=1 NODE_OPTIONS=--experimental-vm-modules vitest run --config ../../vitest.config.mts",
-    "test-unit": "vitest run --config ../../vitest.config.mts test/unit.test.ts",
+    "test-unit": "vitest run --config ../../vitest.config.mts test/unit",
     "test-e2e": "pnpm test test/integration-*",
     "vitest-run": "vitest -c ../../vitest.config.mts",
-    "vitest-unit": "glob --absolute 'test/unit.test.ts'",
+    "vitest-unit": "glob --absolute 'test/unit.*test.ts'",
     "vitest-e2e": "glob --absolute 'test/integration-*'"
   }
 }

package/templates/vc_compileall.py

@@ -0,0 +1,47 @@
+import compileall
+import json
+import signal
+import sys
+from multiprocessing import Pool
+from py_compile import PycInvalidationMode
+
+
+def compile_source(source_file):
+    try:
+        return compileall.compile_file(
+            source_file,
+            force=True,
+            quiet=1,
+            invalidation_mode=PycInvalidationMode.UNCHECKED_HASH,
+        )
+    except Exception as error:
+        print(f"Failed to compile {source_file}: {error}", file=sys.stderr)
+        return False
+
+
+def main():
+    with open(sys.argv[1], encoding="utf-8") as source_list:
+        source_files = json.load(source_list)
+
+    if not source_files:
+        return 0
+
+    try:
+        with Pool() as pool:
+            def abort_pool(signum, _):
+                pool.terminate()
+                raise SystemExit(128 + signum)
+
+            for sig in signal.SIGINT, signal.SIGTERM:
+              signal.signal(sig, abort_pool)
+
+            pool.map(compile_source, source_files)
+    except Exception as error:
+        print(f"Bytecode compilation unavailable: {error}", file=sys.stderr)
+        return 1
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

package/templates/vc_fastapi_static.py

@@ -0,0 +1,116 @@
+"""
+Discover StaticFiles mounts in a FastAPI/Starlette app by importing the user's
+app object and walking its route table. Writes a JSON array of
+{"urlPath": str, "directory": str} objects to the output file.
+
+Usage: python <this_script> <entrypoint_abs_path> <variable_name> <output_path>
+"""
+
+from __future__ import annotations
+
+import importlib.util
+import json
+import os
+import sys
+from dataclasses import asdict, dataclass
+from typing import TYPE_CHECKING, cast
+
+from starlette.routing import BaseRoute, Mount, Router
+from starlette.staticfiles import StaticFiles
+
+if TYPE_CHECKING:
+    from fastapi.routing import _EffectiveRouteContext, _FrontendRouteGroup
+
+
+@dataclass
+class StaticMount:
+    urlPath: str
+    directory: str
+
+    @classmethod
+    def from_route(cls, route: Mount, prefix: str = "") -> StaticMount | None:
+        static_app = route.app
+        if not isinstance(static_app, StaticFiles):
+            return None
+        directory = static_app.directory
+        if directory is None:
+            return None
+        return cls(
+            urlPath=prefix + route.path,
+            directory=os.path.abspath(str(directory)),
+        )
+
+
+def get_low_priority_routes(router: Router) -> list[_FrontendRouteGroup]:
+    return getattr(router, "_low_priority_routes", [])
+
+
+def get_effective_low_priority_routes(route: BaseRoute) -> list[_EffectiveRouteContext]:
+    if fn := getattr(route, "effective_low_priority_routes", None):
+        return fn()
+    return []
+
+
+def collect_mounts(router: Router, prefix: str = "") -> list[StaticMount]:
+    mounts = []
+
+    for route in router.routes:
+        # app.mount("/path", StaticFiles(...))
+        if isinstance(route, Mount):
+            if m := StaticMount.from_route(route, prefix):
+                mounts.append(m)
+            if isinstance(route.app, Router):
+                sub_prefix = prefix + route.path.rstrip("/")
+                mounts.extend(collect_mounts(route.app, sub_prefix))
+        
+        # app.include_router(router, prefix="/path")
+        for ctx in get_effective_low_priority_routes(route):
+            for r in ctx.original_route.routes:
+                if m := StaticMount.from_route(r, ctx.frontend_prefix):
+                    mounts.append(m)
+
+    # app.frontend()
+    for group in get_low_priority_routes(router):
+        for route in group.routes:
+            if m := StaticMount.from_route(route, prefix):
+                mounts.append(m)
+
+    return mounts
+
+
+def write_output(output_path: str, data: list[object]) -> None:
+    with open(output_path, "w") as f:
+        json.dump(data, f)
+
+
+def main() -> None:
+    entrypoint_abs = sys.argv[1]
+    variable_name = sys.argv[2]
+    output_path = sys.argv[3]
+
+    spec = importlib.util.spec_from_file_location("__vc_app", entrypoint_abs)
+    if spec is None or spec.loader is None:
+        write_output(output_path, [])
+        return
+
+    mod = importlib.util.module_from_spec(spec)
+    try:
+        spec.loader.exec_module(mod)  # type: ignore[union-attr]
+    except Exception as exc:
+        print(f"vc_fastapi_static: exec_module failed: {exc}", file=sys.stderr)
+        write_output(output_path, [])
+        return
+
+    app = getattr(mod, variable_name, None)
+    if app is None:
+        write_output(output_path, [])
+        return
+
+    mounts = []
+    if router := getattr(app, "router", None):
+        mounts = collect_mounts(router)
+
+    write_output(output_path, [asdict(m) for m in mounts])
+
+
+main()