weiweiw
/
Langchain-Chatchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复代理为空的问题

This commit is contained in:
glide-the 2023-10-04 13:33:42 +08:00
parent e88d926bbb
commit a655608d01
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/utils.py
View File

@ -425,7 +425,7 @@ def set_httpx_config(
if host not in no_proxy: if host not in no_proxy:
no_proxy.append(host) no_proxy.append(host)
os.environ["NO_PROXY"] = ",".join(no_proxy) os.environ["NO_PROXY"] = ",".join(no_proxy)
# TODO: 简单的清除系统代理不是个好的选择，影响太多。似乎修改代理服务器的bypass列表更好。 # TODO: 简单的清除系统代理不是个好的选择，影响太多。似乎修改代理服务器的bypass列表更好。
# patch requests to use custom proxies instead of system settings # patch requests to use custom proxies instead of system settings
# def _get_proxies(): # def _get_proxies():
@ -506,10 +506,11 @@ def get_httpx_client(
default_proxies.update({host: None}) default_proxies.update({host: None})
# get proxies from system envionrent # get proxies from system envionrent
# proxy not str empty string, None, False, 0, [] or {}
default_proxies.update({ default_proxies.update({
"http://": os.environ.get("http_proxy"), "http://": os.environ.get("http_proxy") if len(os.environ.get("http_proxy").strip()) > 0 else None,
"https://": os.environ.get("https_proxy"), "https://": os.environ.get("https_proxy") if len(os.environ.get("https_proxy").strip()) > 0 else None,
"all://": os.environ.get("all_proxy"), "all://": os.environ.get("all_proxy") if len(os.environ.get("all_proxy").strip()) > 0 else None,
}) })
for host in os.environ.get("no_proxy", "").split(","): for host in os.environ.get("no_proxy", "").split(","):
if host := host.strip(): if host := host.strip():
@ -524,6 +525,7 @@ def get_httpx_client(
# construct Client # construct Client
kwargs.update(timeout=timeout, proxies=default_proxies) kwargs.update(timeout=timeout, proxies=default_proxies)
print(kwargs)
if use_async: if use_async:
return httpx.AsyncClient(**kwargs) return httpx.AsyncClient(**kwargs)
else: else: