RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
Fix: allow yiyan api key (#18601)
Lynne2bbef071294
diff --git a/api/apps/services/provider_api_service.py b/api/apps/services/provider_api_service.pyindex 4fd476a130..7020d99c84 100644--- a/api/apps/services/provider_api_service.py+++ b/api/apps/services/provider_api_service.py@@ -750,12 +750,6 @@ async def verify_api_key(provider_id_or_name: str, api_key: str | dict, base_urltimeout_seconds = int(os.environ.get("LLM_TIMEOUT_SECONDS", 10))extra = {"provider": provider_name}msg = ""- if provider_name == "BaiduYiyan":- if isinstance(api_key, str):- try:- json.loads(api_key)- except (json.JSONDecodeError, TypeError):- api_key = {"yiyan_ak": api_key, "yiyan_sk": ""}api_key_str = api_key if isinstance(api_key, str) else json.dumps(api_key)# check passed typespassed_types = set()diff --git a/rag/llm/chat_model.py b/rag/llm/chat_model.pyindex e5fcbcb7cd..543387212d 100644--- a/rag/llm/chat_model.py+++ b/rag/llm/chat_model.py@@ -1335,10 +1335,17 @@ class BaiduYiyanChat(Base):import qianfan- key = json.loads(key)- ak = key.get("yiyan_ak", "")- sk = key.get("yiyan_sk", "")- self.client = qianfan.ChatCompletion(ak=ak, sk=sk)+ try:+ key_obj = json.loads(key)+ except (json.JSONDecodeError, TypeError):+ key_obj = key+ if isinstance(key_obj, dict):+ ak = key_obj.get("yiyan_ak", "")+ sk = key_obj.get("yiyan_sk", "")+ self.client = qianfan.ChatCompletion(ak=ak, sk=sk)+ else:+ # adapt to one-line api_key+ self.client = qianfan.ChatCompletion(access_token=key_obj)self.model_name = model_name.lower()def _clean_conf(self, gen_conf):diff --git a/rag/llm/embedding_model.py b/rag/llm/embedding_model.pyindex 5da4195814..3e4e58f320 100644--- a/rag/llm/embedding_model.py+++ b/rag/llm/embedding_model.py@@ -1092,10 +1092,17 @@ class BaiduYiyanEmbed(Base):def __init__(self, key, model_name, base_url=None):import qianfan- key = json.loads(key)- ak = key.get("yiyan_ak", "")- sk = key.get("yiyan_sk", "")- self.client = qianfan.Embedding(ak=ak, sk=sk)+ try:+ key_obj = json.loads(key)+ except (json.JSONDecodeError, TypeError):+ key_obj = key+ if isinstance(key_obj, dict):+ ak = key_obj.get("yiyan_ak", "")+ sk = key_obj.get("yiyan_sk", "")+ self.client = qianfan.Embedding(ak=ak, sk=sk)+ else:+ # adapt to one-line api_key+ self.client = qianfan.Embedding(access_token=key_obj)self.model_name = model_namedef encode(self, texts: list, batch_size=16):diff --git a/rag/llm/rerank_model.py b/rag/llm/rerank_model.pyindex 0a9d5eee24..a14a9a97fa 100644--- a/rag/llm/rerank_model.py+++ b/rag/llm/rerank_model.py@@ -580,10 +580,17 @@ class BaiduYiyanRerank(Base):def __init__(self, key, model_name, base_url=None):from qianfan.resources import Reranker- key = json.loads(key)- ak = key.get("yiyan_ak", "")- sk = key.get("yiyan_sk", "")- self.client = Reranker(ak=ak, sk=sk, request_timeout=30)+ try:+ key_obj = json.loads(key)+ except (json.JSONDecodeError, TypeError):+ key_obj = key+ if isinstance(key_obj, dict):+ ak = key_obj.get("yiyan_ak", "")+ sk = key_obj.get("yiyan_sk", "")+ self.client = Reranker(ak=ak, sk=sk, request_timeout=30)+ else:+ # adapt to one-line api_key+ self.client = Reranker(access_token=key_obj, request_timeout=30)self.model_name = model_namedef _compute_rank(self, query: str, texts: List) -> Tuple[np.ndarray, int]: