mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-04 07:00:22 +00:00
refactor: share embedded run and discord test helpers
This commit is contained in:
@@ -40,8 +40,7 @@ import {
|
||||
} from "../tokens.js";
|
||||
import type { GetReplyOptions, ReplyPayload } from "../types.js";
|
||||
import {
|
||||
buildEmbeddedRunBaseParams,
|
||||
buildEmbeddedRunContexts,
|
||||
buildEmbeddedRunExecutionParams,
|
||||
resolveModelFallbackOptions,
|
||||
} from "./agent-runner-utils.js";
|
||||
import { type BlockReplyPipeline } from "./block-reply-pipeline.js";
|
||||
@@ -308,20 +307,17 @@ export async function runAgentTurnWithFallback(params: {
|
||||
}
|
||||
})();
|
||||
}
|
||||
const { authProfile, embeddedContext, senderContext } = buildEmbeddedRunContexts({
|
||||
run: params.followupRun.run,
|
||||
sessionCtx: params.sessionCtx,
|
||||
hasRepliedRef: params.opts?.hasRepliedRef,
|
||||
provider,
|
||||
});
|
||||
const runBaseParams = buildEmbeddedRunBaseParams({
|
||||
run: params.followupRun.run,
|
||||
provider,
|
||||
model,
|
||||
runId,
|
||||
authProfile,
|
||||
allowTransientCooldownProbe: runOptions?.allowTransientCooldownProbe,
|
||||
});
|
||||
const { embeddedContext, senderContext, runBaseParams } = buildEmbeddedRunExecutionParams(
|
||||
{
|
||||
run: params.followupRun.run,
|
||||
sessionCtx: params.sessionCtx,
|
||||
hasRepliedRef: params.opts?.hasRepliedRef,
|
||||
provider,
|
||||
runId,
|
||||
allowTransientCooldownProbe: runOptions?.allowTransientCooldownProbe,
|
||||
model,
|
||||
},
|
||||
);
|
||||
return (async () => {
|
||||
const result = await runEmbeddedPiAgent({
|
||||
...embeddedContext,
|
||||
|
||||
@@ -27,8 +27,7 @@ import type { TemplateContext } from "../templating.js";
|
||||
import type { VerboseLevel } from "../thinking.js";
|
||||
import type { GetReplyOptions } from "../types.js";
|
||||
import {
|
||||
buildEmbeddedRunBaseParams,
|
||||
buildEmbeddedRunContexts,
|
||||
buildEmbeddedRunExecutionParams,
|
||||
resolveModelFallbackOptions,
|
||||
} from "./agent-runner-utils.js";
|
||||
import {
|
||||
@@ -482,18 +481,13 @@ export async function runMemoryFlushIfNeeded(params: {
|
||||
...resolveModelFallbackOptions(params.followupRun.run),
|
||||
runId: flushRunId,
|
||||
run: async (provider, model, runOptions) => {
|
||||
const { authProfile, embeddedContext, senderContext } = buildEmbeddedRunContexts({
|
||||
const { embeddedContext, senderContext, runBaseParams } = buildEmbeddedRunExecutionParams({
|
||||
run: params.followupRun.run,
|
||||
sessionCtx: params.sessionCtx,
|
||||
hasRepliedRef: params.opts?.hasRepliedRef,
|
||||
provider,
|
||||
});
|
||||
const runBaseParams = buildEmbeddedRunBaseParams({
|
||||
run: params.followupRun.run,
|
||||
provider,
|
||||
model,
|
||||
runId: flushRunId,
|
||||
authProfile,
|
||||
allowTransientCooldownProbe: runOptions?.allowTransientCooldownProbe,
|
||||
});
|
||||
const result = await runEmbeddedPiAgent({
|
||||
|
||||
@@ -263,6 +263,31 @@ export function buildEmbeddedRunContexts(params: {
|
||||
};
|
||||
}
|
||||
|
||||
export function buildEmbeddedRunExecutionParams(params: {
|
||||
run: FollowupRun["run"];
|
||||
sessionCtx: TemplateContext;
|
||||
hasRepliedRef: { value: boolean } | undefined;
|
||||
provider: string;
|
||||
model: string;
|
||||
runId: string;
|
||||
allowTransientCooldownProbe?: boolean;
|
||||
}) {
|
||||
const { authProfile, embeddedContext, senderContext } = buildEmbeddedRunContexts(params);
|
||||
const runBaseParams = buildEmbeddedRunBaseParams({
|
||||
run: params.run,
|
||||
provider: params.provider,
|
||||
model: params.model,
|
||||
runId: params.runId,
|
||||
authProfile,
|
||||
allowTransientCooldownProbe: params.allowTransientCooldownProbe,
|
||||
});
|
||||
return {
|
||||
embeddedContext,
|
||||
senderContext,
|
||||
runBaseParams,
|
||||
};
|
||||
}
|
||||
|
||||
export function resolveProviderScopedAuthProfile(params: {
|
||||
provider: string;
|
||||
primaryProvider: string;
|
||||
|
||||
Reference in New Issue
Block a user