Skip to content
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

Jump to bottom

Do not stop indexer on RAG error #4481

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not stop indexer on RAG error #4481

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
648396f
Do not index trashed file
nono Oct 24, 2024
00d61ad
Do not stop indexer on RAG error
nono Oct 24, 2024
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
7 changes: 4 additions & 3 deletions model/rag/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ func Index(inst *instance.Instance, logger logger.Logger, msg IndexMessage) erro
return nil
}

var errj error
for _, change := range feed.Results {
if err := callRAGIndexer(inst, msg.Doctype, change); err != nil {
logger.Warnf("Index error: %s", err)
return err
errj = errors.Join(errj, err)
}
}
_ = updateLastSequenceNumber(inst, msg.Doctype, feed.LastSeq)
Expand All @@ -65,7 +66,7 @@ func Index(inst *instance.Instance, logger logger.Logger, msg IndexMessage) erro
_ = pushJob(inst, msg.Doctype)
}

return nil
return errj
}

func callRAGIndexer(inst *instance.Instance, doctype string, change couchdb.Change) error {
Expand All @@ -85,7 +86,7 @@ func callRAGIndexer(inst *instance.Instance, doctype string, change couchdb.Chan
return err
}
u.Path = fmt.Sprintf("/docs/%s/%s/%s", inst.Domain, doctype, change.DocID)
if change.Deleted {
if change.Deleted || change.Doc.Get("trashed") == true {
req, err := http.NewRequest(http.MethodDelete, u.String(), nil)
if err != nil {
return err
Expand Down
Loading