Skip to content

Commit

Permalink
feat: Remove reasoning_contentfor DeepSeek API messages
Browse files Browse the repository at this point in the history
  • Loading branch information
Kadxy committed Jan 30, 2025
1 parent c449737 commit dabb7c7
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 8 deletions.
14 changes: 11 additions & 3 deletions app/client/platforms/deepseek.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ import {
SpeechOptions,
} from "../api";
import { getClientConfig } from "@/app/config/client";
import { getMessageTextContent } from "@/app/utils";
import {
getMessageTextContent,
getMessageTextContentWithoutThinking,
} from "@/app/utils";
import { RequestPayload } from "./openai";
import { fetch } from "@/app/utils/stream";

Expand Down Expand Up @@ -67,8 +70,13 @@ export class DeepSeekApi implements LLMApi {
async chat(options: ChatOptions) {
const messages: ChatOptions["messages"] = [];
for (const v of options.messages) {
const content = getMessageTextContent(v);
messages.push({ role: v.role, content });
if (v.role === "assistant") {
const content = getMessageTextContentWithoutThinking(v);
messages.push({ role: v.role, content });
} else {
const content = getMessageTextContent(v);
messages.push({ role: v.role, content });
}
}

const modelConfig = {
Expand Down
30 changes: 25 additions & 5 deletions app/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export function trimTopic(topic: string) {
return (
topic
// fix for gemini
.replace(/^["*]+|["*]+$/g, "")
.replace(/[",.!?*]*$/, "")
.replace(/^["""*]+|[""*]+$/g, "")
.replace(/["""",.!?*]*$/, "")
);
}

Expand Down Expand Up @@ -241,6 +241,28 @@ export function getMessageTextContent(message: RequestMessage) {
return "";
}

export function getMessageTextContentWithoutThinking(message: RequestMessage) {
let content = "";

if (typeof message.content === "string") {
content = message.content;
} else {
for (const c of message.content) {
if (c.type === "text") {
content = c.text ?? "";
break;
}
}
}

// Filter out thinking lines (starting with "> ")
return content
.split("\n")
.filter((line) => !line.startsWith("> ") && line.trim() !== "")
.join("\n")
.trim();
}

export function getMessageImages(message: RequestMessage): string[] {
if (typeof message.content === "string") {
return [];
Expand All @@ -256,9 +278,7 @@ export function getMessageImages(message: RequestMessage): string[] {

export function isVisionModel(model: string) {
const visionModels = useAccessStore.getState().visionModels;
const envVisionModels = visionModels
?.split(",")
.map((m) => m.trim());
const envVisionModels = visionModels?.split(",").map((m) => m.trim());
if (envVisionModels?.includes(model)) {
return true;
}
Expand Down

0 comments on commit dabb7c7

Please sign in to comment.