Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Cleanup runConfigId / input merging #179

Merged
merged 1 commit into from
Dec 1, 2024
Merged

chore: Cleanup runConfigId / input merging #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions control-plane/src/modules/contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,17 +524,29 @@ export const definition = {
.describe(
"When provided, the run will be marked as as a test / evaluation",
),
configId: z
.string()
.optional()
.describe("The run configuration ID to use"),
input: z
.object({})
.passthrough()
.describe(
"Structured input arguments to merge with the initial prompt. The schema must match the run configuration input schema if defined",
)
.optional(),
config: z
.object({
id: z.string().describe("The run configuration ID"),
id: z.string().describe("DEPRECATED"),
input: z
.object({})
.passthrough()
.describe(
"The run configuration input arguments, the schema must match the run configuration input schema",
"DEPRECATED",
)
.optional(),
})
.describe("DEPRECATED")
.optional(),
context: anyObject
.optional()
Expand Down
29 changes: 0 additions & 29 deletions control-plane/src/modules/prompt-templates.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,34 +196,5 @@ describe("prompt-templates", () => {
},
});
});

it("should merge initialPrompt with run input", () => {
const options = {
input: {
name: "World",
},
};

const runConfig = {
id: "test-id",
name: "test-template",
initialPrompt: "Hello: ",
inputSchema: {
type: "object",
required: ["name"],
properties: {
name: { type: "string" },
extra: { type: "string" },
},
},
versions: [],
} as any;

const result = mergeRunConfigOptions(options, runConfig);

expect(result.error).toBeNull();
expect(result.options?.initialPrompt).toContain("Hello");
expect(result.options?.initialPrompt).toContain("World");
});
});
});
4 changes: 0 additions & 4 deletions control-plane/src/modules/prompt-templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,6 @@ export const mergeRunConfigOptions = (
}
}

if (options.input) {
mergedOptions.initialPrompt = `${mergedOptions.initialPrompt}\n\n<DATA>\n${JSON.stringify(options.input, null, 2)}\n</DATA>`;
}

mergedOptions.messageMetadata = {
displayable: {
templateName: runConfig.name,
Expand Down
24 changes: 19 additions & 5 deletions control-plane/src/modules/workflows/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,21 @@ export const runsRouter = initServer().router(
await auth.canAccess({ cluster: { clusterId } });
auth.canCreate({ run: true });

// TODO: Remove once use of deprecated fields is removed
if (body.config) {
logger.info("Depreacted `run.config` provided in call to createRun");
body.configId = body.configId ?? body.config.id;
body.input = body.input ?? body.config.input;
}

// TODO: Remove once use of deprecated fields is removed
if (body.template) {
logger.info("Depreacted `run.template` provided in call to createRun");
body.config = body.template;
body.configId = body.configId ?? body.template.id;
body.input = body.input ?? body.template.input;
}

if (!body.initialPrompt && !body.config) {
if (!body.initialPrompt && !body.configId) {
return {
status: 400,
body: {
Expand Down Expand Up @@ -124,13 +133,13 @@ export const runsRouter = initServer().router(
callSummarization: body.callSummarization,
reasoningTraces: body.reasoningTraces,

input: body.config?.input,
input: body.input,
};

const runConfig = body.config
const runConfig = body.configId
? await getRunConfig({
clusterId,
id: body.config.id,
id: body.configId,
})
: undefined;

Expand All @@ -148,6 +157,11 @@ export const runsRouter = initServer().router(
runOptions = merged.options;
}

if (runOptions.input) {
runOptions.initialPrompt = `${runOptions.initialPrompt}\n\n<DATA>\n${JSON.stringify(runOptions.input, null, 2)}\n</DATA>`;
}


if (!runOptions.initialPrompt) {
throw new Error("Failed to construct initialPrompt");
}
Expand Down