Skip to content

improvement(schema): centralize derivation of block schemas #3175

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
icecrasher321 merged 11 commits into from
Feb 11, 2026
Merged

improvement(schema): centralize derivation of block schemas #3175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
089b8df
improvement(schema): centralize derivation of block schemas
icecrasher321 Feb 10, 2026
606f0f3
address bugbot comments
icecrasher321 Feb 10, 2026
b32d4e4
remove unused code
icecrasher321 Feb 10, 2026
2ffdcb4
address greptile comments
icecrasher321 Feb 10, 2026
34bdb4f
Merge remote-tracking branch 'origin/staging' into improvement/schema…
icecrasher321 Feb 10, 2026
f25505a
merge conflict resolution
icecrasher321 Feb 10, 2026
454127f
fix
icecrasher321 Feb 10, 2026
e1c5737
update tests
icecrasher321 Feb 10, 2026
1e80633
address greptile comments
icecrasher321 Feb 10, 2026
dd7111d
make evaluator metrics only
icecrasher321 Feb 10, 2026
a7c92b9
return base and metrics for evaluator
icecrasher321 Feb 10, 2026
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
Prev Previous commit
Next Next commit
address bugbot comments
  • Loading branch information
@icecrasher321
icecrasher321 committed Feb 10, 2026
commit 606f0f3b8c3b74ddcabe1128b6bb5ab01f3aefdb
30 changes: 1 addition & 29 deletions apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
'use client'

import { useMemo } from 'react'
import {
getEffectiveBlockOutputs,
getEvaluatorMetricOutputs,
} from '@/lib/workflows/blocks/block-outputs'
import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
import type { SchemaField } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/field-item/field-item'
import { getBlock } from '@/blocks'
import { useSubBlockStore } from '@/stores/workflows/subblock/store'
Expand Down Expand Up @@ -123,31 +120,6 @@ export function useBlockOutputFields({
return []
}

// Handle evaluator blocks - use metrics if available
if (blockType === 'evaluator') {
const metricOutputs = getEvaluatorMetricOutputs(mergedSubBlocks)
if (metricOutputs) {
return Object.entries(metricOutputs).map(([name, output]) => ({
name,
type:
output &&
typeof output === 'object' &&
'type' in output &&
typeof output.type === 'string'
? output.type
: 'number',
description:
output &&
typeof output === 'object' &&
'description' in output &&
typeof output.description === 'string'
? output.description
: undefined,
}))
}
// Fall through to use blockConfig.outputs
}

// Handle variables blocks - use variable assignments if available
if (blockType === 'variables') {
const variablesValue =
Expand Down
16 changes: 1 addition & 15 deletions apps/sim/lib/copilot/tools/client/workflow/block-output-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import {
getEffectiveBlockOutputPaths,
getEvaluatorMetricOutputs,
} from '@/lib/workflows/blocks/block-outputs'
import { getEffectiveBlockOutputPaths } from '@/lib/workflows/blocks/block-outputs'
import { normalizeName } from '@/executor/constants'
import { useVariablesStore } from '@/stores/panel/variables/store'
import type { Variable } from '@/stores/panel/variables/types'
Expand Down Expand Up @@ -97,17 +94,6 @@ export function computeBlockOutputPaths(block: BlockState, ctx: WorkflowContext)
return ['results', ...insidePaths]
}

if (block.type === 'evaluator') {
const metricOutputs = getEvaluatorMetricOutputs(mergedSubBlocks)
if (metricOutputs) {
return Object.keys(metricOutputs)
}
return getEffectiveBlockOutputPaths(block.type, mergedSubBlocks, {
triggerMode: Boolean(block.triggerMode),
preferToolOutputs: !block.triggerMode,
})
}

if (block.type === 'variables') {
const variablesValue = getSubBlockValue(blocks, subBlockValues, block.id, 'variables')
if (variablesValue && Array.isArray(variablesValue) && variablesValue.length > 0) {
Expand Down