symposium 0.15.2 → 0.15.3

package/Agent.js

@@ -114,15 +114,17 @@ export default class Agent {
 		return this.execute(thread);
 	}
 
-	async beforeExecute(thread) {
+	async beforeExecute(thread, emitter) {
 		if (this.options.memory_handler)
 			thread = await this.options.memory_handler.handle(thread);
 		return thread;
 	}
 
 	async execute(thread, counter = 0, existing_emitter = null) {
+		const emitter = existing_emitter || new BufferedEventEmitter();
+
 		if (counter === 0)
-			thread = await this.beforeExecute(thread);
+			thread = await this.beforeExecute(thread, emitter);
 
 		const model = Symposium.getModelByName(thread.state.model);
 
@@ -161,7 +163,6 @@ export default class Agent {
 			console.error(e.message);
 			switch (this.type) {
 				case 'chat':
-					const emitter = existing_emitter || new BufferedEventEmitter();
 					emitter.emit('error', e.message);
 					if (!existing_emitter)
 						emitter.emit('end');
@@ -177,18 +178,13 @@ export default class Agent {
 
 		try {
 			thread = await this.afterExecute(thread, completion);
-			const emitter = this.handleCompletion(thread, completion, existing_emitter);
+			const response = await this.handleCompletion(thread, completion, emitter);
 
 			switch (this.type) {
 				case 'utility':
-					return new Promise((resolve, reject) => {
-						emitter.on('data', data => {
-							if (data.type === 'response')
-								resolve(data.content);
-						});
-
-						emitter.on('error', error => reject(error));
-					});
+					if (!existing_emitter)
+						emitter.emit('end');
+					return response;
 
 				case 'chat':
 					if (!existing_emitter) {
@@ -207,7 +203,7 @@ export default class Agent {
 			console.error(e);
 
 			if (counter < this.max_retries)
-				await this.execute(thread, counter + 1, existing_emitter);
+				await this.execute(thread, counter + 1, emitter);
 		}
 	}
 
@@ -306,11 +302,9 @@ export default class Agent {
 		return message;
 	}
 
-	async handleCompletion(thread, completion, existing_emitter = null) {
+	async handleCompletion(thread, completion, emitter) {
 		const model = Symposium.getModelByName(thread.state.model);
 
-		const emitter = existing_emitter || new BufferedEventEmitter();
-
 		const functions = [];
 		for (let message of completion) {
 			thread.addDirectMessage(message);
@@ -320,17 +314,10 @@ export default class Agent {
 				switch (m.type) {
 					case 'text':
 						if (this.type === 'utility') {
-							let response = null;
 							if (this.utility.type === 'text')
-								response = await this.afterHandle(thread, completion, 'return', m.content);
+								return this.afterHandle(thread, completion, 'return', m.content);
 							if (this.utility.type === 'json' && model.supports_structured_output)
-								response = await this.afterHandle(thread, completion, 'return', JSON.parse(m.content));
-
-							if (response) {
-								emitter.emit('data', {type: 'response', content: response});
-								emitter.emit('end');
-								return emitter;
-							}
+								return this.afterHandle(thread, completion, 'return', JSON.parse(m.content));
 						}
 
 						emitter.emit('data', {type: 'output', content: m.content});
@@ -344,13 +331,10 @@ export default class Agent {
 			}
 		}
 
-		let response;
 		if (functions.length) {
 			for (let f of functions) {
-				if (this.utility && ['function', 'json'].includes(this.utility.type)) {
-					response = this.afterHandle(thread, completion, 'return', f.arguments);
-					break;
-				}
+				if (this.utility && ['function', 'json'].includes(this.utility.type))
+					return this.afterHandle(thread, completion, 'return', f.arguments);
 
 				const function_response = await this.callFunction(thread, f, emitter);
 
@@ -364,23 +348,11 @@ export default class Agent {
 				await this.log('function_response', function_response);
 			}
 
-			if (!response)
-				response = this.afterHandle(thread, completion, 'continue');
+			return this.afterHandle(thread, completion, 'continue');
 		} else {
 			await thread.storeState();
-			response = this.afterHandle(thread, completion, 'void');
+			return this.afterHandle(thread, completion, 'void');
 		}
-
-		response
-			.then(content => {
-				emitter.emit('data', {type: 'response', content});
-				emitter.emit('end');
-			})
-			.catch(error => {
-				emitter.emit('error', error);
-			});
-
-		return emitter;
 	}
 
 	async afterHandle(thread, completion, type, value = null) {

package/package.json

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