cleaning

Author: centdix

frontend/src/lib/components/copilot/chat/flow/core.ts

@@ -12,7 +12,7 @@ import {
 	getLangContext,
 	SUPPORTED_CHAT_SCRIPT_LANGUAGES
 } from '../script/core'
-import { createSearchHubScriptsTool, createToolDef, type Tool, executeTestRun } from '../shared'
+import { createSearchHubScriptsTool, createToolDef, type Tool, executeTestRun, buildSchemaForTool } from '../shared'
 import type { ExtendedOpenFlow } from '$lib/components/flows/types'
 import { copilotSessionModel } from '$lib/stores'
 import { get } from 'svelte/store'
@@ -354,7 +354,8 @@ const testRunFlowToolDef = createToolDef(
 const testRunStepSchema = z.object({
 	stepId: z.string().describe('The id of the step to test'),
 	args: z
-		.record(z.any())
+		.object({})
+		.nullable()
 		.optional()
 		.describe('Arguments to pass to the step (optional, uses default step inputs if not provided)')
 })
@@ -592,32 +593,17 @@ export const flowTools: Tool<FlowAIChatHelpers>[] = [
 			})
 		},
 		setSchema: async function(helpers: FlowAIChatHelpers) {
-			try {
-				if (this.def?.function?.parameters) {
-					const flowInputsSchema = await helpers.getFlowInputsSchema()
-					this.def.function.parameters = { ...flowInputsSchema, additionalProperties: false }
-					// OPEN AI models don't support strict mode well with schema with complex properties, so we disable it
-					const model = get(copilotSessionModel)?.provider
-					if (model === 'openai' || model === 'azure_openai') {
-						this.def.function.strict = false
-					}
-				}
-			} catch (e) {
-				console.error('Error setting schema for test_run_flow tool', e)
-				// fallback to schema with any properties
-				this.def.function.parameters = {
-					type: 'object',
-					properties: {},
-					additionalProperties: true,
-					strict: false
-				}
-			}
+			await buildSchemaForTool(this.def, async () => {
+				const flowInputsSchema = await helpers.getFlowInputsSchema()
+				return flowInputsSchema
+			})
 		},
 		requiresConfirmation: true,
 		showDetails: true
 	},
 	{
-		def: testRunStepToolDef,
+		// set strict to false to avoid issues with open ai models
+		def: { ...testRunStepToolDef, function: { ...testRunStepToolDef.function, strict: false } },
 		fn: async ({ args, workspace, helpers, toolCallbacks, toolId }) => {
 			const { flow } = helpers.getFlowAndSelectedId()
 
@@ -661,11 +647,7 @@ export const flowTools: Tool<FlowAIChatHelpers>[] = [
 							requestBody: {
 								content: moduleValue.content ?? '',
 								language: moduleValue.language,
-								args:
-									module.id === 'preprocessor'
-										? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...stepArgs }
-										: stepArgs,
-								tag: flow.tag || moduleValue.tag
+								args: module.id === 'preprocessor' ? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...stepArgs } : stepArgs
 							}
 						}),
 					workspace,
@@ -676,18 +658,15 @@ export const flowTools: Tool<FlowAIChatHelpers>[] = [
 				})
 			} else if (moduleValue.type === 'script') {
 				// Test script step - need to get the script content
-				let script
-				if (moduleValue.hash) {
-					script = await ScriptService.getScriptByHash({
-						workspace: workspace,
-						hash: moduleValue.hash
-					})
-				} else {
-					script = await ScriptService.getScriptByPath({
-						workspace: workspace,
-						path: moduleValue.path
-					})
-				}
+				const script = moduleValue.hash
+					? await ScriptService.getScriptByHash({
+							workspace: workspace,
+							hash: moduleValue.hash
+						})
+					: await ScriptService.getScriptByPath({
+							workspace: workspace,
+							path: moduleValue.path
+						})
 
 				return executeTestRun({
 					jobStarter: () =>
@@ -696,12 +675,7 @@ export const flowTools: Tool<FlowAIChatHelpers>[] = [
 							requestBody: {
 								content: script.content,
 								language: script.language,
-								args:
-									module.id === 'preprocessor'
-										? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...stepArgs }
-										: stepArgs,
-								tag: flow.tag || (moduleValue.tag_override ? moduleValue.tag_override : script.tag),
-								lock: script.lock
+								args: module.id === 'preprocessor' ? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...stepArgs } : stepArgs,
 							}
 						}),
 					workspace,
