From c7a99880336b897cfa2367ed8020c5f94cb92fef Mon Sep 17 00:00:00 2001 From: RockChinQ <1010553892@qq.com> Date: Fri, 10 Nov 2023 10:54:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A5=E6=96=B0=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E7=BD=AE=E6=AD=A3=E5=90=91=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 9 ++++++--- tests/proxy_test/forward_proxy_test.py | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 tests/proxy_test/forward_proxy_test.py diff --git a/main.py b/main.py index a5d3114b..4f6f4a19 100644 --- a/main.py +++ b/main.py @@ -191,13 +191,16 @@ def start(first_time_init=False): # 配置OpenAI proxy import openai - openai.proxy = None # 先重置，因为重载后可能需要清除proxy + openai.proxies = None # 先重置，因为重载后可能需要清除proxy if "http_proxy" in config.openai_config and config.openai_config["http_proxy"] is not None: - openai.proxy = config.openai_config["http_proxy"] + openai.proxies = { + "http": config.openai_config["http_proxy"], + "https": config.openai_config["http_proxy"] + } # 配置openai api_base if "reverse_proxy" in config.openai_config and config.openai_config["reverse_proxy"] is not None: - openai.api_base = config.openai_config["reverse_proxy"] + openai.base_url = config.openai_config["reverse_proxy"] # 主启动流程 database = pkg.database.manager.DatabaseManager() diff --git a/tests/proxy_test/forward_proxy_test.py b/tests/proxy_test/forward_proxy_test.py new file mode 100644 index 00000000..dbe5399f --- /dev/null +++ b/tests/proxy_test/forward_proxy_test.py @@ -0,0 +1,24 @@ +import os + +import openai + +client = openai.Client( + api_key=os.environ["OPENAI_API_KEY"], +) + +openai.proxies = { + 'http': 'http://127.0.0.1:7890', + 'https': 'http://127.0.0.1:7890', +} + +resp = client.chat.completions.create( + model="gpt-3.5-turbo", + messages=[ + { + "role": "user", + "content": "Hello, how are you?", + } + ] +) + +print(resp) \ No newline at end of file