jacob/katniss-ai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ollama cloud support

Browse Source
This commit is contained in:
J / Jacob Babich
2026-10-16 12:57:27 -04:00
parent e74b5f6a4b
commit 6e3a283d81
5 changed files with 102 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/server/chat/completions.rs
View File

@@ -1,7 +1,6 @@
use crate::CloudflareCredentials;
use crate::openai;
use crate::server::AppState;
use crate::server::Provider;
use crate::server::Upstream;
use crate::server::take_random_by_swapping;
use axum::Json;
@@ -86,6 +85,22 @@ impl Display for ShortcutAndMaybeReasoning {
}
}
#[derive(Debug, Clone)]
enum Provider {
CloudflareWorkersAi,
GoogleAiStudio,
Groq,
HuggingFace,
Kilo,
Mistral,
NovitaAi,
NvidiaNim,
Ollama,
OpenRouter,
VercelAiGateway,
ZAi,
}
impl Shortcut {
fn suggestions(&self) -> Vec<(Provider, EcoString)> {
use Provider as P;
@@ -125,7 +140,9 @@ impl Shortcut {
P::OpenRouter,
"nvidia/nemotron-3-nano-omni-30b-a3b-reasoning:free".into(),
),
(P::Ollama, "nemotron-3-nano:30b".into()),
(P::Groq, "openai/gpt-oss-20b".into()),
(P::Ollama, "gpt-oss:20b".into()),
(P::NvidiaNim, "openai/gpt-oss-20b".into()),
(P::CloudflareWorkersAi, "@cf/openai/gpt-oss-20b".into()),
(P::OpenRouter, "openai/gpt-oss-20b:free".into()),
@@ -145,6 +162,7 @@ impl Shortcut {
(P::NvidiaNim, "meta/muse-glimmer-30b".into()),
(P::HuggingFace, "meta-models/Muse-Glimmer-30B".into()),
(P::GoogleAiStudio, "gemma-4-31b-it".into()),
(P::Ollama, "gemma4:31b".into()),
(P::NvidiaNim, "google/gemma-4-31b-it".into()),
(P::OpenRouter, "google/gemma-4-31b-it:free".into()),
(P::HuggingFace, "google/gemma-4-31B-it".into()),
@@ -185,6 +203,7 @@ impl Shortcut {
"inclusionai/ling-3.0-flash-sante".into(),
),
(P::VercelAiGateway, "mistral/mistral-large-3".into()),
(P::Ollama, "nemotron-3-super".into()),
(P::NvidiaNim, "nvidia/nemotron-3-super-120b-a12b".into()),
(P::Kilo, "nvidia-nemotron-3-super-120b-a12b-free".into()),
(
@@ -192,6 +211,7 @@ impl Shortcut {
"nvidia/nemotron-3-super-120b-a12b:free".into(),
),
(P::Groq, "openai/gpt-oss-120b".into()),
(P::Ollama, "gpt-oss:120b".into()),
(P::CloudflareWorkersAi, "@cf/openai/gpt-oss-120b".into()),
(P::OpenRouter, "openai/gpt-oss-120b:free".into()),
(P::HuggingFace, "openai/gpt-oss-120b".into()),
@@ -208,10 +228,11 @@ impl Shortcut {
(P::VercelAiGateway, "openai/gpt-5.2".into()),
(P::NvidiaNim, "deepseek-ai/deepseek-v4.1-flash".into()),
(P::HuggingFace, "deepseek-ai/DeepSeek-V4.1-Flash".into()),
(P::VercelAiGateway, "xiaomi/mimo-v2.6-flash".into()),
(P::HuggingFace, "XiaomiMiMo/MiMo-V2.6-Flash-RL".into()),
(P::VercelAiGateway, "inclusionai/ling-3.1-flash".into()),
(P::HuggingFace, "inclusionAI/Ling-3.1-flash".into()),
(P::Ollama, "beam".into()),
(P::VercelAiGateway, "xiaomi/mimo-v2.6-flash".into()),
(P::HuggingFace, "XiaomiMiMo/MiMo-V2.6-Flash-RL".into()),
(P::Kilo, "nex-agi-nex-n2-5-pro-free".into()),
(P::VercelAiGateway, "xiaomi/mimo-v2.5".into()),
(P::Kilo, "dots-studio-dots-3-note-preview-free".into()),
@@ -223,6 +244,7 @@ impl Shortcut {
(P::Kilo, "tencent-hy3-preview-free".into()),
(P::OpenRouter, "thinkingmachines/inkling-small:free".into()),
(P::HuggingFace, "thinkingmachines/Inkling-Small".into()),
(P::Ollama, "nemotron-3-ultra".into()),
(P::NvidiaNim, "nvidia/nemotron-3-ultra-550b-a55b".into()),
(P::Kilo, "nvidia-nemotron-3-ultra-550b-a55b-free".into()),
],
@@ -232,11 +254,11 @@ impl Shortcut {
(P::HuggingFace, "zai-org/GLM-5.3".into()),
(P::CloudflareWorkersAi, "@cf/zai-org/glm-5.3".into()),
(P::Mistral, "zai-glm-5-3".into()),
(P::NvidiaNim, "moonshotai/kimi-k3".into()),
(P::HuggingFace, "moonshotai/Kimi-K3".into()),
(P::HuggingFace, "tencent/Hy4-preview".into()),
(P::HuggingFace, "XiaomiMiMo/MiMo-V2.6-Pro-RL".into()),
(P::Mistral, "mistral-large-4".into()),
(P::NvidiaNim, "moonshotai/kimi-k3".into()),
(P::HuggingFace, "moonshotai/Kimi-K3".into()),
(P::HuggingFace, "Qwen/Qwen3.8-2.4T-A95B".into()),
(P::VercelAiGateway, "xiaomi/mimo-v2.5-pro".into()),
(P::OpenRouter, "thinkingmachines/inkling:free".into()),
@@ -397,7 +419,6 @@ pub async fn create_chat_completion(
.build()
})
.collect(),
Provider::LiquidAi => unreachable!(),
Provider::Mistral => state
.app_args
.mistral_api_key
@@ -434,6 +455,18 @@ pub async fn create_chat_completion(
.build()
})
.collect(),
Provider::Ollama => state
.app_args
.ollama_cloud_api_key
.iter()
.cloned()
.map(|api_key| {
Upstream::builder()
.url("https://ollama.com/v1/chat/completions".parse().expect("TODO"))
.api_key(api_key)
.build()
})
.collect(),
Provider::OpenRouter => state
.app_args
.openrouter_api_key