symposium 0.3.3 → 0.3.4

package/Agent.js

@@ -105,13 +105,7 @@ export default class Agent {
 			}
 		}
 
-		const completion_payload = {};
-		if (this.options.talking_function) {
-			completion_payload.functions = [this.options.talking_function];
-			completion_payload.function_call = {name: this.options.talking_function.name};
-		}
-
-		const completion = await this.generateCompletion(thread, completion_payload);
+		const completion = await this.generateCompletion(thread);
 
 		await this.handleCompletion(thread, completion);
 
@@ -125,29 +119,10 @@ export default class Agent {
 		}
 	}
 
-	async generateCompletion(thread, payload = {}, retry_counter = 1) {
+	async generateCompletion(thread, retry_counter = 1) {
 		try {
-			const completion_payload = {
-				model: thread.state.model,
-				messages: thread.getMessagesJson(),
-				functions: await this.getFunctions(),
-				...payload,
-			};
-
-			if (!completion_payload.functions?.length) {
-				delete completion_payload.functions;
-				if (completion_payload.hasOwnProperty('function_call'))
-					delete completion_payload.function_call;
-			}
-
-			const openai = await Symposium.getOpenAi();
-			const chatCompletion = await openai.chat.completions.create(completion_payload);
-
-			let completion = chatCompletion.choices[0].message;
-			if (completion.function_call && completion.function_call.arguments)
-				completion.function_call.arguments = JSON.parse(completion.function_call.arguments);
-
-			return completion;
+			const model = Symposium.getModelByName(thread.state.model);
+			return model.generate(thread, await this.getFunctions())
 		} catch (error) {
 			if (error.response) {
 				console.error(error.response.status);
@@ -158,7 +133,7 @@ export default class Agent {
 						setTimeout(resolve, 1000);
 					});
 
-					return this.generateCompletion(thread, payload, retry_counter + 1);
+					return this.generateCompletion(thread, retry_counter + 1);
 				}
 
 				await thread.reply('# Errore ' + error.response.status + ': ' + JSON.stringify(error.response.data));
@@ -173,18 +148,11 @@ export default class Agent {
 	}
 
 	async handleCompletion(thread, completion) {
-		if (this.options.talking_function && completion.function_call) {
-			const text = completion.function_call.arguments[Object.keys(this.options.talking_function.parameters.properties)[0]];
-			thread.addAssistantMessage(text);
-			await this.log('ai_message', text);
-			await thread.reply(text);
-			return thread.storeState()
-		}
-
 		thread.addAssistantMessage(completion.content, completion.function_call ? {
 			...completion.function_call,
 			arguments: JSON.stringify(completion.function_call.arguments),
 		} : null);
+
 		if (completion.content) {
 			await this.log('ai_message', completion.content);
 			await thread.reply(completion.content);

package/Model.js

@@ -1,13 +1,17 @@
 export default class Model {
+	vendor;
 	name;
 	name_for_tiktoken;
 	label;
 	tokens;
+	supports_tools = false;
 
-	constructor(name, label, tokens, name_for_tiktoken = null) {
-		this.name = name;
-		this.label = label;
-		this.tokens = tokens;
-		this.name_for_tiktoken = name_for_tiktoken || name;
+	constructor() {
+		if (!this.name_for_tiktoken)
+			this.name_for_tiktoken = this.name;
+	}
+
+	async generate(thread) {
+		return null;
 	}
 }

package/Symposium.js

@@ -1,40 +1,35 @@
 import Redis from "@travio/redis";
 import OpenAI from "openai";
-import Model from "./Model.js";
+import Gpt35 from "./models/Gpt35.js";
+import Gpt4 from "./models/Gpt4.js";
+import Gpt4Turbo from "./models/Gpt4Turbo.js";
+import Gpt4Vision from "./models/Gpt4Vision.js";
 
 export default class Symposium {
-	static openai;
-	static models = [];
+	static models = new Map();
 
 	static async init() {
-		this.loadModel(new Model('gpt-3.5-turbo-0125', 'gpt-3.5', 16384));
-		this.loadModel(new Model('gpt-4', 'gpt-4', 8192));
-		this.loadModel(new Model('gpt-4-turbo-preview', 'gpt-4-turbo', 128000, 'gpt-4'));
-		this.loadModel(new Model('gpt-4-vision-preview', 'gpt-4-vision', 128000, 'gpt-4'));
+		this.loadModel(new Gpt35());
+		this.loadModel(new Gpt4());
+		this.loadModel(new Gpt4Turbo());
+		this.loadModel(new Gpt4Vision());
 
 		return Redis.init();
 	}
 
 	static loadModel(model) {
-		this.models.push(model);
+		this.models.set(model.name, model);
 	}
 
-	static async getOpenAi() {
-		if (!this.openai)
-			this.openai = new OpenAI({apiKey: process.env.OPENAI_API_KEY});
-
-		return this.openai;
+	static getModelByName(name) {
+		return this.models.find(model => model.name === name);
 	}
 
 	static getModelByLabel(label) {
 		return this.models.find(model => model.label === label);
 	}
 
-	static getModelByName(name) {
-		return this.models.find(model => model.name === name);
-	}
-
-	static async transcribe(agent, file, thread) {
+	/*static async transcribe(agent, file, thread) {
 		const words = await agent.getPromptWordsForTranscription(thread);
 
 		const response = await this.getOpenAi().then(openai => openai.audio.transcriptions.create({
@@ -43,5 +38,5 @@ export default class Symposium {
 			prompt: words.join(', '),
 		}));
 		return response.text;
-	}
+	}*/
 }

package/models/Gpt35.js

@@ -0,0 +1,8 @@
+import OpenAIModel from "./OpenAIModel.js";
+
+export default class Gpt35 extends OpenAIModel {
+	vendor = 'openai';
+	name = 'gpt-3.5-turbo';
+	label = 'gpt-3.5';
+	tokens = 16384;
+}

package/models/Gpt4.js

@@ -0,0 +1,7 @@
+import OpenAIModel from "./OpenAIModel.js";
+
+export default class Gpt4  extends OpenAIModel {
+	name = 'gpt-4';
+	label = 'gpt-4';
+	tokens = 8192;
+}

package/models/Gpt4Turbo.js

@@ -0,0 +1,8 @@
+import OpenAIModel from "./OpenAIModel.js";
+
+export default class Gpt4Turbo extends OpenAIModel {
+	name = 'gpt-4-turbo-preview';
+	label = 'gpt-4-turbo';
+	name_for_tiktoken = 'gpt-4';
+	tokens = 128000;
+}

package/models/Gpt4Vision.js

@@ -0,0 +1,9 @@
+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_tools = false;
+}

package/models/OpenAIModel.js

@@ -0,0 +1,37 @@
+import Model from "../Model.js";
+import OpenAI from "openai";
+
+export default class OpenAIModel extends Model {
+	openai;
+	vendor = 'openai';
+	supports_tools = true;
+
+	getOpenAi() {
+		if (!this.openai)
+			this.openai = new OpenAI({apiKey: process.env.OPENAI_API_KEY});
+
+		return this.openai;
+	}
+
+	async generate(thread, functions = []) {
+		const completion_payload = {
+			model: this.name,
+			messages: thread.getMessagesJson(),
+			functions,
+		};
+
+		if (!completion_payload.functions?.length) {
+			delete completion_payload.functions;
+			if (completion_payload.hasOwnProperty('function_call'))
+				delete completion_payload.function_call;
+		}
+
+		const chatCompletion = await this.getOpenAi().chat.completions.create(completion_payload);
+
+		const completion = chatCompletion.choices[0].message;
+		if (completion.function_call && completion.function_call.arguments)
+			completion.function_call.arguments = JSON.parse(completion.function_call.arguments);
+
+		return completion;
+	}
+}

package/package.json

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