mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-10 11:39:50 +08:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
98e91d33dc |
@@ -192,7 +192,7 @@ MODELSCOPE_BASE_URL=https://your-custom-endpoint
|
|||||||
可选的自定义 URL:
|
可选的自定义 URL:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
OLLAMA_BASE_URL=http://localhost:11434
|
OLLAMA_BASE_URL=http://localhost:11434/api
|
||||||
```
|
```
|
||||||
|
|
||||||
### Vercel AI Gateway
|
### Vercel AI Gateway
|
||||||
|
|||||||
@@ -194,7 +194,7 @@ AI_MODEL=llama3.2
|
|||||||
Optional custom URL:
|
Optional custom URL:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
OLLAMA_BASE_URL=http://localhost:11434
|
OLLAMA_BASE_URL=http://localhost:11434/api
|
||||||
```
|
```
|
||||||
|
|
||||||
### ModelScope
|
### ModelScope
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ AI_MODEL=llama3.2
|
|||||||
任意のカスタム URL:
|
任意のカスタム URL:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
OLLAMA_BASE_URL=http://localhost:11434
|
OLLAMA_BASE_URL=http://localhost:11434/api
|
||||||
```
|
```
|
||||||
|
|
||||||
### ModelScope
|
### ModelScope
|
||||||
|
|||||||
+1
-1
@@ -70,7 +70,7 @@ AI_MODEL=global.anthropic.claude-sonnet-4-5-20250929-v1:0
|
|||||||
# AZURE_REASONING_SUMMARY=detailed
|
# AZURE_REASONING_SUMMARY=detailed
|
||||||
|
|
||||||
# Ollama Configuration (Local or Cloud)
|
# Ollama Configuration (Local or Cloud)
|
||||||
# OLLAMA_BASE_URL=https://ollama.com/api # Optional: Ollama Cloud; defaults to local Ollama (http://127.0.0.1:11434)
|
# OLLAMA_BASE_URL=https://ollama.com/api # Optional: Ollama Cloud; defaults to local Ollama (http://127.0.0.1:11434/api)
|
||||||
# OLLAMA_API_KEY=your-ollama-cloud-api-key # Optional: For Ollama Cloud or authenticated remote instances
|
# OLLAMA_API_KEY=your-ollama-cloud-api-key # Optional: For Ollama Cloud or authenticated remote instances
|
||||||
# OLLAMA_ENABLE_THINKING=true # Optional: Enable thinking for models that support it (e.g., qwen3)
|
# OLLAMA_ENABLE_THINKING=true # Optional: Enable thinking for models that support it (e.g., qwen3)
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -25,6 +25,7 @@ import { getEnvFallback } from "@/lib/admin/settings"
|
|||||||
import { isPrivateUrl, redirectGuardedFetch } from "@/lib/ssrf-protection"
|
import { isPrivateUrl, redirectGuardedFetch } from "@/lib/ssrf-protection"
|
||||||
import {
|
import {
|
||||||
normalizeBaseUrl,
|
normalizeBaseUrl,
|
||||||
|
ollamaApiUrl,
|
||||||
PROVIDER_INFO,
|
PROVIDER_INFO,
|
||||||
type ProviderName,
|
type ProviderName,
|
||||||
} from "@/lib/types/model-config"
|
} from "@/lib/types/model-config"
|
||||||
@@ -1025,7 +1026,7 @@ export function getAIModel(clientOverrides?: ClientOverrides): ModelConfig {
|
|||||||
? PROVIDER_INFO.ollama.defaultBaseUrl
|
? PROVIDER_INFO.ollama.defaultBaseUrl
|
||||||
: resolveBaseUrlEnv(overrides, "OLLAMA_BASE_URL"))
|
: resolveBaseUrlEnv(overrides, "OLLAMA_BASE_URL"))
|
||||||
model = createOllama({
|
model = createOllama({
|
||||||
...(baseURL && { baseURL }),
|
...(baseURL && { baseURL: ollamaApiUrl(baseURL) }),
|
||||||
...(apiKey && {
|
...(apiKey && {
|
||||||
headers: { Authorization: `Bearer ${apiKey}` },
|
headers: { Authorization: `Bearer ${apiKey}` },
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { getModelInfo } from "@/lib/model-catalog"
|
|||||||
import { readLimitedBody } from "@/lib/read-limited-body"
|
import { readLimitedBody } from "@/lib/read-limited-body"
|
||||||
import {
|
import {
|
||||||
normalizeBaseUrl,
|
normalizeBaseUrl,
|
||||||
|
ollamaApiUrl,
|
||||||
PROVIDER_INFO,
|
PROVIDER_INFO,
|
||||||
type ProviderName,
|
type ProviderName,
|
||||||
} from "@/lib/types/model-config"
|
} from "@/lib/types/model-config"
|
||||||
@@ -200,8 +201,11 @@ export async function listProviderModels(
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
case "ollama": {
|
case "ollama": {
|
||||||
const api = base.endsWith("/api") ? base : `${base}/api`
|
const data = await getJson(
|
||||||
const data = await getJson(`${api}/tags`, bearer, fetchFn)
|
`${ollamaApiUrl(base)}/tags`,
|
||||||
|
bearer,
|
||||||
|
fetchFn,
|
||||||
|
)
|
||||||
models = (data.models ?? []).map((m: { name: string }) => ({
|
models = (data.models ?? []).map((m: { name: string }) => ({
|
||||||
id: m.name,
|
id: m.name,
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -622,6 +622,15 @@ export function normalizeBaseUrl(url: string): string {
|
|||||||
.replace(/\/(?:chat\/completions|completions|messages|responses)$/, "")
|
.replace(/\/(?:chat\/completions|completions|messages|responses)$/, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ollama's native API root, which the SDK appends /chat to and the model
|
||||||
|
* list /tags. Users often enter the server address ("http://localhost:11434")
|
||||||
|
* or its OpenAI-compatible one (".../v1"); both get /api.
|
||||||
|
*/
|
||||||
|
export function ollamaApiUrl(baseUrl: string): string {
|
||||||
|
return `${normalizeBaseUrl(baseUrl).replace(/\/(?:api|v1)$/, "")}/api`
|
||||||
|
}
|
||||||
|
|
||||||
/** Where a chat request goes for a base URL, or null when the SDK decides */
|
/** Where a chat request goes for a base URL, or null when the SDK decides */
|
||||||
export function chatRequestUrl(
|
export function chatRequestUrl(
|
||||||
provider: ProviderName,
|
provider: ProviderName,
|
||||||
@@ -630,6 +639,7 @@ export function chatRequestUrl(
|
|||||||
const url = normalizeBaseUrl(baseUrl)
|
const url = normalizeBaseUrl(baseUrl)
|
||||||
if (!url) return null
|
if (!url) return null
|
||||||
if (provider === "anthropic") return `${url}/messages`
|
if (provider === "anthropic") return `${url}/messages`
|
||||||
|
if (provider === "ollama") return `${ollamaApiUrl(url)}/chat`
|
||||||
// These SDKs build their own paths (or, for MiniMax, pick the protocol
|
// These SDKs build their own paths (or, for MiniMax, pick the protocol
|
||||||
// from the URL)
|
// from the URL)
|
||||||
const ownPaths: ProviderName[] = [
|
const ownPaths: ProviderName[] = [
|
||||||
@@ -637,7 +647,6 @@ export function chatRequestUrl(
|
|||||||
"vertexai",
|
"vertexai",
|
||||||
"azure",
|
"azure",
|
||||||
"bedrock",
|
"bedrock",
|
||||||
"ollama",
|
|
||||||
"gateway",
|
"gateway",
|
||||||
"minimax",
|
"minimax",
|
||||||
"edgeone",
|
"edgeone",
|
||||||
|
|||||||
@@ -434,7 +434,7 @@ describe("Ollama API key security", () => {
|
|||||||
|
|
||||||
expect(createOllamaMock).toHaveBeenCalledWith(
|
expect(createOllamaMock).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
baseURL: "https://my-ollama.com",
|
baseURL: "https://my-ollama.com/api",
|
||||||
headers: { Authorization: "Bearer client-key" },
|
headers: { Authorization: "Bearer client-key" },
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
@@ -448,7 +448,7 @@ describe("Ollama API key security", () => {
|
|||||||
|
|
||||||
expect(createOllamaMock).toHaveBeenCalledWith(
|
expect(createOllamaMock).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
baseURL: "https://cloud.ollama.com",
|
baseURL: "https://cloud.ollama.com/api",
|
||||||
headers: { Authorization: "Bearer server-key" },
|
headers: { Authorization: "Bearer server-key" },
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
@@ -483,7 +483,24 @@ describe("Ollama API key security", () => {
|
|||||||
|
|
||||||
expect(createOllamaMock).toHaveBeenCalledTimes(1)
|
expect(createOllamaMock).toHaveBeenCalledTimes(1)
|
||||||
const callArgs = createOllamaMock.mock.calls[0][0]
|
const callArgs = createOllamaMock.mock.calls[0][0]
|
||||||
expect(callArgs.baseURL).toBe("https://my-ollama.com")
|
expect(callArgs.baseURL).toBe("https://my-ollama.com/api")
|
||||||
expect(callArgs).not.toHaveProperty("headers")
|
expect(callArgs).not.toHaveProperty("headers")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("sends chat to Ollama's /api for a server address or a /v1 URL", () => {
|
||||||
|
delete process.env.OLLAMA_API_KEY
|
||||||
|
|
||||||
|
for (const baseUrl of [
|
||||||
|
"http://localhost:11434",
|
||||||
|
"http://localhost:11434/",
|
||||||
|
"http://localhost:11434/v1",
|
||||||
|
"http://localhost:11434/api",
|
||||||
|
]) {
|
||||||
|
createOllamaMock.mockClear()
|
||||||
|
getAIModel({ provider: "ollama", baseUrl, modelId: "llama3.2" })
|
||||||
|
expect(createOllamaMock.mock.calls[0][0].baseURL).toBe(
|
||||||
|
"http://localhost:11434/api",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
import { describe, expect, it } from "vitest"
|
import { describe, expect, it } from "vitest"
|
||||||
import { chatRequestUrl, normalizeBaseUrl } from "@/lib/types/model-config"
|
import {
|
||||||
|
chatRequestUrl,
|
||||||
|
normalizeBaseUrl,
|
||||||
|
ollamaApiUrl,
|
||||||
|
} from "@/lib/types/model-config"
|
||||||
|
|
||||||
describe("normalizeBaseUrl", () => {
|
describe("normalizeBaseUrl", () => {
|
||||||
it("drops spaces, trailing slashes and a pasted endpoint path", () => {
|
it("drops spaces, trailing slashes and a pasted endpoint path", () => {
|
||||||
@@ -32,6 +36,9 @@ describe("chatRequestUrl", () => {
|
|||||||
expect(
|
expect(
|
||||||
chatRequestUrl("anthropic", "https://proxy.example.com/v1"),
|
chatRequestUrl("anthropic", "https://proxy.example.com/v1"),
|
||||||
).toBe("https://proxy.example.com/v1/messages")
|
).toBe("https://proxy.example.com/v1/messages")
|
||||||
|
expect(chatRequestUrl("ollama", "http://localhost:11434")).toBe(
|
||||||
|
"http://localhost:11434/api/chat",
|
||||||
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
it("stays out of the way for SDKs that build their own paths", () => {
|
it("stays out of the way for SDKs that build their own paths", () => {
|
||||||
@@ -40,3 +47,21 @@ describe("chatRequestUrl", () => {
|
|||||||
expect(chatRequestUrl("glm", " ")).toBeNull()
|
expect(chatRequestUrl("glm", " ")).toBeNull()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("ollamaApiUrl", () => {
|
||||||
|
it("points at Ollama's /api whatever form the address takes", () => {
|
||||||
|
for (const url of [
|
||||||
|
"http://localhost:11434",
|
||||||
|
"http://localhost:11434/",
|
||||||
|
"http://localhost:11434/api",
|
||||||
|
"http://localhost:11434/api/",
|
||||||
|
"http://localhost:11434/v1",
|
||||||
|
"http://localhost:11434/v1/chat/completions",
|
||||||
|
]) {
|
||||||
|
expect(ollamaApiUrl(url)).toBe("http://localhost:11434/api")
|
||||||
|
}
|
||||||
|
expect(ollamaApiUrl("https://ollama.com/api")).toBe(
|
||||||
|
"https://ollama.com/api",
|
||||||
|
)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user