Merge pull request #39 from thedadams/add-tool-context

feat: add support for tools context
gptscript-ai · May 17, 2024 · 0e2a16c · 0e2a16c
2 parents 21772e2 + c28abda
commit 0e2a16c
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 188 deletions.
diff --git a/examples/example-file-stream.js b/examples/example-file-stream.js
diff --git a/examples/example-models.js b/examples/example-models.js
diff --git a/examples/example-parse-file.js b/examples/example-parse-file.js
diff --git a/examples/example-parse.js b/examples/example-parse.js
diff --git a/examples/example-tool-chat-stream.js b/examples/example-tool-chat-stream.js
diff --git a/examples/example-tool-stream.js b/examples/example-tool-stream.js
diff --git a/examples/example-tools.js b/examples/example-tools.js
diff --git a/examples/example-version.js b/examples/example-version.js
diff --git a/examples/sangeetha.js b/examples/sangeetha.js
diff --git a/src/gptscript.ts b/src/gptscript.ts
@@ -729,6 +729,7 @@ export interface ToolDef {
 	arguments: ArgumentSchema
 	tools: string[]
 	globalTools: string[]
+	context: string[]
 	export: string[]
 	blocking: boolean
 	instructions: string
@@ -960,6 +961,12 @@ function toolDefToString(tool: ToolDef) {
 	if (tool.tools?.length > 0) {
 		toolInfo.push(`Tools: ${tool.tools.join(", ")}`)
 	}
+	if (tool.context?.length > 0) {
+		toolInfo.push(`Context: ${tool.context.join(", ")}`)
+	}
+	if (tool.export?.length > 0) {
+		toolInfo.push(`Export: ${tool.export.join(", ")}`)
+	}
 	if (tool.maxTokens !== undefined) {
 		toolInfo.push(`Max Tokens: ${tool.maxTokens}`)
 	}

diff --git a/tests/fixtures/acorn-labs-context.gpt b/tests/fixtures/acorn-labs-context.gpt
@@ -0,0 +1 @@
+Say "Answer every query with 'Acorn Labs'"
diff --git a/tests/gptscript.test.ts b/tests/gptscript.test.ts
@@ -63,6 +63,26 @@ describe("gptscript module", () => {
 		expect(err).toEqual("")
 	})
 
+	test("evaluate executes a prompt correctly with context", async () => {
+		let out = ""
+		let err = undefined
+		const t = {
+			instructions: "who was the president of the united states in 1928?",
+			context: [path.join(__dirname, "fixtures", "acorn-labs-context.gpt")]
+		}
+
+		try {
+			const run = client.evaluate(t as any, {disableCache: true})
+			out = await run.text()
+			err = run.err
+		} catch (e) {
+			console.error(e)
+		}
+
+		expect(out).toContain("Acorn Labs")
+		expect(err).toEqual("")
+	})
+
 	describe("run with test.gpt fixture", () => {
 		test("should execute test.gpt correctly", async () => {
 			const testGptPath = path.join(__dirname, "fixtures", "test.gpt")