fix: marimo config to follow_symlink in StaticFiles #1327
Merged
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 ↗︎
|
|
CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅ |
Ubehebe
commented
May 7, 2024
| @@ -31,9 +32,14 @@ | |||
| # Root directory for static assets | |||
| root = os.path.realpath(str(import_files("marimo").joinpath("_static"))) | |||
|
|
|||
| config = UserConfigManager().get_config().get("server", {}) | |||
There was a problem hiding this comment.
I wasn't sure how to get the MarimoConfig from a top-level context like this. Most call sites seem to read it off an existing object. Is there a better way than re-instantiating a UserConfigManager?
|
I have read the CLA Document and I hereby sign the CLA |
mscolnick
reviewed
May 7, 2024
| @@ -31,9 +32,14 @@ | |||
| # Root directory for static assets | |||
| root = os.path.realpath(str(import_files("marimo").joinpath("_static"))) | |||
|
|
|||
| config = UserConfigManager().get_config().get("server", {}) | |||
There was a problem hiding this comment.
This is the best way given the current setup - and fine as is
mscolnick
changed the title
|
@Ubehebe yea the test are snapshot tests - running it once fixes it |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hi maintainers, this is a draft of a fix for #1298. It adds a
follow_symlinkboolean flag to Marimo's ServerConfig (defaulting to false), and propagates it to the call site where the StaticFiles for/assetsis constructed. This allows users to set it via their~/.marimo.tomlfiles like so:I've verified this works by patching this PR into my Bazel repo using the setup described here: #1298 (comment). I also verified this PR passes ruff and mypy.
I've kept this PR simple. This is the first time I've tried to change marimo's codebase, so I could definitely have missed things from the discussion in #1298. Suggestions are welcome.