luulam/9router
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: normalize Ollama Local provider input (#955)

Browse Source
This commit is contained in:
Aqil Aziz
2026-05-09 10:05:22 +07:00
committed by GitHub
parent 9080336c5d
commit 0f0c7ede46
3 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/api/providers/route.js
View File

@@ -7,7 +7,8 @@ import {
getProxyPoolById,
} from "@/models";
import { APIKEY_PROVIDERS } from "@/shared/constants/config";
import { FREE_TIER_PROVIDERS, WEB_COOKIE_PROVIDERS, isOpenAICompatibleProvider, isAnthropicCompatibleProvider, isCustomEmbeddingProvider } from "@/shared/constants/providers";
import { AI_PROVIDERS, FREE_TIER_PROVIDERS, WEB_COOKIE_PROVIDERS, isOpenAICompatibleProvider, isAnthropicCompatibleProvider, isCustomEmbeddingProvider } from "@/shared/constants/providers";
import { normalizeProviderId, normalizeProviderSpecificData } from "@/lib/providerNormalization";
export const dynamic = "force-dynamic";
@@ -86,7 +87,8 @@ export async function GET() {
export async function POST(request) {
try {
const body = await request.json();
const { provider, apiKey, name, priority, globalPriority, defaultModel, testStatus } = body;
const provider = normalizeProviderId(body.provider);
const { apiKey, name, displayName, priority, globalPriority, defaultModel, testStatus } = body;
const proxyConfig = normalizeProxyConfig(body);
if (proxyConfig.error) {
return NextResponse.json({ error: proxyConfig.error }, { status: 400 });
@@ -113,11 +115,12 @@ export async function POST(request) {
if (!apiKey && provider !== "ollama-local") {
return NextResponse.json({ error: `${isWebCookieProvider ? "Cookie value" : "API Key"} is required` }, { status: 400 });
}
if (!name) {
const connectionName = name || displayName || AI_PROVIDERS[provider]?.name;
if (!connectionName) {
return NextResponse.json({ error: "Name is required" }, { status: 400 });
}
let providerSpecificData = body.providerSpecificData || null;
let providerSpecificData = normalizeProviderSpecificData(provider, body, body.providerSpecificData);
if (isOpenAICompatibleProvider(provider)) {
const node = await getProviderNodeById(provider);
@@ -184,7 +187,7 @@ export async function POST(request) {
const newConnection = await createProviderConnection({
provider,
authType: isWebCookieProvider ? "cookie" : "apikey",
name,
name: connectionName,
apiKey: apiKey || "",
priority: priority || 1,
globalPriority: globalPriority || null,

4
src/app/api/providers/validate/route.js
View File

@@ -5,6 +5,7 @@ import { getDefaultModel } from "open-sse/config/providerModels.js";
import { resolveOllamaLocalHost, PROVIDERS } from "open-sse/config/providers.js";
import { openaiToCommandCode } from "open-sse/translator/request/openai-to-commandcode.js";
import { PROVIDER_ENDPOINTS } from "@/shared/constants/config";
import { normalizeProviderId } from "@/lib/providerNormalization";
// Probe a webSearch/webFetch provider using its searchConfig/fetchConfig.
// Returns true if API key is accepted (status !== 401 && !== 403).
@@ -84,7 +85,8 @@ async function probeMediaProvider(provider, apiKey) {
export async function POST(request) {
try {
const body = await request.json();
const { provider, apiKey, providerSpecificData } = body;
const provider = normalizeProviderId(body.provider);
const { apiKey, providerSpecificData } = body;
const isNoAuth = AI_PROVIDERS[provider]?.noAuth === true;
if (!provider || (!apiKey && provider !== "ollama-local" && !isNoAuth)) {