feat: 移除知识库中的重排序模型配置,改为全局会话设置
This commit is contained in:
@@ -74,7 +74,6 @@ export interface DownloadTask {
|
||||
export interface KBModelConfigRequest {
|
||||
llmModelId: string
|
||||
embeddingModelId: string
|
||||
rerankModelId?: string
|
||||
vllmModelId?: string
|
||||
documentSplitting: {
|
||||
chunkSize: number
|
||||
|
||||
@@ -12,7 +12,6 @@ export function createKnowledgeBase(data: {
|
||||
chunking_config?: any;
|
||||
embedding_model_id?: string;
|
||||
summary_model_id?: string;
|
||||
rerank_model_id?: string;
|
||||
vlm_model_id?: string;
|
||||
vlm_config?: any;
|
||||
cos_config?: any;
|
||||
|
||||
@@ -247,8 +247,7 @@ const initFormData = (type: 'document' | 'faq' = 'document') => {
|
||||
},
|
||||
modelConfig: {
|
||||
llmModelId: '',
|
||||
embeddingModelId: '',
|
||||
rerankModelId: ''
|
||||
embeddingModelId: ''
|
||||
},
|
||||
chunkingConfig: {
|
||||
chunkSize: 512,
|
||||
@@ -324,8 +323,7 @@ const loadKBData = async () => {
|
||||
},
|
||||
modelConfig: {
|
||||
llmModelId: kb.summary_model_id || '',
|
||||
embeddingModelId: kb.embedding_model_id || '',
|
||||
rerankModelId: kb.rerank_model_id || ''
|
||||
embeddingModelId: kb.embedding_model_id || ''
|
||||
},
|
||||
chunkingConfig: {
|
||||
chunkSize: kb.chunking_config?.chunk_size || 512,
|
||||
@@ -451,11 +449,6 @@ const buildSubmitData = () => {
|
||||
summary_model_id: formData.value.modelConfig.llmModelId
|
||||
}
|
||||
|
||||
// 可选的 Rerank 模型
|
||||
if (formData.value.modelConfig.rerankModelId) {
|
||||
data.rerank_model_id = formData.value.modelConfig.rerankModelId
|
||||
}
|
||||
|
||||
// 添加多模态配置
|
||||
if (formData.value.multimodalConfig.enabled) {
|
||||
if (formData.value.multimodalConfig.vllmModelId) {
|
||||
@@ -547,7 +540,6 @@ const handleSubmit = async () => {
|
||||
const config: KBModelConfigRequest = {
|
||||
llmModelId: data.summary_model_id,
|
||||
embeddingModelId: data.embedding_model_id,
|
||||
rerankModelId: data.rerank_model_id || '',
|
||||
vllmModelId: data.vlm_model_id || '',
|
||||
documentSplitting: {
|
||||
chunkSize: data.chunking_config.chunk_size,
|
||||
|
||||
@@ -51,25 +51,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ReRank 重排序模型 -->
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
<label>{{ $t('knowledgeEditor.models.rerankLabel') }}</label>
|
||||
<p class="desc">{{ $t('knowledgeEditor.models.rerankDesc') }}</p>
|
||||
</div>
|
||||
<div class="setting-control">
|
||||
<ModelSelector
|
||||
ref="rerankSelectorRef"
|
||||
model-type="Rerank"
|
||||
:selected-model-id="config.rerankModelId"
|
||||
:all-models="allModels"
|
||||
@update:selected-model-id="handleRerankChange"
|
||||
@add-model="handleAddModel('rerank')"
|
||||
:placeholder="$t('knowledgeEditor.models.rerankPlaceholder')"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -83,7 +64,6 @@ import { useI18n } from 'vue-i18n'
|
||||
interface ModelConfig {
|
||||
llmModelId?: string
|
||||
embeddingModelId?: string
|
||||
rerankModelId?: string
|
||||
vllmModelId?: string
|
||||
}
|
||||
|
||||
@@ -105,7 +85,6 @@ const { t } = useI18n()
|
||||
// 引用各个模型选择器
|
||||
const llmSelectorRef = ref<InstanceType<typeof ModelSelector>>()
|
||||
const embeddingSelectorRef = ref<InstanceType<typeof ModelSelector>>()
|
||||
const rerankSelectorRef = ref<InstanceType<typeof ModelSelector>>()
|
||||
|
||||
// 处理LLM模型变化
|
||||
const handleLLMChange = (modelId: string) => {
|
||||
@@ -123,14 +102,6 @@ const handleEmbeddingChange = (modelId: string) => {
|
||||
})
|
||||
}
|
||||
|
||||
// 处理ReRank模型变化
|
||||
const handleRerankChange = (modelId: string) => {
|
||||
emit('update:config', {
|
||||
...props.config,
|
||||
rerankModelId: modelId
|
||||
})
|
||||
}
|
||||
|
||||
// 处理添加模型按钮点击
|
||||
const handleAddModel = (subSection: string) => {
|
||||
// 打开全局设置对话框,并导航到对应的模型子页面
|
||||
|
||||
@@ -272,18 +272,17 @@ func (s *knowledgeBaseService) CopyKnowledgeBase(ctx context.Context,
|
||||
targetKB = &types.KnowledgeBase{
|
||||
ID: uuid.New().String(),
|
||||
Name: sourceKB.Name,
|
||||
Type: sourceKB.Type,
|
||||
Description: sourceKB.Description,
|
||||
TenantID: tenantID,
|
||||
ChunkingConfig: sourceKB.ChunkingConfig,
|
||||
ImageProcessingConfig: sourceKB.ImageProcessingConfig,
|
||||
EmbeddingModelID: sourceKB.EmbeddingModelID,
|
||||
SummaryModelID: sourceKB.SummaryModelID,
|
||||
RerankModelID: sourceKB.RerankModelID,
|
||||
VLMModelID: sourceKB.VLMModelID,
|
||||
StorageConfig: sourceKB.StorageConfig,
|
||||
FAQConfig: faqConfig,
|
||||
}
|
||||
Type: sourceKB.Type,
|
||||
Description: sourceKB.Description,
|
||||
TenantID: tenantID,
|
||||
ChunkingConfig: sourceKB.ChunkingConfig,
|
||||
ImageProcessingConfig: sourceKB.ImageProcessingConfig,
|
||||
EmbeddingModelID: sourceKB.EmbeddingModelID,
|
||||
SummaryModelID: sourceKB.SummaryModelID,
|
||||
VLMModelID: sourceKB.VLMModelID,
|
||||
StorageConfig: sourceKB.StorageConfig,
|
||||
FAQConfig: faqConfig,
|
||||
}
|
||||
targetKB.EnsureDefaults()
|
||||
if err := s.repo.CreateKnowledgeBase(ctx, targetKB); err != nil {
|
||||
return nil, nil, err
|
||||
|
||||
@@ -87,8 +87,7 @@ func NewInitializationHandler(
|
||||
type KBModelConfigRequest struct {
|
||||
LLMModelID string `json:"llmModelId" binding:"required"`
|
||||
EmbeddingModelID string `json:"embeddingModelId" binding:"required"`
|
||||
RerankModelID string `json:"rerankModelId"` // 可选
|
||||
VLLMModelID string `json:"vllmModelId"` // 可选
|
||||
VLLMModelID string `json:"vllmModelId"` // 可选
|
||||
|
||||
// 文档分块配置
|
||||
DocumentSplitting struct {
|
||||
@@ -250,18 +249,6 @@ func (h *InitializationHandler) UpdateKBConfig(c *gin.Context) {
|
||||
kb.SummaryModelID = req.LLMModelID
|
||||
kb.EmbeddingModelID = req.EmbeddingModelID
|
||||
|
||||
// 处理可选的Rerank模型
|
||||
if req.RerankModelID != "" {
|
||||
rerankModel, err := h.modelService.GetModelByID(ctx, req.RerankModelID)
|
||||
if err != nil || rerankModel == nil {
|
||||
logger.Warn(ctx, "Rerank model not found", "modelId", req.RerankModelID)
|
||||
} else {
|
||||
kb.RerankModelID = req.RerankModelID
|
||||
}
|
||||
} else {
|
||||
kb.RerankModelID = ""
|
||||
}
|
||||
|
||||
// 处理可选的VLLM模型
|
||||
if req.VLLMModelID != "" {
|
||||
vllmModel, err := h.modelService.GetModelByID(ctx, req.VLLMModelID)
|
||||
@@ -541,8 +528,6 @@ func (h *InitializationHandler) InitializeByKB(c *gin.Context) {
|
||||
existingModelID = kb.EmbeddingModelID
|
||||
case types.ModelTypeKnowledgeQA:
|
||||
existingModelID = kb.SummaryModelID
|
||||
case types.ModelTypeRerank:
|
||||
existingModelID = kb.RerankModelID
|
||||
case types.ModelTypeVLLM:
|
||||
existingModelID = kb.VLMModelID
|
||||
}
|
||||
@@ -592,7 +577,7 @@ func (h *InitializationHandler) InitializeByKB(c *gin.Context) {
|
||||
}
|
||||
|
||||
// 找到模型ID
|
||||
var embeddingModelID, llmModelID, rerankModelID, vlmModelID string
|
||||
var embeddingModelID, llmModelID, vlmModelID string
|
||||
for _, model := range processedModels {
|
||||
if model.Type == types.ModelTypeEmbedding {
|
||||
embeddingModelID = model.ID
|
||||
@@ -600,9 +585,6 @@ func (h *InitializationHandler) InitializeByKB(c *gin.Context) {
|
||||
if model.Type == types.ModelTypeKnowledgeQA {
|
||||
llmModelID = model.ID
|
||||
}
|
||||
if model.Type == types.ModelTypeRerank {
|
||||
rerankModelID = model.ID
|
||||
}
|
||||
if model.Type == types.ModelTypeVLLM {
|
||||
vlmModelID = model.ID
|
||||
}
|
||||
@@ -611,11 +593,6 @@ func (h *InitializationHandler) InitializeByKB(c *gin.Context) {
|
||||
// 更新知识库配置
|
||||
kb.SummaryModelID = llmModelID
|
||||
kb.EmbeddingModelID = embeddingModelID
|
||||
if req.Rerank.Enabled {
|
||||
kb.RerankModelID = rerankModelID
|
||||
} else {
|
||||
kb.RerankModelID = ""
|
||||
}
|
||||
|
||||
// 更新文档分割配置
|
||||
kb.ChunkingConfig = types.ChunkingConfig{
|
||||
@@ -1106,7 +1083,6 @@ func (h *InitializationHandler) GetCurrentConfigByKB(c *gin.Context) {
|
||||
modelIDs := []string{
|
||||
kb.EmbeddingModelID,
|
||||
kb.SummaryModelID,
|
||||
kb.RerankModelID,
|
||||
kb.VLMModelID,
|
||||
}
|
||||
|
||||
|
||||
@@ -119,16 +119,13 @@ func (h *Handler) CreateSession(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// Use knowledge base's models if session doesn't specify them
|
||||
if createdSession.RerankModelID == "" {
|
||||
createdSession.RerankModelID = kb.RerankModelID
|
||||
}
|
||||
// Use knowledge base's summary model if session doesn't specify it
|
||||
if createdSession.SummaryModelID == "" {
|
||||
createdSession.SummaryModelID = kb.SummaryModelID
|
||||
}
|
||||
|
||||
logger.Debugf(ctx, "Knowledge base fetched: %s, rerank model: %s, summary model: %s",
|
||||
kb.ID, kb.RerankModelID, kb.SummaryModelID)
|
||||
logger.Debugf(ctx, "Knowledge base fetched: %s, summary model: %s",
|
||||
kb.ID, kb.SummaryModelID)
|
||||
} else {
|
||||
logger.Debug(ctx, "No knowledge base ID provided, models will use session strategy or be determined at query time")
|
||||
}
|
||||
|
||||
@@ -59,8 +59,6 @@ type KnowledgeBase struct {
|
||||
EmbeddingModelID string `yaml:"embedding_model_id" json:"embedding_model_id"`
|
||||
// Summary model ID
|
||||
SummaryModelID string `yaml:"summary_model_id" json:"summary_model_id"`
|
||||
// Rerank model ID
|
||||
RerankModelID string `yaml:"rerank_model_id" json:"rerank_model_id"`
|
||||
// VLM model ID
|
||||
VLMModelID string `yaml:"vlm_model_id" json:"vlm_model_id"`
|
||||
// VLM config
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
-- Remove rerank_model_id from knowledge_bases table
|
||||
-- ReRank model is now configured globally in conversation settings, not per knowledge base
|
||||
ALTER TABLE knowledge_bases DROP COLUMN rerank_model_id;
|
||||
@@ -0,0 +1,3 @@
|
||||
-- Remove rerank_model_id from knowledge_bases table
|
||||
-- ReRank model is now configured globally in conversation settings, not per knowledge base
|
||||
ALTER TABLE knowledge_bases DROP COLUMN rerank_model_id;
|
||||
Reference in New Issue
Block a user