-
Notifications
You must be signed in to change notification settings - Fork 3.1k
feat(install): offer express install on Windows WSL #3824
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 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
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
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
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,69 @@ | ||
| // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import assert from "node:assert/strict"; | ||
| import { describe, it } from "vitest"; | ||
|
|
||
| import { resolveProviderKeyFallback } from "../../../dist/lib/onboard/provider-key-fallback"; | ||
|
|
||
| const option = (key: string) => ({ key, label: key }); | ||
|
|
||
| describe("resolveProviderKeyFallback", () => { | ||
| it("maps generic install action keys to already-running provider options", () => { | ||
| const options = [option("ollama"), option("vllm")]; | ||
|
|
||
| assert.equal( | ||
| resolveProviderKeyFallback(options, "install-ollama", { isWindowsHostOllama: false })?.key, | ||
| "ollama", | ||
| ); | ||
| assert.equal( | ||
| resolveProviderKeyFallback(options, "install-vllm", { isWindowsHostOllama: false })?.key, | ||
| "vllm", | ||
| ); | ||
| }); | ||
|
|
||
| it("prefers Windows-host start when install-windows-ollama is requested after install already exists", () => { | ||
| const options = [option("ollama"), option("start-windows-ollama")]; | ||
|
|
||
| assert.equal( | ||
| resolveProviderKeyFallback(options, "install-windows-ollama", { | ||
| isWindowsHostOllama: false, | ||
| })?.key, | ||
| "start-windows-ollama", | ||
| ); | ||
| }); | ||
|
|
||
| it("allows Windows-host install/start requests to collapse to ollama only for Windows-host Ollama", () => { | ||
| const options = [option("ollama")]; | ||
|
|
||
| assert.equal( | ||
| resolveProviderKeyFallback(options, "install-windows-ollama", { | ||
| isWindowsHostOllama: true, | ||
| })?.key, | ||
| "ollama", | ||
| ); | ||
| assert.equal( | ||
| resolveProviderKeyFallback(options, "start-windows-ollama", { | ||
| isWindowsHostOllama: true, | ||
| })?.key, | ||
| "ollama", | ||
| ); | ||
| }); | ||
|
|
||
| it("does not satisfy Windows-host requests with WSL or Linux local Ollama", () => { | ||
| const options = [option("ollama")]; | ||
|
|
||
| assert.equal( | ||
| resolveProviderKeyFallback(options, "install-windows-ollama", { | ||
| isWindowsHostOllama: false, | ||
| }), | ||
| undefined, | ||
| ); | ||
| assert.equal( | ||
| resolveProviderKeyFallback(options, "start-windows-ollama", { | ||
| isWindowsHostOllama: false, | ||
| }), | ||
| undefined, | ||
| ); | ||
| }); | ||
| }); |
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,41 @@ | ||
| // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| export interface ProviderOption { | ||
| key: string; | ||
| label?: string; | ||
| } | ||
|
|
||
| export interface ProviderKeyFallbackContext { | ||
| isWindowsHostOllama: boolean; | ||
| } | ||
|
|
||
| export function resolveProviderKeyFallback<T extends ProviderOption>( | ||
| options: T[], | ||
| providerKey: string | null | undefined, | ||
| context: ProviderKeyFallbackContext, | ||
| ): T | undefined { | ||
| const find = (key: string) => options.find((option) => option.key === key); | ||
|
|
||
| switch (providerKey) { | ||
| case "install-ollama": | ||
| return find("ollama"); | ||
| case "install-vllm": | ||
| return find("vllm"); | ||
| case "install-windows-ollama": | ||
| // Windows-host Ollama requests may arrive from NEMOCLAW_PROVIDER before | ||
| // the dynamic menu knows whether Windows Ollama needs install, | ||
| // start/restart, or is already reachable. Collapse only to later-state | ||
| // entries that still point at the Windows host. | ||
| return ( | ||
| find("start-windows-ollama") || | ||
| (context.isWindowsHostOllama ? find("ollama") : undefined) | ||
| ); | ||
| case "start-windows-ollama": | ||
| return context.isWindowsHostOllama ? find("ollama") : undefined; | ||
| case "ollama": | ||
| return find("install-ollama"); | ||
| default: | ||
| return undefined; | ||
| } | ||
| } |
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.
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.
Uh oh!
There was an error while loading. Please reload this page.