gyt/opendan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs for proxy and dynamics node

Browse Source
This commit is contained in:
streetycat
2023-10-24 09:27:06 +00:00
parent e4be896b7c
commit c342e5678b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aios_kernel/compute_node_config.py
+4 -2
View File
@@ -70,10 +70,12 @@ class ComputeNodeConfig:
def remove_node(self, model_type: str, url: str, model_name: str): def remove_node(self, model_type: str, url: str, model_name: str):
if model_type == "llama": if model_type == "llama":
llama_nodes_cfg = self.config.get("llama") or [] llama_nodes_cfg = self.config.get("llama") or []
for i in range(0, len(llama_nodes_cfg)): i = 0
cfg = llama_nodes_cfg[i] for cfg in llama_nodes_cfg:
if url == cfg["url"] and model_name == cfg["model_name"]: if url == cfg["url"] and model_name == cfg["model_name"]:
llama_nodes_cfg.pop(i) llama_nodes_cfg.pop(i)
else:
i += 1
def list(self) -> str: def list(self) -> str:
return toml.dumps(self.config) return toml.dumps(self.config)
src/service/aios_shell/proxy.py
+6 -1
View File
@@ -35,10 +35,15 @@ def apply_storage():
socks.set_default_proxy(socks.SOCKS5, host, int(port), username = username, password = password) socks.set_default_proxy(socks.SOCKS5, host, int(port), username = username, password = password)
socket.socket = socks.socksocket socket.socket = socks.socksocket
logger.info(f"proxy {host_url} will be used.") logger.info(f"proxy {host_url} will be used.")
case "http":
(host, port) = host.split(":")
socks.set_default_proxy(socks.HTTP, host, int(port), username = username, password = password)
socket.socket = socks.socksocket
logger.info(f"proxy {host_url} will be used.")
case _: case _:
logger.error(f"the proxy type ({proxy_type}) has not support. proxy will not be used.") logger.error(f"the proxy type ({proxy_type}) has not support. proxy will not be used.")
def declare_user_config(): def declare_user_config():
user_config = AIStorage.get_instance().get_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@username@password', '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|http'", True, None)