uvicorn 0.32.1__py3-none-any.whl → 0.34.0__py3-none-any.whl

uvicorn/__init__.py

@@ -1,5 +1,5 @@
 from uvicorn.config import Config
 from uvicorn.main import Server, main, run
 
-__version__ = "0.32.1"
+__version__ = "0.34.0"
 __all__ = ["main", "run", "Config", "Server"]

uvicorn/_types.py

@@ -32,20 +32,8 @@ from __future__ import annotations
 
 import sys
 import types
-from typing import (
-    Any,
-    Awaitable,
-    Callable,
-    Iterable,
-    Literal,
-    MutableMapping,
-    Optional,
-    Protocol,
-    Tuple,
-    Type,
-    TypedDict,
-    Union,
-)
+from collections.abc import Awaitable, Iterable, MutableMapping
+from typing import Any, Callable, Literal, Optional, Protocol, TypedDict, Union
 
 if sys.version_info >= (3, 11):  # pragma: py-lt-311
     from typing import NotRequired
@@ -54,8 +42,8 @@ else:  # pragma: py-gte-311
 
 # WSGI
 Environ = MutableMapping[str, Any]
-ExcInfo = Tuple[Type[BaseException], BaseException, Optional[types.TracebackType]]
-StartResponse = Callable[[str, Iterable[Tuple[str, str]], Optional[ExcInfo]], None]
+ExcInfo = tuple[type[BaseException], BaseException, Optional[types.TracebackType]]
+StartResponse = Callable[[str, Iterable[tuple[str, str]], Optional[ExcInfo]], None]
 WSGIApp = Callable[[Environ, StartResponse], Union[Iterable[bytes], BaseException]]
 
 
@@ -281,7 +269,7 @@ class ASGI2Protocol(Protocol):
     async def __call__(self, receive: ASGIReceiveCallable, send: ASGISendCallable) -> None: ...  # pragma: no cover
 
 
