refac: modernize type annotations (PEP 604 / PEP 585)

backend/open_webui/retrieval/web/azure.py

@@ -1,5 +1,6 @@
 import logging
 from typing import Optional
+
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)

backend/open_webui/retrieval/web/bing.py

@@ -1,10 +1,11 @@
+import argparse
 import logging
 import os
 from pprint import pprint
 from typing import Optional
+
 import requests
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
-import argparse
 
 log = logging.getLogger(__name__)
 """

backend/open_webui/retrieval/web/bocha.py

@@ -1,8 +1,8 @@
+import json
 import logging
 from typing import Optional
 
 import requests
-import json
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)

backend/open_webui/retrieval/web/brave.py

@@ -8,6 +8,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_brave(api_key: str, query: str, count: int, filter_list: list[str | None] = None) -> list[SearchResult]:
     """Search using Brave's Search API and return the results as a list of SearchResult objects.
 

backend/open_webui/retrieval/web/duckduckgo.py

@@ -9,6 +9,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_duckduckgo(
     query: str,
     count: int,

backend/open_webui/retrieval/web/external.py

@@ -1,14 +1,11 @@
 import logging
-from typing import Optional, List
+from typing import List, Optional
 
 import requests
-
 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.env import FORWARD_SESSION_INFO_HEADER_CHAT_ID
 
 log = logging.getLogger(__name__)
 

backend/open_webui/retrieval/web/google_pse.py

@@ -7,6 +7,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_google_pse(
     api_key: str,
     search_engine_id: str,

backend/open_webui/retrieval/web/jina_search.py

@@ -8,6 +8,7 @@ from yarl import URL
 
 log = logging.getLogger(__name__)
 
+
 def search_jina(api_key: str, query: str, count: int, base_url: str = '') -> list[SearchResult]:
     """
     Search using Jina's Search API and return the results as a list of SearchResult objects.

backend/open_webui/retrieval/web/main.py

@@ -7,6 +7,7 @@ from open_webui.retrieval.web.utils import resolve_hostname
 from open_webui.utils.misc import is_string_allowed
 from pydantic import BaseModel
 
+
 def get_filtered_results(results, filter_list):
     if not filter_list:
         return results
@@ -37,6 +38,7 @@ def get_filtered_results(results, filter_list):
 
     return filtered_results
 
+
 class SearchResult(BaseModel):
     link: str
     title: str | None

backend/open_webui/retrieval/web/mojeek.py

@@ -7,6 +7,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_mojeek(api_key: str, query: str, count: int, filter_list: list[str | None] = None) -> list[SearchResult]:
     """Search using Mojeek's Search API and return the results as a list of SearchResult objects.
 

backend/open_webui/retrieval/web/perplexity.py

@@ -1,7 +1,7 @@
 import logging
-from typing import Optional, Literal
-import requests
+from typing import Literal, Optional
 
+import requests
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 MODELS = Literal[

backend/open_webui/retrieval/web/perplexity_search.py

@@ -1,7 +1,7 @@
 import logging
-from typing import Optional, Literal
-import requests
+from typing import Literal, Optional
 
+import requests
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 from open_webui.utils.headers import include_user_info_headers
 

backend/open_webui/retrieval/web/searxng.py

@@ -7,6 +7,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_searxng(  # noqa: PLR0913
     query_url: str,
     query: str,

backend/open_webui/retrieval/web/serper.py

@@ -8,6 +8,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_serper(api_key: str, query: str, count: int, filter_list: list[str | None] = None) -> list[SearchResult]:
     """Search using serper.dev's API and return the results as a list of SearchResult objects.
 

backend/open_webui/retrieval/web/serply.py

@@ -8,6 +8,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_serply(
     api_key: str,
     query: str,

backend/open_webui/retrieval/web/serpstack.py

@@ -7,6 +7,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_serpstack(
     api_key: str,
     query: str,

backend/open_webui/retrieval/web/sougou.py

@@ -1,7 +1,6 @@
-import logging
 import json
-from typing import Optional, List
-
+import logging
+from typing import List, Optional
 
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
@@ -15,8 +14,8 @@ def search_sougou(
     count: int,
     filter_list: Optional[List[str]] = None,
 ) -> List[SearchResult]:
-    from tencentcloud.common.common_client import CommonClient
     from tencentcloud.common import credential
+    from tencentcloud.common.common_client import CommonClient
     from tencentcloud.common.exception.tencent_cloud_sdk_exception import (
         TencentCloudSDKException,
     )

backend/open_webui/retrieval/web/tavily.py

@@ -7,6 +7,7 @@ from open_webui.retrieval.web.main import SearchResult, get_filtered_results
 
 log = logging.getLogger(__name__)
 
+
 def search_tavily(
     api_key: str,
     query: str,

backend/open_webui/retrieval/web/utils.py

@@ -5,8 +5,6 @@ import socket
 import ssl
 import urllib.parse
 import urllib.request
-
-import requests
 from datetime import datetime, time, timedelta
 from typing import (
     Any,
@@ -14,41 +12,41 @@ from typing import (
     Dict,
     Iterator,
     List,
+    Literal,
     Optional,
     Sequence,
     Union,
-    Literal,
 )
 
-from fastapi.concurrency import run_in_threadpool
 import aiohttp
 import certifi
+import requests
 import validators
+from fastapi.concurrency import run_in_threadpool
 from langchain_community.document_loaders import PlaywrightURLLoader, WebBaseLoader
 from langchain_community.document_loaders.base import BaseLoader
 from langchain_core.documents import Document
-
-from open_webui.retrieval.loaders.tavily import TavilyLoader
-from open_webui.retrieval.loaders.external_web import ExternalWebLoader
-from open_webui.retrieval.web.firecrawl import scrape_firecrawl_url
-from open_webui.constants import ERROR_MESSAGES
 from open_webui.config import (
     ENABLE_RAG_LOCAL_WEB_FETCH,
-    PLAYWRIGHT_WS_URL,
-    PLAYWRIGHT_TIMEOUT,
-    WEB_LOADER_ENGINE,
-    WEB_LOADER_TIMEOUT,
+    EXTERNAL_WEB_LOADER_API_KEY,
+    EXTERNAL_WEB_LOADER_URL,
     FIRECRAWL_API_BASE_URL,
     FIRECRAWL_API_KEY,
     FIRECRAWL_TIMEOUT,
+    PLAYWRIGHT_TIMEOUT,
+    PLAYWRIGHT_WS_URL,
     TAVILY_API_KEY,
     TAVILY_EXTRACT_DEPTH,
-    EXTERNAL_WEB_LOADER_URL,
-    EXTERNAL_WEB_LOADER_API_KEY,
     WEB_FETCH_FILTER_LIST,
+    WEB_LOADER_ENGINE,
+    WEB_LOADER_TIMEOUT,
 )
+from open_webui.constants import ERROR_MESSAGES
+from open_webui.env import AIOHTTP_CLIENT_ALLOW_REDIRECTS, AIOHTTP_CLIENT_SESSION_SSL
+from open_webui.retrieval.loaders.external_web import ExternalWebLoader
+from open_webui.retrieval.loaders.tavily import TavilyLoader
+from open_webui.retrieval.web.firecrawl import scrape_firecrawl_url
 from open_webui.utils.misc import is_string_allowed
-from open_webui.env import AIOHTTP_CLIENT_SESSION_SSL, AIOHTTP_CLIENT_ALLOW_REDIRECTS
 
 log = logging.getLogger(__name__)
 

backend/open_webui/retrieval/web/yacy.py

@@ -2,8 +2,8 @@ import logging
 from typing import Optional
 
 import requests
-from requests.auth import HTTPDigestAuth
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results
+from requests.auth import HTTPDigestAuth
 
 log = logging.getLogger(__name__)
 

backend/open_webui/retrieval/web/yandex.py

@@ -3,19 +3,16 @@ import io
 import json
 import logging
 import os
-from typing import Optional, List
-
-import requests
-
-from fastapi import Request
-
-from open_webui.retrieval.web.main import SearchResult, get_filtered_results
-from open_webui.utils.headers import include_user_info_headers
-from open_webui.env import FORWARD_SESSION_INFO_HEADER_CHAT_ID
-
+from typing import List, Optional
 from xml.etree import ElementTree as ET
 from xml.etree.ElementTree import Element
 
+import requests
+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
+
 log = logging.getLogger(__name__)
 
 
@@ -122,8 +119,8 @@ def search_yandex(
 
 
 if __name__ == '__main__':
-    from starlette.datastructures import Headers
     from fastapi import FastAPI
+    from starlette.datastructures import Headers
 
     result = search_yandex(
         Request(

backend/open_webui/retrieval/web/ydc.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, List
+from typing import List, Optional
 
 import requests
 from open_webui.retrieval.web.main import SearchResult, get_filtered_results