Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0b3db73
feat: implement Dify-compatible retrieval API
xugangqiang Jun 5, 2026
b062a64
fix: address code review findings
xugangqiang Jun 5, 2026
9cce96d
chore: remove dead KGPipelineIface interface
xugangqiang Jun 5, 2026
aa250dd
refactor: extract internal/service/kg/ sub-package
xugangqiang Jun 5, 2026
a72fdac
refactor: remove KG prefix from identifiers in kg package
xugangqiang Jun 5, 2026
6734452
chore: remove dead kg_retrieval.go wrapper (no external callers)
xugangqiang Jun 5, 2026
24d7aa5
chore: remove dead kg_search.go wrapper (no external callers)
xugangqiang Jun 5, 2026
8c82b85
chore: remove redundant VectorSimilarityWeight (nlp service defaults …
xugangqiang Jun 5, 2026
f9998d7
refactor: let service own default values, handler only passes user input
xugangqiang Jun 5, 2026
ff8b4df
refactor: replace inline fusion weights with constants and buildFusio…
xugangqiang Jun 5, 2026
e5e1548
fix: initialize KGRelation.Sim from _score/score in kgRelationFromChunk
xugangqiang Jun 5, 2026
938e489
refactor: remove dead Weight int from KGRelation, unify on PageRank
xugangqiang Jun 5, 2026
ca25f98
fix: distinguish 404 (not found) vs 500 (DB error) in KB lookup
xugangqiang Jun 5, 2026
89857ac
fix: return 500 when document loading fails, add test
xugangqiang Jun 5, 2026
9f58fc3
fix: TestDifyRetrieval_NoAuth now tests real handler auth path
xugangqiang Jun 5, 2026
fd9e29a
test: add RetrievalNotFound path (search returns "not_found" → 404)
xugangqiang Jun 5, 2026
936bfde
refactor: remove redundant KG prefix from kg package function names
xugangqiang Jun 5, 2026
c12f227
feat: implement POST /api/v1/searchbots/retrieval_test
xugangqiang Jun 5, 2026
ef984a1
Revert "feat: implement POST /api/v1/searchbots/retrieval_test"
xugangqiang Jun 5, 2026
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
14 changes: 13 additions & 1 deletion cmd/server_main.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,20 @@ func startServer(config *server.Config) {
&handler.SearchbotRealLLM{Svc: modelProviderService},
)

// Dify retrieval handler
docDAO := dao.NewDocumentDAO()
retrievalService := nlp.NewRetrievalService(docEngine, docDAO)
difyRetrievalHandler := handler.NewDifyRetrievalHandler(
knowledgebaseService,
modelProviderService,
metadataService,
retrievalService,
docDAO,
docEngine,
)

// Initialize router
r := router.NewRouter(authHandler, userHandler, tenantHandler, documentHandler, datasetsHandler, systemHandler, knowledgebaseHandler, chunkHandler, llmHandler, chatHandler, chatSessionHandler, connectorHandler, searchHandler, fileHandler, memoryHandler, mcpHandler, skillSearchHandler, providerHandler, agentHandler, relatedQuestionsHandler)
r := router.NewRouter(authHandler, userHandler, tenantHandler, documentHandler, datasetsHandler, systemHandler, knowledgebaseHandler, chunkHandler, llmHandler, chatHandler, chatSessionHandler, connectorHandler, searchHandler, fileHandler, memoryHandler, mcpHandler, skillSearchHandler, providerHandler, agentHandler, relatedQuestionsHandler, difyRetrievalHandler)

// Create Gin engine
ginEngine := gin.New()
Expand Down
373 changes: 373 additions & 0 deletions internal/handler/dify_retrieval_handler.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,373 @@
//
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

package handler

import (
"context"
"errors"
"fmt"
"net/http"
"strconv"
"strings"

"ragflow/internal/common"
"gorm.io/gorm"
"go.uber.org/zap"
"ragflow/internal/engine"
"ragflow/internal/entity"
modelModule "ragflow/internal/entity/models"
"ragflow/internal/service"
"ragflow/internal/service/kg"
"ragflow/internal/service/nlp"

"github.com/gin-gonic/gin"
)

// --- Interfaces (for testability) ---

// KBServiceIface abstracts KnowledgebaseService for the Dify handler.
type KBServiceIface interface {
GetByID(kbID string) (*entity.Knowledgebase, error)
Accessible(kbID, userID string) bool
}

// ModelServiceIface abstracts ModelProviderService for the Dify handler.
type ModelServiceIface interface {
GetEmbeddingModel(tenantID, embdID string) (*modelModule.EmbeddingModel, error)
GetChatModel(tenantID, compositeModelName string) (*modelModule.ChatModel, error)
}

// MetadataServiceIface abstracts MetadataService for the Dify handler.
type MetadataServiceIface interface {
GetFlattedMetaByKBs(kbIDs []string) (common.MetaData, error)
LabelQuestion(question string, kbs []*entity.Knowledgebase) map[string]float64
}

// RetrievalServiceIface abstracts RetrievalService for the Dify handler.
type RetrievalServiceIface interface {
Retrieval(ctx context.Context, req *nlp.RetrievalRequest) (*nlp.RetrievalResult, error)
}

// DocumentDAOIface abstracts DocumentDAO for the Dify handler.
type DocumentDAOIface interface {
GetByIDs(ids []string) ([]*entity.Document, error)
}

// --- Request / Response types ---

// difyRetrievalRequest is the JSON body / query params for the Dify retrieval endpoint.
type difyRetrievalRequest struct {
KnowledgeID string `json:"knowledge_id" form:"knowledge_id"`
Query string `json:"query" form:"query"`
UseKG bool `json:"use_kg" form:"use_kg"`
RetrievalSetting *difyRetrievalSetting `json:"retrieval_setting"`
MetadataCondition *difyMetadataCondition `json:"metadata_condition"`
}

type difyRetrievalSetting struct {
TopK *int `json:"top_k" form:"top_k"`
ScoreThreshold *float64 `json:"score_threshold" form:"score_threshold"`
}

// difyCondition is a Dify-format metadata filter condition.
// Dify uses "name"/"comparison_operator" instead of MetaFilterCondition's "key"/"op".
type difyCondition struct {
Name string `json:"name"`
ComparisonOperator string `json:"comparison_operator"`
Value interface{} `json:"value"`
}

type difyMetadataCondition struct {
Conditions []difyCondition `json:"conditions"`
Logic string `json:"logic"`
}

// toMetaFilterConditions converts Dify-format conditions to internal MetaFilterConditions.
func (c difyMetadataCondition) toMetaFilterConditions() []service.MetaFilterCondition {
if len(c.Conditions) == 0 {
return nil
}
result := make([]service.MetaFilterCondition, len(c.Conditions))
for i, dc := range c.Conditions {
v := ""
if dc.Value != nil {
v = fmt.Sprint(dc.Value)
}
result[i] = service.MetaFilterCondition{
Key: dc.Name,
Op: dc.ComparisonOperator,
Value: v,
}
}
return result
}

// difyRecord is one item in the response records array.
type difyRecord struct {
Content string `json:"content"`
Score float64 `json:"score"`
Title string `json:"title"`
Metadata map[string]interface{} `json:"metadata"`
}

// --- Handler ---

// DifyRetrievalHandler handles Dify-compatible retrieval requests.
type DifyRetrievalHandler struct {
kbSvc KBServiceIface
modelSvc ModelServiceIface
metadataSvc MetadataServiceIface
retrievalSvc RetrievalServiceIface
docDAO DocumentDAOIface
docEngine engine.DocEngine
}

// NewDifyRetrievalHandler creates a new DifyRetrievalHandler.
// The KG pipeline is created inline when use_kg=true to avoid injecting
// a pipeline that depends on per-request model configuration.
func NewDifyRetrievalHandler(
kbSvc KBServiceIface,
modelSvc ModelServiceIface,
metadataSvc MetadataServiceIface,
retrievalSvc RetrievalServiceIface,
docDAO DocumentDAOIface,
docEngine engine.DocEngine,
) *DifyRetrievalHandler {
return &DifyRetrievalHandler{
kbSvc: kbSvc,
modelSvc: modelSvc,
metadataSvc: metadataSvc,
retrievalSvc: retrievalSvc,
docDAO: docDAO,
docEngine: docEngine,
}
}

// Retrieval handles POST/GET /api/v1/dify/retrieval.
// Matches Python: api/apps/restful_apis/dify_retrieval_api.py::retrieval()
func (h *DifyRetrievalHandler) Retrieval(c *gin.Context) {
user, errCode, errMsg := GetUser(c)
if errCode != common.CodeSuccess {
c.JSON(http.StatusUnauthorized, gin.H{"code": errCode, "message": errMsg})
return
}

var req difyRetrievalRequest
if c.Request.Method == http.MethodGet {
if err := c.ShouldBindQuery(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"code": common.CodeArgumentError, "message": "invalid query parameters"})
return
}
// Manually extract top_k and score_threshold from query (flat params, not nested)
if v := c.Query("top_k"); v != "" {
if parsed, err := strconv.Atoi(v); err == nil {
if req.RetrievalSetting == nil {
req.RetrievalSetting = &difyRetrievalSetting{}
}
req.RetrievalSetting.TopK = &parsed
}
}
if v := c.Query("score_threshold"); v != "" {
if parsed, err := strconv.ParseFloat(v, 64); err == nil {
if req.RetrievalSetting == nil {
req.RetrievalSetting = &difyRetrievalSetting{}
}
req.RetrievalSetting.ScoreThreshold = &parsed
}
Comment on lines +176 to +190

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Validate top_k / score_threshold instead of silently accepting invalid inputs.

Line 175 and Line 183 ignore parse errors, and Line 224 accepts non-positive top_k. This can send invalid pagination/scoring parameters downstream with unpredictable behavior.

Proposed fix
 		if v := c.Query("top_k"); v != "" {
-			if parsed, err := strconv.Atoi(v); err == nil {
-				if req.RetrievalSetting == nil {
-					req.RetrievalSetting = &difyRetrievalSetting{}
-				}
-				req.RetrievalSetting.TopK = &parsed
-			}
+			parsed, err := strconv.Atoi(v)
+			if err != nil || parsed <= 0 {
+				c.JSON(http.StatusBadRequest, gin.H{"code": common.CodeArgumentError, "message": "top_k must be a positive integer"})
+				return
+			}
+			if req.RetrievalSetting == nil {
+				req.RetrievalSetting = &difyRetrievalSetting{}
+			}
+			req.RetrievalSetting.TopK = &parsed
 		}
 		if v := c.Query("score_threshold"); v != "" {
-			if parsed, err := strconv.ParseFloat(v, 64); err == nil {
-				if req.RetrievalSetting == nil {
-					req.RetrievalSetting = &difyRetrievalSetting{}
-				}
-				req.RetrievalSetting.ScoreThreshold = &parsed
-			}
+			parsed, err := strconv.ParseFloat(v, 64)
+			if err != nil {
+				c.JSON(http.StatusBadRequest, gin.H{"code": common.CodeArgumentError, "message": "score_threshold must be a number"})
+				return
+			}
+			if req.RetrievalSetting == nil {
+				req.RetrievalSetting = &difyRetrievalSetting{}
+			}
+			req.RetrievalSetting.ScoreThreshold = &parsed
 		}

Also applies to: 223-225

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@internal/handler/dify_retrieval_handler.go` around lines 174 - 188, The
current parsing of c.Query("top_k") and c.Query("score_threshold") in the
handler silently ignores parse errors and allows invalid values; update the
parsing logic around c.Query("top_k") (strconv.Atoi) and
c.Query("score_threshold") (strconv.ParseFloat) to validate inputs and return a
400 error on invalid values instead of silently skipping them: for TopK ensure
parsed > 0 (and reject non-positive integers) before assigning to
req.RetrievalSetting.TopK, and for ScoreThreshold ensure the parsed float is
within an acceptable range (e.g. 0.0–1.0) before assigning to
req.RetrievalSetting.ScoreThreshold; use the handler's error response path (e.g.
c.JSON/c.AbortWithStatusJSON) to surface clear validation messages when strconv
parsing fails or values are out of range.

}
} else {
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"code": common.CodeArgumentError, "message": "invalid request body"})
return
}
}

if req.KnowledgeID == "" || req.Query == "" {
c.JSON(http.StatusBadRequest, gin.H{"code": common.CodeArgumentError, "message": "knowledge_id and query are required"})
return
}

kb, err := h.kbSvc.GetByID(req.KnowledgeID)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.JSON(http.StatusNotFound, gin.H{"code": common.CodeNotFound, "message": "Knowledgebase not found!"})
} else {
c.JSON(http.StatusInternalServerError, gin.H{"code": common.CodeServerError, "message": "failed to query knowledgebase"})
}
return
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

if !h.kbSvc.Accessible(req.KnowledgeID, user.ID) {
c.JSON(http.StatusUnauthorized, gin.H{"code": common.CodeAuthenticationError, "message": "No authorization."})
return
}

// Parse retrieval options (nil means service uses defaults)
var topK *int
if req.RetrievalSetting != nil && req.RetrievalSetting.TopK != nil {
topK = req.RetrievalSetting.TopK
}
var scoreThreshold *float64
if req.RetrievalSetting != nil && req.RetrievalSetting.ScoreThreshold != nil {
scoreThreshold = req.RetrievalSetting.ScoreThreshold
}
pageSize := 1024
if topK != nil {
pageSize = *topK
}

// Get embedding model
embModel, err := h.modelSvc.GetEmbeddingModel(kb.TenantID, kb.EmbdID)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"code": common.CodeServerError, "message": fmt.Sprintf("failed to get embedding model: %v", err)})
return
}

// Metadata filter
metas, metaErr := h.metadataSvc.GetFlattedMetaByKBs([]string{req.KnowledgeID})
docIDs := make([]string, 0)
if metaErr == nil && req.MetadataCondition != nil {
logic := req.MetadataCondition.Logic
if logic == "" {
logic = "and"
}
filteredIDs := service.ApplyMetaFilter(metas, req.MetadataCondition.toMetaFilterConditions(), logic)
docIDs = append(docIDs, filteredIDs...)
}
if len(docIDs) == 0 && req.MetadataCondition != nil {
docIDs = []string{"-999"}
}

// Label question for rank features
kbs := []*entity.Knowledgebase{kb}
rankFeature := h.metadataSvc.LabelQuestion(req.Query, kbs)

// Chunk retrieval
sr := &nlp.RetrievalRequest{
Question: req.Query,
TenantIDs: []string{kb.TenantID},
KbIDs: []string{req.KnowledgeID},
DocIDs: docIDs,
Page: 1,
PageSize: pageSize,
Top: topK,
SimilarityThreshold: scoreThreshold,
EmbeddingModel: embModel,
}
if rankFeature != nil {
sr.RankFeature = &rankFeature
}

result, err := h.retrievalSvc.Retrieval(c.Request.Context(), sr)
if err != nil {
if strings.Contains(err.Error(), "not_found") {
c.JSON(http.StatusNotFound, gin.H{"code": common.CodeNotFound, "message": "No chunk found! Check the chunk status please!"})
return
}
c.JSON(http.StatusInternalServerError, gin.H{"code": common.CodeServerError, "message": err.Error()})
return
}

// Enrich with child chunks
chunks := nlp.RetrievalByChildren(result.Chunks, []string{kb.TenantID}, h.docEngine, c.Request.Context())

// KG retrieval (optional)
if req.UseKG {
chatModel, kgErr := h.modelSvc.GetChatModel(kb.TenantID, "")
if kgErr != nil {
common.Warn("KG retrieval: failed to get chat model", zap.String("kbID", req.KnowledgeID), zap.Error(kgErr))
} else if chatModel != nil {
kgPipeline := kg.NewPipeline(
h.docEngine,
[]string{req.KnowledgeID},
[]string{kb.TenantID},
req.Query,
)
kgPipeline.SetChatModel(chatModel)
kgPipeline.SetEmbModel(embModel)
if kgResult, kgErr := kgPipeline.Retrieval(c.Request.Context()); kgErr == nil {
if content, ok := kgResult["content_with_weight"].(string); ok && content != "" {
chunks = append([]map[string]interface{}{kgResult}, chunks...)
}
}
}
}

// Collect doc IDs and fetch documents
docIDSet := make(map[string]struct{})
for _, ch := range chunks {
if docID, ok := ch["doc_id"].(string); ok && docID != "" {
docIDSet[docID] = struct{}{}
}
}
allDocIDs := make([]string, 0, len(docIDSet))
for id := range docIDSet {
allDocIDs = append(allDocIDs, id)
}

docMap := make(map[string]*entity.Document)
if len(allDocIDs) > 0 {
docs, err := h.docDAO.GetByIDs(allDocIDs)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"code": common.CodeServerError, "message": fmt.Sprintf("failed to load documents: %v", err)})
return
}
for _, d := range docs {
docMap[d.ID] = d
}
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// Build response
records := make([]difyRecord, 0, len(chunks))
for _, ch := range chunks {
docID, _ := ch["doc_id"].(string)
doc := docMap[docID]
if doc == nil {
continue
}

// Remove vector to reduce response size
delete(ch, "vector")

meta := make(map[string]interface{})
if doc.MetaFields != nil {
for k, v := range *doc.MetaFields {
meta[k] = v
}
}
meta["doc_id"] = docID
meta["document_id"] = docID

score, _ := ch["similarity"].(float64)
title, _ := ch["docnm_kwd"].(string)
content, _ := ch["content_with_weight"].(string)

records = append(records, difyRecord{
Content: content,
Score: score,
Title: title,
Metadata: meta,
})
}

c.JSON(http.StatusOK, gin.H{"records": records})
}

// HealthCheck returns a simple health check response.
func (h *DifyRetrievalHandler) HealthCheck(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"code": 0, "data": true})
}
Loading
Loading