Skip to content

Commit aca7005

Browse files
icecrasher321icecrasher321
committed
fix(resolver): consolidate code to resolve references
1 parent 376f7cb commit aca7005

File tree

14 files changed

+621
-231
lines changed

14 files changed

+621
-231
lines changed

‎apps/sim/app/api/function/execute/route.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ describe('Function Execute API Route', () => {
313313
'block-2': 'world',
314314
},
315315
blockNameMapping: {
316-
validVar: 'block-1',
316+
validvar: 'block-1',
317317
another_valid: 'block-2',
318318
},
319319
})
@@ -539,7 +539,7 @@ describe('Function Execute API Route', () => {
539539
'block-complex': complexData,
540540
},
541541
blockNameMapping: {
542-
complexData: 'block-complex',
542+
complexdata: 'block-complex',
543543
},
544544
})
545545

‎apps/sim/app/api/function/execute/route.ts‎

Lines changed: 46 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { executeInE2B } from '@/lib/execution/e2b'
66
import { executeInIsolatedVM } from '@/lib/execution/isolated-vm'
77
import { CodeLanguage, DEFAULT_CODE_LANGUAGE, isValidCodeLanguage } from '@/lib/execution/languages'
88
import { escapeRegExp, normalizeName, REFERENCE } from '@/executor/constants'
9+
import { type OutputSchema, resolveBlockReference } from '@/executor/utils/block-reference'
910
import {
1011
createEnvVarPattern,
1112
createWorkflowVariablePattern,
1213
} from '@/executor/utils/reference-validation'
13-
import { navigatePath } from '@/executor/variables/resolvers/reference'
1414
export const dynamic = 'force-dynamic'
1515
export const runtime = 'nodejs'
1616

