fix(chat_model): raise clear ModelException when BaiduYiyan key is not a JSON object (infiniflow#17389)

The BaiduYiyan / Qianfan provider in rag/llm/chat_model.py:1189 does an
unguarded `json.loads(key)` followed by `.get("yiyan_ak")` and
`.get("yiyan_sk")`. The provider REQUIRES a JSON key (per
conf/models/baidu.json) but a user pasting a plain Baidu API key like
"bce-v3/ALTAK-.../..." (the most common mistake: copying from the Qianfan
console into a BaiduYiyan field) would crash with
`json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)`
from inside rag/llm internals, with no indication of what the user did
wrong.

This is the BaiduYiyan equivalent of:

- infiniflow#17204 / PR infiniflow#17215 (Azure-OpenAI)
- infiniflow#17373 / PR infiniflow#17377 (AWS Bedrock)

Add a parallel helper to rag.llm.key_utils that mirrors the Bedrock fix
shape:

```
def _resolve_qianfan_credentials(key):
    # Accepts dict or JSON-string-encoded dict. Returns the dict.
    # On non-JSON input (e.g. plain "bce-v3/..."):
    #   raises ModelException with the required schema in the message
    #   (yiyan_ak + yiyan_sk, conf/models/baidu.json reference).
    # On JSON top-level non-dict (list, string, number):
    #   raises ModelException rather than letting the caller hit
    #   AttributeError on .get("yiyan_ak").
```

Wire BaiduYiyanChat.__init__ (chat_model.py:1189) through the helper
instead of the bare `json.loads(key)`. The downstream
`key.get("yiyan_ak", "")` / `.get("yiyan_sk", "")` calls are
unchanged.

No public API change. No data-model change. No migration.

Fixes infiniflow#17389.

Author: Harsh23Kashyap

rag/llm/chat_model.py

@@ -36,8 +36,12 @@
 from common.llm_request_context import current_llm_user
 from common.token_utils import num_tokens_from_string, total_token_count_from_response, usage_from_response
 from rag.llm import FACTORY_DEFAULT_BASE_URL, LITELLM_PROVIDER_PREFIX, SupportedLiteLLMProvider
+<<<<<<< HEAD
 from rag.llm.key_utils import _normalize_replicate_key
 from rag.llm.mws_utils import mws_api_url, require_mws_token
+=======
+from rag.llm.key_utils import _normalize_replicate_key, _resolve_qianfan_credentials
+>>>>>>> c6d1af4b1 (fix(chat_model): raise clear ModelException when BaiduYiyan key is not a JSON object (#17389))
 from rag.llm.tool_decorator import FunctionToolSession, is_tool
 from rag.nlp import is_chinese, is_english
 from rag.utils.url_utils import ensure_v1
@@ -1335,7 +1339,12 @@ def __init__(self, key, model_name, base_url=None, **kwargs):
 
         import qianfan
 
-        key = json.loads(key)
+        # Parse via the shared helper. On non-JSON input (e.g. a plain Baidu
+        # API key like "bce-v3/...") the helper raises a clear ModelException
+        # pointing at the required schema; without this guard a raw
+        # json.loads would surface a JSONDecodeError from inside rag/llm
+        # internals (see #17389).
+        key = _resolve_qianfan_credentials(key)
         ak = key.get("yiyan_ak", "")
         sk = key.get("yiyan_sk", "")
         self.client = qianfan.ChatCompletion(ak=ak, sk=sk)

rag/llm/key_utils.py

@@ -14,6 +14,9 @@
 #  limitations under the License.
 #
 import json
+import logging
+
+from common.exceptions import ModelException
 
 
 def _normalize_replicate_key(key):
@@ -31,4 +34,59 @@ def _normalize_replicate_key(key):
     return key
 
 
-__all__ = ["_normalize_replicate_key"]
+def _resolve_qianfan_credentials(key):
+    """Parse a BaiduYiyan (Baidu Qianfan) ``key`` and return it as a dict.
+
+    The BaiduYiyan / Qianfan API requires a JSON object with at least
+    ``yiyan_ak`` and ``yiyan_sk``. See ``conf/models/baidu.json`` for the
+    model class.
+
+    On non-JSON input -- for example a user pasting a plain Baidu API key
+    like ``"bce-v3/ALTAK-.../..."`` -- we raise a clear
+    :class:`ModelException` pointing at the required schema, instead of
+    letting ``json.loads`` bubble up as ``json.decoder.JSONDecodeError:
+    Expecting value: line 1 column 1 (char 0)`` from inside ``rag/llm``
+    internals. Mirrors the fix shape of ``_resolve_bedrock_credentials``
+    for #17373 and the Azure fix for #17204 / #17215.
+
+    On a JSON top-level type that is not a dict (e.g. a list, string, or
+    number), we also raise the same clear error rather than calling
+    ``.get("yiyan_ak")`` on the value and getting an ``AttributeError``.
+    """
+    if isinstance(key, dict):
+        payload = key
+    elif isinstance(key, str):
+        try:
+            payload = json.loads(key)
+        except (json.JSONDecodeError, TypeError):
+            logging.warning(
+                "BaiduYiyan key is not valid JSON; expected a JSON object with 'yiyan_ak' and 'yiyan_sk' (see conf/models/baidu.json).",
+            )
+            raise ModelException(
+                'BaiduYiyan requires a JSON key with at least \'yiyan_ak\' and \'yiyan_sk\'. Example: {"yiyan_ak": "...", "yiyan_sk": "..."}. See conf/models/baidu.json for the model class.',
+                retryable=False,
+            )
+    else:
+        logging.warning(
+            "BaiduYiyan key is not a string or dict (got %s); expected a JSON object with 'yiyan_ak' and 'yiyan_sk'.",
+            type(key).__name__,
+        )
+        raise ModelException(
+            f"BaiduYiyan requires a JSON key, got {type(key).__name__}. See conf/models/baidu.json for the model class.",
+            retryable=False,
+        )
+
+    if not isinstance(payload, dict):
+        logging.warning(
+            "BaiduYiyan key parsed as JSON but is not a dict (got %s).",
+            type(payload).__name__,
+        )
+        raise ModelException(
+            f"BaiduYiyan key must be a JSON object, got {type(payload).__name__}. See conf/models/baidu.json for the model class.",
+            retryable=False,
+        )
+
+    return payload
+
+
+__all__ = ["_normalize_replicate_key", "_resolve_qianfan_credentials"]