@vercel/python 5.0.5 → 5.0.7

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@vercel/python",
-  "version": "5.0.5",
+  "version": "5.0.7",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
   "files": [
     "dist",
-    "vc_init.py"
+    "vc_init.py",
+    "vc_init_dev_asgi.py"
   ],
   "repository": {
     "type": "git",

package/vc_init.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 import os
 import site
@@ -5,9 +6,19 @@ import importlib
 import base64
 import json
 import inspect
+import threading
+import asyncio
+import http
+import time
 from importlib import util
-from http.server import BaseHTTPRequestHandler
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 import socket
+import functools
+import logging
+import builtins
+from typing import Callable, Literal
+import contextvars
+import io
 
 _here = os.path.dirname(__file__)
 _vendor_rel = '__VC_HANDLER_VENDOR_DIR'
@@ -51,72 +62,69 @@ def format_headers(headers, decode=False):
         keyToList[key].append(value)
     return keyToList
 
-if 'VERCEL_IPC_PATH' in os.environ:
-    from http.server import ThreadingHTTPServer
-    import http
-    import time
-    import contextvars
-    import functools
-    import builtins
-    import logging
+# Custom logging handler so logs are properly categorized
+class VCLogHandler(logging.Handler):
+    def __init__(self, send_message: Callable[[dict], None], context_getter: Callable[[], dict] | None = None):
+        super().__init__()
+        self._send_message = send_message
+        self._context_getter = context_getter
 
-    start_time = time.time()
-    sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    sock.connect(os.getenv("VERCEL_IPC_PATH", ""))
+    def emit(self, record):
+        try:
+            message = record.getMessage()
+        except Exception:
+            try:
+                message = f"{record.msg}"
+            except Exception:
+                message = ""
+
+        if record.levelno >= logging.CRITICAL:
+            level = "fatal"
+        elif record.levelno >= logging.ERROR:
+            level = "error"
+        elif record.levelno >= logging.WARNING:
+            level = "warn"
+        elif record.levelno >= logging.INFO:
+            level = "info"
+        else:
+            level = "debug"
 
-    send_message = lambda message: sock.sendall((json.dumps(message) + '\0').encode())
-    storage = contextvars.ContextVar('storage', default=None)
+        ctx = None
+        try:
+            ctx = self._context_getter() if self._context_getter is not None else None
+        except Exception:
+            ctx = None
 
-    # Override urlopen from urllib3 (& requests) to send Request Metrics
-    try:
-        import urllib3
-        from urllib.parse import urlparse
+        if ctx is not None:
+            try:
+                self._send_message({
+                    "type": "log",
+                    "payload": {
+                        "context": {
+                            "invocationId": ctx['invocationId'],
+                            "requestId": ctx['requestId'],
+                        },
+                        "message": base64.b64encode(message.encode()).decode(),
+                        "level": level,
+                    }
+                })
+            except Exception:
+                pass
+        else:
+            try:
+                sys.stdout.write(message + "\n")
+            except Exception:
+                pass
 
-        def timed_request(func):
-            fetchId = 0
-            @functools.wraps(func)
-            def wrapper(self, method, url, *args, **kwargs):
-                nonlocal fetchId
-                fetchId += 1
-                start_time = int(time.time() * 1000)
-                result = func(self, method, url, *args, **kwargs)
-                elapsed_time = int(time.time() * 1000) - start_time
-                parsed_url = urlparse(url)
-                context = storage.get()
-                if context is not None:
-                    send_message({
-                        "type": "metric",
-                        "payload": {
-                            "context": {
-                                "invocationId": context['invocationId'],
-                                "requestId": context['requestId'],
-                            },
-                            "type": "fetch-metric",
-                            "payload": {
-                                "pathname": parsed_url.path,
-                                "search": parsed_url.query,
-                                "start": start_time,
-                                "duration": elapsed_time,
-                                "host": parsed_url.hostname or self.host,
-                                "statusCode": result.status,
-                                "method": method,
-                                "id": fetchId
-                            }
-                        }
-                    })
-                return result
-            return wrapper
-        urllib3.connectionpool.HTTPConnectionPool.urlopen = timed_request(urllib3.connectionpool.HTTPConnectionPool.urlopen)
-    except:
-        pass
 
+def setup_logging(send_message: Callable[[dict], None], storage: contextvars.ContextVar[dict | None]):
     # Override sys.stdout and sys.stderr to map logs to the correct request
     class StreamWrapper:
-        def __init__(self, stream, stream_name):
+        def __init__(self, stream: io.TextIOBase, stream_name: Literal["stdout", "stderr"]):
             self.stream = stream
             self.stream_name = stream_name
 
-        def write(self, message):
+        def write(self, message: str):
             context = storage.get()
             if context is not None:
                 send_message({
@@ -139,19 +147,15 @@ if 'VERCEL_IPC_PATH' in os.environ:
     sys.stdout = StreamWrapper(sys.stdout, "stdout")
     sys.stderr = StreamWrapper(sys.stderr, "stderr")
 
-    # Override the global print to log to stdout
-    def print_wrapper(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            sys.stdout.write(' '.join(map(str, args)) + '\n')
-        return wrapper
-    builtins.print = print_wrapper(builtins.print)
-
-    # Override logging to maps logs to the correct request
-    def logging_wrapper(func, level="info"):
+    # Wrap top-level logging helpers to emit structured logs when a request
+    # context is available; otherwise fall back to the original behavior.
+    def logging_wrapper(func: Callable[..., None], level: str = "info") -> Callable[..., None]:
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
-            context = storage.get()
+            try:
+                context = storage.get()
+            except Exception:
+                context = None
             if context is not None:
                 send_message({
                     "type": "log",
@@ -168,12 +172,77 @@ if 'VERCEL_IPC_PATH' in os.environ:
                 func(*args, **kwargs)
         return wrapper
 
-    logging.basicConfig(level=logging.INFO)
-    logging.debug = logging_wrapper(logging.debug)
-    logging.info = logging_wrapper(logging.info)
+    logging.basicConfig(level=logging.INFO, handlers=[VCLogHandler(send_message, storage.get)], force=True)
+    logging.debug = logging_wrapper(logging.debug, "debug")
+    logging.info = logging_wrapper(logging.info, "info")
     logging.warning = logging_wrapper(logging.warning, "warn")
     logging.error = logging_wrapper(logging.error, "error")
-    logging.critical = logging_wrapper(logging.critical, "error")
+    logging.fatal = logging_wrapper(logging.fatal, "fatal")
+    logging.critical = logging_wrapper(logging.critical, "fatal")
+
+    # Ensure built-in print funnels through stdout wrapper so prints are
+    # attributed to the current request context.
+    def print_wrapper(func: Callable[..., None]) -> Callable[..., None]:
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            sys.stdout.write(' '.join(map(str, args)) + '\n')
+        return wrapper
+
+    builtins.print = print_wrapper(builtins.print)
+
+
+if 'VERCEL_IPC_PATH' in os.environ:
+    start_time = time.time()
+    sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    sock.connect(os.getenv("VERCEL_IPC_PATH", ""))
+
+    send_message = lambda message: sock.sendall((json.dumps(message) + '\0').encode())
+    storage = contextvars.ContextVar('storage', default=None)
+
+    # Override urlopen from urllib3 (& requests) to send Request Metrics
+    try:
+        import urllib3
+        from urllib.parse import urlparse
+
+        def timed_request(func):
+            fetchId = 0
+            @functools.wraps(func)
+            def wrapper(self, method, url, *args, **kwargs):
+                nonlocal fetchId
+                fetchId += 1
+                start_time = int(time.time() * 1000)
+                result = func(self, method, url, *args, **kwargs)
+                elapsed_time = int(time.time() * 1000) - start_time
+                parsed_url = urlparse(url)
+                context = storage.get()
+                if context is not None:
+                    send_message({
+                        "type": "metric",
+                        "payload": {
+                            "context": {
+                                "invocationId": context['invocationId'],
+                                "requestId": context['requestId'],
+                            },
+                            "type": "fetch-metric",
+                            "payload": {
+                                "pathname": parsed_url.path,
+                                "search": parsed_url.query,
+                                "start": start_time,
+                                "duration": elapsed_time,
+                                "host": parsed_url.hostname or self.host,
+                                "statusCode": result.status,
+                                "method": method,
+                                "id": fetchId
+                            }
+                        }
+                    })
+                return result
+            return wrapper
+        urllib3.connectionpool.HTTPConnectionPool.urlopen = timed_request(urllib3.connectionpool.HTTPConnectionPool.urlopen)
+    except:
+        pass
+
+    setup_logging(send_message, storage)
 
     class BaseHandler(BaseHTTPRequestHandler):
         # Re-implementation of BaseHTTPRequestHandler's log_message method to
@@ -256,6 +325,7 @@ if 'VERCEL_IPC_PATH' in os.environ:
                 method()
                 self.wfile.flush()
     elif 'app' in __vc_variables:
+        # WSGI
         if (
             not inspect.iscoroutinefunction(__vc_module.app) and
             not inspect.iscoroutinefunction(__vc_module.app.__call__)
@@ -321,10 +391,10 @@ if 'VERCEL_IPC_PATH' in os.environ:
                     finally:
                         if hasattr(response, 'close'):
                             response.close()
+        # ASGI
         else:
             from urllib.parse import urlparse
             from io import BytesIO
-            import asyncio
 
             app = __vc_module.app
 
@@ -339,6 +409,7 @@ if 'VERCEL_IPC_PATH' in os.environ:
                             headers_encoded.append([k.lower().encode(), [i.encode() for i in v]])
                         else:
                             headers_encoded.append([k.lower().encode(), v.encode()])
+
                     scope = {
                         'server': (self.headers.get('host', 'lambda'), self.headers.get('x-forwarded-port', 80)),
                         'client': (self.headers.get(
@@ -361,41 +432,91 @@ if 'VERCEL_IPC_PATH' in os.environ:
                     else:
                         body = b''
 
-                    if _use_legacy_asyncio:
-                        loop = asyncio.new_event_loop()
-                        app_queue = asyncio.Queue(loop=loop)
-                    else:
-                        app_queue = asyncio.Queue()
-                    app_queue.put_nowait({'type': 'http.request', 'body': body, 'more_body': False})
-
-                    # Prepare ASGI receive function
-                    async def receive():
-                        message = await app_queue.get()
-                        return message
-
-                    # Prepare ASGI send function
-                    response_started = False
-                    async def send(event):
-                        nonlocal response_started
-                        if event['type'] == 'http.response.start':
-                            self.send_response(event['status'])
-                            if 'headers' in event:
-                                for name, value in event['headers']:
-                                    self.send_header(name.decode(), value.decode())
-                            self.end_headers()
-                            response_started = True
-                        elif event['type'] == 'http.response.body':
-                            self.wfile.write(event['body'])
-                            if not event.get('more_body', False):
-                                self.wfile.flush()
+                    # Event to signal that the response has been fully sent
+                    response_done = threading.Event()
 
-                    # Run the ASGI application
-                    asgi_instance = app(scope, receive, send)
-                    if _use_legacy_asyncio:
-                        asgi_task = loop.create_task(asgi_instance)
-                        loop.run_until_complete(asgi_task)
-                    else:
-                        asyncio.run(asgi_instance)
+                    # Propagate request context to background thread for logging & metrics
+                    request_context = storage.get()
+
+                    def run_asgi():
+                        # Ensure request context is available in this thread
+                        if request_context is not None:
+                            token = storage.set(request_context)
+                        else:
+                            token = None
+                        # Track if headers were sent, so we can synthesize a 500 on early failure
+                        response_started = False
+                        try:
+                            async def runner():
+                                # Per-request app queue
+                                if _use_legacy_asyncio:
+                                    loop = asyncio.get_running_loop()
+                                    app_queue = asyncio.Queue(loop=loop)
+                                else:
+                                    app_queue = asyncio.Queue()
+
+                                await app_queue.put({'type': 'http.request', 'body': body, 'more_body': False})
+
+                                async def receive():
+                                    message = await app_queue.get()
+                                    return message
+
+                                async def send(event):
+                                    nonlocal response_started
+                                    if event['type'] == 'http.response.start':
+                                        self.send_response(event['status'])
+                                        if 'headers' in event:
+                                            for name, value in event['headers']:
+                                                self.send_header(name.decode(), value.decode())
+                                        self.end_headers()
+                                        response_started = True
+                                    elif event['type'] == 'http.response.body':
+                                        # Stream body as it is produced; flush on completion
+                                        body_bytes = event.get('body', b'') or b''
+                                        if body_bytes:
+                                            self.wfile.write(body_bytes)
+                                        if not event.get('more_body', False):
+                                            try:
+                                                self.wfile.flush()
+                                            finally:
+                                                response_done.set()
+                                                try:
+                                                    app_queue.put_nowait({'type': 'http.disconnect'})
+                                                except Exception:
+                                                    pass
+
+                                # Run ASGI app (includes background tasks)
+                                asgi_instance = app(scope, receive, send)
+                                await asgi_instance
+
+                            asyncio.run(runner())
+                        except Exception:
+                            # If the app raised before starting the response, synthesize a 500
+                            try:
+                                if not response_started:
+                                    self.send_response(500)
+                                    self.end_headers()
+                                try:
+                                    self.wfile.flush()
+                                except Exception:
+                                    pass
+                            except Exception:
+                                pass
+                        finally:
+                            # Always unblock the waiting thread to avoid hangs
+                            try:
+                                response_done.set()
+                            except Exception:
+                                pass
+                            if token is not None:
+                                storage.reset(token)
+
+                    # Run ASGI in background thread to allow returning after final flush
+                    t = threading.Thread(target=run_asgi, daemon=True)
+                    t.start()
+
+                    # Wait until final body chunk has been flushed to client
+                    response_done.wait()
 
     if 'Handler' in locals():
         server = ThreadingHTTPServer(('127.0.0.1', 0), Handler)

package/vc_init_dev_asgi.py

@@ -0,0 +1,58 @@
+# Auto-generated template used by vercel dev (Python, ASGI)
+# Serves static files from PUBLIC_DIR before delegating to the user ASGI app.
+from importlib import import_module
+import os
+from os import path as _p
+
+# Optional StaticFiles import; tolerate missing deps
+StaticFiles = None
+try:
+    from fastapi.staticfiles import StaticFiles as _SF
+    StaticFiles = _SF
+except Exception:
+    try:
+        from starlette.staticfiles import StaticFiles as _SF
+        StaticFiles = _SF
+    except Exception:
+        StaticFiles = None
+
+USER_MODULE = "__VC_DEV_MODULE_PATH__"
+_mod = import_module(USER_MODULE)
+_app = getattr(_mod, 'app', None)
+if _app is None:
+    raise RuntimeError(
+        f"Missing 'app' in module '{USER_MODULE}'. Define `app = ...` (ASGI app)."
+    )
+
+# Sanic compatibility: prefer `app.asgi` when available
+USER_ASGI_APP = getattr(_app, 'asgi', _app)
+
+PUBLIC_DIR = 'public'
+
+# Prepare static files app (if starlette/fastapi installed)
+static_app = None
+if StaticFiles is not None:
+    try:
+        try:
+            static_app = StaticFiles(directory=PUBLIC_DIR, check_dir=False)
+        except TypeError:
+            # Older Starlette without check_dir parameter
+            static_app = StaticFiles(directory=PUBLIC_DIR)
+    except Exception:
+        static_app = None
+
+
+async def app(scope, receive, send):
+    if static_app is not None and scope.get('type') == 'http':
+        req_path = scope.get('path', '/') or '/'
+        safe = _p.normpath(req_path).lstrip('/')
+        full = _p.join(PUBLIC_DIR, safe)
+        try:
+            base = _p.realpath(PUBLIC_DIR)
+            target = _p.realpath(full)
+            if (target == base or target.startswith(base + _p.sep)) and _p.isfile(target):
+                await static_app(scope, receive, send)
+                return
+        except Exception:
+            pass
+    await USER_ASGI_APP(scope, receive, send)