Browse Source

fix

feature/add_provider_popi
weige 2 months ago
parent
commit
c7204034ea
  1. 5
      src/app/api/generate/providers/__tests__/popiserver.test.ts
  2. 2
      src/app/api/generate/providers/popiserver.ts
  3. 2
      src/app/api/llm/__tests__/route.test.ts
  4. 2
      src/app/api/llm/route.ts

5
src/app/api/generate/providers/__tests__/popiserver.test.ts

@ -88,6 +88,7 @@ describe("popiserver generation provider", () => {
subType: 203, subType: 203,
aiPlatform: "GATEWAY", aiPlatform: "GATEWAY",
origin: "canvas", origin: "canvas",
model: "",
aiModelId: 15, aiModelId: 15,
aiModelCode: "viduq2-pro", aiModelCode: "viduq2-pro",
aiModelCodeAlias: "viduq2-pro", aiModelCodeAlias: "viduq2-pro",
@ -134,6 +135,7 @@ describe("popiserver generation provider", () => {
const [, init] = vi.mocked(global.fetch).mock.calls[0]; const [, init] = vi.mocked(global.fetch).mock.calls[0];
expect(JSON.parse(String(init?.body))).toMatchObject({ expect(JSON.parse(String(init?.body))).toMatchObject({
chatPrompt: "比例:16:9\n清晰度:1K\n提示词:create a cinematic cat", chatPrompt: "比例:16:9\n清晰度:1K\n提示词:create a cinematic cat",
model: "",
ratio: "16:9", ratio: "16:9",
resolution: "1K", resolution: "1K",
}); });
@ -174,6 +176,7 @@ describe("popiserver generation provider", () => {
const [, init] = vi.mocked(global.fetch).mock.calls[0]; const [, init] = vi.mocked(global.fetch).mock.calls[0];
expect(JSON.parse(String(init?.body))).toMatchObject({ expect(JSON.parse(String(init?.body))).toMatchObject({
chatPrompt: "比例:9:16\n清晰度:2K\n提示词:create a clean product render", chatPrompt: "比例:9:16\n清晰度:2K\n提示词:create a clean product render",
model: "",
aspectRatio: "9:16", aspectRatio: "9:16",
resolution: "2K", resolution: "2K",
}); });
@ -196,7 +199,7 @@ describe("popiserver generation provider", () => {
expect(JSON.parse(String(init?.body))).toEqual({ expect(JSON.parse(String(init?.body))).toEqual({
type: 3, type: 3,
chatPrompt: "我是一个小白兔,白白的小白兔", chatPrompt: "我是一个小白兔,白白的小白兔",
model: "speech-2.8-hd", model: "",
origin: "canvas", origin: "canvas",
aiPlatform: "GATEWAY", aiPlatform: "GATEWAY",
aiModelId: 30, aiModelId: 30,

2
src/app/api/generate/providers/popiserver.ts

@ -454,7 +454,7 @@ function buildPopiTaskBody(input: GenerationInput, modelDetail: PopiAIModel | nu
const commonBody = { const commonBody = {
type, type,
chatPrompt: buildPopiChatPrompt(input.prompt, parameters, aspectRatio, modelCode, modelAlias), chatPrompt: buildPopiChatPrompt(input.prompt, parameters, aspectRatio, modelCode, modelAlias),
model: modelAlias, model: "",
origin: "canvas", origin: "canvas",
aiPlatform: "GATEWAY", aiPlatform: "GATEWAY",
aiModelId, aiModelId,

2
src/app/api/llm/__tests__/route.test.ts

@ -502,7 +502,7 @@ describe("/api/llm route", () => {
], ],
}, },
], ],
model: "kimi-k2.6", model: "",
stream: false, stream: false,
aiModelId: 31, aiModelId: 31,
}), }),

2
src/app/api/llm/route.ts

@ -352,7 +352,7 @@ async function generateWithPopiserver(
{ role: "system", content: "You are a helpful assistant." }, { role: "system", content: "You are a helpful assistant." },
{ role: "user", content }, { role: "user", content },
], ],
model: modelId, model: "",
stream: false, stream: false,
aiModelId: aiModelId ?? POPISERVER_LLM_MODEL_IDS[modelId], aiModelId: aiModelId ?? POPISERVER_LLM_MODEL_IDS[modelId],
}), }),

Loading…
Cancel
Save