Open-source LLM knowledge platform: turn raw documents into a queryable RAG, an autonomous reasoning agent, and a self-maintaining Wiki.
Go agentagenticaichatbotdsh-pluginembeddingsevaluationgenerative-aigolangknowledge-basellmmulti-tenantollamaopenaiquestion-answeringragrerankingsemantic-searchvector-searchwiki
fix(notion): 在资源发现失败时中止增量同步 (#3682)
诉说晚秋605d70fc528a
diff --git a/internal/datasource/connector/notion/connector.go b/internal/datasource/connector/notion/connector.goindex 05d107cab..cda1f055d 100644--- a/internal/datasource/connector/notion/connector.go+++ b/internal/datasource/connector/notion/connector.go@@ -220,7 +220,10 @@ func (c *Connector) FetchIncremental(ctx context.Context, config *types.DataSour// Subsequent syncs: discover all pages, diff against cursor, fetch only changeslogger.Infof(ctx, "[Notion] incremental sync, discovering pages")- pages, fetchVisited := c.discoverAllResources(ctx, client, resourceIDs)+ pages, fetchVisited, err := c.discoverAllResources(ctx, client, resourceIDs)+ if err != nil {+ return nil, nil, err+ }logger.Infof(ctx, "[Notion] discovered %d pages", len(pages))newEditTimes := make(map[string]time.Time)@@ -672,11 +675,12 @@ func (c *Connector) buildDatabaseItem(ctx context.Context, client *notionClient,// Returns the included pages plus the excluded set (visible pages NOT under any// selected root) so callers can seed `visited` for child-block recursion without// a second SearchPages round-trip.-func (c *Connector) discoverAllResources(ctx context.Context, client *notionClient, resourceIDs []string) (included []notionPage, excluded map[string]bool) {+func (c *Connector) discoverAllResources(+ ctx context.Context, client *notionClient, resourceIDs []string,+) (included []notionPage, excluded map[string]bool, err error) {allPages, err := client.SearchPages(ctx)if err != nil {- logger.Warnf(ctx, "[Notion] failed to search pages for discovery: %v", err)- return nil, nil+ return nil, nil, fmt.Errorf("discover notion resources: %w", err)}// data_source objects use database_parent for workspace hierarchy.@@ -728,7 +732,7 @@ func (c *Connector) discoverAllResources(ctx context.Context, client *notionClieexcluded[id] = true}}- return included, excluded+ return included, excluded, nil}// --- File upload resolution ---diff --git a/internal/datasource/connector/notion/discovery_failure_test.go b/internal/datasource/connector/notion/discovery_failure_test.gonew file mode 100644index 000000000..d9b102509--- /dev/null+++ b/internal/datasource/connector/notion/discovery_failure_test.go@@ -0,0 +1,71 @@+package notion++import (+ "context"+ "encoding/json"+ "errors"+ "net/http"+ "net/http/httptest"+ "strconv"+ "testing"+ "time"++ "github.com/Tencent/WeKnora/internal/datasource"+)++func TestFetchIncrementalSearchFailure(t *testing.T) {+ for _, failPage := range []int{1, 2} {+ t.Run("page_"+strconv.Itoa(failPage), func(t *testing.T) {+ allowNotionTestServer(t)+ requests := 0+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ requests+++ if r.URL.Path != "/v1/search" {+ t.Errorf("unexpected path: %s", r.URL.Path)+ }+ if requests == failPage {+ http.Error(w, "access revoked", http.StatusUnauthorized)+ return+ }+ _ = json.NewEncoder(w).Encode(map[string]interface{}{+ "results": []interface{}{}, "has_more": true, "next_cursor": "second-page",+ })+ }))+ defer server.Close()+ config := makeNotionConfig(&Config{APIKey: "test-token"}, server.URL, []string{"page-1"})+ cursor := buildCursor(map[string]time.Time{"page-1": time.Date(2026, 1, 15, 10, 0, 0, 0, time.UTC)})+ items, next, err := NewConnector().FetchIncremental(context.Background(), config, cursor)+ if !errors.Is(err, datasource.ErrInvalidCredentials) {+ t.Errorf("expected credential error, got %v", err)+ }+ if len(items) != 0 || next != nil {+ t.Errorf("failed discovery must return no items or cursor, got items=%+v cursor=%+v", items, next)+ }+ if requests != failPage {+ t.Errorf("expected %d requests, got %d", failPage, requests)+ }+ })+ }+}++func TestFetchIncrementalSuccessfulEmptySearch(t *testing.T) {+ allowNotionTestServer(t)+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {+ _ = json.NewEncoder(w).Encode(map[string]interface{}{+ "results": []interface{}{}, "has_more": false,+ })+ }))+ defer server.Close()+ config := makeNotionConfig(&Config{APIKey: "test-token"}, server.URL, []string{"page-1"})+ cursor := buildCursor(map[string]time.Time{"page-1": time.Date(2026, 1, 15, 10, 0, 0, 0, time.UTC)})+ items, next, err := NewConnector().FetchIncremental(context.Background(), config, cursor)+ if err != nil {+ t.Fatalf("expected successful discovery, got %v", err)+ }+ if len(items) != 1 || items[0].ExternalID != "page-1" || !items[0].IsDeleted {+ t.Fatalf("expected deletion of absent page-1, got %+v", items)+ }+ if next == nil {+ t.Fatal("expected updated cursor after successful discovery")+ }+}