fix: stop error when run has no output

Instead, only error when the run has an error Signed-off-by: Donnie Adams <[email protected]>
gptscript-ai · Sep 11, 2024 · 1cf71a6 · 1cf71a6
1 parent 77b3878
commit 1cf71a6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/gptscript.ts b/src/gptscript.ts
@@ -480,11 +480,11 @@ export class Run {
 
                 res.on("end", () => {
                     if (this.state === RunState.Running || this.state === RunState.Finished || this.state === RunState.Continue) {
-                        if (this.stdout) {
+                        if (this.stdout || !this.stderr) {
                             if (this.state !== RunState.Continue) {
                                 this.state = RunState.Finished
                             }
-                            resolve(this.stdout)
+                            resolve(this.stdout || "")
                         } else {
                             this.state = RunState.Error
                             reject(new Error(this.stderr))

diff --git a/tests/gptscript.test.ts b/tests/gptscript.test.ts
@@ -1,5 +1,5 @@
 import * as gptscript from "../src/gptscript"
-import {ArgumentSchemaType, getEnv, PropertyType, RunEventType, TextType, ToolType} from "../src/gptscript"
+import {ArgumentSchemaType, getEnv, PropertyType, RunEventType, TextType, ToolDef, ToolType} from "../src/gptscript"
 import path from "path"
 import {fileURLToPath} from "url"
 import * as fs from "node:fs"
@@ -85,6 +85,29 @@ describe("gptscript module", () => {
         expect(await run.text()).toContain("Calvin Coolidge")
     })
 
+    test("evaluate executes subtool with empty instructions", async () => {
+        const tools = [
+            {
+                type: "tool",
+                tools: ["new-tool-1"],
+                instructions: "Ask the user for their 'first name'. Then reply hello to the user.",
+            } as ToolDef,
+            {
+                type: "tool",
+                name: "new-tool-1",
+            } as ToolDef,
+        ]
+        const run = await g.evaluate(tools, {
+            input: "{}",
+            disableCache: true,
+            workspace: "",
+            subTool: "new-tool-1",
+        })
+
+        expect(run).toBeDefined()
+        expect(await run.text()).toContain("Understood.")
+    })
+
     test("evaluate executes and streams a prompt correctly", async () => {
         let out = ""
         let err = undefined