feat: create_asgi_app to programatically run marimo apps #1002
Conversation
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
akshayka
previously approved these changes
Mar 27, 2024
marimo/_server/api/middleware.py
Outdated
Comment on lines
72
to
104
| # class StripBaseURLMiddleware: | ||
| # def __init__(self, app: ASGIApp, base_url: str) -> None: | ||
| # self.app = app | ||
| # self.base_url = base_url | ||
|
|
||
| async def __call__( | ||
| self, scope: Scope, receive: Receive, send: Send | ||
| ) -> None: | ||
| # If not HTTP, skip | ||
| if scope["type"] != "http": | ||
| return await self.app(scope, receive, send) | ||
| # async def __call__( | ||
| # self, scope: Scope, receive: Receive, send: Send | ||
| # ) -> None: | ||
| # # If not HTTP, skip | ||
| # if scope["type"] != "http": | ||
| # return await self.app(scope, receive, send) | ||
|
|
||
| # If base URL is empty, skip | ||
| if self.base_url == "" or self.base_url == "/": | ||
| return await self.app(scope, receive, send) | ||
| # # If base URL is empty, skip | ||
| # if self.base_url == "" or self.base_url == "/": | ||
| # return await self.app(scope, receive, send) | ||
|
|
||
| request = Request(scope) | ||
| # request = Request(scope) | ||
|
|
||
| # If under common infra routes, allow | ||
| if request.url.path in ALLOWED_BASE_URLS: | ||
| return await self.app(scope, receive, send) | ||
| # # If under common infra routes, allow | ||
| # if request.url.path in ALLOWED_BASE_URLS: | ||
| # return await self.app(scope, receive, send) | ||
|
|
||
| # If not under base URL or under infra routes, return 404 | ||
| # Otherwise, this may hide real issues | ||
| if not request.url.path.startswith(self.base_url): | ||
| response = JSONResponse({"error": "Not found"}, status_code=404) | ||
| return await response(scope, receive, send) | ||
| # # If not under base URL or under infra routes, return 404 | ||
| # # Otherwise, this may hide real issues | ||
| # if not request.url.path.startswith(self.base_url): | ||
| # response = JSONResponse({"error": "Not found"}, status_code=404) | ||
| # return await response(scope, receive, send) | ||
|
|
||
| # Strip base URL | ||
| scope["path"] = scope["path"][len(self.base_url) :] | ||
| if not scope["path"].startswith("/"): | ||
| scope["path"] = "/" + scope["path"] | ||
| return await self.app(scope, receive, send) | ||
| # # Strip base URL | ||
| # scope["path"] = scope["path"][len(self.base_url) :] | ||
| # if not scope["path"].startswith("/"): | ||
| # scope["path"] = "/" + scope["path"] | ||
| # return await self.app(scope, receive, send) |
There was a problem hiding this comment.
Can all this dead code be deleted?
tests/_server/asgi.py
Outdated
There was a problem hiding this comment.
asgi.py -> test_asgi.py, to make sure pytest runs it.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This exposes a new function from the
marimomodule:create_asgi_app. Which is a builder to add many marimo apps:Closes #904 #395
Regarding the API:
create_asgi_appso 1) we can share configs, 2) we can initialize shared singletons between the appsrootinstead offilenameso we can latter supportdirsorcodeIt would look something like: