vercel-runtime 0.7.0__tar.gz → 0.9.0__tar.gz

{vercel_runtime-0.7.0 → vercel_runtime-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vercel-runtime
-Version: 0.7.0
+Version: 0.9.0
 License-Expression: Apache-2.0
 License-File: src/vercel_runtime/_vendor/__init__.py
 License-File: src/vercel_runtime/_vendor/click/LICENSE.txt

{vercel_runtime-0.7.0 → vercel_runtime-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vercel-runtime"
-version = "0.7.0"
+version = "0.9.0"
 license = "Apache-2.0"
 license-files = [
   "src/vercel_runtime/_vendor/*/LICEN[CS]E*",
@@ -139,6 +139,7 @@ exclude_lines = [
 
 [tool.vendoring]
 destination = "src/vercel_runtime/_vendor/"
+patches-dir = "patches/"
 requirements = "src/vercel_runtime/_vendor/vendor.txt"
 namespace = "vercel_runtime._vendor"
 protected-files = ["__init__.py", "vendor.txt"]

{vercel_runtime-0.7.0 → vercel_runtime-0.9.0}/src/vercel_runtime/_vendor/uvicorn/LICENSE.md

@@ -4,14 +4,14 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-- Redistributions of source code must retain the above copyright notice, this
+* Redistributions of source code must retain the above copyright notice, this
   list of conditions and the following disclaimer.
 
-- Redistributions in binary form must reproduce the above copyright notice,
+* Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-- Neither the name of the copyright holder nor the names of its
+* Neither the name of the copyright holder nor the names of its
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.
 

{vercel_runtime-0.7.0 → vercel_runtime-0.9.0}/src/vercel_runtime/_vendor/werkzeug/serving.py

@@ -17,6 +17,7 @@ from __future__ import annotations
 import errno
 import io
 import os
+import re
 import selectors
 import socket
 import socketserver
@@ -27,6 +28,7 @@ from datetime import timedelta
 from datetime import timezone
 from http.server import BaseHTTPRequestHandler
 from http.server import HTTPServer
+from pathlib import Path
 from urllib.parse import unquote
 from urllib.parse import urlsplit
 
@@ -55,6 +57,16 @@ except ImportError:
     ssl = _SslDummy()  # type: ignore
     connection_dropped_errors = (ConnectionError, socket.timeout)
 
+def _vendored_versions() -> dict[str, str]:
+    vendor_txt = Path(__file__).parent.parent / "vendor.txt"
+    try:
+        return dict(
+            re.findall(r"^(\S+)==(\S+)", vendor_txt.read_text(), re.MULTILINE)
+        )
+    except Exception:
+        return {}
+
+
 _log_add_style = True
 
 if os.name == "nt":
@@ -807,9 +819,7 @@ class BaseWSGIServer(HTTPServer):
         else:
             self.ssl_context = None
 
-        import importlib.metadata
-
-        self._server_version = f"Werkzeug/{importlib.metadata.version('werkzeug')}"
+        self._server_version = f"Werkzeug/{_vendored_versions().get('werkzeug', 'unknown')}"
 
     def log(self, type: str, message: str, *args: t.Any) -> None:
         _log(type, message, *args)

{vercel_runtime-0.7.0 → vercel_runtime-0.9.0}/src/vercel_runtime/dev.py

@@ -12,11 +12,16 @@ from vercel_runtime._vendor.uvicorn.config import (
     LOGGING_CONFIG as UVICORN_LOGGING_CONFIG,
 )
 from vercel_runtime._vendor.werkzeug.serving import run_simple
+from vercel_runtime.crons import bootstrap_cron_service_app, is_cron_service
 from vercel_runtime.resolver import detect_app_type, import_module, resolve_app
 from vercel_runtime.routing import (
     apply_service_route_prefix_to_asgi_scope,
     strip_service_route_prefix,
 )
+from vercel_runtime.workers import (
+    bootstrap_worker_service_app,
+    is_worker_service,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Callable
@@ -118,12 +123,14 @@ def _build_uvicorn_log_config(
     if default_fmt is None:
         default_fmt = {
             **uvicorn_fmts["default"],
+            "()": "vercel_runtime._vendor.uvicorn.logging.DefaultFormatter",
             "use_colors": not _NO_COLOR,
         }
 
     if access_fmt is None:
         access_fmt = {
             **uvicorn_fmts["access"],
+            "()": "vercel_runtime._vendor.uvicorn.logging.AccessFormatter",
             "use_colors": not _NO_COLOR,
         }
 
@@ -351,22 +358,24 @@ def _start_wsgi(host: str, port: int) -> None:
 
 
 def _start_asgi(host: str, port: int) -> None:
-    # Prefer user-installed fastapi-cli when available
-    try:
-        from fastapi_cli.cli import (  # noqa: PLC0415  # pyright: ignore[reportMissingImports]
-            dev as fastapi_dev,  # pyright: ignore[reportUnknownVariableType]
-        )
+    # Prefer user-installed fastapi-cli for web services;
+    # cron/worker go straight to uvicorn.
+    if not is_cron_service() and not is_worker_service():
+        try:
+            from fastapi_cli.cli import (  # noqa: PLC0415  # pyright: ignore[reportMissingImports]
+                dev as fastapi_dev,  # pyright: ignore[reportUnknownVariableType]
+            )
 
-        _patch_fastapi_cli_log_config()
-        fastapi_dev(
-            entrypoint="vercel_runtime.dev:asgi_app",
-            host=host,
-            port=port,
-            reload=True,
-        )
-        sys.exit(0)
-    except (ImportError, AttributeError):
-        pass
+            _patch_fastapi_cli_log_config()
+            fastapi_dev(
+                entrypoint="vercel_runtime.dev:asgi_app",
+                host=host,
+                port=port,
+                reload=True,
+            )
+            sys.exit(0)
+        except (ImportError, AttributeError):
+            pass
 
     vendored_uvicorn.run(
         "vercel_runtime.dev:asgi_app",
@@ -383,10 +392,20 @@ def _setup_apps() -> None:
 
     module_name = os.environ["VERCEL_DEV_MODULE_NAME"]
     entry_abs = os.environ["VERCEL_DEV_ENTRY_ABS"]
+    framework = os.environ["VERCEL_DEV_FRAMEWORK"]
 
     _setup_server_log_routing()
 
     mod = import_module(module_name, entry_abs)
+
+    if is_cron_service():
+        _asgi_user_app = bootstrap_cron_service_app(mod)
+        return
+
+    if is_worker_service():
+        _asgi_user_app = cast("ASGI", bootstrap_worker_service_app(mod))
+        return
+
     app_name, user_app = resolve_app(mod, module_name)
     try:
         result = detect_app_type(user_app, module_name, app_name)
@@ -397,12 +416,40 @@ def _setup_apps() -> None:
     if result[0] == "asgi":
         _asgi_user_app = result[1]
     else:
-        _wsgi_user_app = result[1]
+        wsgi_app = result[1]
+
+        if framework == "django":
+            wsgi_app = _wrap_django_static(wsgi_app)
+
+        _wsgi_user_app = wsgi_app
+
+
+def _wrap_django_static(app: WSGIApplication) -> WSGIApplication:
+    # If this is a django app, wrap it with StaticFilesHandler to serve static
+    # files. This is necessary because the dev server will not run the full
+    # build process (including collectstatic), so static files may not
+    # be available depending on the user's configuration.
+    #
+    # Special cases:
+    # - If whitenoise is used, this will override it but that's ok because we
+    #   don't need it in the dev server.
+    # - If django-storages is used, this will override it but that's ok because
+    #   django-storages handles its own upload to some other CDN.
+    try:
+        from django.contrib.staticfiles.handlers import (  # type: ignore[import-not-found]  # noqa: PLC0415  # pyright: ignore[reportMissingImports]
+            StaticFilesHandler,  # pyright: ignore[reportUnknownVariableType]
+        )
+
+        return cast("WSGIApplication", StaticFilesHandler(app))
+    except ImportError:
+        return app
 
 
 # Setup apps at import time so that servers reloader can pick them up.
-if os.environ.get("VERCEL_DEV_MODULE_NAME") and os.environ.get(
-    "VERCEL_DEV_ENTRY_ABS"
+if (
+    os.environ.get("VERCEL_DEV_MODULE_NAME")
+    and os.environ.get("VERCEL_DEV_ENTRY_ABS")
+    and os.environ.get("VERCEL_DEV_FRAMEWORK")
 ):
     _setup_apps()