Merge branch 'dev' into feature-mg

metagpt/tools/azure_tts.py

@@ -12,11 +12,12 @@ from uuid import uuid4
 import base64
 import sys
 
+from metagpt.config import CONFIG, Config
+
 sys.path.append(str(Path(__file__).resolve().parent.parent.parent))  # fix-bug: No module named 'metagpt'
 from metagpt.logs import logger
 from aiofile import async_open
 from azure.cognitiveservices.speech import AudioConfig, SpeechConfig, SpeechSynthesizer
-import os
 
 
 class AzureTTS:
@@ -27,8 +28,8 @@ class AzureTTS:
         :param subscription_key: key is used to access your Azure AI service API, see: `https://portal.azure.com/` > `Resource Management` > `Keys and Endpoint`
         :param region: This is the location (or region) of your resource. You may need to use this field when making calls to this API.
         """
-        self.subscription_key = subscription_key if subscription_key else os.environ.get('AZURE_TTS_SUBSCRIPTION_KEY')
-        self.region = region if region else os.environ.get('AZURE_TTS_REGION')
+        self.subscription_key = subscription_key if subscription_key else CONFIG.AZURE_TTS_SUBSCRIPTION_KEY
+        self.region = region if region else CONFIG.AZURE_TTS_REGION
 
     # 参数参考：https://learn.microsoft.com/zh-cn/azure/cognitive-services/speech-service/language-support?tabs=tts#voice-styles-and-roles
     async def synthesize_speech(self, lang, voice, text, output_file):
@@ -87,9 +88,9 @@ async def oas3_azsure_tts(text, lang="", voice="", style="", role="", subscripti
     if not style:
         style = "affectionate"
     if not subscription_key:
-        subscription_key = os.environ.get("AZURE_TTS_SUBSCRIPTION_KEY")
+        subscription_key = CONFIG.AZURE_TTS_SUBSCRIPTION_KEY
     if not region:
-        region = os.environ.get("AZURE_TTS_REGION")
+        region = CONFIG.AZURE_TTS_REGION
 
     xml_value = AzureTTS.role_style_text(role=role, style=style, text=text)
     tts = AzureTTS(subscription_key=subscription_key, region=region)
@@ -108,6 +109,7 @@ async def oas3_azsure_tts(text, lang="", voice="", style="", role="", subscripti
 
 
 if __name__ == "__main__":
+    Config()
     loop = asyncio.new_event_loop()
     v = loop.create_task(oas3_azsure_tts("测试，test"))
     loop.run_until_complete(v)

metagpt/tools/metagpt_text_to_image.py

@@ -6,6 +6,7 @@
 @File    : metagpt_text_to_image.py
 @Desc    : MetaGPT Text-to-Image OAS3 api, which provides text-to-image functionality.
 """
+import asyncio
 import base64
 import os
 import sys
@@ -16,6 +17,8 @@ import aiohttp
 import requests
 from pydantic import BaseModel
 
+from metagpt.config import CONFIG, Config
+
 sys.path.append(str(Path(__file__).resolve().parent.parent.parent))  # fix-bug: No module named 'metagpt'
 from metagpt.logs import logger
 
@@ -25,7 +28,7 @@ class MetaGPTText2Image:
         """
         :param model_url: Model reset api url
         """
