From 3b820fce608d32147b3a77c5c787ab3c19ee69e2 Mon Sep 17 00:00:00 2001 From: Frank Qing Date: Thu, 5 Jun 2025 23:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20(merlin=5Fdevbox.zsh,=20merlin=5Fwo?= =?UTF-8?q?rker.zsh):=20consolidate=20proxy=20configurations=20and=20alias?= =?UTF-8?q?es=20for=20Hugging=20Face=20and=20HTTP=20proxies,=20enhancing?= =?UTF-8?q?=20endpoint=20management=20and=20consistency=20across=20environ?= =?UTF-8?q?ments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zshrc/merlin_devbox.zsh | 34 ++++++++++++++++++++++------------ zshrc/merlin_worker.zsh | 37 +++++++++++++++++++++---------------- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/zshrc/merlin_devbox.zsh b/zshrc/merlin_devbox.zsh index a3e41ba..4b1de73 100644 --- a/zshrc/merlin_devbox.zsh +++ b/zshrc/merlin_devbox.zsh @@ -1,15 +1,3 @@ -# proxy -export HF_ENDPOINT=http://huggingface-proxy-sg.byted.org -export HTTP_PROXY=http://sys-proxy-rd-relay.byted.org:8118 -export HTTPS_PROXY=http://sys-proxy-rd-relay.byted.org:8118 -export NO_PROXY=byted.org,bytedance.net,10.*.*.*,127.*.*.* -export http_proxy=http://sys-proxy-rd-relay.byted.org:8118 -export https_proxy=http://sys-proxy-rd-relay.byted.org:8118 -export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.* - -alias proxy_on='export http_proxy=http://sys-proxy-rd-relay.byted.org:8118; export https_proxy=http://sys-proxy-rd-relay.byted.org:8118; export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.*; export HTTP_PROXY=http://sys-proxy-rd-relay.byted.org:8118; export HTTPS_PROXY=http://sys-proxy-rd-relay.byted.org:8118; export NO_PROXY=byted.org,bytedance.net,10.*.*.*,127.*.*.*' -alias proxy_off='unset http_proxy; unset https_proxy; unset no_proxy; unset HTTP_PROXY; unset HTTPS_PROXY; unset NO_PROXY' - # Merlin devbox specific aliases alias l=ls alias ll='ls -l --color=auto' @@ -46,3 +34,25 @@ if [ -f /opt/tiger/rh2_bashrc ]; then source /opt/tiger/rh2_bashrc fi source /opt/tiger/mlx_deploy/userrc + + +# huggingface proxy +export HF_NETWORK_PROXY=http://huggingface-proxy-sg.byted.org +export HF_MIRROR_INTERNAL=http://huggingface-mirror.bytedance.net +export HF_MIRROR_EXTERNAL=https://hf-mirror.com +export HF_ENDPOINT=$HF_NETWORK_PROXY +alias hf_network_proxy='export HF_ENDPOINT=$HF_NETWORK_PROXY' +alias hf_mirror_internal='export HF_ENDPOINT=$HF_MIRROR_INTERNAL' +alias hf_mirror_external='export HF_ENDPOINT=$HF_MIRROR_EXTERNAL' + +# http proxy +export HF_ENDPOINT=http://huggingface-proxy-sg.byted.org +export HTTP_PROXY=http://sys-proxy-rd-relay.byted.org:8118 +export HTTPS_PROXY=http://sys-proxy-rd-relay.byted.org:8118 +export NO_PROXY=byted.org,bytedance.net,10.*.*.*,127.*.*.* +export http_proxy=http://sys-proxy-rd-relay.byted.org:8118 +export https_proxy=http://sys-proxy-rd-relay.byted.org:8118 +export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.* + +alias proxy_on='export http_proxy=http://sys-proxy-rd-relay.byted.org:8118; export https_proxy=http://sys-proxy-rd-relay.byted.org:8118; export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.*; export HTTP_PROXY=http://sys-proxy-rd-relay.byted.org:8118; export HTTPS_PROXY=http://sys-proxy-rd-relay.byted.org:8118; export NO_PROXY=byted.org,bytedance.net,10.*.*.*,127.*.*.*' +alias proxy_off='unset http_proxy; unset https_proxy; unset no_proxy; unset HTTP_PROXY; unset HTTPS_PROXY; unset NO_PROXY' diff --git a/zshrc/merlin_worker.zsh b/zshrc/merlin_worker.zsh index 736590e..98a37e9 100644 --- a/zshrc/merlin_worker.zsh +++ b/zshrc/merlin_worker.zsh @@ -1,19 +1,3 @@ -# huggingface proxy -export HF_NETWORK_PROXY=http://huggingface-proxy-sg.byted.org -export HF_MIRROR_INTERNAL=http://huggingface-mirror.bytedance.net -export HF_MIRROR_EXTERNAL=https://hf-mirror.com -export HF_ENDPOINT=$HF_NETWORK_PROXY -alias hf_network_proxy='export HF_ENDPOINT=$HF_NETWORK_PROXY' -alias hf_mirror_internal='export HF_ENDPOINT=$HF_MIRROR_INTERNAL' -alias hf_mirror_external='export HF_ENDPOINT=$HF_MIRROR_EXTERNAL' - -# http proxy -export http_proxy=http://sys-proxy-rd-relay.byted.org:8118 -export https_proxy=http://sys-proxy-rd-relay.byted.org:8118 -export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.* -alias proxy_on='export http_proxy=http://sys-proxy-rd-relay.byted.org:8118; export https_proxy=http://sys-proxy-rd-relay.byted.org:8118; export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.*' -alias proxy_off='unset http_proxy; unset https_proxy; unset no_proxy' - # specific aliases alias save_log=/opt/tiger/rh2/rh2/init/log.sh alias stdout='tail -f /var/log/tiger/stdout' @@ -31,3 +15,24 @@ export PYSPARK_PYTHON=/usr/bin/python3 export PYTHONPATH=::/opt/tiger/arnold_toolbox:/opt/tiger/rh2:/opt/tiger/rh2:/opt/tiger/pyutil:/python:/python/lib/py4j-0.10.9-src.zip export PATH=/opt/tiger/arnold/arnold_entrypoint/debugger/cloudide/release-standalone/bin/remote-cli:$PATH export PYTHONPATH=$PYTHONPATH:/opt/tiger/pyutil:/opt/tiger/rh2:/opt/tiger/arnold_toolbox + +# huggingface proxy +export HF_NETWORK_PROXY=http://huggingface-proxy-sg.byted.org +export HF_MIRROR_INTERNAL=http://huggingface-mirror.bytedance.net +export HF_MIRROR_EXTERNAL=https://hf-mirror.com +export HF_ENDPOINT=$HF_NETWORK_PROXY +alias hf_network_proxy='export HF_ENDPOINT=$HF_NETWORK_PROXY' +alias hf_mirror_internal='export HF_ENDPOINT=$HF_MIRROR_INTERNAL' +alias hf_mirror_external='export HF_ENDPOINT=$HF_MIRROR_EXTERNAL' + +# http proxy +export HF_ENDPOINT=http://huggingface-proxy-sg.byted.org +export HTTP_PROXY=http://sys-proxy-rd-relay.byted.org:8118 +export HTTPS_PROXY=http://sys-proxy-rd-relay.byted.org:8118 +export NO_PROXY=byted.org,bytedance.net,10.*.*.*,127.*.*.* +export http_proxy=http://sys-proxy-rd-relay.byted.org:8118 +export https_proxy=http://sys-proxy-rd-relay.byted.org:8118 +export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.* + +alias proxy_on='export http_proxy=http://sys-proxy-rd-relay.byted.org:8118; export https_proxy=http://sys-proxy-rd-relay.byted.org:8118; export no_proxy=byted.org,bytedance.net,10.*.*.*,127.*.*.*; export HTTP_PROXY=http://sys-proxy-rd-relay.byted.org:8118; export HTTPS_PROXY=http://sys-proxy-rd-relay.byted.org:8118; export NO_PROXY=byted.org,bytedance.net,10.*.*.*,127.*.*.*' +alias proxy_off='unset http_proxy; unset https_proxy; unset no_proxy; unset HTTP_PROXY; unset HTTPS_PROXY; unset NO_PROXY'