Skip to content

fix: schemaRecallNode recall schema information with query #455

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
luowanghaoyun wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −12
Open

fix: schemaRecallNode recall schema information with query #455

Show file tree
Hide file tree
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
11 changes: 1 addition & 10 deletions ...gement/src/main/java/com/alibaba/cloud/ai/dataagent/service/schema/SchemaServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.ai.document.Document;
import org.springframework.ai.embedding.BatchingStrategy;
import org.springframework.ai.vectorstore.SearchRequest;
import org.springframework.ai.vectorstore.filter.Filter;
import org.springframework.ai.vectorstore.filter.FilterExpressionBuilder;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -298,15 +297,7 @@ public List<Document> getTableDocumentsByDatasource(Integer datasourceId, String

Filter.Expression filterExpression = DynamicFilterService.combineWithAnd(conditions);

// 执行向量检索
SearchRequest searchRequest = SearchRequest.builder()
.query(query)
.topK(tableTopK)
.similarityThreshold(tableThreshold)
.filterExpression(filterExpression)
.build();

return agentVectorStoreService.getDocumentsOnlyByFilter(filterExpression, tableTopK);
return agentVectorStoreService.getDocumentsOnlyByFilter(filterExpression, tableTopK, query, tableThreshold);
}

private List<String> getMissingTableNamesWithForeignKeySet(List<Document> tableDocuments,
Expand Down
3 changes: 3 additions & 0 deletions ...main/java/com/alibaba/cloud/ai/dataagent/service/vectorstore/AgentVectorStoreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public interface AgentVectorStoreService {
// 通过元数据过滤精确查找
List<Document> getDocumentsOnlyByFilter(Filter.Expression filterExpression, Integer topK);

List<Document> getDocumentsOnlyByFilter(Filter.Expression filterExpression, Integer topK, String query,
Double similarityThreshold);

boolean hasDocuments(String agentId);

void addDocuments(String agentId, List<Document> documents);
Expand Down
10 changes: 8 additions & 2 deletions .../java/com/alibaba/cloud/ai/dataagent/service/vectorstore/AgentVectorStoreServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,20 @@ public List<Document> getDocumentsForAgent(String agentId, String query, String

@Override
public List<Document> getDocumentsOnlyByFilter(Filter.Expression filterExpression, Integer topK) {
return getDocumentsOnlyByFilter(filterExpression, topK, DEFAULT, 0.0);
}

@Override
public List<Document> getDocumentsOnlyByFilter(Filter.Expression filterExpression, Integer topK, String query,
Double similarityThreshold) {
Assert.notNull(filterExpression, "filterExpression cannot be null.");
if (topK == null)
topK = dataAgentProperties.getVectorStore().getDefaultTopkLimit();
SearchRequest searchRequest = SearchRequest.builder()
.query(DEFAULT)
.query(query)
.topK(topK)
.filterExpression(filterExpression)
.similarityThreshold(0.0)
.similarityThreshold(similarityThreshold)
.build();
return vectorStore.similaritySearch(searchRequest);
}
Expand Down
Loading