support debugging self file (#312)

microsoft · Apr 1, 2024 · 8fe2adc · 8fe2adc
1 parent 68131c2
commit 8fe2adc
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 81 deletions.
diff --git a/packages/core/src/expander.ts b/packages/core/src/expander.ts
@@ -169,14 +169,18 @@ export async function expandTemplate(
 
     const systems = (template.system ?? []).slice(0)
     if (template.system === undefined) {
+        const useSchema = /defschema/i.test(jsSource)
         systems.push("system")
         systems.push("system.explanations")
         // select file expansion type
         if (/diff/i.test(jsSource)) systems.push("system.diff")
         else if (/changelog/i.test(jsSource)) systems.push("system.changelog")
-        else systems.push("system.files")
+        else {
+            systems.push("system.files")
+            if (useSchema) systems.push("system.files_schema")
+        }
+        if (useSchema) systems.push("system.schema")
         if (/annotations?/i.test(jsSource)) systems.push("system.annotations")
-        if (/defschema/i.test(jsSource)) systems.push("system.schema")
     }
     const systemTemplates = systems.map((s) =>
         fragment.file.project.getTemplate(s)

diff --git a/packages/core/src/genaisrc/system.files.genai.js b/packages/core/src/genaisrc/system.files.genai.js
@@ -4,7 +4,7 @@ system({
 })
 
 const folder =
-    env.vars["outputFolder"] || env.template.outputFolder || "."
+    env.vars["outputFolder"] || "."
 $`## Files
 
 When generating or updating files you will use the following syntax:`
@@ -32,16 +32,3 @@ if (folder !== ".") $`When generating new files, place files in folder "${folder
 $`If a file does not have changes, do not regenerate.`
 $`Do NOT emit line numbers in file.`
 $`CSV files are inlined as markdown tables.`
-
-$`
-### JSON Schema
-
-When you generate JSON or YAML according to a named schema, 
-you MUST add the schema identifier in the code fence header.
-`
-
-def(
-    `File ${folder}/data.json`,
-    `...`,
-    { language: "json", schema: "CITY_SCHEMA" }
-)
diff --git a/packages/core/src/genaisrc/system.files_schema.js b/packages/core/src/genaisrc/system.files_schema.js
@@ -0,0 +1,20 @@
+system({
+    title: "JSON schema for file generation",
+    description: "Apply JSON schemas to generated data",
+})
+
+const folder =
+    env.vars["outputFolder"] || "."
+
+$`
+## Files with JSON Schema
+
+When you generate JSON or YAML according to a named schema, 
+you MUST add the schema identifier in the code fence header.
+`
+
+def(
+    `File ${folder}/data.json`,
+    `...`,
+    { language: "json", schema: "CITY_SCHEMA" }
+)
diff --git a/packages/core/src/prompt_template.d.ts b/packages/core/src/prompt_template.d.ts
@@ -156,11 +156,6 @@ interface PromptTemplate extends PromptLike, ModelOptions {
      */
     system?: SystemPromptId[]
 
-    /**
-     * Specifies a folder to create output files into
-     */
-    outputFolder?: string
-
     /**
      * Specifies the type of output. Default is `markdown`.
      */

diff --git a/packages/core/src/template.ts b/packages/core/src/template.ts
@@ -427,7 +427,6 @@ export async function parsePromptTemplate(
             c.checkString("title")
             c.checkString("description")
             c.checkString("model")
-            c.checkString("outputFolder")
             c.checkString("responseType")
 
             c.checkBool("unlisted")

diff --git a/packages/sample/genaisrc/genaiscript.d.ts b/packages/sample/genaisrc/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/node/genaiscript.d.ts b/packages/sample/genaisrc/node/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/python/genaiscript.d.ts b/packages/sample/genaisrc/python/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/style/genaiscript.d.ts b/packages/sample/genaisrc/style/genaiscript.d.ts
diff --git a/packages/sample/src/aici/genaiscript.d.ts b/packages/sample/src/aici/genaiscript.d.ts
diff --git a/packages/sample/src/makecode/genaiscript.d.ts b/packages/sample/src/makecode/genaiscript.d.ts
diff --git a/packages/sample/src/tla/genaiscript.d.ts b/packages/sample/src/tla/genaiscript.d.ts
diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -113,7 +113,12 @@
                 {
                     "command": "genaiscript.fragment.prompt",
                     "when": "!inDebugMode && resourceFilename =~ /.*\\.genai\\.js$/",
-                    "group": "navigation"
+                    "group": "genaiscript@1"
+                },
+                {
+                    "command": "genaiscript.fragment.debug",
+                    "when": "!inDebugMode && resourceFilename =~ /.*\\.genai\\.js$/",
+                    "group": "genaiscript@2"
                 }
             ],
             "commandPalette": [

diff --git a/packages/vscode/src/fragmentcommands.ts b/packages/vscode/src/fragmentcommands.ts
@@ -9,10 +9,7 @@ import {
     templateGroup,
 } from "genaiscript-core"
 import { ExtensionState } from "./state"
-import {
-    checkDirectoryExists,
-    checkFileExists,
-} from "./fs"
+import { checkDirectoryExists, checkFileExists } from "./fs"
 
 type TemplateQuickPickItem = {
     template?: PromptTemplate
@@ -87,31 +84,26 @@ export function activateFragmentCommands(state: ExtensionState) {
     const fragmentPrompt = async (
         options:
             | {
-                fragment?: Fragment | string | vscode.Uri
-                template?: PromptTemplate
-                debug?: boolean
-            }
+                  fragment?: Fragment | string | vscode.Uri
+                  template?: PromptTemplate
+              }
             | vscode.Uri
     ) => {
         if (typeof options === "object" && options instanceof vscode.Uri)
             options = { fragment: options }
-        let { fragment, template, debug } = options || {}
+        let { fragment, template } = options || {}
 
         await state.cancelAiRequest()
         await state.parseWorkspace()
 
-        if (fragment instanceof vscode.Uri && GENAI_JS_REGEX.test(fragment.path)) {
-            template = state.project.templates.find(p => p.filename === (fragment as vscode.Uri).fsPath)
+        if (
+            fragment instanceof vscode.Uri &&
+            GENAI_JS_REGEX.test(fragment.path)
+        ) {
+            template = state.project.templates.find(
+                (p) => p.filename === (fragment as vscode.Uri).fsPath
+            )
             assert(template !== undefined)
-            /*
-            const uris = await vscode.window.showOpenDialog({
-                canSelectMany: false,
-                openLabel: 'Select env.files',
-                canSelectFolders: true,
-                canSelectFiles: true
-            })
-            fragment = uris?.[0]
-            */
         }
 
         fragment = await resolveSpec(fragment)
@@ -141,7 +133,13 @@ export function activateFragmentCommands(state: ExtensionState) {
         await state.cancelAiRequest()
         await state.parseWorkspace()
 
-        const template = await pickTemplate()
+        let template: PromptTemplate
+        if (GENAI_JS_REGEX.test(file.path)) {
+            template = state.project.templates.find(
+                (p) => p.filename === file.fsPath
+            )
+            assert(template !== undefined)
+        } else template = await pickTemplate()
         await vscode.debug.startDebugging(
             vscode.workspace.workspaceFolders[0],
             {
@@ -216,8 +214,9 @@ export function templatesToQuickPickItems(
                                     template.filename
                                 )) ??
                             template.id,
-                        description: `${template.id} ${template.description || ""
-                            }`,
+                        description: `${template.id} ${
+                            template.description || ""
+                        }`,
                         template,
                     }
             )