@@ -745,8 +719,7 @@ export function prepareFlowSystemMessage(): ChatCompletionSystemMessageParam {
 Follow the user instructions carefully.
 Go step by step, and explain what you're doing as you're doing it.
 DO NOT wait for user confirmation before performing an action. Only do it if the user explicitly asks you to wait in their initial instructions.
-ALWAYS use the \`test_run_flow\` tool to test the flow, and iterate on the flow until it works as expected. If the user cancels the test run, do not try again and wait for the next user instruction.
-Use the \`test_run_step\` tool to test individual steps of the flow when debugging or validating specific step functionality.
+ALWAYS test your modifications. You have access to the \`test_run_flow\` and \`test_run_step\` tools to test the flow and steps. If you only modified a single step, use the \`test_run_step\` tool to test it. If you modified the flow, use the \`test_run_flow\` tool to test it. If the user cancels the test run, do not try again and wait for the next user instruction.
 
 ## Understanding User Requests
 

frontend/src/lib/components/copilot/chat/script/core.ts

@@ -13,7 +13,7 @@ import { scriptLangToEditorLang } from '$lib/scripts'
 import { getDbSchemas } from '$lib/components/apps/components/display/dbtable/utils'
 import type { CodePieceElement, ContextElement } from '../context'
 import { PYTHON_PREPROCESSOR_MODULE_CODE, TS_PREPROCESSOR_MODULE_CODE } from '$lib/script_helpers'
-import { createSearchHubScriptsTool, type Tool, executeTestRun } from '../shared'
+import { createSearchHubScriptsTool, type Tool, executeTestRun, buildSchemaForTool } from '../shared'
 import { setupTypeAcquisition, type DepsToGet } from '$lib/ata'
 import { getModelContextWindow } from '../../lib'
 import { inferArgs } from '$lib/infer'
@@ -888,9 +888,6 @@ export const testRunScriptTool: Tool<ScriptChatHelpers> = {
 					content: codeToTest,
 					args,
 					language: scriptOptions.lang as ScriptLang,
-					tag: undefined,
-					lock: undefined,
-					script_hash: undefined
 				}
 			}),
 			workspace,
@@ -901,7 +898,7 @@ export const testRunScriptTool: Tool<ScriptChatHelpers> = {
 		})
 	},
 	setSchema: async function(helpers: ScriptChatHelpers) {
-		try {
+		await buildSchemaForTool(this.def, async () => {
 			const scriptOptions = helpers.getScriptOptions()
 			const code = scriptOptions?.code
 			const lang = scriptOptions?.lang
@@ -911,23 +908,10 @@ export const testRunScriptTool: Tool<ScriptChatHelpers> = {
 			if (codeToTest) {
 				const newSchema = emptySchema()
 				await inferArgs(lang, codeToTest, newSchema)
-				this.def.function.parameters = { ...newSchema, additionalProperties: false }
-				// OPEN AI models don't support strict mode well with schema with complex properties, so we disable it
-				const model = get(copilotSessionModel)?.provider
-				if (model === 'openai' || model === 'azure_openai') {
-					this.def.function.strict = false
-				}
-			}
-		} catch (e) {
-			console.error('Error setting schema for test_run_script tool', e)
-			// fallback to schema with any properties
-			this.def.function.parameters = {
-				type: 'object',
-				properties: {},
-				additionalProperties: true,
-				strict: false
+				return newSchema
 			}
-		}
+			return emptySchema()
+		})
 	},
 	requiresConfirmation: true,
 	showDetails: true,

frontend/src/lib/components/copilot/chat/shared.ts

@@ -5,7 +5,7 @@ import type {
 } from 'openai/resources/chat/completions.mjs'
 import { get } from 'svelte/store'
 import type { ContextElement } from './context'
-import { workspaceStore } from '$lib/stores'
+import { copilotSessionModel, workspaceStore } from '$lib/stores'
 import type { ExtendedOpenFlow } from '$lib/components/flows/types'
 import type { FunctionParameters } from 'openai/resources/shared.mjs'
 import { zodToJsonSchema } from 'zod-to-json-schema'
@@ -253,6 +253,22 @@ export const createSearchHubScriptsTool = (withContent: boolean = false) => ({
 	}
 })
 
+export async function buildSchemaForTool(toolDef: ChatCompletionTool, schemaBuilder: () => Promise<FunctionParameters>): Promise<void> {
+	try {
+		const schema = await schemaBuilder()
+		toolDef.function.parameters = { ...schema, additionalProperties: false }
+		// OPEN AI models don't support strict mode well with schema with complex properties, so we disable it
+		const model = get(copilotSessionModel)?.provider
+		if (model === 'openai' || model === 'azure_openai') {
+			toolDef.function.strict = false
+		}
+	} catch (error) {
+		console.error('Error building schema for tool', error)
+		// fallback to schema with any properties
+		toolDef.function.parameters = { type: 'object', properties: {}, additionalProperties: true, strict: false }
+	}
+}
+
 // Constants for result formatting
 const MAX_RESULT_LENGTH = 12000
 const MAX_LOG_LENGTH = 4000