From 2108c44c8bf5b0a6fdad8416d18b8b812313cefc Mon Sep 17 00:00:00 2001
From: corevibe555 <45244658+corevibe555@users.noreply.github.com>
Date: Mon, 13 Apr 2026 08:53:45 +0300
Subject: [PATCH] refactor(api): consolidate duplicate RerankingModelConfig and
 WeightedScoreConfig definitions (#34747)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 api/core/rag/entities/__init__.py             |  8 ++++-
 api/core/rag/entities/retrieval_settings.py   | 25 ++++++++++++-
 .../nodes/knowledge_index/entities.py         | 11 +-----
 .../nodes/knowledge_retrieval/entities.py     | 11 +-----
 .../knowledge_entities/knowledge_entities.py  | 10 +++---
 .../rag_pipeline_entities.py                  | 36 +++++++++----------
 6 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/api/core/rag/entities/__init__.py b/api/core/rag/entities/__init__.py
index 63c6708704..373b68894b 100644
--- a/api/core/rag/entities/__init__.py
+++ b/api/core/rag/entities/__init__.py
@@ -4,7 +4,12 @@ from core.rag.entities.event import DatasourceCompletedEvent, DatasourceErrorEve
 from core.rag.entities.index_entities import EconomySetting, EmbeddingSetting, IndexMethod
 from core.rag.entities.metadata_entities import Condition, MetadataFilteringCondition, SupportedComparisonOperator
 from core.rag.entities.processing_entities import ParentMode, PreProcessingRule, Rule, Segmentation
-from core.rag.entities.retrieval_settings import KeywordSetting, VectorSetting, WeightedScoreConfig
+from core.rag.entities.retrieval_settings import (
+    KeywordSetting,
+    RerankingModelConfig,
+    VectorSetting,
+    WeightedScoreConfig,
+)
 
 __all__ = [
     "Condition",
@@ -19,6 +24,7 @@ __all__ = [
     "MetadataFilteringCondition",
     "ParentMode",
     "PreProcessingRule",
+    "RerankingModelConfig",
     "RetrievalSourceMetadata",
     "Rule",
     "Segmentation",
diff --git a/api/core/rag/entities/retrieval_settings.py b/api/core/rag/entities/retrieval_settings.py
index a0c6512c9c..8d40ab68fd 100644
--- a/api/core/rag/entities/retrieval_settings.py
+++ b/api/core/rag/entities/retrieval_settings.py
@@ -1,4 +1,27 @@
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class RerankingModelConfig(BaseModel):
+    """
+    Canonical reranking model configuration.
+
+    Accepts both naming conventions:
+    - reranking_provider_name / reranking_model_name (services layer)
+    - provider / model (workflow layer via validation_alias)
+    """
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    reranking_provider_name: str = Field(validation_alias="provider")
+    reranking_model_name: str = Field(validation_alias="model")
+
+    @property
+    def provider(self) -> str:
+        return self.reranking_provider_name
+
+    @property
+    def model(self) -> str:
+        return self.reranking_model_name
 
 
 class VectorSetting(BaseModel):
diff --git a/api/core/workflow/nodes/knowledge_index/entities.py b/api/core/workflow/nodes/knowledge_index/entities.py
index f8e239d250..04a10f9257 100644
--- a/api/core/workflow/nodes/knowledge_index/entities.py
+++ b/api/core/workflow/nodes/knowledge_index/entities.py
@@ -4,21 +4,12 @@ from graphon.entities.base_node_data import BaseNodeData
 from graphon.enums import NodeType
 from pydantic import BaseModel
 
-from core.rag.entities.retrieval_settings import WeightedScoreConfig
+from core.rag.entities import RerankingModelConfig, WeightedScoreConfig
 from core.rag.index_processor.index_processor_base import SummaryIndexSettingDict
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.workflow.nodes.knowledge_index import KNOWLEDGE_INDEX_NODE_TYPE
 
 
-class RerankingModelConfig(BaseModel):
-    """
-    Reranking Model Config.
-    """
-
-    reranking_provider_name: str
-    reranking_model_name: str
-
-
 class RetrievalSetting(BaseModel):
     """
     Retrieval Setting.
diff --git a/api/core/workflow/nodes/knowledge_retrieval/entities.py b/api/core/workflow/nodes/knowledge_retrieval/entities.py
index f4bc3fb9d3..460ec693ce 100644
--- a/api/core/workflow/nodes/knowledge_retrieval/entities.py
+++ b/api/core/workflow/nodes/knowledge_retrieval/entities.py
@@ -5,20 +5,11 @@ from graphon.enums import BuiltinNodeTypes, NodeType
 from graphon.nodes.llm.entities import ModelConfig, VisionConfig
 from pydantic import BaseModel, Field
 
-from core.rag.entities import Condition, MetadataFilteringCondition, WeightedScoreConfig
+from core.rag.entities import Condition, MetadataFilteringCondition, RerankingModelConfig, WeightedScoreConfig
 
 __all__ = ["Condition"]
 
 
-class RerankingModelConfig(BaseModel):
-    """
-    Reranking Model Config.
-    """
-
-    provider: str
-    model: str
-
-
 class MultipleRetrievalConfig(BaseModel):
     """
     Multiple Retrieval Config.
diff --git a/api/services/entities/knowledge_entities/knowledge_entities.py b/api/services/entities/knowledge_entities/knowledge_entities.py
index cb38104e8c..aee6004bff 100644
--- a/api/services/entities/knowledge_entities/knowledge_entities.py
+++ b/api/services/entities/knowledge_entities/knowledge_entities.py
@@ -7,6 +7,11 @@ from core.rag.index_processor.constant.index_type import IndexStructureType
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 
 
+class RerankingModel(BaseModel):
+    reranking_provider_name: str | None = None
+    reranking_model_name: str | None = None
+
+
 class NotionIcon(BaseModel):
     type: str
     url: str | None = None
@@ -53,11 +58,6 @@ class ProcessRule(BaseModel):
     rules: Rule | None = None
 
 
-class RerankingModel(BaseModel):
-    reranking_provider_name: str | None = None
-    reranking_model_name: str | None = None
-
-
 class WeightVectorSetting(BaseModel):
     vector_weight: float
     embedding_provider_name: str
diff --git a/api/services/entities/knowledge_entities/rag_pipeline_entities.py b/api/services/entities/knowledge_entities/rag_pipeline_entities.py
index a360fd2854..2afe9e1aa1 100644
--- a/api/services/entities/knowledge_entities/rag_pipeline_entities.py
+++ b/api/services/entities/knowledge_entities/rag_pipeline_entities.py
@@ -6,6 +6,24 @@ from core.rag.entities import KeywordSetting, VectorSetting
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 
 
+class RerankingModelConfig(BaseModel):
+    """
+    Reranking Model Config.
+    """
+
+    reranking_provider_name: str | None = ""
+    reranking_model_name: str | None = ""
+
+
+class WeightedScoreConfig(BaseModel):
+    """
+    Weighted score Config.
+    """
+
+    vector_setting: VectorSetting | None
+    keyword_setting: KeywordSetting | None
+
+
 class IconInfo(BaseModel):
     icon: str
     icon_background: str | None = None
@@ -28,24 +46,6 @@ class RagPipelineDatasetCreateEntity(BaseModel):
     yaml_content: str | None = None
 
 
-class RerankingModelConfig(BaseModel):
-    """
-    Reranking Model Config.
-    """
-
-    reranking_provider_name: str | None = ""
-    reranking_model_name: str | None = ""
-
-
-class WeightedScoreConfig(BaseModel):
-    """
-    Weighted score Config.
-    """
-
-    vector_setting: VectorSetting | None
-    keyword_setting: KeywordSetting | None
-
-
 class RetrievalSetting(BaseModel):
     """
     Retrieval Setting.