Update handling of outputs in runToolCalls and streamline `runPromp…

…t` usage in tools
microsoft · Sep 9, 2024 · 816cf0f · 816cf0f
1 parent 471e9f2
commit 816cf0f
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 8 deletions.
diff --git a/docs/genaisrc/genaiscript.d.ts b/docs/genaisrc/genaiscript.d.ts
diff --git a/genaisrc/genaiscript.d.ts b/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/chat.ts b/packages/core/src/chat.ts
@@ -218,6 +218,12 @@ async function runToolCalls(
                     toolContent = `FILENAME: ${filename}
 ${fenceMD(content, " ")}
 `
+                } else if (
+                    typeof output === "object" &&
+                    (output as RunPromptResult).text
+                ) {
+                    const { text } = output as RunPromptResult
+                    toolContent = text
                 } else {
                     toolContent = YAMLStringify(output)
                 }

diff --git a/packages/core/src/genaisrc/genaiscript.d.ts b/packages/core/src/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -496,6 +496,8 @@ type ToolCallOutput =
     | ToolCallContent
     | ShellOutput
     | WorkspaceFile
+    | RunPromptResult
+    | undefined
 
 interface WorkspaceFileCache<K, V> {
     /**

diff --git a/packages/sample/genaisrc/genaiscript.d.ts b/packages/sample/genaisrc/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/nested-agents.genai.mts b/packages/sample/genaisrc/nested-agents.genai.mts
@@ -13,8 +13,8 @@ defTool(
             description: "the prompt to be executed by the LLM",
         },
     },
-    async ({ prompt }) => {
-        const res = await env.generator.runPrompt(
+    async ({ prompt }) =>
+        await env.generator.runPrompt(
             (_) => {
                 _.$`You are an AI assistant that can help with file system tasks.
 
@@ -31,8 +31,6 @@ defTool(
                 tools: "fs",
             }
         )
-        return res.text
-    }
 )
 
 /**
@@ -47,14 +45,12 @@ defTool(
             description: "the python to be executed by the LLM",
         },
     },
-    async ({ code }) => {
-        const res = await env.generator.runPrompt(code, {
+    async ({ code }) =>
+        await env.generator.runPrompt(code, {
             model: "openai:gpt-4o",
             label: "llm-4o agent_fs",
             tools: "python",
         })
-        return res.text
-    }
 )
 
 // now as a question about the file system

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/slides/genaisrc/genaiscript.d.ts b/slides/genaisrc/genaiscript.d.ts