diff --git a/.gitignore b/.gitignore index 433a15e..f7aae85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .vscode/ node_modules/ -bots/ package-lock.json temp.js scratch.js diff --git a/agent.js b/agent.js index 7263ad6..a6beffd 100644 --- a/agent.js +++ b/agent.js @@ -4,20 +4,23 @@ import { History } from './utils/history.js'; import { Coder } from './utils/coder.js'; import { getQuery, containsQuery } from './utils/queries.js'; import { containsCodeBlock } from './utils/skill-library.js'; +import { Events } from './utils/events.js'; export class Agent { - constructor(name, save_path, clear_memory=false, autostart=false) { + constructor(name, save_path, load_path=null, init_message=null) { this.name = name; this.bot = initBot(name); this.history = new History(this, save_path); this.history.loadExamples(); this.coder = new Coder(this); - if (!clear_memory) { - this.history.load(); + if (load_path) { + this.history.load(load_path); } + this.events = new Events(this, this.history.events) + this.bot.on('login', () => { this.bot.chat('Hello world! I am ' + this.name); console.log(`${this.name} logged in.`); @@ -26,26 +29,20 @@ export class Agent { if (username === this.name) return; console.log('received message from', username, ':', message); - this.respond(username, message); - this.history.save(); - }); - - this.bot.on('finished_executing', () => { - setTimeout(() => { - if (!this.coder.executing) { - // return to default behavior - } - }, 10000); + this.handleMessage(username, message); }); - if (autostart) - this.respond('system', 'Agent process restarted. Notify the user and decide what to do.'); - + if (init_message) { + this.handleMessage('system', init_message); + } else { + this.bot.emit('finished_executing'); + } }); } - async respond(username, message) { - await this.history.add(username, message); + async handleMessage(source, message) { + await this.history.add(source, message); + for (let i=0; i<5; i++) { let res = await sendRequest(this.history.getHistory(), this.history.getSystemMessage()); this.history.add(this.name, res); @@ -66,12 +63,13 @@ export class Agent { if (message) this.bot.chat(message); let code = res.substring(res.indexOf('```')+3, res.lastIndexOf('```')); + if (code) { this.coder.queueCode(code); let code_return = await this.coder.execute(); let message = code_return.message; if (code_return.interrupted && !code_return.timedout) - break; // when interupted but not timed out, we were interupted by another conversation. end this one. + break; if (!code_return.success) { message += "\nWrite code to fix the problem and try again."; } @@ -81,9 +79,12 @@ export class Agent { } else { // conversation response this.bot.chat(res); - console.log('Purely conversational response:', res) + console.log('Purely conversational response:', res); break; } } + + this.history.save(); + this.bot.emit('finished_executing'); } } diff --git a/bots/assist.json b/bots/assist.json new file mode 100644 index 0000000..2307682 --- /dev/null +++ b/bots/assist.json @@ -0,0 +1,7 @@ +{ + "name": "andy", + "bio": "You are playing minecraft and assisting other players in tasks.", + "memory": "", + "events": [], + "turns": [] +} \ No newline at end of file diff --git a/controller/agent-process.js b/controller/agent-process.js index 53fdf1b..929317e 100644 --- a/controller/agent-process.js +++ b/controller/agent-process.js @@ -4,8 +4,9 @@ export class AgentProcess { constructor(name) { this.name = name; } - start(clear_memory=false, autostart=false) { + start(clear_memory=false, autostart=false, profile='assist') { let args = ['controller/init-agent.js', this.name]; + args.push('-p', profile); if (clear_memory) args.push('-c'); if (autostart) @@ -21,8 +22,8 @@ export class AgentProcess { console.log(`Agent process exited with code ${code} and signal ${signal}`); if (code !== 0) { - // agent must run for at least 30 seconds before restarting - if (Date.now() - last_restart < 30 * 1000) { + // agent must run for at least 10 seconds before restarting + if (Date.now() - last_restart < 10000) { console.error('Agent process exited too quickly. Killing entire process. Goodbye.'); process.exit(1); } diff --git a/controller/init-agent.js b/controller/init-agent.js index e632064..96d9381 100644 --- a/controller/init-agent.js +++ b/controller/init-agent.js @@ -8,6 +8,11 @@ if (args.length < 1) { } const argv = yargs(args) + .option('profile', { + alias: 'p', + type: 'string', + description: 'profile to use for agent' + }) .option('clear_memory', { alias: 'c', type: 'boolean', @@ -20,8 +25,8 @@ const argv = yargs(args) }).argv const name = argv._[0]; -const clear_memory = !!argv.clear_memory; -const autostart = !!argv.autostart; const save_path = './bots/'+name+'.json'; +const load_path = !!argv.clear_memory ? './bots/'+argv.profile+'.json' : save_path; +const init_message = !!argv.autostart ? 'Agent process restarted. Notify the user and decide what to do.' : null; -new Agent(name, save_path, clear_memory, autostart); +new Agent(name, save_path, load_path, init_message); diff --git a/utils/coder.js b/utils/coder.js index f6040d1..0b6e405 100644 --- a/utils/coder.js +++ b/utils/coder.js @@ -96,22 +96,22 @@ export class Coder { this.executing = false; clearTimeout(TIMEOUT); - this.agent.bot.emit('finished_executing'); let output = this.formatOutput(this.agent.bot); let interrupted = this.agent.bot.interrupt_code; let timedout = this.timedout; this.clear(); + this.agent.bot.emit("code_terminated"); return {success:true, message: output, interrupted, timedout}; } catch (err) { this.executing = false; clearTimeout(TIMEOUT); - this.agent.bot.emit('finished_executing'); console.error("Code execution triggered catch: " + err); let message = this.formatOutput(this.agent.bot); message += '!!Code threw exception!! Error: ' + err; let interrupted = this.agent.bot.interrupt_code; await this.stop(); + this.agent.bot.emit("code_terminated"); return {success: false, message, interrupted, timedout: false}; } } diff --git a/utils/events.js b/utils/events.js new file mode 100644 index 0000000..015cf17 --- /dev/null +++ b/utils/events.js @@ -0,0 +1,47 @@ +export class Events { + constructor(agent, events) { + this.events = events; + if (agent != null) + this.init(agent, events); + } + + init(agent, events) { + this.events = events; + for (let [event, callback, params] of events) { + if (callback != null) + agent.bot.on(event, this[callback].bind(this, agent, params)); + } + + agent.bot.on('time', () => { + if (agent.bot.time.timeOfDay == 0) + agent.bot.emit('sunrise'); + else if (agent.bot.time.timeOfDay == 6000) + agent.bot.emit('noon'); + else if (agent.bot.time.timeOfDay == 12000) + agent.bot.emit('sunset'); + else if (agent.bot.time.timeOfDay == 18000) + agent.bot.emit('midnight'); + }); + + agent.bot.on('health', () => { + if (agent.bot.health < 20) + agent.bot.emit('damaged'); + }); + } + + async executeCode(agent, code) { + console.log('responding to event with code.'); + agent.coder.queueCode(code); + let code_return = await agent.coder.execute(); + console.log('code return:', code_return.message); + agent.history.add('system', code_return.message); + } + + sendThought(agent, message) { + agent.handleMessage(agent.name, message); + } + + sendChat(agent, message) { + agent.bot.chat(message); + } +} \ No newline at end of file diff --git a/utils/history.js b/utils/history.js index abaa323..93d46be 100644 --- a/utils/history.js +++ b/utils/history.js @@ -14,6 +14,9 @@ export class History { this.bio = ''; this.memory = ''; + // The bot's events + this.events = []; + // Variables for controlling the agent's memory and knowledge this.max_messages = 20; this.fewshot = 5; @@ -34,8 +37,7 @@ export class History { } getSystemMessage() { - let system_message = `You are a playful Minecraft bot named '${this.name}' that can communicate with players, see, move, mine, build, and interact with the world by writing and executing code. - Act human-like as if you were a typical Minecraft player, rather than an AI. Be very brief in your responses, omit needless words, and do not give instructions unless asked.`; + let system_message = `You are a playful Minecraft bot named '${this.name}' that can communicate with players, see, move, mine, build, and interact with the world by writing and executing code. Act human-like as if you were a typical Minecraft player, rather than an AI. Be very brief in your responses, omit needless words, and do not give instructions unless asked.`; system_message += getQueryDocs(); system_message += getSkillDocs(); if (this.bio != '') @@ -101,6 +103,8 @@ export class History { const embedding = await embed(messages); this.examples.push({'embedding': embedding, 'turns': example}); } + + await this.setExamples(); } async setExamples() { @@ -135,27 +139,30 @@ export class History { if (this.turns.length >= this.max_messages) { console.log('summarizing memory') let to_summarize = [this.turns.shift()]; - while (this.turns[0].role != 'user' && this.turns.length > 0) + while (this.turns[0].role != 'user' && this.turns.length > 1) to_summarize.push(this.turns.shift()); await this.storeMemories(to_summarize); } - if (role === 'user') + if (role != 'assistant') await this.setExamples(); } - save() { - if (this.save_path === '' || this.save_path == null) return; + save(save_path=null) { + if (save_path == null) + save_path = this.save_path; + if (save_path === '' || save_path == null) return; // save history object to json file mkdirSync('bots', { recursive: true }); let data = { 'name': this.name, 'bio': this.bio, 'memory': this.memory, + 'events': this.events, 'turns': this.turns }; const json_data = JSON.stringify(data, null, 4); - writeFileSync(this.save_path, json_data, (err) => { + writeFileSync(save_path, json_data, (err) => { if (err) { throw err; } @@ -163,18 +170,21 @@ export class History { }); } - load() { - if (this.save_path === '' || this.save_path == null) return; + load(load_path=null) { + if (load_path == null) + load_path = this.save_path; + if (load_path === '' || load_path == null) return; try { // load history object from json file - const data = readFileSync(this.save_path, 'utf8'); + const data = readFileSync(load_path, 'utf8'); const obj = JSON.parse(data); - this.turns = obj.turns; this.bio = obj.bio; this.memory = obj.memory; - this.num_saved_turns = obj.num_saved_turns; + this.events = obj.events; + this.turns = obj.turns; } catch (err) { console.log('No history file found for ' + this.name + '.'); + console.log(load_path); } } } \ No newline at end of file diff --git a/utils/queries.js b/utils/queries.js index 417b235..1820197 100644 --- a/utils/queries.js +++ b/utils/queries.js @@ -46,7 +46,7 @@ const queryList = [ perform: function (agent) { return pad("Current code:\n`" + agent.coder.current_code +"`"); } - }, + } ]; const queryMap = {}; @@ -68,8 +68,7 @@ export function containsQuery(message) { } export function getQueryDocs() { - let docs = `\n*QUERY DOCS\n You can use the following commands to query for information about the world. - Use the query name in your response and the next input will have the requested information.\n`; + let docs = `\n*QUERY DOCS\n You can use the following commands to query for information about the world. Use the query name in your response and the next input will have the requested information.\n`; for (let query of queryList) { docs += query.name + ': ' + query.description + '\n'; } diff --git a/utils/skill-library.js b/utils/skill-library.js index e9830dd..246e3ab 100644 --- a/utils/skill-library.js +++ b/utils/skill-library.js @@ -2,8 +2,7 @@ import * as skills from './skills.js'; import * as world from './world.js'; export function getSkillDocs() { - let docstring = "\n*SKILL DOCS\nThese skills are javascript functions that can be called with a js function by writing a code block. Ex: '```// write description comment and code here```' \n\ - Your code block should return a bool indicating if the task was completed successfully. It will return true if you don't write a return statement.\n"; + let docstring = "\n*SKILL DOCS\nThese skills are javascript functions that can be called with a js function by writing a code block. Ex: '```// write description comment and code here```' \nYour code block should return a bool indicating if the task was completed successfully. It will return true if you don't write a return statement.\n"; docstring += docHelper(Object.values(skills), 'skills'); docstring += docHelper(Object.values(world), 'world'); return docstring + '*\n'; diff --git a/utils/world.js b/utils/world.js index cc6fbd1..9cf6749 100644 --- a/utils/world.js +++ b/utils/world.js @@ -183,15 +183,16 @@ export function getNearbyPlayerNames(bot) { } -export function getNearbyBlockTypes(bot) { +export function getNearbyBlockTypes(bot, distance=16) { /** * Get a list of all nearby block names. * @param {Bot} bot - The bot to get nearby blocks for. + * @param {number} distance - The maximum distance to search, default 16. * @returns {string[]} - A list of all nearby blocks. * @example * let blocks = world.getNearbyBlockTypes(bot); **/ - let blocks = getNearbyBlocks(bot, 16); + let blocks = getNearbyBlocks(bot, distance); let found = []; for (let i = 0; i < blocks.length; i++) { if (!found.includes(blocks[i].name)) {