better fallback

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, buildSchemaForTool } from '../shared'
+import { createSearchHubScriptsTool, createToolDef, type Tool, executeTestRun, buildSchemaForTool, buildTestRunArgs } from '../shared'
 import type { ExtendedOpenFlow } from '$lib/components/flows/types'
 
 export type AIModuleAction = 'added' | 'modified' | 'removed'
@@ -562,7 +562,7 @@ export const flowTools: Tool<FlowAIChatHelpers>[] = [
 	},
 	{
 		def: testRunFlowToolDef,
-		fn: async ({ args, workspace, helpers, toolCallbacks, toolId }) => {
+		fn: async function({ args, workspace, helpers, toolCallbacks, toolId }) {
 			const { flow } = helpers.getFlowAndSelectedId()
 
 			if (!flow || !flow.value) {
@@ -575,11 +575,12 @@ export const flowTools: Tool<FlowAIChatHelpers>[] = [
 				)
 			}
 
+			const parsedArgs = await buildTestRunArgs(args, this.def)
 			return executeTestRun({
 				jobStarter: () => JobService.runFlowPreview({
 					workspace: workspace,
 					requestBody: {
-						args: args,
+						args: parsedArgs,
 						value: flow.value,
 					}
 				}),

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, buildSchemaForTool } from '../shared'
+import { createSearchHubScriptsTool, type Tool, executeTestRun, buildSchemaForTool, buildTestRunArgs } from '../shared'
 import { setupTypeAcquisition, type DepsToGet } from '$lib/ata'
 import { getModelContextWindow } from '../../lib'
 import { inferArgs } from '$lib/infer'
@@ -855,7 +855,7 @@ const TEST_RUN_SCRIPT_TOOL: ChatCompletionTool = {
 
 export const testRunScriptTool: Tool<ScriptChatHelpers> = {
 	def: TEST_RUN_SCRIPT_TOOL,
-	fn: async ({ args, workspace, helpers, toolCallbacks, toolId }) => {
+	fn: async function({ args, workspace, helpers, toolCallbacks, toolId }) {
 		const scriptOptions = helpers.getScriptOptions()
 
 		if (!scriptOptions) {
@@ -880,13 +880,15 @@ export const testRunScriptTool: Tool<ScriptChatHelpers> = {
 			toolCallbacks.setToolStatus(toolId, { content: 'Code changes applied, starting test...' })
 		}
 
+		const parsedArgs = await buildTestRunArgs(args, this.def)
+
 		return executeTestRun({
 			jobStarter: () => JobService.runScriptPreview({
 				workspace: workspace,
 				requestBody: {
 					path: scriptOptions.path,
 					content: codeToTest,
-					args,
+					args: parsedArgs,
 					language: scriptOptions.lang as ScriptLang,
 				}
 			}),

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

@@ -190,6 +190,9 @@ export function createToolDef(
 		name,
 		target: 'openAi'
 	})
+	if (name === 'test_run_step') {
+		console.log('schema', schema)
+	}
 	let parameters = schema.definitions![name] as FunctionParameters
 	parameters = {
 		...parameters,
@@ -253,19 +256,29 @@ export const createSearchHubScriptsTool = (withContent: boolean = false) => ({
 	}
 })
 
-export async function buildSchemaForTool(toolDef: ChatCompletionTool, schemaBuilder: () => Promise<FunctionParameters>): Promise<void> {
+export async function buildSchemaForTool(toolDef: ChatCompletionTool, schemaBuilder: () => Promise<FunctionParameters>): Promise<boolean> {
 	try {
 		const schema = await schemaBuilder()
+
+		// if schema properties contains values different from '^[a-zA-Z0-9_.-]{1,64}$'
+		const invalidProperties = Object.keys(schema.properties ?? {}).filter((key) => !/^[a-zA-Z0-9_.-]{1,64}$/.test(key))
+		if (invalidProperties.length > 0) {
+			console.warn(`Invalid flow inputs schema: ${invalidProperties.join(', ')}`)
+			throw new Error(`Invalid flow inputs schema: ${invalidProperties.join(', ')}`)
+		}
+
 		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
 		}
+		return true
 	} 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 }
+		toolDef.function.parameters = { type: 'object', properties: { args: { type: 'string', description: 'JSON string containing the arguments for the tool' } }, additionalProperties: false, strict: false, required: ['args'] }
+		return false
 	}
 }
 
@@ -378,6 +391,20 @@ function getErrorMessage(result: unknown): string {
 	return 'Unknown error'
 }
 
+// Build test run args based on the tool definition, if it contains a fallback schema
+export async function buildTestRunArgs(args: any, toolDef: ChatCompletionTool): Promise<any> {
+	let parsedArgs = args
+	// if the schema is the fallback schema, parse the args as a JSON string
+	if ((toolDef.function.parameters as any).properties?.args?.description === 'JSON string containing the arguments for the tool') {
+		try {
+			parsedArgs = JSON.parse(args.args)
+		} catch (error) {
+			console.error('Error parsing arguments for tool', error)
+		}
+	}
+	return parsedArgs
+}
+
 // Main execution function for test runs
 export async function executeTestRun(config: TestRunConfig): Promise<string> {
 	try {