-
Notifications
You must be signed in to change notification settings - Fork 1.8k
.NET: Add bundled Python guest options #5859
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
Open
jsturtevant
wants to merge
2
commits into
microsoft:main
Choose a base branch
from
jsturtevant:wasm-include
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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
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 |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
|
|
||
| using System.Collections.Generic; | ||
| using HyperlightSandbox.Api; | ||
| using HyperlightSandbox.Guest.Python; | ||
| using Microsoft.Extensions.AI; | ||
| using Microsoft.Shared.Diagnostics; | ||
|
|
||
|
|
@@ -12,8 +13,9 @@ namespace Microsoft.Agents.AI.Hyperlight; | |
| /// <see cref="HyperlightExecuteCodeFunction"/>. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// Use the <see cref="CreateForWasm(string)"/> and <see cref="CreateForJavaScript()"/> | ||
| /// factory methods to construct an instance with the desired sandbox backend. | ||
| /// Use the <see cref="CreateForPython()"/>, <see cref="CreateForWasm(string)"/>, | ||
| /// and <see cref="CreateForJavaScript()"/> factory methods to construct an instance | ||
| /// with the desired sandbox backend. | ||
| /// The parameterless constructor is equivalent to <see cref="CreateForJavaScript()"/>. | ||
| /// </remarks> | ||
| public sealed class HyperlightCodeActProviderOptions | ||
|
|
@@ -34,7 +36,17 @@ private HyperlightCodeActProviderOptions(SandboxBackend backend, string? moduleP | |
| } | ||
|
|
||
| /// <summary> | ||
| /// Creates options targeting the <see cref="SandboxBackend.Wasm"/> backend. | ||
| /// Creates options targeting the <see cref="SandboxBackend.Wasm"/> backend | ||
| /// with the bundled Python guest module from the | ||
| /// <c>Hyperlight.HyperlightSandbox.Guest.Python</c> NuGet package. | ||
| /// No explicit module path needs to be provided by the caller. | ||
| /// </summary> | ||
| public static HyperlightCodeActProviderOptions CreateForPython() | ||
| => new(SandboxBackend.Wasm, PythonGuestModule.GetModulePath()); | ||
|
Comment on lines
+44
to
+45
Contributor
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. Please also update the Harness_Step04_CodeExecution sample, to use this new helper. |
||
|
|
||
| /// <summary> | ||
| /// Creates options targeting the <see cref="SandboxBackend.Wasm"/> backend | ||
| /// with a custom guest module. | ||
| /// </summary> | ||
| /// <param name="modulePath">Path to the guest module (<c>.wasm</c> or <c>.aot</c> file).</param> | ||
| public static HyperlightCodeActProviderOptions CreateForWasm(string modulePath) | ||
|
|
@@ -53,7 +65,8 @@ public static HyperlightCodeActProviderOptions CreateForJavaScript() | |
|
|
||
| /// <summary> | ||
| /// Gets the path to the guest module. Set when the options were created via | ||
| /// <see cref="CreateForWasm(string)"/>; <see langword="null"/> otherwise. | ||
| /// <see cref="CreateForPython()"/> or <see cref="CreateForWasm(string)"/>; | ||
| /// <see langword="null"/> when using the built-in JavaScript backend. | ||
| /// </summary> | ||
| public string? ModulePath { get; } | ||
|
|
||
|
|
||
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
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.
Make sure to update to the latest code from main, since this is already added in main.