symposium 0.6.0 → 0.6.2

package/Model.js

@@ -18,6 +18,22 @@ export default class Model {
 		throw new Error('countTokens not implemented in this model');
 	}
 
+	parseOptions(options = {}, functions = []) {
+		options = {
+			functions: null,
+			force_function: null,
+			...options,
+		};
+
+		if (options.functions !== null)
+			functions = options.functions;
+
+		if (options.force_function && !functions.find(f => f.name === options.force_function))
+			throw new Error('Function ' + options.force_function + ' not found.');
+
+		return {options, functions};
+	}
+
 	promptFromFunctions(options, functions) {
 		if (options.force_function)
 			functions = functions.filter(f => f.name !== options.force_function);

package/models/AnthropicModel.js

@@ -14,14 +14,9 @@ export default class AnthropicModel extends Model {
 	}
 
 	async generate(thread, functions = [], options = {}) {
-		options = {
-			functions: null,
-			force_function: null,
-			...options,
-		};
-
-		if (options.functions !== null)
-			functions = options.functions;
+		const parsed = this.parseOptions(options, functions);
+		options = parsed.options;
+		functions = parsed.functions;
 
 		let [system, messages] = this.convertMessages(thread);
 
@@ -45,16 +40,16 @@ export default class AnthropicModel extends Model {
 			})),
 		};
 
-		if (options.force_function && completion_payload.functions.length) {
-			completion_payload.messages.push({
-				role: 'user',
-				content: [
-					{type: 'text', text: 'Use the ' + options.force_function + ' tool in your response.'},
-				],
+		if (options.force_function) {
+			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) {
@@ -86,32 +81,47 @@ 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,
-								};
+								if (message.role === 'function') {
+									return {
+										type: 'text',
+										content: c.content,
+									};
+								} else {
+									return {
+										type: 'text',
+										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,
 								};
 
 							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

@@ -16,14 +16,9 @@ export default class OpenAIModel extends Model {
 	}
 
 	async generate(thread, functions = [], options = {}) {
-		options = {
-			functions: null,
-			force_function: null,
-			...options,
-		};
-
-		if (options.functions !== null)
-			functions = options.functions;
+		const parsed = this.parseOptions(options, functions);
+		options = parsed.options;
+		functions = parsed.functions;
 
 		let messages = thread.messages;
 
@@ -57,7 +52,7 @@ export default class OpenAIModel extends Model {
 			functions,
 		};
 
-		if (options.force_function && completion_payload.functions.length)
+		if (options.force_function)
 			completion_payload.function_call = {name: options.force_function};
 		if (!completion_payload.functions.length)
 			delete completion_payload.functions;

package/package.json

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