symposium 0.6.6 → 0.6.8

package/Agent.js

@@ -162,7 +162,7 @@ export default class Agent {
 
 					const match = text.match(/^CALL ([A-Za-z0-9_]+)\n([\s\S]*)$/);
 					if (match)
-						newContent.push({type: 'function', content: {name: match[1], arguments: JSON.parse(match[2] || '{}')}});
+						newContent.push({type: 'function', content: [{name: match[1], arguments: JSON.parse(match[2] || '{}')}]});
 					else
 						newContent.push({type: 'text', content: text});
 				}
@@ -176,7 +176,7 @@ export default class Agent {
 	}
 
 	async handleCompletion(thread, completion) {
-		let call_function = null;
+		const functions = [];
 		for (let message of completion) {
 			thread.addDirectMessage(message);
 			await this.log('ai_message', message.content);
@@ -188,19 +188,30 @@ export default class Agent {
 						break;
 
 					case 'function':
-						if (call_function)
-							throw new Error('The model replied with more than one function');
-						else
-							call_function = m.content;
+						functions.push(m.content);
 						break;
 				}
 			}
 		}
 
-		if (call_function)
-			return this.callFunction(thread, call_function);
-		else
-			return thread.storeState();
+		if (functions.length) {
+			for(let f of functions) {
+				const response = await this.callFunction(thread, f);
+
+				thread.addMessage('tool', [
+					{
+						type: 'function_response',
+						content: {name: f.name, response, id: f.id || undefined},
+					},
+				], f.name);
+
+				await this.log('function_response', response);
+			}
+
+			await this.execute(thread);
+		}else {
+			await thread.storeState();
+		}
 	}
 
 	async getFunctions(parsed = true) {
@@ -227,32 +238,17 @@ export default class Agent {
 	}
 
 	async callFunction(thread, function_call) {
-		let functions = await this.getFunctions(false);
+		const functions = await this.getFunctions(false);
 		if (!functions.has(function_call.name))
 			throw new Error('Unrecognized function ' + function_call.name);
 
 		await this.log('function_call', function_call);
 
 		try {
-			const response = await functions.get(function_call.name).tool.callFunction(thread, function_call.name, function_call.arguments);
-			thread.addMessage('function', [
-				{
-					type: 'function_response',
-					content: {response, id: function_call.id || undefined},
-				},
-			], function_call.name);
-			await this.log('function_response', response);
+			return await functions.get(function_call.name).tool.callFunction(thread, function_call.name, function_call.arguments);
 		} catch (error) {
-			thread.addMessage('function', [
-				{
-					type: 'function_response',
-					content: {response: {error}},
-				},
-			], function_call.name);
-			await this.log('function_response', {error});
+			return {error};
 		}
-
-		await this.execute(thread);
 	}
 
 	async setModel(thread, label) {

package/Symposium.js

@@ -2,7 +2,6 @@ import Redis from "@travio/redis";
 import Gpt35 from "./models/Gpt35.js";
 import Gpt4 from "./models/Gpt4.js";
 import Gpt4Turbo from "./models/Gpt4Turbo.js";
-import Gpt4Vision from "./models/Gpt4Vision.js";
 import Whisper from "./models/Whisper.js";
 import Claude3Haiku from "./models/Claude3Haiku.js";
 import Claude3Sonnet from "./models/Claude3Sonnet.js";
@@ -15,7 +14,6 @@ export default class Symposium {
 		this.loadModel(new Gpt35());
 		this.loadModel(new Gpt4());
 		this.loadModel(new Gpt4Turbo());
-		this.loadModel(new Gpt4Vision());
 		this.loadModel(new Whisper());
 
 		this.loadModel(new Claude3Haiku());

package/models/AnthropicModel.js

@@ -62,11 +62,13 @@ export default class AnthropicModel extends Model {
 					case 'tool_use':
 						message_content.push({
 							type: 'function',
-							content: {
-								id: m.id,
-								name: m.name,
-								arguments: m.input,
-							},
+							content: [
+								{
+									id: m.id,
+									name: m.name,
+									arguments: m.input,
+								},
+							],
 						});
 						break;
 
@@ -88,7 +90,7 @@ export default class AnthropicModel extends Model {
 				system.push(message.content.map(c => c.content).join("\n"));
 			} else {
 				const parsedMessage = {
-					role: message.role === 'function' ? 'user' : message.role,
+					role: ['function', 'tool'].includes(message.role) ? 'user' : message.role,
 					content: message.content.map(c => {
 						switch (c.type) {
 							case 'text':
@@ -100,9 +102,9 @@ export default class AnthropicModel extends Model {
 							case 'function':
 								return {
 									type: 'tool_use',
-									name: c.content.name,
-									input: c.content.arguments,
-									id: c.content.id,
+									name: c.content[0].name,
+									input: c.content[0].arguments,
+									id: c.content[0].id,
 								};
 
 							case 'function_response':

package/models/OpenAIModel.js

@@ -49,13 +49,21 @@ export default class OpenAIModel extends Model {
 		const completion_payload = {
 			model: this.name,
 			messages: convertedMessages,
-			functions,
+			tools: functions.map(f => ({
+				type: 'function',
+				function: f,
+			})),
 		};
 
-		if (options.force_function)
-			completion_payload.function_call = {name: options.force_function};
-		if (!completion_payload.functions.length)
-			delete completion_payload.functions;
+		if (options.force_function) {
+			completion_payload.tool_choice = {
+				type: 'function',
+				function: {name: options.force_function},
+			};
+		}
+
+		if (!completion_payload.tools.length)
+			delete completion_payload.tools;
 
 		const chatCompletion = await this.getOpenAi().chat.completions.create(completion_payload);
 		const completion = chatCompletion.choices[0].message;
@@ -63,13 +71,20 @@ export default class OpenAIModel extends Model {
 		const message_content = [];
 		if (completion.content)
 			message_content.push({type: 'text', content: completion.content});
-		if (completion.function_call) {
+
+		if (completion.tool_calls?.length) {
 			message_content.push({
 				type: 'function',
-				content: {
-					name: completion.function_call.name,
-					arguments: completion.function_call.arguments ? JSON.parse(completion.function_call.arguments) : {},
-				},
+				content: completion.tool_calls.map(tool_call => {
+					if (tool_call.type !== 'function')
+						throw new Error('Unsupported tool type ' + tool_call.type);
+
+					return {
+						id: tool_call.id,
+						name: tool_call.function.name,
+						arguments: tool_call.function.arguments ? JSON.parse(tool_call.function.arguments) : {},
+					};
+				}),
 			});
 		}
 
@@ -108,15 +123,19 @@ export default class OpenAIModel extends Model {
 						messages.push({
 							role: message.role,
 							name: message.name,
-							function_call: {
-								name: c.content.name,
-								arguments: c.content.arguments ? JSON.stringify(c.content.arguments) : '{}',
-							},
+							tool_calls: c.content.map(tool_call => ({
+								id: tool_call.id,
+								type: 'function',
+								function: {
+									name: tool_call.name,
+									arguments: tool_call.arguments ? JSON.stringify(tool_call.arguments) : '{}',
+								},
+							})),
 						});
 					} else {
 						messages.push({
 							role: message.role,
-							content: '```CALL \n' + c.content.name + '\n' + JSON.stringify(c.content.arguments || {}) + '\n```',
+							content: c.content.map(f => '```CALL \n' + f.name + '\n' + JSON.stringify(f.arguments || {}) + '\n```').join("\n\n"),
 							name: message.name,
 						});
 					}
@@ -126,6 +145,7 @@ export default class OpenAIModel extends Model {
 					if (this.supports_functions) {
 						messages.push({
 							role: message.role,
+							tool_call_id: c.content.id,
 							content: JSON.stringify(c.content.response),
 							name: message.name,
 						});

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "symposium",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Agents",
   "main": "index.js",
   "author": "Domenico Giambra",

package/models/Gpt4Vision.js

@@ -1,9 +0,0 @@
-import OpenAIModel from "./OpenAIModel.js";
-
-export default class Gpt4Vision extends OpenAIModel {
-	name = 'gpt-4-vision-preview';
-	label = 'gpt-4-vision';
-	name_for_tiktoken = 'gpt-4';
-	tokens = 128000;
-	supports_functions = false;
-}