From c5184154b5a568c50746ff7f4dbfa043c30a52ea Mon Sep 17 00:00:00 2001 From: streetycat <305190374@qq.com> Date: Wed, 20 Sep 2023 07:46:42 +0000 Subject: [PATCH] proxy with authorize --- src/aios_kernel/local_llama_compute_node.py | 2 +- src/service/aios_shell/proxy.py | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/aios_kernel/local_llama_compute_node.py b/src/aios_kernel/local_llama_compute_node.py index 5cba82e..7e50661 100644 --- a/src/aios_kernel/local_llama_compute_node.py +++ b/src/aios_kernel/local_llama_compute_node.py @@ -47,7 +47,7 @@ class LocalLlama_ComputeNode(Queue_ComputeNode): "state": ComputeTaskState.ERROR, "error": { "code": response.status_code, - "message": "http request failed: " + response.status_code + "message": "http request failed: " + str(response.status_code) } } else: diff --git a/src/service/aios_shell/proxy.py b/src/service/aios_shell/proxy.py index 7f8a352..ec07eb3 100644 --- a/src/service/aios_shell/proxy.py +++ b/src/service/aios_shell/proxy.py @@ -16,17 +16,25 @@ def apply_storage(): return host_url = proxy_cfg.value - if host_url is not None: - (proxy_type, host) = host_url.split("@") + if host_url is not None and len(host_url) > 3: + url_fields = host_url.split("@") + proxy_type, host, username, password = url_fields[0], None, None, None + if len(url_fields) > 1: + host = url_fields[1] + if len(url_fields) > 2: + username = url_fields[2] + if len(url_fields) > 3: + password = url_fields[3] + match proxy_type: case "socks5": (host, port) = host.split(":") - socks.set_default_proxy(socks.SOCKS5, host, int(port)) + socks.set_default_proxy(socks.SOCKS5, host, int(port), username = username, password = password) socket.socket = socks.socksocket - print("proxy {host_url} will be used.") + print(f"proxy {host_url} will be used.") case _: - print("the proxy type ({proxy_type}) has not support.") + print(f"the proxy type ({proxy_type}) has not support.") def declare_user_config(): user_config = AIStorage.get_instance().get_user_config() - user_config.add_user_config("proxy", "set your proxy service as 'proxy_type@host:port', 'proxy_type' = 'socks5'", True, None) + user_config.add_user_config("proxy", "set your proxy service as 'proxy_type@host:port@username@password', 'proxy_type' = 'socks5'", True, None)