refac

backend/open_webui/retrieval/web/bocha.py

@@ -1,9 +1,9 @@
-import json
 import logging
 from typing import Optional
 
 import requests
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
+from open_webui.utils.json_codec import JSONCodec
 
 log = logging.getLogger(__name__)
 
@@ -41,7 +41,7 @@ def search_bocha(api_key: str, query: str, count: int, filter_list: Optional[lis
     url = 'https://api.bochaai.com/v1/web-search?utm_source=ollama'
     headers = {'Authorization': f'Bearer {api_key}', 'Content-Type': 'application/json'}
 
-    payload = json.dumps({'query': query, 'summary': True, 'freshness': 'noLimit', 'count': count})
+    payload = JSONCodec.dumps({'query': query, 'summary': True, 'freshness': 'noLimit', 'count': count})
 
     response = requests.post(url, headers=headers, data=payload, timeout=5)
     response.raise_for_status()

backend/open_webui/retrieval/web/serper.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-import json
 import logging
 
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
+from open_webui.utils.json_codec import JSONCodec
 from open_webui.utils.session_pool import get_session
 
 log = logging.getLogger(__name__)
@@ -23,7 +23,7 @@ async def search_serper(
     headers = {'X-API-KEY': api_key, 'Content-Type': 'application/json'}
 
     session = await get_session()
-    async with session.post(url, headers=headers, data=json.dumps({'q': query})) as response:
+    async with session.post(url, headers=headers, data=JSONCodec.dumps({'q': query})) as response:
         response.raise_for_status()
         payload = await response.json()
 

backend/open_webui/retrieval/web/sougou.py

@@ -1,8 +1,8 @@
-import json
 import logging
 from typing import List, Optional
 
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
+from open_webui.utils.json_codec import JSONCodec
 
 log = logging.getLogger(__name__)
 
@@ -28,10 +28,10 @@ def search_sougou(
         http_profile.endpoint = 'tms.tencentcloudapi.com'
         client_profile = ClientProfile()
         client_profile.http_profile = http_profile
-        params = json.dumps({'Query': query, 'Cnt': 20})
+        params = JSONCodec.dumps({'Query': query, 'Cnt': 20})
         common_client = CommonClient('tms', '2020-12-29', cred, '', profile=client_profile)
         results = [
-            json.loads(page) for page in common_client.call_json('SearchPro', json.loads(params))['Response']['Pages']
+            JSONCodec.loads(page) for page in common_client.call_json('SearchPro', JSONCodec.loads(params))['Response']['Pages']
         ]
         sorted_results = sorted(results, key=lambda x: x.get('scour', 0.0), reverse=True)
         if filter_list:

backend/open_webui/retrieval/web/yandex.py

@@ -1,6 +1,5 @@
 import base64
 import io
-import json
 import logging
 import os
 from typing import List, Optional
@@ -12,6 +11,7 @@ from fastapi import Request
 from open_webui.env import FORWARD_SESSION_INFO_HEADER_CHAT_ID
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 from open_webui.utils.headers import include_user_info_headers
+from open_webui.utils.json_codec import JSONCodec
 
 log = logging.getLogger(__name__)
 
@@ -55,7 +55,7 @@ def search_yandex(
         if chat_id:
             headers[FORWARD_SESSION_INFO_HEADER_CHAT_ID] = str(chat_id)
 
-        payload = {} if yandex_search_config == '' else json.loads(yandex_search_config)
+        payload = {} if yandex_search_config == '' else JSONCodec.loads(yandex_search_config)
 
         if type(payload.get('query', None)) != dict:
             payload['query'] = {}