Skip to content

fix(ollama): respect ollama URL and port #2004

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.

Sign up for GitHub

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
alicehau merged 2 commits into from
Apr 2, 2025
Merged

fix(ollama): respect ollama URL and port #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12e8bc6
fix(ollama): respect ollama URL and port
sammcj Apr 2, 2025
51e8f0c
fix(ollama): respect ollama URL and port
sammcj Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion crates/goose/src/providers/ollama.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,13 @@ impl OllamaProvider {
.map_err(|e| ProviderError::RequestFailed(format!("Invalid base URL: {e}")))?;

// Set the default port if missing
// Don't add default port if:
// 1. URL explicitly ends with standard ports (:80 or :443)
// 2. URL uses HTTPS (which implicitly uses port 443)
let explicit_default_port = self.host.ends_with(":80") || self.host.ends_with(":443");
if base_url.port().is_none() && !explicit_default_port {
let is_https = base_url.scheme() == "https";

if base_url.port().is_none() && !explicit_default_port && !is_https {
base_url.set_port(Some(OLLAMA_DEFAULT_PORT)).map_err(|_| {
ProviderError::RequestFailed("Failed to set default port".to_string())
})?;
Expand Down
7 changes: 6 additions & 1 deletion crates/goose/src/providers/toolshim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,13 @@ impl OllamaInterpreter {
.map_err(|e| ProviderError::RequestFailed(format!("Invalid base URL: {e}")))?;

// Set the default port if missing
// Don't add default port if:
// 1. URL explicitly ends with standard ports (:80 or :443)
// 2. URL uses HTTPS (which implicitly uses port 443)
let explicit_default_port = host.ends_with(":80") || host.ends_with(":443");
if base_url.port().is_none() && !explicit_default_port {
let is_https = base_url.scheme() == "https";

if base_url.port().is_none() && !explicit_default_port && !is_https {
base_url.set_port(Some(OLLAMA_DEFAULT_PORT)).map_err(|_| {
ProviderError::RequestFailed("Failed to set default port".to_string())
})?;
Expand Down