-        self.model_url = model_url if model_url else os.environ.get('METAGPT_TEXT_TO_IMAGE_MODEL')
+        self.model_url = model_url if model_url else CONFIG.METAGPT_TEXT_TO_IMAGE_MODEL
 
     async def text_2_image(self, text, size_type="512x512"):
         """Text to image
@@ -98,12 +101,16 @@ async def oas3_metagpt_text_to_image(text, size_type: str = "512x512", model_url
     if not text:
         return ""
     if not model_url:
-        model_url = os.environ.get('METAGPT_TEXT_TO_IMAGE_MODEL_URL')
+        model_url = CONFIG.METAGPT_TEXT_TO_IMAGE_MODEL_URL
     return await MetaGPTText2Image(model_url).text_2_image(text, size_type=size_type)
 
 
 if __name__ == "__main__":
-    v = oas3_metagpt_text_to_image("Panda emoji")
+    Config()
+    loop = asyncio.new_event_loop()
+    task = loop.create_task(oas3_metagpt_text_to_image("Panda emoji"))
+    v = loop.run_until_complete(task)
+    print(v)
     data = base64.b64decode(v)
     with open("tmp.png", mode="wb") as writer:
         writer.write(data)

metagpt/tools/openai_text_to_embedding.py

@@ -17,7 +17,7 @@ import requests
 from pydantic import BaseModel
 import sys
 
-from metagpt.config import CONFIG
+from metagpt.config import CONFIG, Config
 
 sys.path.append(str(Path(__file__).resolve().parent.parent.parent))  # fix-bug: No module named 'metagpt'
 from metagpt.logs import logger
@@ -48,7 +48,7 @@ class OpenAIText2Embedding:
         """
         :param openai_api_key: OpenAI API key, For more details, checkout: `https://platform.openai.com/account/api-keys`
         """
-        self.openai_api_key = openai_api_key if openai_api_key else os.environ.get('OPENAI_API_KEY')
+        self.openai_api_key = openai_api_key if openai_api_key else CONFIG.OPENAI_API_KEY
 
     async def text_2_embedding(self, text, model="text-embedding-ada-002"):
         """Text to embedding
@@ -89,7 +89,8 @@ async def oas3_openai_text_to_embedding(text, model="text-embedding-ada-002", op
 
 
 if __name__ == "__main__":
+    Config()
     loop = asyncio.new_event_loop()
-    v = loop.create_task(oas3_openai_text_to_embedding("Panda emoji"))
-    loop.run_until_complete(v)
+    task = loop.create_task(oas3_openai_text_to_embedding("Panda emoji"))
+    v = loop.run_until_complete(task)
     print(v)

metagpt/tools/openai_text_to_image.py

@@ -6,6 +6,7 @@
 @File    : openai_text_to_image.py
 @Desc    : OpenAI Text-to-Image OAS3 api, which provides text-to-image functionality.
 """
+import asyncio
 import base64
 import os
 import sys
@@ -16,6 +17,8 @@ import aiohttp
 import requests
 from pydantic import BaseModel
 
+from metagpt.config import CONFIG, Config
+
 sys.path.append(str(Path(__file__).resolve().parent.parent.parent))  # fix-bug: No module named 'metagpt'
 from metagpt.logs import logger
 
@@ -25,7 +28,7 @@ class OpenAIText2Image:
         """
         :param openai_api_key: OpenAI API key, For more details, checkout: `https://platform.openai.com/account/api-keys`
         """
-        self.openai_api_key = openai_api_key if openai_api_key else os.environ.get('OPENAI_API_KEY')
+        self.openai_api_key = openai_api_key if openai_api_key else CONFIG.OPENAI_API_KEY
 
     async def text_2_image(self, text, size_type="1024x1024"):
         """Text to image
@@ -90,10 +93,13 @@ async def oas3_openai_text_to_image(text, size_type: str = "1024x1024", openai_a
     if not text:
         return ""
     if not openai_api_key:
-        openai_api_key = os.environ.get("OPENAI_API_KEY")
+        openai_api_key = CONFIG.OPENAI_API_KEY
     return await OpenAIText2Image(openai_api_key).text_2_image(text, size_type=size_type)
 
 
 if __name__ == "__main__":
-    v = oas3_openai_text_to_image("Panda emoji")
+    Config()
+    loop = asyncio.new_event_loop()
+    task = loop.create_task(oas3_openai_text_to_image("Panda emoji"))
+    v = loop.run_until_complete(task)
     print(v)