From 8c94195c0b6ec48daab98f042d7cbac6ff22aef2 Mon Sep 17 00:00:00 2001 From: Chao Lan Date: Sun, 6 Aug 2023 05:50:15 +0800 Subject: [PATCH 1/3] fix the bug can not use proxy --- metagpt/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metagpt/config.py b/metagpt/config.py index d53571468..e92c4fa75 100644 --- a/metagpt/config.py +++ b/metagpt/config.py @@ -49,11 +49,11 @@ class Config(metaclass=Singleton): self.openai_api_base = self._get("OPENAI_API_BASE") if not self.openai_api_base or "YOUR_API_BASE" == self.openai_api_base: + logger.info("Set OPENAI_API_BASE in case of network issues") + else: openai_proxy = self._get("OPENAI_PROXY") or self.global_proxy if openai_proxy: openai.proxy = openai_proxy - else: - logger.info("Set OPENAI_API_BASE in case of network issues") self.openai_api_type = self._get("OPENAI_API_TYPE") self.openai_api_version = self._get("OPENAI_API_VERSION") self.openai_api_rpm = self._get("RPM", 3) From c1c73a235757c0fa9d6c88b55575df9b1656be58 Mon Sep 17 00:00:00 2001 From: Chao Lan Date: Mon, 7 Aug 2023 16:26:31 +0800 Subject: [PATCH 2/3] no longer checking the value of OPENAI_API_BASE --- metagpt/config.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/metagpt/config.py b/metagpt/config.py index e92c4fa75..821ae7cd0 100644 --- a/metagpt/config.py +++ b/metagpt/config.py @@ -48,12 +48,9 @@ class Config(metaclass=Singleton): raise NotConfiguredException("Set OPENAI_API_KEY first") self.openai_api_base = self._get("OPENAI_API_BASE") - if not self.openai_api_base or "YOUR_API_BASE" == self.openai_api_base: - logger.info("Set OPENAI_API_BASE in case of network issues") - else: - openai_proxy = self._get("OPENAI_PROXY") or self.global_proxy - if openai_proxy: - openai.proxy = openai_proxy + openai_proxy = self._get("OPENAI_PROXY") or self.global_proxy + if openai_proxy: + openai.proxy = openai_proxy self.openai_api_type = self._get("OPENAI_API_TYPE") self.openai_api_version = self._get("OPENAI_API_VERSION") self.openai_api_rpm = self._get("RPM", 3) From 848eb373419ec667e5cf257f787e59cb20a495d2 Mon Sep 17 00:00:00 2001 From: Chao Lan Date: Wed, 9 Aug 2023 03:24:51 +0000 Subject: [PATCH 3/3] set OPENAI_API_BASE when using proxy --- metagpt/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/metagpt/config.py b/metagpt/config.py index 821ae7cd0..48010dcec 100644 --- a/metagpt/config.py +++ b/metagpt/config.py @@ -51,6 +51,7 @@ class Config(metaclass=Singleton): openai_proxy = self._get("OPENAI_PROXY") or self.global_proxy if openai_proxy: openai.proxy = openai_proxy + openai.api_base = self.openai_api_base self.openai_api_type = self._get("OPENAI_API_TYPE") self.openai_api_version = self._get("OPENAI_API_VERSION") self.openai_api_rpm = self._get("RPM", 3)