fix bugs for proxy and dynamics node

practicing-musician · Oct 24, 2023 · c342e56 · c342e56
1 parent e4be896
commit c342e56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/aios_kernel/compute_node_config.py b/src/aios_kernel/compute_node_config.py
@@ -70,10 +70,12 @@ def add_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":
  llama_nodes_cfg = self.config.get("llama") or []
- for i in range(0, len(llama_nodes_cfg)):
-  cfg = llama_nodes_cfg[i]
+ i = 0
+ for cfg in llama_nodes_cfg:
  if url == cfg["url"] and model_name == cfg["model_name"]:
  llama_nodes_cfg.pop(i)
+ else:
+ i += 1
 
  def list(self) -> str:
  return toml.dumps(self.config)

diff --git a/src/service/aios_shell/proxy.py b/src/service/aios_shell/proxy.py
@@ -35,10 +35,15 @@ def apply_storage():
  socks.set_default_proxy(socks.SOCKS5, host, int(port), username = username, password = password)
  socket.socket = socks.socksocket
  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 _:
  logger.error(f"the proxy type ({proxy_type}) has not support. proxy will not be used.")
 
 
 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@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)