Skip to content

fix: handle object output in eval assertions and reduce GPT-4.1 concurrency #1090

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

Merged
stack72 merged 1 commit into from
Apr 4, 2026
Merged

fix: handle object output in eval assertions and reduce GPT-4.1 concurrency #1090

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
12 changes: 10 additions & 2 deletions .github/workflows/multi-model-eval.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ jobs:
strategy:
fail-fast: false
matrix:
model: [sonnet, opus, gpt-4.1, gemini-2.5-pro]
include:
- model: sonnet
concurrency: 20
- model: opus
concurrency: 20
- model: gpt-4.1
concurrency: 5
- model: gemini-2.5-pro
concurrency: 20
steps:
- name: Check if model is selected
id: check
Expand Down Expand Up @@ -54,4 +62,4 @@ jobs:
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
run: deno run eval-skill-triggers --model ${{ matrix.model }}
run: deno run eval-skill-triggers --model ${{ matrix.model }} --concurrency ${{ matrix.concurrency }}
23 changes: 12 additions & 11 deletions evals/promptfoo/generate_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,14 @@ async function main(): Promise<void> {
{
type: "javascript",
value: [
`const toolCalls = (context.prompt?.raw || '').includes('tool_use') ? [] : [];`,
`const needle = '${skillName}';`,
`const str = typeof output === 'string' ? output : JSON.stringify(output);`,
`try {`,
` const calls = JSON.parse(output);`,
` if (Array.isArray(calls)) {`,
` return calls.some(c => c.function?.name === '${skillName}' || c.name === '${skillName}');`,
` }`,
` const parsed = typeof output === 'object' ? (Array.isArray(output) ? output : [output]) : JSON.parse(str);`,
` const calls = Array.isArray(parsed) ? parsed : [parsed];`,
` return calls.some(c => c.function?.name === needle || c.name === needle);`,
`} catch {}`,
`return String(output).includes('"${skillName}"');`,
`return str.includes('"' + needle + '"');`,
].join("\n"),
},
],
Expand All @@ -221,13 +221,14 @@ async function main(): Promise<void> {
{
type: "javascript",
value: [
`const needle = '${skillName}';`,
`const str = typeof output === 'string' ? output : JSON.stringify(output);`,
`try {`,
` const calls = JSON.parse(output);`,
` if (Array.isArray(calls)) {`,
` return !calls.some(c => c.function?.name === '${skillName}' || c.name === '${skillName}');`,
` }`,
` const parsed = typeof output === 'object' ? (Array.isArray(output) ? output : [output]) : JSON.parse(str);`,
` const calls = Array.isArray(parsed) ? parsed : [parsed];`,
` return !calls.some(c => c.function?.name === needle || c.name === needle);`,
`} catch {}`,
`return !String(output).includes('"${skillName}"');`,
`return !str.includes('"' + needle + '"');`,
].join("\n"),
},
],
Expand Down
Loading
Loading