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.
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
Use a2wsgi.WSGIMiddleware replace WSGIMiddleware #1303
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,12 +28,21 @@ | |
# enable this functionality. | ||
pass | ||
|
||
try: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. depending on the answer to the comment above @abersheeran the try / catch may not be necessary |
||
from a2wsgi import WSGIMiddleware | ||
except ImportError: | ||
from uvicorn._types import WSGIApp | ||
|
||
class WSGIMiddleware: # type: ignore | ||
def __init__(self, app: WSGIApp, workers: int = 10): | ||
raise RuntimeError("Please install `a2wsgi` for serving WSGI applications") | ||
|
||
|
||
from uvicorn.importer import ImportFromStringError, import_from_string | ||
from uvicorn.middleware.asgi2 import ASGI2Middleware | ||
from uvicorn.middleware.debug import DebugMiddleware | ||
from uvicorn.middleware.message_logger import MessageLoggerMiddleware | ||
from uvicorn.middleware.proxy_headers import ProxyHeadersMiddleware | ||
from uvicorn.middleware.wsgi import WSGIMiddleware | ||
|
||
HTTPProtocolType = Literal["auto", "h11", "httptools"] | ||
WSProtocolType = Literal["auto", "none", "websockets", "wsproto"] | ||
|
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My only question here is: should this go in
extra_requirements
so that people have it when installing viapip install uvicorn[standard]
or directly in theminimal_requirements
section ?the idea of
uvicorn[standard]
vsuvicorn
was in summary cpython vs pure-python, or high-speed vs minimal, so I'd thought we better put it in minimal_requirements instead but I'm open on anything reallyThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we think Uvicorn can be used as a WSGI Server, then it should be added to minimal_requirements.
But in README:
So I'm not so sure...
What are @tomchristie 's thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should add it in the docs and then close #177
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree.