fix:Fix adb retrieve settings issue

Change-Id: I665fa00b9362e58b43295c7167b70ff015ea3ea1
Co-developed-by: Qoder <noreply@qoder.com>

Author: 灵轮

agentrun/knowledgebase/__knowledgebase_async_template.py

@@ -276,6 +276,18 @@ def _get_data_api(self, config: Optional[Config] = None):
         converted_provider_settings = None
         converted_retrieve_settings = None
 
+        # 当 retrieve_settings 被 pydantic Union 匹配到错误的类型时（由于 extra="allow"），
+        # 从 __pydantic_extra__ 提取原始数据作为 dict 使用
+        # When retrieve_settings is matched to wrong Union type by pydantic (due to extra="allow"),
+        # extract raw data from __pydantic_extra__ as dict
+        if (
+            self.retrieve_settings is not None
+            and not isinstance(self.retrieve_settings, dict)
+            and hasattr(self.retrieve_settings, "__pydantic_extra__")
+            and self.retrieve_settings.__pydantic_extra__
+        ):
+            self.retrieve_settings = self.retrieve_settings.__pydantic_extra__
+
         if provider == KnowledgeBaseProvider.BAILIAN:
             # 百炼设置 / Bailian settings
             if self.provider_settings:

agentrun/knowledgebase/api/__data_async_template.py

@@ -426,14 +426,10 @@ def _build_query_content_request(
                     self.retrieve_settings.rerank_factor
                 )
             if self.retrieve_settings.rerank_model is not None:
-                rerank_model_params: Dict[str, Any] = {
-                    "Name": self.retrieve_settings.rerank_model.name,
-                }
-                if self.retrieve_settings.rerank_model.instruct is not None:
-                    rerank_model_params["Instruct"] = (
-                        self.retrieve_settings.rerank_model.instruct
-                    )
-                request_params["rerank_model"] = rerank_model_params
+                request_params["rerank_model"] = gpdb_models.QueryContentRequestRerankModel(
+                    name=self.retrieve_settings.rerank_model.name,
+                    instruct=self.retrieve_settings.rerank_model.instruct,
+                )
             if self.retrieve_settings.recall_window is not None:
                 request_params["recall_window"] = (
                     self.retrieve_settings.recall_window

agentrun/knowledgebase/api/data.py

@@ -636,14 +636,10 @@ def _build_query_content_request(
                     self.retrieve_settings.rerank_factor
                 )
             if self.retrieve_settings.rerank_model is not None:
-                rerank_model_params: Dict[str, Any] = {
-                    "Name": self.retrieve_settings.rerank_model.name,
-                }
-                if self.retrieve_settings.rerank_model.instruct is not None:
-                    rerank_model_params["Instruct"] = (
-                        self.retrieve_settings.rerank_model.instruct
-                    )
-                request_params["rerank_model"] = rerank_model_params
+                request_params["rerank_model"] = gpdb_models.QueryContentRequestRerankModel(
+                    name=self.retrieve_settings.rerank_model.name,
+                    instruct=self.retrieve_settings.rerank_model.instruct,
+                )
             if self.retrieve_settings.recall_window is not None:
                 request_params["recall_window"] = (
                     self.retrieve_settings.recall_window

agentrun/knowledgebase/knowledgebase.py

@@ -458,6 +458,18 @@ def _get_data_api(self, config: Optional[Config] = None):
         converted_provider_settings = None
         converted_retrieve_settings = None
 
+        # 当 retrieve_settings 被 pydantic Union 匹配到错误的类型时（由于 extra="allow"），
+        # 从 __pydantic_extra__ 提取原始数据作为 dict 使用
+        # When retrieve_settings is matched to wrong Union type by pydantic (due to extra="allow"),
+        # extract raw data from __pydantic_extra__ as dict
+        if (
+            self.retrieve_settings is not None
+            and not isinstance(self.retrieve_settings, dict)
+            and hasattr(self.retrieve_settings, "__pydantic_extra__")
+            and self.retrieve_settings.__pydantic_extra__
+        ):
+            self.retrieve_settings = self.retrieve_settings.__pydantic_extra__
+
         if provider == KnowledgeBaseProvider.BAILIAN:
             # 百炼设置 / Bailian settings
             if self.provider_settings: