From ab772aae390498664720556047029f302cdcc47f Mon Sep 17 00:00:00 2001 From: mar77i Date: Mon, 5 Aug 2024 18:58:23 +0200 Subject: [PATCH] reformat code, update dependencies --- hub/app.py | 12 ++++++------ hub/static.py | 8 +++++--- hub/utils.py | 1 + hub/websocket.py | 16 ++++++++-------- requirements.txt | 8 ++++---- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/hub/app.py b/hub/app.py index 3d70154..24b09b8 100644 --- a/hub/app.py +++ b/hub/app.py @@ -32,9 +32,11 @@ class App(TemplateTreeFileApp, FalconApp): secret = self.secret if isinstance(secret, str): secret = secret.encode() - return urlsafe_b64encode( - pbkdf2_hmac("sha512", value, secret, 221100) - ).rstrip(b"=").decode("ascii") + return ( + urlsafe_b64encode(pbkdf2_hmac("sha512", value, secret, 221100)) + .rstrip(b"=") + .decode("ascii") + ) def uri_tail(self, path: Path) -> str: return self.scramble(super().uri_tail(path)) @@ -45,9 +47,7 @@ class App(TemplateTreeFileApp, FalconApp): self.secret = secret or token_urlsafe(64) kwargs.setdefault("media_type", MEDIA_HTML) FalconApp.__init__(self, **kwargs) - TemplateTreeFileApp.__init__( - self, self, base_dir, "/derp", "root" - ) + TemplateTreeFileApp.__init__(self, self, base_dir, "/derp", "root") self.env = Environment( loader=FileSystemLoader(self.base_dir), autoescape=select_autoescape(), diff --git a/hub/static.py b/hub/static.py index f3e0d84..19fa138 100644 --- a/hub/static.py +++ b/hub/static.py @@ -15,6 +15,7 @@ class StaticFile: """ Basic static file wrapper. """ + media_types_per_suffix: dict[str, str] = { ".html": MEDIA_HTML, ".js": MEDIA_JS, @@ -52,6 +53,7 @@ class TreeFileApp: index.html to "/" (root uri) to index.html and a/index.html to "/a" (directory uri) """ + @staticmethod def is_ignored_filename(path): return path.name.startswith(".") @@ -88,13 +90,13 @@ class TreeFileApp: return self.base_uri or "/" index_suffix = "/index.html" if uri_tail.endswith(index_suffix): - uri_tail = uri_tail[:-len(index_suffix)] + uri_tail = uri_tail[: -len(index_suffix)] return f"{self.base_uri}/{uri_tail.lstrip('/')}" @staticmethod def create_name(root_base_uri, base_uri): if base_uri.startswith(root_base_uri): - base_uri = base_uri[len(root_base_uri):] + base_uri = base_uri[len(root_base_uri) :] return base_uri.replace("/", ".").strip(".") def __init__(self, root, base_dir, base_uri="/", name=None): @@ -152,7 +154,7 @@ class TemplateTreeFileApp(TreeFileApp): def uri_tail(self, path: Path) -> str: uri_tail = super().uri_tail(path) if uri_tail.endswith(StaticTemplateFile.TEMPLATE_SUFFIX): - uri_tail = uri_tail[:-len(StaticTemplateFile.TEMPLATE_SUFFIX)] + uri_tail = uri_tail[: -len(StaticTemplateFile.TEMPLATE_SUFFIX)] return uri_tail diff --git a/hub/utils.py b/hub/utils.py index d888f15..a58cf57 100644 --- a/hub/utils.py +++ b/hub/utils.py @@ -2,6 +2,7 @@ from jinja2_simple_tags import StandaloneTag from .static import StaticTemplateFile, TreeFileApp + class StaticTag(StandaloneTag): tags = {"static"} diff --git a/hub/websocket.py b/hub/websocket.py index 0ce426a..84dfba7 100644 --- a/hub/websocket.py +++ b/hub/websocket.py @@ -1,7 +1,7 @@ -import asyncio import json import pickle import sys +from asyncio import gather from asyncio.exceptions import CancelledError from functools import partial from traceback import print_exception @@ -62,7 +62,7 @@ class WebSocketApp: if callable(join_cb): await join_cb() try: - await asyncio.gather( + await gather( self.process_websocket( self.conn, web_socket, **(process_websockets_kwargs or {}) ), @@ -99,12 +99,12 @@ class WebSocketApp: ) async def on_websocket_master(self, req, web_socket): - return await self.on_websocket( - req, - web_socket, - f"{self.name}-master", - {"recipients": self.get_master_recipients}, - ) + return await self.on_websocket( + req, + web_socket, + f"{self.name}-master", + {"recipients": self.get_master_recipients}, + ) def get_master_recipients(self, data): return [ diff --git a/requirements.txt b/requirements.txt index 95f864d..d860ae5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ anyio==4.4.0 -black==24.4.2 +black==24.8.0 click==8.1.7 falcon==3.1.3 h11==0.14.0 @@ -10,14 +10,14 @@ Jinja2==3.1.4 jinja2-simple-tags==0.6.1 MarkupSafe==2.1.5 mypy-extensions==1.0.0 -packaging==24.0 +packaging==24.1 pathspec==0.12.1 platformdirs==4.2.2 python-dotenv==1.0.1 PyYAML==6.0.1 -redis==5.0.5 +redis==5.0.8 sniffio==1.3.1 -uvicorn==0.30.1 +uvicorn==0.30.5 uvloop==0.19.0 watchfiles==0.22.0 websockets==12.0 -- 2.46.0