Skip to content

Use cast() for asgiref types only when type checking #1190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Use cast() for asgiref types only when type checking #1190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions shiny/_autoreload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ def __init__(
)
# The starlette types and the asgiref types are compatible, but we'll use the
# latter internally. See the note in the __call__ method for more details.
self.app = cast(ASGI3Application, app)
if TYPE_CHECKING:
app = cast(ASGI3Application, app)
self.app = app
ws_url = autoreload_url()
self.script = (
f""" <script src="__shared/shiny-autoreload.js" data-ws-url="{html.escape(ws_url)}"></script>
Expand All @@ -125,22 +127,24 @@ async def __call__(
# more rigorous. In the call interface, we accept both types for compatibility
# with both. But internally we'll use the more rigorous types.
# See https://github.com/encode/starlette/blob/39dccd9/docs/middleware.md#type-annotations
scope = cast(Scope, scope)
receive_casted = cast(ASGIReceiveCallable, receive)
send_casted = cast(ASGISendCallable, send)
if TYPE_CHECKING:
scope = cast(Scope, scope)
receive = cast(ASGIReceiveCallable, receive)
send = cast(ASGISendCallable, send)

if scope["type"] != "http":
return await self.app(scope, receive_casted, send_casted)
return await self.app(scope, receive, send)
if scope["path"] != "/" or len(self.script) == 0:
return await self.app(scope, receive_casted, send_casted)
return await self.app(scope, receive, send)

def mangle_callback(body: bytes) -> tuple[bytes, bool]:
if b"</head>" in body:
return (body.replace(b"</head>", self.script, 1), True)
else:
return (body, False)

mangler = ResponseMangler(send_casted, mangle_callback)
await self.app(scope, receive_casted, mangler.send)
mangler = ResponseMangler(send, mangle_callback)
await self.app(scope, receive, mangler.send)


# PARENT PROCESS ------------------------------------------------------------
Expand Down