symposium 0.6.1 → 0.6.3

package/Agent.js

@@ -235,10 +235,20 @@ export default class Agent {
 
 		try {
 			const response = await functions.get(function_call.name).tool.callFunction(thread, function_call.name, function_call.arguments);
-			thread.addMessage('function', JSON.stringify(response), function_call.name);
+			thread.addMessage('function', [
+				{
+					type: 'function_response',
+					content: {response, id: function_call.id || undefined},
+				},
+			], function_call.name);
 			await this.log('function_response', response);
 		} catch (error) {
-			thread.addMessage('function', JSON.stringify({error}), function_call.name);
+			thread.addMessage('function', [
+				{
+					type: 'function_response',
+					content: {response: {error}},
+				},
+			], function_call.name);
 			await this.log('function_response', {error});
 		}
 

package/Model.js

@@ -31,7 +31,7 @@ export default class Model {
 		if (options.force_function && !functions.find(f => f.name === options.force_function))
 			throw new Error('Function ' + options.force_function + ' not found.');
 
-		return [options, functions];
+		return {options, functions};
 	}
 
 	promptFromFunctions(options, functions) {

package/models/AnthropicModel.js

@@ -41,15 +41,15 @@ export default class AnthropicModel extends Model {
 		};
 
 		if (options.force_function) {
-			completion_payload.messages.push({
-				role: 'user',
-				content: [
-					{type: 'text', text: 'Use the ' + options.force_function + ' tool in your response.'},
-				],
+			completion_payload.messages[completion_payload.messages.length - 1].content.push({
+				type: 'text',
+				text: 'Usa il tool "' + options.force_function + '" nella tua prossima risposta!',
 			});
 		}
 
-		const message = await this.getAnthropic().messages.create(completion_payload);
+		const message = completion_payload.tools.length ?
+			await this.getAnthropic().beta.tools.messages.create(completion_payload)
+			: await this.getAnthropic().messages.create(completion_payload);
 
 		const message_content = [];
 		if (message.content) {
@@ -63,6 +63,7 @@ export default class AnthropicModel extends Model {
 						message_content.push({
 							type: 'function',
 							content: {
+								id: m.id,
 								name: m.name,
 								arguments: m.input,
 							},
@@ -81,32 +82,48 @@ export default class AnthropicModel extends Model {
 	}
 
 	convertMessages(thread) {
-		let system = [], messages = [];
+		let system = [], messages = [], lastMessage = null;
 		for (let message of thread.messages) {
 			if (message.role === 'system') {
 				system.push(message.content.map(c => c.content).join("\n"));
 			} else {
-				messages.push({
+				const parsedMessage = {
 					role: message.role === 'function' ? 'user' : message.role,
 					content: message.content.map(c => {
 						switch (c.type) {
 							case 'text':
 								return {
 									type: 'text',
-									text: (message.role === 'function' ? 'FUNCTION RESPONSE: ' : '') + c.content,
+									text: c.content.trim(),
 								};
 
 							case 'function':
 								return {
-									type: 'text',
-									text: '```CALL \n' + c.content.name + '\n' + JSON.stringify(c.content.arguments || {}) + '\n```',
+									type: 'tool_use',
+									name: c.content.name,
+									input: c.content.arguments,
+									id: c.content.id,
+								};
+
+							case 'function_response':
+								return {
+									type: 'tool_result',
+									content: c.content.response,
+									tool_use_id: c.content.id,
 								};
 
 							default:
 								throw new Error('Message type "' + c.type + '" unsupported by this model');
 						}
 					}),
-				});
+				};
+
+				if (lastMessage && lastMessage.role === parsedMessage.role) {
+					lastMessage.content = lastMessage.content.concat(message.content);
+				} else {
+					messages.push(parsedMessage);
+					lastMessage = parsedMessage;
+				}
 			}
 		}
 

package/models/OpenAIModel.js

@@ -122,6 +122,22 @@ export default class OpenAIModel extends Model {
 					}
 					break;
 
+				case 'function_response':
+					if (this.supports_functions) {
+						messages.push({
+							role: message.role,
+							content: JSON.stringify(c.content.response),
+							name: message.name,
+						});
+					} else {
+						messages.push({
+							role: 'user',
+							content: 'FUNCTION RESPONSE:\n' + JSON.stringify(c.content.response),
+							name: message.name,
+						});
+					}
+					break;
+
 				default:
 					throw new Error('Message type unsupported by this model');
 			}

package/package.json

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