uvicorn 0.32.1__py3-none-any.whl → 0.33.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.33.0"
 __all__ = ["main", "run", "Config", "Server"]

uvicorn/config.py

@@ -137,7 +137,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/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/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.33.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uvicorn
-Version: 0.32.1
+Version: 0.33.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

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

@@ -1,14 +1,14 @@
-uvicorn/__init__.py,sha256=W3_kBxLdT0TKiO6g5ToxBxQfeytQQHTODQQpYRjDGVU,147
+uvicorn/__init__.py,sha256=nQrfD4JNBDymcrFz6K1qe5h9zmUYcCjhNChn_ySwPPs,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/config.py,sha256=GxC0lBCK0rLFJsloj_yqqS0NZ9QoBN89525b0V_yws4,20870
 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/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
@@ -32,14 +32,13 @@ uvicorn/protocols/websockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 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/__init__.py,sha256=wT8eOEIqT1yWQgytZtv5taWMul7xoTIY0xm1m4oyPTw,507
 uvicorn/supervisors/basereload.py,sha256=Hxezjgt_HXkOPVj-hJGH7uj0bZ3EhmwsmaOBc63ySoM,3831
 uvicorn/supervisors/multiprocess.py,sha256=Opt0XvOUj1DIMXYwb4OlkJZxeh_RjweFnTmDPYItONw,7507
 uvicorn/supervisors/statreload.py,sha256=gc-HUB44f811PvxD_ZIEQYenM7mWmhQQjYg7KKQ1c5o,1542
 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.33.0.dist-info/METADATA,sha256=qpnMGZS9iuwL1XUUHOvHeSAhzTL-aDsrko1-xB809pM,6584
+uvicorn-0.33.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+uvicorn-0.33.0.dist-info/entry_points.txt,sha256=FW1w-hkc9QgwaGoovMvm0ZY73w_NcycWdGAUfDsNGxw,46
+uvicorn-0.33.0.dist-info/licenses/LICENSE.md,sha256=7-Gs8-YvuZwoiw7HPlp3O3Jo70Mg_nV-qZQhTktjw3E,1526
+uvicorn-0.33.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