Skip to content

Commit b5ba2de

Browse files
committed
fix: remove old url extract (#1260)
1 parent e6640b1 commit b5ba2de

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed

src/main/presenter/agentPresenter/message/messageBuilder.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { ModelType } from '@shared/model'
55
import { CONVERSATION, ModelConfig, SearchResult, ChatMessage } from '@shared/presenter'
66
import type { MCPToolDefinition } from '@shared/presenter'
77

8-
import { ContentEnricher } from '../../content/contentEnricher'
98
import { modelCapabilities } from '../../configPresenter/modelCapabilities'
109
import { enhanceSystemPromptWithDateTime } from '../utility/promptEnhancer'
1110
import { ToolCallCenter } from '../tool/toolCallCenter'
@@ -33,7 +32,6 @@ export interface PreparePromptContentParams {
3332
userContent: string
3433
contextMessages: Message[]
3534
searchResults: SearchResult[] | null
36-
urlResults: SearchResult[]
3735
userMessage: Message
3836
vision: boolean
3937
imageFiles: MessageFile[]
@@ -63,7 +61,6 @@ export async function preparePromptContent({
6361
userContent,
6462
contextMessages,
6563
searchResults: _searchResults,
66-
urlResults,
6764
userMessage,
6865
vision,
6966
imageFiles,
@@ -84,10 +81,6 @@ export async function preparePromptContent({
8481
const isAgentMode = chatMode === 'agent'
8582

8683
const isImageGeneration = modelType === ModelType.ImageGeneration
87-
const enrichedUserMessage =
88-
!isImageGeneration && urlResults.length > 0
89-
? '\n\n' + ContentEnricher.enrichUserMessageWithUrlContent(userContent, urlResults)
90-
: ''
9184

9285
const finalSystemPrompt = enhanceSystemPromptWithDateTime(systemPrompt, {
9386
isImageGeneration,
@@ -116,7 +109,7 @@ export async function preparePromptContent({
116109

117110
const systemPromptTokens =
118111
!isImageGeneration && finalSystemPrompt ? approximateTokenSize(finalSystemPrompt) : 0
119-
const userMessageTokens = approximateTokenSize(userContent + enrichedUserMessage)
112+
const userMessageTokens = approximateTokenSize(userContent)
120113
const toolDefinitionsTokens = toolDefinitions.reduce((acc, tool) => {
121114
return acc + approximateTokenSize(JSON.stringify(tool))
122115
}, 0)
@@ -137,7 +130,7 @@ export async function preparePromptContent({
137130
isImageGeneration ? '' : finalSystemPrompt,
138131
artifacts,
139132
userContent,
140-
enrichedUserMessage,
133+
'',
141134
imageFiles,
142135
vision,
143136
supportsFunctionCall

src/main/presenter/agentPresenter/streaming/streamGenerationHandler.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ import type {
99
UserMessageContent
1010
} from '@shared/chat'
1111
import type { CONVERSATION, MCPToolResponse, SearchResult } from '@shared/presenter'
12-
import { ContentEnricher } from '../../content/contentEnricher'
13-
import {
14-
buildUserMessageContext,
15-
formatUserMessageContent,
16-
getNormalizedUserMessageText
17-
} from '../message/messageFormatter'
12+
import { buildUserMessageContext, formatUserMessageContent } from '../message/messageFormatter'
1813
import { preparePromptContent } from '../message/messageBuilder'
1914
import type { GeneratingMessageState } from './types'
2015
import { presenter } from '@/presenter'
@@ -89,7 +84,7 @@ export class StreamGenerationHandler extends BaseHandler {
8984

9085
this.throwIfCancelled(state.message.id)
9186

92-
const { userContent, urlResults, imageFiles } = await this.processUserMessageContent(
87+
const { userContent, imageFiles } = await this.processUserMessageContent(
9388
userMessage as UserMessage
9489
)
9590

@@ -119,7 +114,6 @@ export class StreamGenerationHandler extends BaseHandler {
119114
userContent,
120115
contextMessages,
121116
searchResults,
122-
urlResults,
123117
userMessage,
124118
vision: Boolean(modelConfig?.vision),
125119
imageFiles: modelConfig?.vision ? imageFiles : [],
@@ -269,7 +263,6 @@ export class StreamGenerationHandler extends BaseHandler {
269263
userContent: 'continue',
270264
contextMessages,
271265
searchResults: null,
272-
urlResults: [],
273266
userMessage,
274267
vision: false,
275268
imageFiles: [],
@@ -475,10 +468,8 @@ export class StreamGenerationHandler extends BaseHandler {
475468

476469
async processUserMessageContent(
477470
userMessage: UserMessage
478-
): Promise<{ userContent: string; urlResults: SearchResult[]; imageFiles: MessageFile[] }> {
471+
): Promise<{ userContent: string; imageFiles: MessageFile[] }> {
479472
const userContent = buildUserMessageContext(userMessage.content)
480-
const normalizedText = getNormalizedUserMessageText(userMessage.content)
481-
const urlResults = await ContentEnricher.extractAndEnrichUrls(normalizedText)
482473

483474
const imageFiles =
484475
userMessage.content.files?.filter((file) => {
@@ -488,7 +479,7 @@ export class StreamGenerationHandler extends BaseHandler {
488479
return isImage
489480
}) || []
490481

491-
return { userContent, urlResults, imageFiles }
482+
return { userContent, imageFiles }
492483
}
493484

494485
async updateGenerationState(state: GeneratingMessageState, promptTokens: number): Promise<void> {

src/main/presenter/agentPresenter/utility/utilityHandler.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ export class UtilityHandler extends BaseHandler {
366366
userContent,
367367
contextMessages,
368368
searchResults: null,
369-
urlResults: [],
370369
userMessage,
371370
vision: visionEnabled,
372371
imageFiles: [],

0 commit comments

Comments
 (0)