惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

G
Google Developers Blog
博客园 - 三生石上(FineUI控件)
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
MongoDB | Blog
MongoDB | Blog
小众软件
小众软件
Y
Y Combinator Blog
博客园 - 聂微东
Google DeepMind News
Google DeepMind News
D
Docker
罗磊的独立博客
Microsoft Security Blog
Microsoft Security Blog
D
DataBreaches.Net
B
Blog
Vercel News
Vercel News
Recent Announcements
Recent Announcements
GbyAI
GbyAI
阮一峰的网络日志
阮一峰的网络日志
T
The Blog of Author Tim Ferriss
H
Hackread – Cybersecurity News, Data Breaches, AI and More
P
Proofpoint News Feed
酷 壳 – CoolShell
酷 壳 – CoolShell
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
Microsoft Azure Blog
Microsoft Azure Blog
宝玉的分享
宝玉的分享

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix: defer bedrock discovery sdk import · openclaw/opencl...
steipete · 2026-04-26 · via Recent Commits to openclaw:main

@@ -1,13 +1,10 @@

11

import {

2-

BedrockClient,

3-

ListFoundationModelsCommand,

2+

type BedrockClient,

43

type ListFoundationModelsCommandOutput,

5-

ListInferenceProfilesCommand,

64

type ListInferenceProfilesCommandOutput,

75

} from "@aws-sdk/client-bedrock";

86

import { createSubsystemLogger } from "openclaw/plugin-sdk/core";

97

import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";

10-

import { resolveAwsSdkEnvVarName } from "openclaw/plugin-sdk/provider-auth-runtime";

118