-ASGI2Application = Type[ASGI2Protocol]
+ASGI2Application = type[ASGI2Protocol]
 ASGI3Application = Callable[
     [
         Scope,

uvicorn/config.py

@@ -9,9 +9,10 @@ import os
 import socket
 import ssl
 import sys
+from collections.abc import Awaitable
 from configparser import RawConfigParser
 from pathlib import Path
-from typing import IO, Any, Awaitable, Callable, Literal
+from typing import IO, Any, Callable, Literal
 
 import click
 
@@ -137,7 +138,7 @@ def resolve_reload_patterns(patterns_list: list[str], directories_list: list[str
         # Special case for the .* pattern, otherwise this would only match
         # hidden directories which is probably undesired
         if pattern == ".*":
-            continue
+            continue  # pragma: py-darwin
         patterns.append(pattern)
         if is_dir(Path(pattern)):
             directories.append(Path(pattern))

uvicorn/logging.py

@@ -16,7 +16,7 @@ class ColourizedFormatter(logging.Formatter):
     A custom log formatter class that:
 
     * Outputs the LOG_LEVEL with an appropriate color.
-    * If a log call includes an `extras={"color_message": ...}` it will be used
+    * If a log call includes an `extra={"color_message": ...}` it will be used
       for formatting the output, instead of the plain text message.
     """
 

uvicorn/middleware/wsgi.py

@@ -6,7 +6,7 @@ import io
 import sys
 import warnings
 from collections import deque
-from typing import Iterable
+from collections.abc import Iterable
 
 from uvicorn._types import (
     ASGIReceiveCallable,

uvicorn/protocols/websockets/websockets_impl.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import asyncio
 import http
 import logging
-from typing import Any, Literal, Optional, Sequence, cast
+from collections.abc import Sequence
+from typing import Any, Literal, Optional, cast
 from urllib.parse import unquote
 
 import websockets

uvicorn/protocols/websockets/wsproto_impl.py

@@ -224,6 +224,7 @@ class WSProtocol(asyncio.Protocol):
         headers: list[tuple[bytes, bytes]] = [
             (b"content-type", b"text/plain; charset=utf-8"),
             (b"connection", b"close"),
+            (b"content-length", b"21"),
         ]
         output = self.conn.send(wsproto.events.RejectConnection(status_code=500, headers=headers, has_body=True))
         output += self.conn.send(wsproto.events.RejectData(data=b"Internal Server Error"))

uvicorn/server.py

@@ -10,9 +10,10 @@ import socket
 import sys
 import threading
 import time
+from collections.abc import Generator, Sequence
 from email.utils import formatdate
 from types import FrameType
-from typing import TYPE_CHECKING, Generator, Sequence, Union
+from typing import TYPE_CHECKING, Union
 
 import click
 
@@ -284,10 +285,7 @@ class Server:
                 len(self.server_state.tasks),
             )
             for t in self.server_state.tasks:
-                if sys.version_info < (3, 9):  # pragma: py-gte-39
-                    t.cancel()
-                else:  # pragma: py-lt-39
-                    t.cancel(msg="Task cancelled, timeout graceful shutdown exceeded")
+                t.cancel(msg="Task cancelled, timeout graceful shutdown exceeded")
 
         # Send the lifespan shutdown event, and wait for application shutdown.
         if not self.force_exit:

uvicorn/supervisors/__init__.py

@@ -9,15 +9,8 @@ if TYPE_CHECKING:
     ChangeReload: type[BaseReload]
 else:
     try:
-        from uvicorn.supervisors.watchfilesreload import (
-            WatchFilesReload as ChangeReload,
-        )
+        from uvicorn.supervisors.watchfilesreload import WatchFilesReload as ChangeReload
     except ImportError:  # pragma: no cover
-        try:
-            from uvicorn.supervisors.watchgodreload import (
-                WatchGodReload as ChangeReload,
-            )
-        except ImportError:
-            from uvicorn.supervisors.statreload import StatReload as ChangeReload
+        from uvicorn.supervisors.statreload import StatReload as ChangeReload
 
 __all__ = ["Multiprocess", "ChangeReload"]

uvicorn/supervisors/basereload.py

@@ -5,10 +5,11 @@ import os
 import signal
 import sys
 import threading
+from collections.abc import Iterator
 from pathlib import Path
 from socket import socket
 from types import FrameType
-from typing import Callable, Iterator
+from typing import Callable
 
 import click
 

uvicorn/supervisors/statreload.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
 import logging
+from collections.abc import Iterator
 from pathlib import Path
 from socket import socket
-from typing import Callable, Iterator
+from typing import Callable
 
 from uvicorn.config import Config
 from uvicorn.supervisors.basereload import BaseReload

uvicorn/workers.py

@@ -11,7 +11,7 @@ from gunicorn.arbiter import Arbiter
 from gunicorn.workers.base import Worker
 
 from uvicorn.config import Config
-from uvicorn.main import Server
+from uvicorn.server import Server
 
 warnings.warn(
     "The `uvicorn.workers` module is deprecated. Please use `uvicorn-worker` package instead.\n"

{uvicorn-0.32.1.dist-info → uvicorn-0.34.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uvicorn
-Version: 0.32.1
+Version: 0.34.0
 Summary: The lightning-fast ASGI server.
 Project-URL: Changelog, https://github.com/encode/uvicorn/blob/master/CHANGELOG.md
 Project-URL: Funding, https://github.com/sponsors/encode
@@ -14,7 +14,6 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -23,7 +22,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Internet :: WWW/HTTP
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: click>=7.0
 Requires-Dist: h11>=0.8
 Requires-Dist: typing-extensions>=4.0; python_version < '3.11'

{uvicorn-0.32.1.dist-info → uvicorn-0.34.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-uvicorn/__init__.py,sha256=W3_kBxLdT0TKiO6g5ToxBxQfeytQQHTODQQpYRjDGVU,147
+uvicorn/__init__.py,sha256=6QKvxaTzHjM48izaeuZXBkVrqShBw6KeHswYwj4FwHg,147
 uvicorn/__main__.py,sha256=DQizy6nKP0ywhPpnCHgmRDYIMfcqZKVEzNIWQZjqtVQ,62
 uvicorn/_subprocess.py,sha256=HbfRnsCkXyg7xCWVAWWzXQTeWlvLKfTlIF5wevFBkR4,2766
-uvicorn/_types.py,sha256=TcUzCyKNq90ZX2Hxa6ce0juF558zLO_AyBB1XijnD2Y,7814
-uvicorn/config.py,sha256=gpsukzuJFbXBRN5_qOnLGiENmGgKM0Fi-eZJ6GwM1dQ,20849
+uvicorn/_types.py,sha256=5FcPvvIfeKsJDjGhTrceDv8TmwzYI8yPF7mXsXTWOUM,7775
+uvicorn/config.py,sha256=bMSdgFZpD6wfQ0-ieIl3Ha3IVDFCGLtt0mpg-JVNtuY,20897
 uvicorn/importer.py,sha256=nRt0QQ3qpi264-n_mR0l55C2ddM8nowTNzT1jsWaam8,1128
-uvicorn/logging.py,sha256=sg4D9lHaW_kKQj_kmP-bolbChjKfhBuihktlWp8RjSI,4236
+uvicorn/logging.py,sha256=-eCE4nOJmFbtB9qfNJuEVNF0Y13LGUHqvFzemYT0PaQ,4235
 uvicorn/main.py,sha256=iv6ptgDBnko0W-VkHs0e3I4UrF7_5sEZrntQNKJGFNY,16915
 uvicorn/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-uvicorn/server.py,sha256=McDmVn0sBIVOzaCoKrp10oxaScD3tosoWhtsL1YldNo,13010
-uvicorn/workers.py,sha256=DukTKlrCyyvWVHbJWBJflIV2yUe-q6KaGdrEwLrNmyc,3893
+uvicorn/server.py,sha256=jdPRUFI_0UCpmBxB8PrpY7hpsgwGTdlKt0IrxFN0jm8,12893
+uvicorn/workers.py,sha256=7KGgGAapxGkGeXUcBGunOjSNdI9R44KCoWTGEAqAdfs,3895
 uvicorn/lifespan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uvicorn/lifespan/off.py,sha256=nfI6qHAUo_8-BEXMBKoHQ9wUbsXrPaXLCbDSS0vKSr8,332
 uvicorn/lifespan/on.py,sha256=1KYuFNNyQONIjtEHhKZAJp-OOokIyjj74wpGCGBv4lk,5184
@@ -20,7 +20,7 @@ uvicorn/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 uvicorn/middleware/asgi2.py,sha256=YQrQNm3RehFts3mzk3k4yw8aD8Egtj0tRS3N45YkQa0,394
 uvicorn/middleware/message_logger.py,sha256=IHEZUSnFNaMFUFdwtZO3AuFATnYcSor-gVtOjbCzt8M,2859
 uvicorn/middleware/proxy_headers.py,sha256=f1VDAc-ipPHdNTuLNHwYCeDgYXoCL_VjD6hDTUXZT_U,5790
-uvicorn/middleware/wsgi.py,sha256=TBeG4W_gEmWddbGfWyxdzJ0IDaWWkJZyF8eIp-1fv0U,7111
+uvicorn/middleware/wsgi.py,sha256=F45FLfMZc510LiYpu7VQnoFpRof4k5pm5CTER4urs3U,7120
 uvicorn/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uvicorn/protocols/utils.py,sha256=rCjYLd4_uwPeZkbRXQ6beCfxyI_oYpvJCwz3jEGNOiE,1849
 uvicorn/protocols/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,16 +30,15 @@ uvicorn/protocols/http/h11_impl.py,sha256=4b-KswK57FBaRPeHXlK_oy8pKM6vG1haALCIeR
 uvicorn/protocols/http/httptools_impl.py,sha256=tuQBCiD6rf5DQeyQwHVc45rxH9ouojMpkXi9KG6NRBk,21805
 uvicorn/protocols/websockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uvicorn/protocols/websockets/auto.py,sha256=kNP-h07ZzjA9dKRUd7MNO0J7xhRJ5xVBfit7wCbdB0A,574
-uvicorn/protocols/websockets/websockets_impl.py,sha256=LV58OW3whQAd4iwbJl4R3iIod8myVYK3IhAn6F5VeZ4,15490
-uvicorn/protocols/websockets/wsproto_impl.py,sha256=haJEXK82Ldu8_hz4NDxQ0KpPXa9vOi6pG6iDLoBDKjs,15341
-uvicorn/supervisors/__init__.py,sha256=UVJYW3RVHMDSgUytToyAgGyd9NUQVqbNpVrQrvm4Tpc,700
-uvicorn/supervisors/basereload.py,sha256=Hxezjgt_HXkOPVj-hJGH7uj0bZ3EhmwsmaOBc63ySoM,3831
+uvicorn/protocols/websockets/websockets_impl.py,sha256=0y4kk-zR-uPdmpjq9OYuzJk7g9amlispUmM91lyqRdY,15517
+uvicorn/protocols/websockets/wsproto_impl.py,sha256=ga8JzDUU2QrQsjgQdgIilfbmBHIrH4zbyGM4maovTRo,15381
+uvicorn/supervisors/__init__.py,sha256=wT8eOEIqT1yWQgytZtv5taWMul7xoTIY0xm1m4oyPTw,507
+uvicorn/supervisors/basereload.py,sha256=arOe3PqQp0L5FvCYDsVg8jUev-57syWFzHhggsM18VY,3858
 uvicorn/supervisors/multiprocess.py,sha256=Opt0XvOUj1DIMXYwb4OlkJZxeh_RjweFnTmDPYItONw,7507
-uvicorn/supervisors/statreload.py,sha256=gc-HUB44f811PvxD_ZIEQYenM7mWmhQQjYg7KKQ1c5o,1542
+uvicorn/supervisors/statreload.py,sha256=hXznDIW3f54ltxik6hXsBSC-1qBFL30eCvtPSlIvn1o,1569
 uvicorn/supervisors/watchfilesreload.py,sha256=41FGNMXPKrKvPr-5O8yRWg43l6OCBtapt39M-gpdk0E,3010
-uvicorn/supervisors/watchgodreload.py,sha256=kd-gOvp14ArTNIc206Nt5CEjZZ4NP2UmMVYE7571yRQ,5486
-uvicorn-0.32.1.dist-info/METADATA,sha256=nLK_Q7qPiHaZyH1sD1w3_s6j58vWZ73Lu6PNuxBGrIs,6584
-uvicorn-0.32.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-uvicorn-0.32.1.dist-info/entry_points.txt,sha256=FW1w-hkc9QgwaGoovMvm0ZY73w_NcycWdGAUfDsNGxw,46
-uvicorn-0.32.1.dist-info/licenses/LICENSE.md,sha256=7-Gs8-YvuZwoiw7HPlp3O3Jo70Mg_nV-qZQhTktjw3E,1526
-uvicorn-0.32.1.dist-info/RECORD,,
+uvicorn-0.34.0.dist-info/METADATA,sha256=bS8aEm2BGuEU-2n8mLQYHWl5dD0TLAU3IxswLCB4QcU,6534
+uvicorn-0.34.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+uvicorn-0.34.0.dist-info/entry_points.txt,sha256=FW1w-hkc9QgwaGoovMvm0ZY73w_NcycWdGAUfDsNGxw,46
+uvicorn-0.34.0.dist-info/licenses/LICENSE.md,sha256=7-Gs8-YvuZwoiw7HPlp3O3Jo70Mg_nV-qZQhTktjw3E,1526
+uvicorn-0.34.0.dist-info/RECORD,,

uvicorn/supervisors/watchgodreload.py

@@ -1,152 +0,0 @@
-from __future__ import annotations
-
-import logging
-import warnings
-from pathlib import Path
-from socket import socket
-from typing import TYPE_CHECKING, Callable
-
-from watchgod import DefaultWatcher
-
-from uvicorn.config import Config
-from uvicorn.supervisors.basereload import BaseReload
-
-if TYPE_CHECKING:
-    import os
-
-    DirEntry = os.DirEntry[str]
-
-logger = logging.getLogger("uvicorn.error")
-
-
-class CustomWatcher(DefaultWatcher):
-    def __init__(self, root_path: Path, config: Config):
-        default_includes = ["*.py"]
-        self.includes = [default for default in default_includes if default not in config.reload_excludes]
-        self.includes.extend(config.reload_includes)
-        self.includes = list(set(self.includes))
-
-        default_excludes = [".*", ".py[cod]", ".sw.*", "~*"]
-        self.excludes = [default for default in default_excludes if default not in config.reload_includes]
-        self.excludes.extend(config.reload_excludes)
-        self.excludes = list(set(self.excludes))
-
-        self.watched_dirs: dict[str, bool] = {}
-        self.watched_files: dict[str, bool] = {}
-        self.dirs_includes = set(config.reload_dirs)
-        self.dirs_excludes = set(config.reload_dirs_excludes)
-        self.resolved_root = root_path
-        super().__init__(str(root_path))
-
-    def should_watch_file(self, entry: DirEntry) -> bool:
-        cached_result = self.watched_files.get(entry.path)
-        if cached_result is not None:
-            return cached_result
-
-        entry_path = Path(entry)
-
-        # cwd is not verified through should_watch_dir, so we need to verify here
-        if entry_path.parent == Path.cwd() and Path.cwd() not in self.dirs_includes:
-            self.watched_files[entry.path] = False
-            return False
-        for include_pattern in self.includes:
-            if str(entry_path).endswith(include_pattern):
-                self.watched_files[entry.path] = True
-                return True
-            if entry_path.match(include_pattern):
-                for exclude_pattern in self.excludes:
-                    if entry_path.match(exclude_pattern):
-                        self.watched_files[entry.path] = False
-                        return False
-                self.watched_files[entry.path] = True
-                return True
-        self.watched_files[entry.path] = False
-        return False
-
-    def should_watch_dir(self, entry: DirEntry) -> bool:
-        cached_result = self.watched_dirs.get(entry.path)
-        if cached_result is not None:
-            return cached_result
-
-        entry_path = Path(entry)
-
-        if entry_path in self.dirs_excludes:
-            self.watched_dirs[entry.path] = False
-            return False
-
-        for exclude_pattern in self.excludes:
-            if entry_path.match(exclude_pattern):
-                is_watched = False
-                if entry_path in self.dirs_includes:
-                    is_watched = True
-
-                for directory in self.dirs_includes:
-                    if directory in entry_path.parents:
-                        is_watched = True
-
-                if is_watched:
-                    logger.debug(
-                        "WatchGodReload detected a new excluded dir '%s' in '%s'; " "Adding to exclude list.",
-                        entry_path.relative_to(self.resolved_root),
-                        str(self.resolved_root),
-                    )
-                self.watched_dirs[entry.path] = False
-                self.dirs_excludes.add(entry_path)
-                return False
-
-        if entry_path in self.dirs_includes:
-            self.watched_dirs[entry.path] = True
-            return True
-
-        for directory in self.dirs_includes:
-            if directory in entry_path.parents:
-                self.watched_dirs[entry.path] = True
-                return True
-
-        for include_pattern in self.includes:
-            if entry_path.match(include_pattern):
-                logger.info(
-                    "WatchGodReload detected a new reload dir '%s' in '%s'; " "Adding to watch list.",
-                    str(entry_path.relative_to(self.resolved_root)),
-                    str(self.resolved_root),
-                )
-                self.dirs_includes.add(entry_path)
-                self.watched_dirs[entry.path] = True
-                return True
-
-        self.watched_dirs[entry.path] = False
-        return False
-
-
-class WatchGodReload(BaseReload):
-    def __init__(
-        self,
-        config: Config,
-        target: Callable[[list[socket] | None], None],
-        sockets: list[socket],
-    ) -> None:
-        warnings.warn(
-            '"watchgod" is deprecated, you should switch ' "to watchfiles (`pip install watchfiles`).",
-            DeprecationWarning,
-        )
-        super().__init__(config, target, sockets)
-        self.reloader_name = "WatchGod"
-        self.watchers = []
-        reload_dirs = []
-        for directory in config.reload_dirs:
-            if Path.cwd() not in directory.parents:
-                reload_dirs.append(directory)
-        if Path.cwd() not in reload_dirs:
-            reload_dirs.append(Path.cwd())
-        for w in reload_dirs:
-            self.watchers.append(CustomWatcher(w.resolve(), self.config))
-
-    def should_restart(self) -> list[Path] | None:
-        self.pause()
-
-        for watcher in self.watchers:
-            change = watcher.check()
-            if change != set():
-                return list({Path(c[1]) for c in change})
-
-        return None