dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

fix: return empty Ollama model list instead of error when Ollama unreachable

Browse Source 
When Ollama is not running, /api/ollama/models now returns [] instead of
HTTP 400. This prevents the UI from breaking when the Ollama service is
unavailable. The frontend already handles an empty list gracefully.

Updated the test to assert success with an empty list rather than an error.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Dave
2026-02-24 15:11:33 +00:00
parent 44f5a9f3fa
commit d66334ee29
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/http/model.rs
View File

@@ -37,6 +37,7 @@ impl ModelApi {
/// Fetch available model names from an Ollama server. /// Fetch available model names from an Ollama server.
/// Optionally override the base URL via query string. /// Optionally override the base URL via query string.
/// Returns an empty list when Ollama is unreachable so the UI stays functional.
#[oai(path = "/ollama/models", method = "get")] #[oai(path = "/ollama/models", method = "get")]
async fn get_ollama_models( async fn get_ollama_models(
&self, &self,
@@ -44,7 +45,7 @@ impl ModelApi {
) -> OpenApiResult<Json<Vec<String>>> { ) -> OpenApiResult<Json<Vec<String>>> {
let models = chat::get_ollama_models(base_url.0) let models = chat::get_ollama_models(base_url.0)
.await .await
.map_err(bad_request)?; .unwrap_or_default();
Ok(Json(models)) Ok(Json(models))
} }
} }
@@ -116,12 +117,13 @@ mod tests {
} }
#[tokio::test] #[tokio::test]
async fn get_ollama_models_returns_error_for_unreachable_url() { async fn get_ollama_models_returns_empty_list_for_unreachable_url() {
let dir = TempDir::new().unwrap(); let dir = TempDir::new().unwrap();
let api = make_api(&dir); let api = make_api(&dir);
// Port 1 is reserved and should immediately refuse the connection. // Port 1 is reserved and should immediately refuse the connection.
let base_url = Query(Some("http://127.0.0.1:1".to_string())); let base_url = Query(Some("http://127.0.0.1:1".to_string()));
let result = api.get_ollama_models(base_url).await; let result = api.get_ollama_models(base_url).await;
assert!(result.is_err()); assert!(result.is_ok());
assert_eq!(result.unwrap().0, Vec::<String>::new());
} }
} }