From 24e6d16a095c9e526a240ce7bc648d3cfe676426 Mon Sep 17 00:00:00 2001
From: yihong0618 <zouzou0208@gmail.com>
Date: Fri, 22 Sep 2023 16:47:34 +0800
Subject: [PATCH 1/2] fix: proxyllm do not need controller_addr

---
 pilot/model/cluster/worker/manager.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pilot/model/cluster/worker/manager.py b/pilot/model/cluster/worker/manager.py
index 49c582a07..2f84a3216 100644
--- a/pilot/model/cluster/worker/manager.py
+++ b/pilot/model/cluster/worker/manager.py
@@ -1,17 +1,18 @@
 import asyncio
 import itertools
 import json
-import os
-import sys
-import random
-import time
 import logging
+import os
+import random
+import sys
+import time
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import asdict
 from typing import Awaitable, Callable, Dict, Iterator, List, Optional
 
 from fastapi import APIRouter, FastAPI
 from fastapi.responses import StreamingResponse
+
 from pilot.component import SystemApp
 from pilot.model.base import (
     ModelInstance,
@@ -20,16 +21,16 @@ from pilot.model.base import (
     WorkerApplyType,
     WorkerSupportedModel,
 )
-from pilot.model.cluster.registry import ModelRegistry
-from pilot.model.llm_utils import list_supported_models
-from pilot.model.parameter import ModelParameters, ModelWorkerParameters, WorkerType
-from pilot.model.cluster.worker_base import ModelWorker
+from pilot.model.cluster.base import *
 from pilot.model.cluster.manager_base import (
     WorkerManager,
-    WorkerRunData,
     WorkerManagerFactory,
+    WorkerRunData,
 )
-from pilot.model.cluster.base import *
+from pilot.model.cluster.registry import ModelRegistry
+from pilot.model.cluster.worker_base import ModelWorker
+from pilot.model.llm_utils import list_supported_models
+from pilot.model.parameter import ModelParameters, ModelWorkerParameters, WorkerType
 from pilot.utils.parameter_utils import (
     EnvArgumentParser,
     ParameterDescription,
@@ -638,7 +639,7 @@ def _setup_fastapi(worker_params: ModelWorkerParameters, app=None):
             router as controller_router,
         )
 
-        if not worker_params.controller_addr:
+        if not worker_params.controller_addr and worker_params.model_name != "proxyllm":
             worker_params.controller_addr = f"http://127.0.0.1:{worker_params.port}"
         logger.info(
             f"Run WorkerManager with standalone mode, controller_addr: {worker_params.controller_addr}"

From 76fdf52b0ae6ee896492bba9968eb706a2678d3f Mon Sep 17 00:00:00 2001
From: yihong0618 <zouzou0208@gmail.com>
Date: Sat, 23 Sep 2023 14:46:26 +0800
Subject: [PATCH 2/2] fix: another way

---
 pilot/model/cluster/worker/manager.py | 6 +++++-
 pilot/model/parameter.py              | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pilot/model/cluster/worker/manager.py b/pilot/model/cluster/worker/manager.py
index 2f84a3216..da34c314a 100644
--- a/pilot/model/cluster/worker/manager.py
+++ b/pilot/model/cluster/worker/manager.py
@@ -639,7 +639,11 @@ def _setup_fastapi(worker_params: ModelWorkerParameters, app=None):
             router as controller_router,
         )
 
-        if not worker_params.controller_addr and worker_params.model_name != "proxyllm":
+        if not worker_params.controller_addr:
+            # if we have http_proxy or https_proxy in env, the server can not start
+            # so set it to empty here
+            os.environ["http_proxy"] = ""
+            os.environ["https_proxy"] = ""
             worker_params.controller_addr = f"http://127.0.0.1:{worker_params.port}"
         logger.info(
             f"Run WorkerManager with standalone mode, controller_addr: {worker_params.controller_addr}"
diff --git a/pilot/model/parameter.py b/pilot/model/parameter.py
index c7917a95f..6fd8ec5ab 100644
--- a/pilot/model/parameter.py
+++ b/pilot/model/parameter.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+import os
 from dataclasses import dataclass, field
 from enum import Enum
 from typing import Dict, Optional
@@ -246,6 +247,11 @@ class ProxyModelParameters(BaseModelParameters):
     proxy_api_key: str = field(
         metadata={"tags": "privacy", "help": "The api key of current proxy LLM"},
     )
+    http_proxy: Optional[str] = field(
+        default=os.environ.get("http_proxy") or os.environ.get("https_proxy"),
+        metadata={"help": "The http or https proxy to use openai"},
+    )
+
     proxyllm_backend: Optional[str] = field(
         default=None,
         metadata={