Improve script compilation wording, enhance function definitions, and…

… optimize agent response computation
microsoft · Sep 24, 2024 · 184ca4e · 184ca4e
1 parent 1eca1f7
commit 184ca4e
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 52 deletions.
diff --git a/docs/genaisrc/genaiscript.d.ts b/docs/genaisrc/genaiscript.d.ts
diff --git a/docs/src/content/docs/reference/cli/commands.md b/docs/src/content/docs/reference/cli/commands.md
@@ -133,7 +133,7 @@ Commands:
   list                      List all available scripts in workspace
   create <name>             Create a new script
   fix                       fix all definition files
-  compile [folders...]      Compile all script in workspace
+  compile [folders...]      Compile all scripts in workspace
   model [options] [script]  List model connection information for scripts
   help [command]            display help for command
 ```
@@ -179,7 +179,7 @@ Options:
 ```
 Usage: genaiscript scripts compile [options] [folders...]
 
-Compile all script in workspace
+Compile all scripts in workspace
 
 Arguments:
   folders     Pattern to match files

diff --git a/genaisrc/genaiscript.d.ts b/genaisrc/genaiscript.d.ts
diff --git a/packages/auto/genaiscript.d.ts b/packages/auto/genaiscript.d.ts
diff --git a/packages/core/src/genaisrc/genaiscript.d.ts b/packages/core/src/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/runpromptcontext.ts b/packages/core/src/runpromptcontext.ts
@@ -59,7 +59,7 @@ export function createChatTurnGenerationContext(
         },
         assistant: (body, options) =>
             ctx.writeText(body, { ...options, assistant: true }),
-        $(strings, ...args) {
+        $: (strings, ...args) => {
             const current = createStringTemplateNode(strings, args)
             appendChild(node, current)
             const res: PromptTemplateString = Object.freeze(<
@@ -88,7 +88,7 @@ export function createChatTurnGenerationContext(
             })
             return res
         },
-        def(name, body, defOptions) {
+        def: (name, body, defOptions) => {
             name = name ?? ""
             const doptions = { ...(defOptions || {}), trace }
             doptions.lineNumbers = doptions.lineNumbers ?? options.lineNumbers
@@ -141,10 +141,25 @@ export function createChatTurnGenerationContext(
                     node,
                     createDef(
                         name,
-                        { filename: "", content: (body as Fenced).content },
+                        { filename: "", content: fenced.content },
                         { language: fenced.language, ...(doptions || {}) }
                     )
                 )
+            } else if (
+                typeof body === "object" &&
+                (body as RunPromptResult).text
+            ) {
+                const res = body as RunPromptResult
+                const fence =
+                    res.fences?.length === 1 ? res.fences[0] : undefined
+                appendChild(
+                    node,
+                    createDef(
+                        name,
+                        { filename: "", content: fence?.content ?? res.text },
+                        { language: fence?.language, ...(doptions || {}) }
+                    )
+                )
             }
 
             // TODO: support clause

diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -1537,7 +1537,7 @@ interface ChatTurnGenerationContext {
     fence(body: StringLike, options?: FenceOptions): void
     def(
         name: string,
-        body: string | WorkspaceFile | WorkspaceFile[] | ShellOutput | Fenced,
+        body: string | WorkspaceFile | WorkspaceFile[] | ShellOutput | Fenced | RunPromptResult,
         options?: DefOptions
     ): string
     defData(

diff --git a/packages/core/src/types/prompt_type.d.ts b/packages/core/src/types/prompt_type.d.ts
@@ -67,7 +67,7 @@ declare function fence(body: StringLike, options?: FenceOptions): void
  */
 declare function def(
     name: string,
-    body: string | WorkspaceFile | WorkspaceFile[] | ShellOutput | Fenced,
+    body: string | WorkspaceFile | WorkspaceFile[] | ShellOutput | Fenced | RunPromptResult,
     options?: DefOptions
 ): string
 

diff --git a/packages/sample/genaisrc/blog/genaiscript.d.ts b/packages/sample/genaisrc/blog/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/genaiscript.d.ts b/packages/sample/genaisrc/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/mixture-of-agents.genai.mts b/packages/sample/genaisrc/mixture-of-agents.genai.mts
@@ -12,18 +12,18 @@ export async function mixtureOfAgents(
         ],
     } = options ?? {}
 
-    // compute agent responses
-    const agentResponses = []
-    for (const agent of agents) {
-        const res = await runPrompt(
-            (ctx) => {
-                ctx.writeText(query)
-                ctx.assistant(`What do you think?`)
-            },
-            { ...agent, label: agent.label || agent.model }
+    // compute agent responses concurrently
+    const agentResponses = await Promise.all(
+        agents.map((agent) =>
+            runPrompt(
+                (ctx) => {
+                    ctx.writeText(query)
+                    ctx.assistant(`What do you think?`)
+                },
+                { ...agent, label: agent.label || agent.model }
+            )
         )
-        agentResponses.push(res.text)
-    }
+    )
 
     // critique
     const { text: critique } = await runPrompt(

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/errors/genaiscript.d.ts b/packages/sample/src/errors/genaiscript.d.ts
diff --git a/packages/sample/src/genaiscript.d.ts b/packages/sample/src/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/sample/src/vision/genaiscript.d.ts b/packages/sample/src/vision/genaiscript.d.ts
diff --git a/packages/vscode/genaisrc/genaiscript.d.ts b/packages/vscode/genaisrc/genaiscript.d.ts