Merge branch 'feature-search-config' into 'mgx_ops'

add discovery_service_url for GoogleAPIWrapper

See merge request pub/MetaGPT!296
This commit is contained in:
张雷 2024-08-12 03:07:12 +00:00
commit 30818e8195
2 changed files with 4 additions and 1 deletions

View file

@ -19,6 +19,7 @@ class SearchConfig(YamlModel):
api_type: SearchEngineType = SearchEngineType.DUCK_DUCK_GO
api_key: str = ""
cse_id: str = "" # for google
discovery_service_url: str = "" # for google
search_func: Optional[Callable] = None
params: dict = Field(
default_factory=lambda: {

View file

@ -26,6 +26,8 @@ class GoogleAPIWrapper(BaseModel):
api_key: str
cse_id: str
discovery_service_url: Optional[str] = None
loop: Optional[asyncio.AbstractEventLoop] = None
executor: Optional[futures.Executor] = None
proxy: Optional[str] = None
@ -56,7 +58,7 @@ class GoogleAPIWrapper(BaseModel):
@property
def google_api_client(self):
build_kwargs = {"developerKey": self.api_key}
build_kwargs = {"developerKey": self.api_key, "discoveryServiceUrl": self.discovery_service_url}
if self.proxy:
parse_result = urlparse(self.proxy)
proxy_type = parse_result.scheme