Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions crates/openfang-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1341,6 +1341,8 @@ fn provider_list() -> Vec<(&'static str, &'static str, &'static str, &'static st
"openrouter/anthropic/claude-sonnet-4",
"OpenRouter",
),
("z.ai", "ZHIPU_API_KEY", "glm-5-20250605", "Z.AI"),
("kimi2", "MOONSHOT_API_KEY", "kimi-k2.5-0711", "Kimi 2"),
]
}

Expand Down Expand Up @@ -4205,6 +4207,8 @@ fn provider_to_env_var(provider: &str) -> String {
"perplexity" => "PERPLEXITY_API_KEY".to_string(),
"cohere" => "COHERE_API_KEY".to_string(),
"xai" => "XAI_API_KEY".to_string(),
"moonshot" | "kimi" | "kimi2" => "MOONSHOT_API_KEY".to_string(),
"zai" | "z.ai" => "ZHIPU_API_KEY".to_string(),
"brave" => "BRAVE_API_KEY".to_string(),
"tavily" => "TAVILY_API_KEY".to_string(),
other => format!("{}_API_KEY", other.to_uppercase()),
Expand Down
16 changes: 16 additions & 0 deletions crates/openfang-cli/src/tui/screens/init_wizard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,22 @@ const PROVIDERS: &[ProviderInfo] = &[
needs_key: true,
hint: "fast inference",
},
ProviderInfo {
name: "z.ai",
display: "Z.AI",
env_var: "ZHIPU_API_KEY",
default_model: "glm-5-20250605",
needs_key: true,
hint: "Chinese models",
},
ProviderInfo {
name: "kimi2",
display: "Kimi 2",
env_var: "MOONSHOT_API_KEY",
default_model: "kimi-k2.5-0711",
needs_key: true,
hint: "long context",
},
ProviderInfo {
name: "qwen",
display: "Qwen (Alibaba)",
Expand Down
12 changes: 12 additions & 0 deletions crates/openfang-cli/src/tui/screens/wizard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,18 @@ const PROVIDERS: &[ProviderInfo] = &[
default_model: "moonshot-v1-128k",
needs_key: true,
},
ProviderInfo {
name: "kimi2",
env_var: "MOONSHOT_API_KEY",
default_model: "kimi-k2.5-0711",
needs_key: true,
},
ProviderInfo {
name: "z.ai",
env_var: "ZHIPU_API_KEY",
default_model: "glm-5-20250605",
needs_key: true,
},
ProviderInfo {
name: "zhipu",
env_var: "ZHIPU_API_KEY",
Expand Down
4 changes: 2 additions & 2 deletions crates/openfang-kernel/src/kernel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4746,8 +4746,8 @@ fn infer_provider_from_model(model: &str) -> Option<String> {
"minimax" | "gemini" | "anthropic" | "openai" | "groq" | "deepseek" | "mistral"
| "cohere" | "xai" | "ollama" | "together" | "fireworks" | "perplexity"
| "cerebras" | "sambanova" | "replicate" | "huggingface" | "ai21" | "codex"
| "claude-code" | "copilot" | "github-copilot" | "qwen" | "zhipu" | "zai" | "moonshot"
| "openrouter" | "volcengine" | "doubao" | "dashscope" => {
| "claude-code" | "copilot" | "github-copilot" | "qwen" | "zhipu" | "zai" | "z.ai"
| "moonshot" | "kimi" | "kimi2" | "openrouter" | "volcengine" | "doubao" | "dashscope" => {
return Some(prefix.to_string());
}
_ => {}
Expand Down
8 changes: 5 additions & 3 deletions crates/openfang-runtime/src/drivers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ fn provider_defaults(provider: &str) -> Option<ProviderDefaults> {
api_key_env: "",
key_required: false,
}),
"moonshot" | "kimi" => Some(ProviderDefaults {
"moonshot" | "kimi" | "kimi2" => Some(ProviderDefaults {
base_url: MOONSHOT_BASE_URL,
api_key_env: "MOONSHOT_API_KEY",
key_required: true,
Expand All @@ -175,7 +175,7 @@ fn provider_defaults(provider: &str) -> Option<ProviderDefaults> {
api_key_env: "ZHIPU_API_KEY",
key_required: true,
}),
"zai" => Some(ProviderDefaults {
"zai" | "z.ai" => Some(ProviderDefaults {
base_url: ZAI_BASE_URL,
api_key_env: "ZHIPU_API_KEY",
key_required: true,
Expand Down Expand Up @@ -423,6 +423,7 @@ pub fn known_providers() -> &'static [&'static str] {
"minimax",
"zhipu",
"zhipu_coding",
"zai",
"qianfan",
"volcengine",
"venice",
Expand Down Expand Up @@ -520,11 +521,12 @@ mod tests {
assert!(providers.contains(&"minimax"));
assert!(providers.contains(&"zhipu"));
assert!(providers.contains(&"zhipu_coding"));
assert!(providers.contains(&"zai"));
assert!(providers.contains(&"qianfan"));
assert!(providers.contains(&"volcengine"));
assert!(providers.contains(&"codex"));
assert!(providers.contains(&"claude-code"));
assert_eq!(providers.len(), 31);
assert_eq!(providers.len(), 32);
}

#[test]
Expand Down
31 changes: 31 additions & 0 deletions crates/openfang-runtime/src/model_catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2825,6 +2825,37 @@ fn builtin_models() -> Vec<ModelCatalogEntry> {
aliases: vec!["codegeex".into()],
},
// ══════════════════════════════════════════════════════════════
// Z.AI Coding / GLM Coding Models (2)
// ══════════════════════════════════════════════════════════════
ModelCatalogEntry {
id: "glm-5-coding".into(),
display_name: "GLM-5 Coding".into(),
provider: "zai_coding".into(),
tier: ModelTier::Frontier,
context_window: 131_072,
max_output_tokens: 16_384,
input_cost_per_m: 2.00,
output_cost_per_m: 8.00,
supports_tools: true,
supports_vision: false,
supports_streaming: true,
aliases: vec!["glm-5-code".into(), "glm-coding".into()],
},
ModelCatalogEntry {
id: "glm-4.7-coding".into(),
display_name: "GLM-4.7 Coding".into(),
provider: "zai_coding".into(),
tier: ModelTier::Smart,
context_window: 131_072,
max_output_tokens: 16_384,
input_cost_per_m: 1.50,
output_cost_per_m: 5.00,
supports_tools: true,
supports_vision: false,
supports_streaming: true,
aliases: vec!["glm-4.7-code".into()],
},
// ══════════════════════════════════════════════════════════════
// Moonshot / Kimi (5)
// ══════════════════════════════════════════════════════════════
ModelCatalogEntry {
Expand Down
2 changes: 1 addition & 1 deletion openfang.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# api_listen = "127.0.0.1:50051" # HTTP API bind address (use 0.0.0.0 for public)

[default_model]
provider = "anthropic" # "anthropic", "gemini", "openai", "groq", "ollama", etc.
provider = "anthropic" # "anthropic", "gemini", "openai", "groq", "z.ai", "kimi2", "ollama", etc.
model = "claude-sonnet-4-20250514" # Model identifier
api_key_env = "ANTHROPIC_API_KEY" # Environment variable holding API key
# base_url = "https://api.anthropic.com" # Optional: override API endpoint
Expand Down