Skip to content

fix(getItems): Fix agent getItems queries #1090

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

Merged
merged 2 commits into from
Oct 13, 2025
Merged

fix(getItems): Fix agent getItems queries #1090

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a575e
fix(getItems): fix agent getItems queries
junaid-shirur Oct 10, 2025
447b147
fix(getItems): fix type defination
junaid-shirur Oct 11, 2025
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
161 changes: 107 additions & 54 deletions server/api/chat/chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ async function* generateIterativeTimeFilterAndQueryRewrite(
collectionFileIds?: string[]
}> = []
let channelIds: string[] = []
let selectedItem = {}
let selectedItem = {} as Record<Apps, string[]>
if (agentPrompt) {
let agentPromptData: { appIntegrations?: string[] } = {}
try {
Expand Down Expand Up @@ -1275,7 +1275,9 @@ async function* generateIterativeTimeFilterAndQueryRewrite(
collectionFolderIds.push(itemId.replace(/^clfd[-_]/, ""))
} else if (itemId.startsWith("clf-")) {
// Collection file - remove clf- prefix
collectionFileIds.push(...expandSheetIds(itemId.replace(/^clf[-_]/, "")))
collectionFileIds.push(
...expandSheetIds(itemId.replace(/^clf[-_]/, "")),
)
}
}

Expand Down Expand Up @@ -1614,7 +1616,13 @@ async function* generateIterativeTimeFilterAndQueryRewrite(
)
totalResultsSpan?.end()
const contextSpan = querySpan?.startSpan("build_context")
const initialContext = await buildContext(totalResults, maxSummaryCount, userMetadata, 0, message)
const initialContext = await buildContext(
totalResults,
maxSummaryCount,
userMetadata,
0,
message,
)

const { imageFileNames } = extractImageFileNames(
initialContext,
Expand Down Expand Up @@ -1964,32 +1972,45 @@ async function* generateAnswerFromGivenContext(
combinedSearchResponse.push(...results.root.children)
}
} else {
const collectionFileIds = fileIds.filter((fid) => fid.startsWith("clf-") || fid.startsWith("att_"))
const nonCollectionFileIds = fileIds.filter((fid) => !fid.startsWith("clf-") && !fid.startsWith("att_"))
if(nonCollectionFileIds && nonCollectionFileIds.length > 0) {
results = await searchVespaInFiles(builtUserQuery, email, nonCollectionFileIds, {
const collectionFileIds = fileIds.filter(
(fid) => fid.startsWith("clf-") || fid.startsWith("att_"),
)
const nonCollectionFileIds = fileIds.filter(
(fid) => !fid.startsWith("clf-") && !fid.startsWith("att_"),
)
if (nonCollectionFileIds && nonCollectionFileIds.length > 0) {
results = await searchVespaInFiles(
builtUserQuery,
email,
nonCollectionFileIds,
{
limit: fileIds?.length,
alpha: userAlpha,
rankProfile: SearchModes.attachmentRank,
})
},
)
if (results.root.children) {
combinedSearchResponse.push(...results.root.children)
}
}
if (collectionFileIds && collectionFileIds.length > 0) {
results = await searchCollectionRAG(messageText, collectionFileIds, undefined)
results = await searchCollectionRAG(
messageText,
collectionFileIds,
undefined,
)
if (results.root.children) {
combinedSearchResponse.push(...results.root.children)
}
}
}

// Apply intelligent chunk selection based on document relevance and chunk scores
chunksPerDocument = await getChunkCountPerDoc(
combinedSearchResponse,
targetChunks,
email,
fileSearchSpan
fileSearchSpan,
)
fileSearchSpan?.end()
}
Expand Down Expand Up @@ -2196,17 +2217,17 @@ async function* generateAnswerFromGivenContext(
generateAnswerSpan?.end()
return
} else if (
// If no answer found, exit and yield nothing related to selected context found
!answer
) {
const noAnswerSpan = generateAnswerSpan?.startSpan("no_answer_response")
yield {
text: "From the selected context, I could not find any information to answer it, please change your query",
}
noAnswerSpan?.end()
generateAnswerSpan?.end()
return
// If no answer found, exit and yield nothing related to selected context found
!answer
) {
const noAnswerSpan = generateAnswerSpan?.startSpan("no_answer_response")
yield {
text: "From the selected context, I could not find any information to answer it, please change your query",
}
noAnswerSpan?.end()
generateAnswerSpan?.end()
return
}
if (config.isReasoning && userRequestsReasoning) {
previousResultsLength += combinedSearchResponse?.length || 0
}
Expand Down Expand Up @@ -2373,7 +2394,7 @@ async function* generatePointQueryTimeExpansion(
collectionFolderIds?: string[]
collectionFileIds?: string[]
}> = []
let selectedItem = {}
let selectedItem = {} as Record<Apps, string[]>
if (agentPrompt) {
let agentPromptData: { appIntegrations?: string[] } = {}
try {
Expand Down Expand Up @@ -2476,7 +2497,9 @@ async function* generatePointQueryTimeExpansion(
collectionFolderIds.push(itemId.replace(/^clfd[-_]/, ""))
} else if (itemId.startsWith("clf-")) {
// Collection file - remove clf- prefix
collectionFileIds.push(...expandSheetIds(itemId.replace(/^clf[-_]/, "")))
collectionFileIds.push(
...expandSheetIds(itemId.replace(/^clf[-_]/, "")),
)
}
}

Expand Down Expand Up @@ -2967,7 +2990,7 @@ async function* generateMetadataQueryAnswer(
collectionFolderIds?: string[]
collectionFileIds?: string[]
}> = []
let selectedItem = {}
let selectedItem: Record<Apps, string[]> = {} as Record<Apps, string[]>
if (agentPrompt) {
let agentPromptData: { appIntegrations?: string[] } = {}
try {
Expand Down Expand Up @@ -3024,6 +3047,10 @@ async function* generateMetadataQueryAnswer(
if (!agentAppEnums.includes(Apps.Slack))
agentAppEnums.push(Apps.Slack)
break
case Apps.KnowledgeBase.toLowerCase():
if (!agentAppEnums.includes(Apps.Slack))
agentAppEnums.push(Apps.Slack)
break
default:
loggerWithChild({ email: email }).warn(
`Unknown integration type in agent prompt: ${integration}`,
Expand Down Expand Up @@ -3069,7 +3096,9 @@ async function* generateMetadataQueryAnswer(
collectionFolderIds.push(itemId.replace(/^clfd[-_]/, ""))
} else if (itemId.startsWith("clf-")) {
// Collection file - remove clf- prefix
collectionFileIds.push(...expandSheetIds(itemId.replace(/^clf[-_]/, "")))
collectionFileIds.push(
...expandSheetIds(itemId.replace(/^clf[-_]/, "")),
)
}
}

Expand Down Expand Up @@ -3122,11 +3151,19 @@ async function* generateMetadataQueryAnswer(
)
let schema: VespaSchema[] | null = null
if (!entities?.length && apps?.length) {
schema = apps.map((app) => appToSchemaMapper(app)).filter((s) => s !== null)
schema = [
...new Set(
apps.map((app) => appToSchemaMapper(app)).filter((s) => s !== null),
),
]
} else if (entities?.length) {
schema = entities
.map((entity) => entityToSchemaMapper(entity))
.filter((s) => s !== null)
schema = [
...new Set(
entities
.map((entity) => entityToSchemaMapper(entity))
.filter((s) => s !== null),
),
]
}

let items: VespaSearchResult[] = []
Expand Down Expand Up @@ -3211,6 +3248,7 @@ async function* generateMetadataQueryAnswer(
dataSourceIds: agentSpecificDataSourceIds,
channelIds: channelIds,
selectedItem: selectedItem,
collectionSelections: agentSpecificCollectionSelections,
},
)
}
Expand Down Expand Up @@ -3239,7 +3277,10 @@ async function* generateMetadataQueryAnswer(
),
)

pageSpan?.setAttribute("context", await buildContext(items, 20, userMetadata, 0, input))
pageSpan?.setAttribute(
"context",
await buildContext(items, 20, userMetadata, 0, input),
)
if (!items.length) {
loggerWithChild({ email: email }).info(
`No documents found on iteration ${iteration}${
Expand Down Expand Up @@ -3347,29 +3388,28 @@ async function* generateMetadataQueryAnswer(
items = []
if (agentPrompt) {
const agentApps = agentAppEnums.filter((a) => apps?.includes(a))
if (agentSpecificCollectionSelections.length) {
agentApps.push(Apps.KnowledgeBase)
schema.push(KbItemsSchema)
}
if (agentApps.length) {
// Hot fix added due to integration issue with Google Drive agent
// we fix this in the short term by blocking all Google Drive agent queries
// to go through getItems
if(agentApps.includes(Apps.GoogleDrive)){
yield { text: METADATA_FALLBACK_TO_RAG }
return
}
loggerWithChild({ email: email }).info(
`[GetItems] Calling getItems with agent prompt - Schema: ${schema}, App: ${apps?.map((a) => a).join(", ")}, Entity: ${entities?.map((e) => e).join(", ")}, Intent: ${JSON.stringify(classification.filters.intent)}`,
`[GetItems] Calling getItems with agent prompt - Schema: ${schema}, App: ${agentApps?.map((a) => a).join(", ")}, Entity: ${entities?.map((e) => e).join(", ")}, Intent: ${JSON.stringify(classification.filters.intent)}`,
)
const channelIds = getChannelIdsFromAgentPrompt(agentPrompt)
searchResults = await getItems({
email,
schema,
app: apps ?? null,
app: agentApps ?? null,
entity: entities ?? null,
timestampRange,
limit: userSpecifiedCountLimit + (classification.filters.offset || 0),
offset: classification.filters.offset || 0,
asc: sortDirection === "asc",
intent: resolvedIntent || {},
channelIds,
selectedItem: selectedItem,
collectionSelections: agentSpecificCollectionSelections,
})
items = searchResults!.root.children || []
loggerWithChild({ email: email }).info(
Expand All @@ -3391,6 +3431,8 @@ async function* generateMetadataQueryAnswer(
offset: classification.filters.offset || 0,
asc: sortDirection === "asc",
intent: resolvedIntent || {},
collectionSelections: agentSpecificCollectionSelections,
selectedItem: selectedItem,
}

loggerWithChild({ email: email }).info(
Expand Down Expand Up @@ -3423,7 +3465,10 @@ async function* generateMetadataQueryAnswer(
),
)

span?.setAttribute("context", await buildContext(items, 20, userMetadata, 0, input))
span?.setAttribute(
"context",
await buildContext(items, 20, userMetadata, 0, input),
)
span?.end()
loggerWithChild({ email: email }).info(
`Retrieved Documents : ${QueryType.GetItems} - ${items.length}`,
Expand Down Expand Up @@ -3569,7 +3614,10 @@ async function* generateMetadataQueryAnswer(
items.map((v: VespaSearchResult) => (v.fields as any).docId),
),
)
iterationSpan?.setAttribute(`context`, await buildContext(items, 20, userMetadata, 0, input))
iterationSpan?.setAttribute(
`context`,
await buildContext(items, 20, userMetadata, 0, input),
)
iterationSpan?.end()

loggerWithChild({ email: email }).info(
Expand Down Expand Up @@ -4421,27 +4469,30 @@ export const MessageApi = async (c: Context) => {
}

let filteredMessages = messages
.slice(0, messages.length - 1)
.filter(
(msg) =>
!(msg.messageRole === MessageRole.Assistant && !msg.message),
)
.slice(0, messages.length - 1)
.filter(
(msg) =>
!(msg.messageRole === MessageRole.Assistant && !msg.message),
)

// Check for follow-up context carry-forward
const lastIdx = filteredMessages.length - 1;
const workingSet = collectFollowupContext(filteredMessages, lastIdx);
const lastIdx = filteredMessages.length - 1
const workingSet = collectFollowupContext(filteredMessages, lastIdx)

const hasCarriedContext =
workingSet.fileIds.length > 0 ||
workingSet.attachmentFileIds.length > 0;
workingSet.attachmentFileIds.length > 0
if (hasCarriedContext) {
fileIds = Array.from(new Set([...fileIds, ...workingSet.fileIds]));
fileIds = Array.from(new Set([...fileIds, ...workingSet.fileIds]))
imageAttachmentFileIds = Array.from(
new Set([...imageAttachmentFileIds, ...workingSet.attachmentFileIds])
);
new Set([
...imageAttachmentFileIds,
...workingSet.attachmentFileIds,
]),
)
loggerWithChild({ email: email }).info(
`Carried forward context from follow-up: ${JSON.stringify(workingSet)}`,
);
)
}
if (
(fileIds && fileIds?.length > 0) ||
Expand Down Expand Up @@ -4704,7 +4755,9 @@ export const MessageApi = async (c: Context) => {
streamSpan.end()
rootSpan.end()
} else {
filteredMessages = filteredMessages.filter((msg) => !msg?.errorMessage)
filteredMessages = filteredMessages.filter(
(msg) => !msg?.errorMessage,
)
loggerWithChild({ email: email }).info(
"Checking if answer is in the conversation or a mandatory query rewrite is needed before RAG",
)
Expand Down
Loading
Loading