fix: #1124 mask model config does not works

This commit is contained in:
Yidadaa
2023-05-01 23:37:02 +08:00
parent b2fc7d476a
commit 9f3188fe45
3 changed files with 26 additions and 33 deletions

View File

@@ -14,9 +14,8 @@ const TIME_OUT_MS = 60000;
const makeRequestParam = (
messages: Message[],
options?: {
filterBot?: boolean;
stream?: boolean;
model?: ModelType;
overrideModel?: ModelType;
},
): ChatRequest => {
let sendMessages = messages.map((v) => ({
@@ -24,18 +23,14 @@ const makeRequestParam = (
content: v.content,
}));
if (options?.filterBot) {
sendMessages = sendMessages.filter((m) => m.role !== "assistant");
}
const modelConfig = {
...useAppConfig.getState().modelConfig,
...useChatStore.getState().currentSession().mask.modelConfig,
};
// override model config
if (options?.model) {
modelConfig.model = options.model;
if (options?.overrideModel) {
modelConfig.model = options.overrideModel;
}
return {
@@ -82,8 +77,7 @@ export async function requestChat(
},
) {
const req: ChatRequest = makeRequestParam(messages, {
filterBot: true,
model: options?.model,
overrideModel: options?.model,
});
const res = await requestOpenaiClient("v1/chat/completions")(req);
@@ -149,9 +143,8 @@ export async function requestUsage() {
export async function requestChatStream(
messages: Message[],
options?: {
filterBot?: boolean;
modelConfig?: ModelConfig;
model?: ModelType;
overrideModel?: ModelType;
onMessage: (message: string, done: boolean) => void;
onError: (error: Error, statusCode?: number) => void;
onController?: (controller: AbortController) => void;
@@ -159,8 +152,7 @@ export async function requestChatStream(
) {
const req = makeRequestParam(messages, {
stream: true,
filterBot: options?.filterBot,
model: options?.model,
overrideModel: options?.overrideModel,
});
console.log("[Request] ", req);