mirrors/mindcraft
1
0
Fork 0
mirror of https://github.com/kolbytn/mindcraft.git synced 2025-07-27 02:15:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

newAction idle compatibility

Browse source
This commit is contained in:
Kolby Nottingham 2024-01-26 14:10:09 -08:00
parent f14656387e
commit 5dd4bbb8cd
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/agent/coder.js
View file

@ -93,11 +93,11 @@ export class Coder {
// wrapper to prevent overlapping code generation loops // wrapper to prevent overlapping code generation loops
await this.stop(); await this.stop();
this.generating = true; this.generating = true;
await this.generateCodeLoop(agent_history); let res = await this.generateCodeLoop(agent_history);
this.generating = false; this.generating = false;
if (!res.interrupted) this.agent.bot.emit('idle');
} }
async generateCodeLoop(agent_history) { async generateCodeLoop(agent_history) {
let system_message = "You are a minecraft mineflayer bot that plays minecraft by writing javascript codeblocks. Given the conversation between you and the user, use the provided skills and world functions to write your code in a codeblock. Example response: ``` // your code here ``` You will then be given a response to your code. If you are satisfied with the response, respond without a codeblock in a conversational way. If something went wrong, write another codeblock and try to fix the problem."; let system_message = "You are a minecraft mineflayer bot that plays minecraft by writing javascript codeblocks. Given the conversation between you and the user, use the provided skills and world functions to write your code in a codeblock. Example response: ``` // your code here ``` You will then be given a response to your code. If you are satisfied with the response, respond without a codeblock in a conversational way. If something went wrong, write another codeblock and try to fix the problem.";
system_message += getSkillDocs(); system_message += getSkillDocs();
@ -120,11 +120,11 @@ export class Coder {
agent_history.add('system', code_return.message); agent_history.add('system', code_return.message);
agent_history.add(this.agent.name, res); agent_history.add(this.agent.name, res);
this.agent.bot.chat(res); this.agent.bot.chat(res);
return; return {success: true, message: null, interrupted: false, timedout: false};
} }
if (failures >= 1) { if (failures >= 1) {
agent_history.add('system', 'Action failed, agent would not write code.'); agent_history.add('system', 'Action failed, agent would not write code.');
return; return {success: false, message: null, interrupted: false, timedout: false};
} }
messages.push({ messages.push({
role: 'system', role: 'system',
@ -138,14 +138,14 @@ export class Coder {
const execution_file = await this.stageCode(code); const execution_file = await this.stageCode(code);
if (!execution_file) { if (!execution_file) {
agent_history.add('system', 'Failed to stage code, something is wrong.'); agent_history.add('system', 'Failed to stage code, something is wrong.');
return; return {success: false, message: null, interrupted: false, timedout: false};
} }
code_return = await this.execute(async ()=>{ code_return = await this.execute(async ()=>{
return await execution_file.main(this.agent.bot); return await execution_file.main(this.agent.bot);
}); });
if (code_return.interrupted && !code_return.timedout) if (code_return.interrupted && !code_return.timedout)
return; return {success: false, message: null, interrupted: true, timedout: false};
console.log(code_return.message); console.log(code_return.message);
messages.push({ messages.push({
@ -157,7 +157,7 @@ export class Coder {
content: code_return.message content: code_return.message
}); });
} }
return; return {success: false, message: null, interrupted: false, timedout: true};
} }
async executeDefault(func=null, name=null, timeout=10) { async executeDefault(func=null, name=null, timeout=10) {
@ -196,7 +196,7 @@ export class Coder {
let interrupted = this.agent.bot.interrupt_code; let interrupted = this.agent.bot.interrupt_code;
let timedout = this.timedout; let timedout = this.timedout;
this.clear(); this.clear();
if (!interrupted) this.agent.bot.emit('idle'); if (!interrupted && !this.generating) this.agent.bot.emit('idle');
return {success:true, message: output, interrupted, timedout}; return {success:true, message: output, interrupted, timedout};
} catch (err) { } catch (err) {
this.executing = false; this.executing = false;
@ -208,7 +208,7 @@ export class Coder {
let message = this.formatOutput(this.agent.bot) + '!!Code threw exception!! Error: ' + err; let message = this.formatOutput(this.agent.bot) + '!!Code threw exception!! Error: ' + err;
let interrupted = this.agent.bot.interrupt_code; let interrupted = this.agent.bot.interrupt_code;
this.clear(); this.clear();
if (!interrupted) this.agent.bot.emit('idle'); if (!interrupted && !this.generating) this.agent.bot.emit('idle');
return {success: false, message, interrupted, timedout: false}; return {success: false, message, interrupted, timedout: false};
} }
} }