import type {

129

BedrockDiscoveryConfig,

1310

ModelDefinitionConfig,

@@ -17,6 +14,7 @@ import {

1714

normalizeLowercaseStringOrEmpty,

1815

normalizeOptionalLowercaseString,

1916

} from "openclaw/plugin-sdk/text-runtime";

17+

import { resolveBedrockConfigApiKey } from "./discovery-shared.js";

20182119

const log = createSubsystemLogger("bedrock-discovery");

2220

@@ -149,6 +147,38 @@ type InferenceProfileSummary = NonNullable<

149147

ListInferenceProfilesCommandOutput["inferenceProfileSummaries"]

150148

>[number];

151149150+

type BedrockDiscoverySdk = {

151+

createClient(region: string): BedrockClient;

152+

createListFoundationModelsCommand(): unknown;

153+

createListInferenceProfilesCommand(input: { nextToken?: string }): unknown;

154+

};

155+156+

async function loadBedrockDiscoverySdk(): Promise<BedrockDiscoverySdk> {

157+

const { BedrockClient, ListFoundationModelsCommand, ListInferenceProfilesCommand } =

158+

await import("@aws-sdk/client-bedrock");

159+

return {

160+

createClient: (region) => new BedrockClient({ region }),

161+

createListFoundationModelsCommand: () => new ListFoundationModelsCommand({}),

162+

createListInferenceProfilesCommand: (input) => new ListInferenceProfilesCommand(input),

163+

};

164+

}

165+166+

function createInjectedClientDiscoverySdk(): BedrockDiscoverySdk {

167+

class ListFoundationModelsCommand {

168+

constructor(readonly input: Record<string, unknown> = {}) {}

169+

}

170+

class ListInferenceProfilesCommand {

171+

constructor(readonly input: Record<string, unknown> = {}) {}

172+

}

173+

return {

174+

createClient() {

175+

throw new Error("clientFactory is required for injected Bedrock discovery commands");

176+

},

177+

createListFoundationModelsCommand: () => new ListFoundationModelsCommand({}),

178+

createListInferenceProfilesCommand: (input) => new ListInferenceProfilesCommand(input),

179+

};

180+

}

181+152182

type BedrockDiscoveryCacheEntry = {

153183

expiresAt: number;

154184

value?: ModelDefinitionConfig[];

@@ -320,13 +350,14 @@ function resolveBaseModelId(profile: InferenceProfileSummary): string | undefine

320350

*/

321351

async function fetchInferenceProfileSummaries(

322352

client: BedrockClient,

353+

createListInferenceProfilesCommand: BedrockDiscoverySdk["createListInferenceProfilesCommand"],

323354

): Promise<InferenceProfileSummary[]> {

324355

try {

325356

const profiles: InferenceProfileSummary[] = [];

326357

let nextToken: string | undefined;

327358

do {

328359

const response: ListInferenceProfilesCommandOutput = await client.send(

329-

new ListInferenceProfilesCommand({ nextToken }),

360+

createListInferenceProfilesCommand({ nextToken }) as never,

330361

);

331362

for (const summary of response.inferenceProfileSummaries ?? []) {

332363

profiles.push(summary);

@@ -414,14 +445,6 @@ export function resetBedrockDiscoveryCacheForTest(): void {

414445

hasLoggedBedrockError = false;

415446

}

416447417-

export function resolveBedrockConfigApiKey(

418-

env: NodeJS.ProcessEnv = process.env,

419-

): string | undefined {

420-

// When no AWS auth env marker is present, Bedrock should fall back to the

421-

// AWS SDK default credential chain instead of persisting a fake apiKey marker.

422-

return resolveAwsSdkEnvVarName(env);

423-

}

424-425448

export async function discoverBedrockModels(params: {

426449

region: string;

427450

config?: BedrockDiscoveryConfig;

@@ -454,18 +477,24 @@ export async function discoverBedrockModels(params: {

454477

}

455478

}

456479457-

const clientFactory = params.clientFactory ?? ((region: string) => new BedrockClient({ region }));

480+

const sdk = params.clientFactory

481+

? createInjectedClientDiscoverySdk()

482+

: await loadBedrockDiscoverySdk();

483+

const clientFactory = params.clientFactory ?? ((region: string) => sdk.createClient(region));

458484

const client = clientFactory(params.region);

459485460486

const discoveryPromise = (async () => {

461487

// Discover foundation models and inference profiles in parallel.

462488

// Both API calls are independent, but we need the foundation model data

463489

// to resolve inference profile capabilities — so we fetch in parallel,

464490

// then build the lookup map before processing profiles.

465-

const [foundationResponse, profileSummaries] = await Promise.all([

466-

client.send(new ListFoundationModelsCommand({})),

467-

fetchInferenceProfileSummaries(client),

491+

const [rawFoundationResponse, profileSummaries] = await Promise.all([

492+

client.send(sdk.createListFoundationModelsCommand() as never),

493+

fetchInferenceProfileSummaries(client, (input) =>

494+

sdk.createListInferenceProfilesCommand(input),

495+

),

468496

]);

497+

const foundationResponse = rawFoundationResponse as ListFoundationModelsCommandOutput;

469498470499

const discovered: ModelDefinitionConfig[] = [];

471500

const seenIds = new Set<string>();

@@ -556,7 +585,7 @@ export async function resolveImplicitBedrockProvider(params: {

556585

...params.pluginConfig?.discovery,

557586

};

558587

const enabled = discoveryConfig?.enabled;

559-

const hasAwsCreds = resolveAwsSdkEnvVarName(env) !== undefined;

588+

const hasAwsCreds = resolveBedrockConfigApiKey(env) !== undefined;

560589

if (enabled === false) {

561590

return null;

562591

}

@@ -581,21 +610,3 @@ export async function resolveImplicitBedrockProvider(params: {

581610

models,

582611

};

583612

}

584-585-

export function mergeImplicitBedrockProvider(params: {

586-

existing: ModelProviderConfig | undefined;

587-

implicit: ModelProviderConfig;

588-

}): ModelProviderConfig {

589-

const { existing, implicit } = params;

590-

if (!existing) {

591-

return implicit;

592-

}

593-

return {

594-

...implicit,

595-

...existing,

596-

models:

597-

Array.isArray(existing.models) && existing.models.length > 0

598-

? existing.models

599-

: implicit.models,

600-

};

601-

}