Skip to content

fix: 修复 deepseek-stream.ts中 SEARCH 过滤问题 #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
2256593769 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −5
Open

fix: 修复 deepseek-stream.ts中 SEARCH 过滤问题 #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/main/proxy/adapters/deepseek-stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,10 @@ export class DeepSeekStreamHandler {
): void {
const cleanedValue = content.replace(/FINISHED/g, '')
// Always filter SEARCH keywords for thinking content
const filteredForSearch = cleanedValue.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
const shouldFilterSearch = this.webSearchEnabled || this.model.includes('search')
const filteredForSearch = shouldFilterSearch
? cleanedValue.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
: cleanedValue
const processedContent = isSearchSilentModel
? filteredForSearch.replace(/\[citation:(\d+)\]/g, '')
: filteredForSearch.replace(/\[citation:(\d+)\]/g, '[$1]')
Expand Down Expand Up @@ -352,6 +355,7 @@ export class DeepSeekStreamHandler {
const isThinkingModel = this.model.includes('think') || this.model.includes('r1') || !!this.reasoningEffort
const isFoldModel = (this.model.includes('fold') || this.model.includes('search') || this.webSearchEnabled) && !isThinkingModel
const isSearchSilentModel = this.model.includes('search-silent')
const isSearchModel = this.model.includes('search') || this.webSearchEnabled

return new Promise((resolve, reject) => {
let buffer = ''
Expand Down Expand Up @@ -386,7 +390,9 @@ export class DeepSeekStreamHandler {
for (const fragment of fragments) {
if (fragment.content) {
let cleanedFragment = fragment.content.replace(/FINISHED/g, '')
cleanedFragment = cleanedFragment.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
if (isSearchModel) {
cleanedFragment = cleanedFragment.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
}
if (fragment.type === 'THINK') {
accumulatedThinkingContent += cleanedFragment
} else if (fragment.type === 'ANSWER' || fragment.type === 'RESPONSE') {
Expand All @@ -400,7 +406,9 @@ export class DeepSeekStreamHandler {
for (const fragment of parsed.v) {
if (fragment.content) {
let cleanedFragment = fragment.content.replace(/FINISHED/g, '')
cleanedFragment = cleanedFragment.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
if (isSearchModel) {
cleanedFragment = cleanedFragment.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
}
if (fragment.type === 'THINK') {
currentPath = 'thinking'
accumulatedThinkingContent += cleanedFragment
Expand Down Expand Up @@ -437,7 +445,9 @@ export class DeepSeekStreamHandler {
}
if (Array.isArray(e.v)) {
let cleanedValue = e.v.map((v: any) => v.content).join('').replace(/FINISHED/g, '')
cleanedValue = cleanedValue.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
if (isSearchModel) {
cleanedValue = cleanedValue.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
}
if (currentPath === 'thinking') {
accumulatedThinkingContent += cleanedValue
} else if (currentPath === 'content') {
Expand All @@ -449,7 +459,9 @@ export class DeepSeekStreamHandler {

if (typeof parsed.v === 'string') {
let cleanedValue = parsed.v.replace(/FINISHED/g, '')
cleanedValue = cleanedValue.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
if (isSearchModel) {
cleanedValue = cleanedValue.replace(/^(SEARCH|WEB_SEARCH|SEARCHING)\s*/i, '')
}
if (currentPath === 'thinking') {
accumulatedThinkingContent += cleanedValue
} else if (currentPath === 'content') {
Expand Down