From c660c98b04a8a827cf1be940b63019e185b5c9b8 Mon Sep 17 00:00:00 2001 From: jyong <718720800@qq.com> Date: Wed, 16 Jul 2025 14:25:16 +0800 Subject: [PATCH] r2 transform --- .../entities/knowledge_entities/rag_pipeline_entities.py | 8 ++++---- .../rag_pipeline/rag_pipeline_transform_service.py | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/api/services/entities/knowledge_entities/rag_pipeline_entities.py b/api/services/entities/knowledge_entities/rag_pipeline_entities.py index 6c1855260e..77d72544ae 100644 --- a/api/services/entities/knowledge_entities/rag_pipeline_entities.py +++ b/api/services/entities/knowledge_entities/rag_pipeline_entities.py @@ -30,8 +30,8 @@ class RerankingModelConfig(BaseModel): Reranking Model Config. """ - reranking_provider_name: str - reranking_model_name: str + reranking_provider_name: Optional[str] = "" + reranking_model_name: Optional[str] = "" class VectorSetting(BaseModel): @@ -57,8 +57,8 @@ class WeightedScoreConfig(BaseModel): Weighted score Config. """ - vector_setting: VectorSetting - keyword_setting: KeywordSetting + vector_setting: Optional[VectorSetting] + keyword_setting: Optional[KeywordSetting] class EmbeddingSetting(BaseModel): diff --git a/api/services/rag_pipeline/rag_pipeline_transform_service.py b/api/services/rag_pipeline/rag_pipeline_transform_service.py index 009495e690..2b0221539f 100644 --- a/api/services/rag_pipeline/rag_pipeline_transform_service.py +++ b/api/services/rag_pipeline/rag_pipeline_transform_service.py @@ -136,8 +136,8 @@ class RagPipelineTransformService: def _deal_knowledge_index( self, dataset: Dataset, doc_form: str, indexing_technique: str, retrieval_model: dict, node: dict ): - knowledge_configuration = node.get("data", {}) - knowledge_configuration = KnowledgeConfiguration(**knowledge_configuration) + knowledge_configuration_dict = node.get("data", {}) + knowledge_configuration = KnowledgeConfiguration(**knowledge_configuration_dict) if indexing_technique == "high_quality": knowledge_configuration.embedding_model = dataset.embedding_model @@ -150,7 +150,9 @@ class RagPipelineTransformService: else: dataset.retrieval_model = knowledge_configuration.retrieval_model.model_dump() - return knowledge_configuration.model_dump() + knowledge_configuration_dict.update(knowledge_configuration.model_dump()) + node["data"] = knowledge_configuration_dict + return node def _create_pipeline( self,