fix: stringify non-tool tools

Signed-off-by: Donnie Adams <[email protected]>
gptscript-ai · Aug 30, 2024 · 7a32707 · 7a32707
1 parent ad748d9
commit 7a32707
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/src/gptscript.ts b/src/gptscript.ts
@@ -215,16 +215,16 @@ export class GPTScript {
         const nodes: any[] = []
 
         for (const block of blocks) {
-            if (block.type === "tool") {
+            if (block.type === "text") {
                 nodes.push({
-                    toolNode: {
-                        tool: block
+                    textNode: {
+                        text: "!" + (block.format || "text") + "\n" + block.content
                     }
                 })
-            } else if (block.type === "text") {
+            } else {
                 nodes.push({
-                    textNode: {
-                        text: "!" + (block.format || "text") + "\n" + block.content
+                    toolNode: {
+                        tool: block
                     }
                 })
             }

diff --git a/tests/gptscript.test.ts b/tests/gptscript.test.ts
@@ -383,6 +383,31 @@ describe("gptscript module", () => {
         expect(response).toContain("Parameter: text: The text to write")
     })
 
+    test("format context tool", async () => {
+        const tool = {
+            id: "my-tool",
+            type: "context" as ToolType,
+            tools: ["sys.write", "sys.read"],
+            instructions: "This is a test",
+            arguments: {
+                type: ArgumentSchemaType,
+                properties: {
+                    text: {
+                        type: PropertyType,
+                        description: "The text to write"
+                    }
+                }
+            }
+        }
+
+        const response = await g.stringify([tool])
+        expect(response).toBeDefined()
+        expect(response).toContain("Tools: sys.write, sys.read")
+        expect(response).toContain("This is a test")
+        expect(response).toContain("Parameter: text: The text to write")
+        expect(response).toContain("Type: Context")
+    })
+
     test("exec tool with chat", async () => {
         let err = undefined
         const t = {