@@ -470,11 +470,14 @@ function resolveEnvironmentVariables(
470470

471471
function resolveTagVariables(
472472
code: string,
473-
blockData: Record<string, any>,
473+
blockData: Record<string, unknown>,
474474
blockNameMapping: Record<string, string>,
475-
contextVariables: Record<string, any>
475+
blockOutputSchemas: Record<string, OutputSchema>,
476+
contextVariables: Record<string, unknown>,
477+
language = 'javascript'
476478
): string {
477479
let resolvedCode = code
480+
const undefinedLiteral = language === 'python' ? 'None' : 'undefined'
478481

479482
const tagPattern = new RegExp(
480483
`${REFERENCE.START}([a-zA-Z_][a-zA-Z0-9_${REFERENCE.PATH_DELIMITER}]*[a-zA-Z0-9_])${REFERENCE.END}`,
@@ -486,25 +489,22 @@ function resolveTagVariables(
486489
const tagName = match.slice(REFERENCE.START.length, -REFERENCE.END.length).trim()
487490
const pathParts = tagName.split(REFERENCE.PATH_DELIMITER)
488491
const blockName = pathParts[0]
492+
const fieldPath = pathParts.slice(1)
489493

490-
const blockId = blockNameMapping[blockName]
491-
if (!blockId) {
492-
continue
493-
}
494+
const result = resolveBlockReference(blockName, fieldPath, {
495+
blockNameMapping,
496+
blockData,
497+
blockOutputSchemas,
498+
})
494499

495-
const blockOutput = blockData[blockId]
496-
if (blockOutput === undefined) {
500+
if (!result) {
497501
continue
498502
}
499503

500-
let tagValue: any
501-
if (pathParts.length === 1) {
502-
tagValue = blockOutput
503-
} else {
504-
tagValue = navigatePath(blockOutput, pathParts.slice(1))
505-
}
504+
let tagValue = result.value
506505

507506
if (tagValue === undefined) {
507+
resolvedCode = resolvedCode.replace(new RegExp(escapeRegExp(match), 'g'), undefinedLiteral)
508508
continue
509509
}
510510

@@ -537,18 +537,27 @@ function resolveTagVariables(
537537
*/
538538
function resolveCodeVariables(
539539
code: string,
540-
params: Record<string, any>,
540+
params: Record<string, unknown>,
541541
envVars: Record<string, string> = {},
542-
blockData: Record<string, any> = {},
542+
blockData: Record<string, unknown> = {},
543543
blockNameMapping: Record<string, string> = {},
544-
workflowVariables: Record<string, any> = {}
545-
): { resolvedCode: string; contextVariables: Record<string, any> } {
544+
blockOutputSchemas: Record<string, OutputSchema> = {},
545+
workflowVariables: Record<string, unknown> = {},
546+
language = 'javascript'
547+
): { resolvedCode: string; contextVariables: Record<string, unknown> } {
546548
let resolvedCode = code
547-
const contextVariables: Record<string, any> = {}
549+
const contextVariables: Record<string, unknown> = {}
548550

549551
resolvedCode = resolveWorkflowVariables(resolvedCode, workflowVariables, contextVariables)
550552
resolvedCode = resolveEnvironmentVariables(resolvedCode, params, envVars, contextVariables)
551-
resolvedCode = resolveTagVariables(resolvedCode, blockData, blockNameMapping, contextVariables)
553+
resolvedCode = resolveTagVariables(
554+
resolvedCode,
555+
blockData,
556+
blockNameMapping,
557+
blockOutputSchemas,
558+
contextVariables,
559+
language
560+
)
552561

553562
return { resolvedCode, contextVariables }
554563
}
@@ -585,6 +594,7 @@ export async function POST(req: NextRequest) {
585594
envVars = {},
586595
blockData = {},
587596
blockNameMapping = {},
597+
blockOutputSchemas = {},
588598
workflowVariables = {},
589599
workflowId,
590600
isCustomTool = false,
@@ -601,20 +611,21 @@ export async function POST(req: NextRequest) {
601611
isCustomTool,
602612
})
603613

604-
// Resolve variables in the code with workflow environment variables
614+
const lang = isValidCodeLanguage(language) ? language : DEFAULT_CODE_LANGUAGE
615+
605616
const codeResolution = resolveCodeVariables(
606617
code,
607618
executionParams,
608619
envVars,
609620
blockData,
610621
blockNameMapping,
611-
workflowVariables
622+
blockOutputSchemas,
623+
workflowVariables,
624+
lang
612625
)
613626
resolvedCode = codeResolution.resolvedCode
614627
const contextVariables = codeResolution.contextVariables
615628

616-
const lang = isValidCodeLanguage(language) ? language : DEFAULT_CODE_LANGUAGE
617-
618629
let jsImports = ''
619630
let jsRemainingCode = resolvedCode
620631
let hasImports = false
@@ -670,7 +681,11 @@ export async function POST(req: NextRequest) {
670681
prologue += `const environmentVariables = JSON.parse(${JSON.stringify(JSON.stringify(envVars))});\n`
671682
prologueLineCount++
672683
for (const [k, v] of Object.entries(contextVariables)) {
673-
prologue += `const ${k} = JSON.parse(${JSON.stringify(JSON.stringify(v))});\n`
684+
if (v === undefined) {
685+
prologue += `const ${k} = undefined;\n`
686+
} else {
687+
prologue += `const ${k} = JSON.parse(${JSON.stringify(JSON.stringify(v))});\n`
688+
}
674689
prologueLineCount++
675690
}
676691

@@ -741,7 +756,11 @@ export async function POST(req: NextRequest) {
741756
prologue += `environmentVariables = json.loads(${JSON.stringify(JSON.stringify(envVars))})\n`
742757
prologueLineCount++
743758
for (const [k, v] of Object.entries(contextVariables)) {
744-
prologue += `${k} = json.loads(${JSON.stringify(JSON.stringify(v))})\n`
759+
if (v === undefined) {
760+
prologue += `${k} = None\n`
761+
} else {
762+
prologue += `${k} = json.loads(${JSON.stringify(JSON.stringify(v))})\n`
763+
}
745764
prologueLineCount++
746765
}
747766
const wrapped = [

‎apps/sim/executor/handlers/agent/agent-handler.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ export class AgentBlockHandler implements BlockHandler {
305305
base.executeFunction = async (callParams: Record<string, any>) => {
306306
const mergedParams = mergeToolParameters(userProvidedParams, callParams)
307307

308-
const { blockData, blockNameMapping } = collectBlockData(ctx)
308+
const { blockData, blockNameMapping, blockOutputSchemas } = collectBlockData(ctx)
309309

310310
const result = await executeTool(
311311
'function_execute',
@@ -317,6 +317,7 @@ export class AgentBlockHandler implements BlockHandler {
317317
workflowVariables: ctx.workflowVariables || {},
318318
blockData,
319319
blockNameMapping,
320+
blockOutputSchemas,
320321
isCustomTool: true,
321322
_context: {
322323
workflowId: ctx.workflowId,

‎apps/sim/executor/handlers/condition/condition-handler.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export async function evaluateConditionExpression(
2626
const contextSetup = `const context = ${JSON.stringify(evalContext)};`
2727
const code = `${contextSetup}\nreturn Boolean(${conditionExpression})`
2828

29-
const { blockData, blockNameMapping } = collectBlockData(ctx)
29+
const { blockData, blockNameMapping, blockOutputSchemas } = collectBlockData(ctx)
3030

3131
const result = await executeTool(
3232
'function_execute',
@@ -37,6 +37,7 @@ export async function evaluateConditionExpression(
3737
workflowVariables: ctx.workflowVariables || {},
3838
blockData,
3939
blockNameMapping,
40+
blockOutputSchemas,
4041
_context: {
4142
workflowId: ctx.workflowId,
4243
workspaceId: ctx.workspaceId,

‎apps/sim/executor/handlers/function/function-handler.test.ts‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ describe('FunctionBlockHandler', () => {
7575
workflowVariables: {},
7676
blockData: {},
7777
blockNameMapping: {},
78-
_context: { workflowId: mockContext.workflowId, workspaceId: mockContext.workspaceId },
78+
blockOutputSchemas: {},
79+
_context: {
80+
workflowId: mockContext.workflowId,
81+
workspaceId: mockContext.workspaceId,
82+
isDeployedContext: mockContext.isDeployedContext,
83+
},
7984
}
8085
const expectedOutput: any = { result: 'Success' }
8186

@@ -84,8 +89,8 @@ describe('FunctionBlockHandler', () => {
8489
expect(mockExecuteTool).toHaveBeenCalledWith(
8590
'function_execute',
8691
expectedToolParams,
87-
false, // skipPostProcess
88-
mockContext // execution context
92+
false,
93+
mockContext
8994
)
9095
expect(result).toEqual(expectedOutput)
9196
})
@@ -107,7 +112,12 @@ describe('FunctionBlockHandler', () => {
107112
workflowVariables: {},
108113
blockData: {},
109114
blockNameMapping: {},
110-
_context: { workflowId: mockContext.workflowId, workspaceId: mockContext.workspaceId },
115+
blockOutputSchemas: {},
116+
_context: {
117+
workflowId: mockContext.workflowId,
118+
workspaceId: mockContext.workspaceId,
119+
isDeployedContext: mockContext.isDeployedContext,
120+
},
111121
}
112122
const expectedOutput: any = { result: 'Success' }
113123

@@ -116,8 +126,8 @@ describe('FunctionBlockHandler', () => {
116126
expect(mockExecuteTool).toHaveBeenCalledWith(
117127
'function_execute',
118128
expectedToolParams,
119-
false, // skipPostProcess
120-
mockContext // execution context
129+
false,
130+
mockContext
121131
)
122132
expect(result).toEqual(expectedOutput)
123133
})
@@ -132,7 +142,12 @@ describe('FunctionBlockHandler', () => {
132142
workflowVariables: {},
133143
blockData: {},
134144
blockNameMapping: {},
135-
_context: { workflowId: mockContext.workflowId, workspaceId: mockContext.workspaceId },
145+
blockOutputSchemas: {},
146+
_context: {
147+
workflowId: mockContext.workflowId,
148+
workspaceId: mockContext.workspaceId,
149+
isDeployedContext: mockContext.isDeployedContext,
150+
},
136151
}
137152

138153
await handler.execute(mockContext, mockBlock, inputs)

‎apps/sim/executor/handlers/function/function-handler.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class FunctionBlockHandler implements BlockHandler {
2323
? inputs.code.map((c: { content: string }) => c.content).join('\n')
2424
: inputs.code
2525

26-
const { blockData, blockNameMapping } = collectBlockData(ctx)
26+
const { blockData, blockNameMapping, blockOutputSchemas } = collectBlockData(ctx)
2727

2828
const result = await executeTool(
2929
'function_execute',
@@ -35,6 +35,7 @@ export class FunctionBlockHandler implements BlockHandler {
3535
workflowVariables: ctx.workflowVariables || {},
3636
blockData,
3737
blockNameMapping,
38+
blockOutputSchemas,
3839
_context: {
3940
workflowId: ctx.workflowId,
4041
workspaceId: ctx.workspaceId,

‎apps/sim/executor/utils/block-data.ts‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,44 @@
1+
import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
12
import { normalizeName } from '@/executor/constants'
23
import type { ExecutionContext } from '@/executor/types'
4+
import type { OutputSchema } from '@/executor/utils/block-reference'
35

46
export interface BlockDataCollection {
5-
blockData: Record<string, any>
7+
blockData: Record<string, unknown>
68
blockNameMapping: Record<string, string>
9+
blockOutputSchemas: Record<string, OutputSchema>
710
}
811

912
export function collectBlockData(ctx: ExecutionContext): BlockDataCollection {
10-
const blockData: Record<string, any> = {}
13+
const blockData: Record<string, unknown> = {}
1114
const blockNameMapping: Record<string, string> = {}
15+
const blockOutputSchemas: Record<string, OutputSchema> = {}
1216

1317
for (const [id, state] of ctx.blockStates.entries()) {
1418
if (state.output !== undefined) {
1519
blockData[id] = state.output
16-
const workflowBlock = ctx.workflow?.blocks?.find((b) => b.id === id)
17-
if (workflowBlock?.metadata?.name) {
18-
blockNameMapping[normalizeName(workflowBlock.metadata.name)] = id
20+
}
21+
22+
const workflowBlock = ctx.workflow?.blocks?.find((b) => b.id === id)
23+
if (!workflowBlock) continue
24+
25+
if (workflowBlock.metadata?.name) {
26+
blockNameMapping[normalizeName(workflowBlock.metadata.name)] = id
27+
}
28+
29+
// Build output schema from block type and params
30+
const blockType = workflowBlock.metadata?.id
31+
if (blockType) {
32+
const params = workflowBlock.config?.params as Record<string, unknown> | undefined
33+
const subBlocks = params
34+
? Object.fromEntries(Object.entries(params).map(([k, v]) => [k, { value: v }]))
35+
: undefined
36+
const schema = getBlockOutputs(blockType, subBlocks)
37+
if (schema && Object.keys(schema).length > 0) {
38+
blockOutputSchemas[id] = schema
1939
}
2040
}
2141
}
2242

23-
return { blockData, blockNameMapping }
43+
return { blockData, blockNameMapping, blockOutputSchemas }
2444
}

0 commit comments

Comments
 (0)