fixbug: azure openai

metagpt/provider/azure_openai_api.py

@@ -27,7 +27,7 @@ class AzureOpenAILLM(OpenAILLM):
     def _init_client(self):
         kwargs = self._make_client_kwargs()
         # https://learn.microsoft.com/zh-cn/azure/ai-services/openai/how-to/migration?tabs=python-new%2Cdalle-fix
-        self.async_client = AsyncAzureOpenAI(**kwargs)
+        self.aclient = AsyncAzureOpenAI(**kwargs)
         self.model = self.config.DEPLOYMENT_NAME  # Used in _calc_usage & _cons_kwargs
 
     def _make_client_kwargs(self) -> dict:

metagpt/utils/redis.py

@@ -23,15 +23,7 @@ def __init__(self):
     async def _connect(self, force=False):
         if self._client and not force:
             return True
-        is_ready = (
-            CONFIG.REDIS_HOST
-            and CONFIG.REDIS_HOST != "YOUR_REDIS_HOST"
-            and CONFIG.REDIS_PORT
-            and CONFIG.REDIS_PORT != "YOUR_REDIS_PORT"
-            and CONFIG.REDIS_DB is not None
-            and CONFIG.REDIS_PASSWORD is not None
-        )
-        if not is_ready:
+        if not self.is_configured:
             return False
 
         try:
@@ -74,3 +66,14 @@ async def close(self):
     @property
     def is_valid(self) -> bool:
         return self._client is not None
+
+    @property
+    def is_configured(self) -> bool:
+        return bool(
+            CONFIG.REDIS_HOST
+            and CONFIG.REDIS_HOST != "YOUR_REDIS_HOST"
+            and CONFIG.REDIS_PORT
+            and CONFIG.REDIS_PORT != "YOUR_REDIS_PORT"
+            and CONFIG.REDIS_DB is not None
+            and CONFIG.REDIS_PASSWORD is not None
+        )

metagpt/utils/s3.py

@@ -154,16 +154,17 @@ async def cache(self, data: str, file_ext: str, format: str = "") -> str:
 
     @property
     def is_valid(self):
-        is_invalid = (
-            not CONFIG.S3_ACCESS_KEY
-            or CONFIG.S3_ACCESS_KEY == "YOUR_S3_ACCESS_KEY"
-            or not CONFIG.S3_SECRET_KEY
-            or CONFIG.S3_SECRET_KEY == "YOUR_S3_SECRET_KEY"
-            or not CONFIG.S3_ENDPOINT_URL
-            or CONFIG.S3_ENDPOINT_URL == "YOUR_S3_ENDPOINT_URL"
-            or not CONFIG.S3_BUCKET
-            or CONFIG.S3_BUCKET == "YOUR_S3_BUCKET"
+        return self.is_configured
+
+    @property
+    def is_configured(self) -> bool:
+        return bool(
+            CONFIG.S3_ACCESS_KEY
+            and CONFIG.S3_ACCESS_KEY != "YOUR_S3_ACCESS_KEY"
+            and CONFIG.S3_SECRET_KEY
+            and CONFIG.S3_SECRET_KEY != "YOUR_S3_SECRET_KEY"
+            and CONFIG.S3_ENDPOINT_URL
+            and CONFIG.S3_ENDPOINT_URL != "YOUR_S3_ENDPOINT_URL"
+            and CONFIG.S3_BUCKET
+            and CONFIG.S3_BUCKET != "YOUR_S3_BUCKET"
         )
-        if is_invalid:
-            logger.info("S3 is invalid")
-        return not is_invalid

tests/metagpt/learn/test_text_to_image.py

@@ -15,20 +15,24 @@
 
 
 @pytest.mark.asyncio
-async def test():
+async def test_metagpt_llm():
     # Prerequisites
     assert CONFIG.METAGPT_TEXT_TO_IMAGE_MODEL_URL
     assert CONFIG.OPENAI_API_KEY
 
     data = await text_to_image("Panda emoji", size_type="512x512")
     assert "base64" in data or "http" in data
-    key = CONFIG.METAGPT_TEXT_TO_IMAGE_MODEL_URL
-    CONFIG.METAGPT_TEXT_TO_IMAGE_MODEL_URL = None
+
+    # Mock session env
+    old_options = CONFIG.options.copy()
+    new_options = old_options.copy()
+    new_options["METAGPT_TEXT_TO_IMAGE_MODEL_URL"] = None
+    CONFIG.set_context(new_options)
     try:
         data = await text_to_image("Panda emoji", size_type="512x512")
         assert "base64" in data or "http" in data
     finally:
-        CONFIG.METAGPT_TEXT_TO_IMAGE_MODEL_URL = key
+        CONFIG.set_context(old_options)
 
 
 if __name__ == "__main__":

tests/metagpt/learn/test_text_to_speech.py

@@ -27,13 +27,16 @@ async def test_text_to_speech():
     assert "base64" in data or "http" in data
 
     # test iflytek
-    key = CONFIG.AZURE_TTS_SUBSCRIPTION_KEY
-    CONFIG.AZURE_TTS_SUBSCRIPTION_KEY = ""
+    ## Mock session env
+    old_options = CONFIG.options.copy()
+    new_options = old_options.copy()
+    new_options["AZURE_TTS_SUBSCRIPTION_KEY"] = ""
+    CONFIG.set_context(new_options)
     try:
         data = await text_to_speech("panda emoji")
         assert "base64" in data or "http" in data
     finally:
-        CONFIG.AZURE_TTS_SUBSCRIPTION_KEY = key
+        CONFIG.set_context(old_options)
 
 
 if __name__ == "__main__":

tests/metagpt/utils/test_redis.py

@@ -27,13 +27,18 @@ async def test_redis():
     assert await conn.get("test") == b"test"
     await conn.close()
 
-    key = CONFIG.REDIS_HOST
-    CONFIG.REDIS_HOST = "YOUR_REDIS_HOST"
-    conn = Redis()
-    await conn.set("test", "test", timeout_sec=0)
-    assert not await conn.get("test") == b"test"
-    CONFIG.REDIS_HOST = key
-    await conn.close()
+    # Mock session env
+    old_options = CONFIG.options.copy()
+    new_options = old_options.copy()
+    new_options["REDIS_HOST"] = "YOUR_REDIS_HOST"
+    CONFIG.set_context(new_options)
+    try:
+        conn = Redis()
+        await conn.set("test", "test", timeout_sec=0)
+        assert not await conn.get("test") == b"test"
+        await conn.close()
+    finally:
+        CONFIG.set_context(old_options)
 
 
 if __name__ == "__main__":

tests/metagpt/utils/test_s3.py

@@ -41,15 +41,18 @@ async def test_s3():
     res = await conn.cache(data, ".bak", "script")
     assert "http" in res
 
-    key = CONFIG.S3_ACCESS_KEY
-    CONFIG.S3_ACCESS_KEY = "YOUR_S3_ACCESS_KEY"
-    conn = S3()
-    assert not conn.is_valid
+    # Mock session env
+    old_options = CONFIG.options.copy()
+    new_options = old_options.copy()
+    new_options["S3_ACCESS_KEY"] = "YOUR_S3_ACCESS_KEY"
+    CONFIG.set_context(new_options)
     try:
+        conn = S3()
+        assert not conn.is_valid
         res = await conn.cache("ABC", ".bak", "script")
         assert not res
     finally:
-        CONFIG.S3_ACCESS_KEY = key
+        CONFIG.set_context(old_options)
 
 
 if __name__ == "__main__":