vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-05 08:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor web search config ownership into extensions

Browse Source
This commit is contained in:
Tak Hoffman
2026-03-17 23:29:52 -05:00
parent 2fbf2c0a47
commit 112d1d3a7c
29 changed files with 856 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/web-search/runtime.ts
View File

@@ -61,22 +61,26 @@ function readProviderEnvValue(envVars: string[]): string | undefined {
return undefined;
}
function hasProviderCredential(providerId: string, search: WebSearchConfig | undefined): boolean {
function hasProviderCredential(
providerId: string,
config: OpenClawConfig | undefined,
search: WebSearchConfig | undefined,
): boolean {
const providers = resolvePluginWebSearchProviders({
config,
bundledAllowlistCompat: true,
});
const provider = providers.find((entry) => entry.id === providerId);
if (!provider) {
return false;
}
const rawValue = provider.getCredentialValue(search as Record<string, unknown> | undefined);
const rawValue =
provider.getConfiguredCredentialValue?.(config) ??
provider.getCredentialValue(search as Record<string, unknown> | undefined);
const fromConfig = normalizeSecretInput(
normalizeResolvedSecretInputString({
value: rawValue,
path:
providerId === "brave"
? "tools.web.search.apiKey"
: `tools.web.search.${providerId}.apiKey`,
path: provider.credentialPath,
}),
);
return Boolean(fromConfig || readProviderEnvValue(provider.envVars));
@@ -93,11 +97,13 @@ export function listWebSearchProviders(params?: {
export function resolveWebSearchProviderId(params: {
search?: WebSearchConfig;
config?: OpenClawConfig;
providers?: PluginWebSearchProviderEntry[];
}): string {
const providers =
params.providers ??
resolvePluginWebSearchProviders({
config: params.config,
bundledAllowlistCompat: true,
});
const raw =
@@ -114,7 +120,7 @@ export function resolveWebSearchProviderId(params: {
if (!raw) {
for (const provider of providers) {
if (!hasProviderCredential(provider.id, params.search)) {
if (!hasProviderCredential(provider.id, params.config, params.search)) {
continue;
}
logVerbose(
@@ -124,7 +130,7 @@ export function resolveWebSearchProviderId(params: {
}
}
return providers[0]?.id ?? "brave";
return providers[0]?.id ?? "";
}
export function resolveWebSearchDefinition(
@@ -154,10 +160,13 @@ export function resolveWebSearchDefinition(
options?.providerId ??
options?.runtimeWebSearch?.selectedProvider ??
options?.runtimeWebSearch?.providerConfigured ??
resolveWebSearchProviderId({ search, providers });
resolveWebSearchProviderId({ config: options?.config, search, providers });
const provider =
providers.find((entry) => entry.id === providerId) ??
providers.find((entry) => entry.id === resolveWebSearchProviderId({ search, providers })) ??
providers.find(
(entry) =>
entry.id === resolveWebSearchProviderId({ config: options?.config, search, providers }),
) ??
providers[0];
if (!provider) {
return null;