-
Notifications
You must be signed in to change notification settings - Fork 147
Add Streamlit support to Python Extensions (Experimental) #954
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
Merged
Merged
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b5de556
Initial plan
Copilot 061bdaa
Add Streamlit support to Python Extensions
Copilot 282844c
Add PORT to STREAMLIT_SERVER_PORT environment variable mapping
Copilot d19ecb3
Add README for Streamlit example
Copilot 31c6448
Address review comments: remove .NET prefix and hardcode streamlit ex…
Copilot 0b68f84
Update src/CommunityToolkit.Aspire.Hosting.Python.Extensions/README.md
tommasodotNET 4b680f7
Update src/CommunityToolkit.Aspire.Hosting.Python.Extensions/Streamli…
tommasodotNET a739f4e
Merge branch 'main' into copilot/add-streamlit-support
aaronpowell 0e4a211
Update StreamlitApp to use Aspire.Hosting.Python integration and mark…
Copilot 5425af5
Merge branch 'main' into copilot/add-streamlit-support
aaronpowell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .venv/ | ||
| __pycache__/ | ||
| *.pyc |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 3.12 |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| # Streamlit API Example | ||
|
|
||
| This is a simple Streamlit application that demonstrates how to run Streamlit apps in Aspire using the Python Extensions. | ||
|
|
||
| ## Prerequisites | ||
|
|
||
| - Python 3.12 or later | ||
| - .NET 8.0 or later | ||
| - Streamlit package | ||
|
|
||
| ## Setup | ||
|
|
||
| 1. Create a virtual environment: | ||
| ```bash | ||
| python -m venv .venv | ||
| ``` | ||
|
|
||
| 2. Activate the virtual environment: | ||
| - On Windows: | ||
| ```bash | ||
| .venv\Scripts\activate | ||
| ``` | ||
| - On macOS/Linux: | ||
| ```bash | ||
| source .venv/bin/activate | ||
| ``` | ||
|
|
||
| 3. Install dependencies: | ||
| ```bash | ||
| pip install streamlit | ||
| ``` | ||
|
|
||
| ## Running the App | ||
|
|
||
| The app can be run as part of the Aspire AppHost project or standalone. | ||
|
|
||
| ### Run with Aspire | ||
|
|
||
| Navigate to the AppHost project and run: | ||
| ```bash | ||
| dotnet run | ||
| ``` | ||
|
|
||
| ### Run Standalone | ||
|
|
||
| From this directory, run: | ||
| ```bash | ||
| streamlit run app.py | ||
| ``` | ||
|
|
||
| ## About the App | ||
|
|
||
| This is a basic Streamlit app that demonstrates: | ||
| - Simple text display | ||
| - Environment variable reading (PORT) | ||
| - Session state management | ||
| - Interactive buttons |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import streamlit as st | ||
| import os | ||
|
|
||
| st.title("Hello, Aspire!") | ||
|
|
||
| st.write("This is a simple Streamlit app running in Aspire.") | ||
|
|
||
| port = os.environ.get("PORT", "8501") | ||
| st.write(f"Running on port: {port}") | ||
|
|
||
| # Add a simple counter | ||
| if "counter" not in st.session_state: | ||
| st.session_state.counter = 0 | ||
|
|
||
| if st.button("Click me!"): | ||
| st.session_state.counter += 1 | ||
|
|
||
| st.write(f"Button clicked {st.session_state.counter} times") |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [project] | ||
| name = "streamlit-api" | ||
| version = "0.1.0" | ||
| description = "Test project for streamlit-api" | ||
| requires-python = ">=3.12" | ||
| dependencies = [ | ||
| "streamlit>=1.40.0", | ||
| ] | ||
|
|
||
| [build-system] | ||
| requires = ["hatchling"] | ||
| build-backend = "hatchling.build" |
This file contains hidden or 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
81 changes: 81 additions & 0 deletions
81
src/CommunityToolkit.Aspire.Hosting.Python.Extensions/StreamlitAppHostingExtension.cs
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| using Aspire.Hosting.ApplicationModel; | ||
| using CommunityToolkit.Aspire.Utils; | ||
|
|
||
| namespace Aspire.Hosting; | ||
|
|
||
| /// <summary> | ||
| /// Provides extension methods for adding Streamlit applications to an <see cref="IDistributedApplicationBuilder"/>. | ||
| /// </summary> | ||
| public static class StreamlitAppHostingExtension | ||
| { | ||
| /// <summary> | ||
| /// Adds a Streamlit application to the distributed application builder. | ||
| /// </summary> | ||
| /// <param name="builder">The distributed application builder.</param> | ||
| /// <param name="name">The name of the Streamlit application.</param> | ||
| /// <param name="projectDirectory">The directory of the project containing the Streamlit application.</param> | ||
| /// <param name="scriptPath">The path to the Python script to be run by Streamlit.</param> | ||
| /// <param name="args">Optional arguments to pass to the Streamlit command.</param> | ||
| /// <returns>An <see cref="IResourceBuilder{StreamlitAppResource}"/> for the Streamlit application resource.</returns> | ||
| /// <exception cref="ArgumentNullException">Thrown if <paramref name="builder"/> is null.</exception> | ||
| /// <exception cref="ArgumentException">Thrown if <paramref name="name"/> or <paramref name="scriptPath"/> is null or empty.</exception> | ||
| public static IResourceBuilder<StreamlitAppResource> AddStreamlitApp( | ||
| this IDistributedApplicationBuilder builder, | ||
| [ResourceName] string name, | ||
| string projectDirectory, | ||
| string scriptPath, | ||
| params string[] args) | ||
| { | ||
| return builder.AddStreamlitApp(name, projectDirectory, scriptPath, ".venv", args); | ||
| } | ||
|
|
||
| private static IResourceBuilder<StreamlitAppResource> AddStreamlitApp( | ||
| this IDistributedApplicationBuilder builder, | ||
| string name, | ||
| string projectDirectory, | ||
| string scriptPath, | ||
| string virtualEnvironmentPath, | ||
| params string[] args) | ||
tommasodotNET marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| { | ||
| ArgumentNullException.ThrowIfNull(builder); | ||
| ArgumentException.ThrowIfNullOrWhiteSpace(name); | ||
| ArgumentException.ThrowIfNullOrWhiteSpace(scriptPath); | ||
|
|
||
| string wd = projectDirectory ?? Path.Combine("..", name); | ||
tommasodotNET marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| var normalizedAppHostDirectory = PathNormalizer.NormalizePathForCurrentPlatform(builder.AppHostDirectory); | ||
| var normalizedWd = PathNormalizer.NormalizePathForCurrentPlatform(wd); | ||
| projectDirectory = PathNormalizer.NormalizePathForCurrentPlatform(Path.Combine(normalizedAppHostDirectory, normalizedWd)); | ||
aaronpowell marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| var projectResource = new StreamlitAppResource(name, projectDirectory); | ||
|
|
||
aaronpowell marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return builder.AddResource(projectResource) | ||
| .WithEnvironment(context => | ||
| { | ||
| // Streamlit uses STREAMLIT_SERVER_PORT instead of PORT, so map PORT to STREAMLIT_SERVER_PORT | ||
| if (context.EnvironmentVariables.TryGetValue("PORT", out var portValue)) | ||
| { | ||
| context.EnvironmentVariables["STREAMLIT_SERVER_PORT"] = portValue; | ||
| } | ||
| }) | ||
| .WithArgs(context => | ||
| { | ||
| AddProjectArguments(scriptPath, args, context); | ||
| }); | ||
| } | ||
|
|
||
| private static void AddProjectArguments(string scriptPath, string[] scriptArgs, CommandLineArgsCallbackContext context) | ||
| { | ||
| context.Args.Add("run"); | ||
| context.Args.Add(scriptPath); | ||
|
|
||
| // Add --server.headless to run without browser opening | ||
| context.Args.Add("--server.headless"); | ||
| context.Args.Add("true"); | ||
|
|
||
| foreach (var arg in scriptArgs) | ||
| { | ||
| context.Args.Add(arg); | ||
| } | ||
| } | ||
| } | ||
11 changes: 11 additions & 0 deletions
11
src/CommunityToolkit.Aspire.Hosting.Python.Extensions/StreamlitAppResource.cs
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| using Aspire.Hosting.Python; | ||
|
|
||
| namespace Aspire.Hosting.ApplicationModel; | ||
|
|
||
| /// <summary> | ||
| /// Represents a Streamlit application. | ||
| /// </summary> | ||
| /// <param name="name">The name of the resource.</param> | ||
| /// <param name="workingDirectory">The working directory for streamlit.</param> | ||
| public class StreamlitAppResource(string name, string workingDirectory) | ||
| : PythonAppResource(name, "streamlit", workingDirectory), IResourceWithServiceDiscovery; |
This file contains hidden or 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 hidden or 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
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.
Does debugging and deploying work?
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 wouldn't invest in that until 13.1 when we can drop our implementation of the internals of the Python integration.
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 make sure it works. The bar should be higher in 13 for new language / framework integrations. Even if it doesn't work I don't want us to merge things without understanding what works and what doesn't work. I'd expect the future to look like a set of capabililities for these language integrations (otel support, endpoints, https, dockerfile, debugging). Doing enough work to know what we will document is a minimum bar here.
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.
While I appreciate the desire, we have to work with the realities of the OSS project - we don't have the resources to do everything that Aspire does.
The goal is to do our best to be producing high quality integrations to the level of Aspire, but it's not always going to be the case, especially if we want to ship. Feel free to raise an issue to get debugger support enabled, but I don't see it as a blocker for us shipping.
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.
Ok let me ask then. Does it work when you run locally and deploy? If it doesn’t? Do we know why? Has anyone built an app with this PR?