-
Notifications
You must be signed in to change notification settings - Fork 2.8k
fix(inference): retry ollama validation probes and docker runtime detection #4540
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
4 commits
Select commit
Hold shift + click to select a range
58604b5
fix(inference): Ollama validation probes and retry Docker runtime
zyang-dev 68cabce
test(inference): mock runner in docker runtime retry test
zyang-dev 3e84fcc
fix(inference): normalize streaming probe timeout errors
zyang-dev 348907c
fix(inference): preserve query-param auth on validation retry
zyang-dev 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import { describe, expect, it, vi } from "vitest"; | ||
|
|
||
| vi.mock("../../runner", () => ({ | ||
| ROOT: "/repo/root", | ||
| run: vi.fn(), | ||
| runCapture: vi.fn(), | ||
| })); | ||
|
|
||
| import { | ||
| DOCKER_INFO_RUNTIME_PROBE_ATTEMPTS, | ||
| DOCKER_INFO_RUNTIME_PROBE_TIMEOUT_MS, | ||
| detectContainerRuntimeFromDockerInfo, | ||
| } from "./runtime"; | ||
|
|
||
| describe("docker runtime detection", () => { | ||
| it("retries indeterminate docker info output before returning a runtime", () => { | ||
| const calls: unknown[] = []; | ||
| const outputs = ["", "", "Operating System: Docker Desktop"]; | ||
|
|
||
| const runtime = detectContainerRuntimeFromDockerInfo({ | ||
| dockerInfoImpl: (opts) => { | ||
| calls.push(opts); | ||
| return outputs.shift() ?? ""; | ||
| }, | ||
| }); | ||
|
|
||
| expect(runtime).toBe("docker-desktop"); | ||
| expect(calls).toHaveLength(DOCKER_INFO_RUNTIME_PROBE_ATTEMPTS); | ||
| expect(calls).toEqual( | ||
| Array.from({ length: DOCKER_INFO_RUNTIME_PROBE_ATTEMPTS }, () => ({ | ||
| ignoreError: true, | ||
| timeout: DOCKER_INFO_RUNTIME_PROBE_TIMEOUT_MS, | ||
| })), | ||
| ); | ||
| }); | ||
|
|
||
| it("returns unknown after all attempts are indeterminate", () => { | ||
| const calls: unknown[] = []; | ||
|
|
||
| const runtime = detectContainerRuntimeFromDockerInfo({ | ||
| attempts: 2, | ||
| dockerInfoImpl: (opts) => { | ||
| calls.push(opts); | ||
| return ""; | ||
| }, | ||
| timeoutMs: 1234, | ||
| }); | ||
|
|
||
| expect(runtime).toBe("unknown"); | ||
| expect(calls).toEqual([ | ||
| { ignoreError: true, timeout: 1234 }, | ||
| { ignoreError: true, timeout: 1234 }, | ||
| ]); | ||
| }); | ||
| }); |
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,33 @@ | ||
| // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import type { ContainerRuntime } from "../../platform"; | ||
| import { inferContainerRuntime } from "../../platform"; | ||
| import { dockerInfo } from "./info"; | ||
| import type { DockerCaptureOptions } from "./run"; | ||
|
|
||
| export const DOCKER_INFO_RUNTIME_PROBE_ATTEMPTS = 3; | ||
| export const DOCKER_INFO_RUNTIME_PROBE_TIMEOUT_MS = 5000; | ||
|
|
||
| type DockerInfoProbe = (opts: DockerCaptureOptions) => string; | ||
|
|
||
| export interface DetectContainerRuntimeOptions { | ||
| attempts?: number; | ||
| dockerInfoImpl?: DockerInfoProbe; | ||
| timeoutMs?: number; | ||
| } | ||
|
|
||
| export function detectContainerRuntimeFromDockerInfo( | ||
| opts: DetectContainerRuntimeOptions = {}, | ||
| ): ContainerRuntime { | ||
| const attempts = Math.max(1, Math.floor(opts.attempts ?? DOCKER_INFO_RUNTIME_PROBE_ATTEMPTS)); | ||
| const timeout = Math.max(1, Math.floor(opts.timeoutMs ?? DOCKER_INFO_RUNTIME_PROBE_TIMEOUT_MS)); | ||
| const probe = opts.dockerInfoImpl ?? dockerInfo; | ||
|
|
||
| for (let attempt = 0; attempt < attempts; attempt++) { | ||
| const runtime = inferContainerRuntime(probe({ ignoreError: true, timeout })); | ||
| if (runtime !== "unknown") return runtime; | ||
| } | ||
|
|
||
| return "unknown"; | ||
| } |
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.
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.