refactor(knowledge): Move the all dependent components to app infra (#795)

This commit is contained in:
Ryo
2025-08-18 18:18:39 +08:00
committed by GitHub
parent 23a468c72c
commit f940edf585
9 changed files with 198 additions and 186 deletions

View File

@@ -58,9 +58,7 @@ import (
"github.com/coze-dev/coze-studio/backend/infra/contract/rdb"
rdbEntity "github.com/coze-dev/coze-studio/backend/infra/contract/rdb/entity"
"github.com/coze-dev/coze-studio/backend/infra/contract/storage"
"github.com/coze-dev/coze-studio/backend/infra/impl/document/parser/builtin"
"github.com/coze-dev/coze-studio/backend/infra/impl/document/progressbar"
"github.com/coze-dev/coze-studio/backend/infra/impl/document/rerank/rrf"
"github.com/coze-dev/coze-studio/backend/pkg/errorx"
"github.com/coze-dev/coze-studio/backend/pkg/lang/ptr"
"github.com/coze-dev/coze-studio/backend/pkg/lang/slices"
@@ -87,12 +85,6 @@ func NewKnowledgeSVC(config *KnowledgeSVCConfig) (Knowledge, eventbus.ConsumerHa
cacheCli: config.CacheCli,
modelFactory: config.ModelFactory,
}
if svc.reranker == nil {
svc.reranker = rrf.NewRRFReranker(0)
}
if svc.parseManager == nil {
svc.parseManager = builtin.NewManager(config.Storage, config.OCR, nil)
}
return svc, svc
}

View File

@@ -41,6 +41,8 @@ import (
"github.com/coze-dev/coze-studio/backend/infra/contract/document/searchstore"
"github.com/coze-dev/coze-studio/backend/infra/contract/storage"
"github.com/coze-dev/coze-studio/backend/infra/impl/cache/redis"
"github.com/coze-dev/coze-studio/backend/infra/impl/document/parser/builtin"
"github.com/coze-dev/coze-studio/backend/infra/impl/document/rerank/rrf"
sses "github.com/coze-dev/coze-studio/backend/infra/impl/document/searchstore/elasticsearch"
ssmilvus "github.com/coze-dev/coze-studio/backend/infra/impl/document/searchstore/milvus"
hembed "github.com/coze-dev/coze-studio/backend/infra/impl/embedding/http"
@@ -169,10 +171,10 @@ func (suite *KnowledgeTestSuite) SetupSuite() {
RDB: rdbService,
Producer: knowledgeProducer,
SearchStoreManagers: mgrs,
ParseManager: nil, // default builtin
ParseManager: builtin.NewManager(tosClient, nil, nil), // default builtin
Storage: tosClient,
Rewriter: nil,
Reranker: nil, // default rrf
Reranker: rrf.NewRRFReranker(0), // default rrf
EnableCompactTable: ptr.Of(true),
})

View File

@@ -32,6 +32,8 @@ import (
knowledgeModel "github.com/coze-dev/coze-studio/backend/api/model/crossdomain/knowledge"
"github.com/coze-dev/coze-studio/backend/domain/knowledge/entity"
"github.com/coze-dev/coze-studio/backend/infra/contract/document"
"github.com/coze-dev/coze-studio/backend/infra/impl/document/parser/builtin"
"github.com/coze-dev/coze-studio/backend/infra/impl/document/rerank/rrf"
"github.com/coze-dev/coze-studio/backend/infra/impl/rdb"
producerMock "github.com/coze-dev/coze-studio/backend/internal/mock/infra/contract/eventbus"
mock "github.com/coze-dev/coze-studio/backend/internal/mock/infra/contract/idgen"
@@ -98,11 +100,14 @@ func MockKnowledgeSVC(t *testing.T) Knowledge {
mockStorage.EXPECT().PutObject(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
rdb := rdb.NewService(db, mockIDGen)
svc, _ := NewKnowledgeSVC(&KnowledgeSVCConfig{
DB: db,
IDGen: mockIDGen,
Storage: mockStorage,
Producer: producer,
RDB: rdb,
DB: db,
IDGen: mockIDGen,
Storage: mockStorage,
Producer: producer,
RDB: rdb,
Reranker: rrf.NewRRFReranker(0),
ParseManager: builtin.NewManager(mockStorage, nil, nil), // default builtin
})
return svc
}