use config

metagpt/tools/azure_tts.py

@@ -13,7 +13,6 @@ from uuid import uuid4
 import aiofiles
 from azure.cognitiveservices.speech import AudioConfig, SpeechConfig, SpeechSynthesizer
 
-from metagpt.config import CONFIG
 from metagpt.logs import logger
 
 
@@ -25,8 +24,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 CONFIG.AZURE_TTS_SUBSCRIPTION_KEY
-        self.region = region if region else CONFIG.AZURE_TTS_REGION
+        self.subscription_key = subscription_key
+        self.region = 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):
@@ -83,10 +82,6 @@ async def oas3_azsure_tts(text, lang="", voice="", style="", role="", subscripti
         role = "Girl"
     if not style:
         style = "affectionate"
-    if not subscription_key:
-        subscription_key = CONFIG.AZURE_TTS_SUBSCRIPTION_KEY
-    if not 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)

metagpt/tools/iflytek_tts.py

@@ -23,7 +23,6 @@ import aiofiles
 import websockets as websockets
 from pydantic import BaseModel
 
-from metagpt.config import CONFIG
 from metagpt.logs import logger
 
 
@@ -56,9 +55,9 @@ class IFlyTekTTS(object):
         :param api_key: WebAPI argument, see: `https://console.xfyun.cn/services/tts`
         :param api_secret: WebAPI argument, see: `https://console.xfyun.cn/services/tts`
         """
-        self.app_id = app_id or CONFIG.IFLYTEK_APP_ID
-        self.api_key = api_key or CONFIG.IFLYTEK_API_KEY
-        self.api_secret = api_secret or CONFIG.API_SECRET
+        self.app_id = app_id
+        self.api_key = api_key
+        self.api_secret = api_secret
 
     async def synthesize_speech(self, text, output_file: str, voice=DEFAULT_IFLYTEK_VOICE):
         url = self._create_url()
@@ -127,14 +126,6 @@ async def oas3_iflytek_tts(text: str, voice: str = "", app_id: str = "", api_key
     :return: Returns the Base64-encoded .mp3 file data if successful, otherwise an empty string.
 
     """
-    if not app_id:
-        app_id = CONFIG.IFLYTEK_APP_ID
-    if not api_key:
-        api_key = CONFIG.IFLYTEK_API_KEY
-    if not api_secret:
-        api_secret = CONFIG.IFLYTEK_API_SECRET
-    if not voice:
-        voice = CONFIG.IFLYTEK_VOICE or DEFAULT_IFLYTEK_VOICE
 
     filename = Path(__file__).parent / (uuid.uuid4().hex + ".mp3")
     try:

metagpt/tools/search_engine.py

@@ -10,7 +10,6 @@ from typing import Callable, Coroutine, Literal, Optional, Union, overload
 
 from semantic_kernel.skill_definition import sk_function
 
-from metagpt.config import CONFIG
 from metagpt.tools import SearchEngineType
 
 
@@ -46,7 +45,6 @@ class SearchEngine:
         engine: Optional[SearchEngineType] = None,
         run_func: Callable[[str, int, bool], Coroutine[None, None, Union[str, list[str]]]] = None,
     ):
-        engine = engine or CONFIG.search_engine
         if engine == SearchEngineType.SERPAPI_GOOGLE:
             module = "metagpt.tools.search_engine_serpapi"
             run_func = importlib.import_module(module).SerpAPIWrapper().run