nanakura/moeka-project
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

chore: short memory

Browse Source
This commit is contained in:
RainbowBird
2025-01-17 02:03:33 +08:00
parent fa99d16c22
commit 5d70b7ae53
2 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/minecraft/src/libs/mineflayer/core.ts
+1 -16
View File
@@ -116,11 +116,6 @@ export class Mineflayer extends EventEmitter<EventHandlers> {
mineflayer.bot.on('end', (reason) => {
mineflayer.logger.withFields({ reason }).log('Bot ended')
// Try to reconnect after 5 seconds
setTimeout(async () => {
await mineflayer.reconnect()
}, 5000)
})
mineflayer.bot.on('error', (err: Error) => {
@@ -161,16 +156,6 @@ export class Mineflayer extends EventEmitter<EventHandlers> {
return mineflayer
}
private async reconnect() {
try {
await this.bot.connect(this.options.botConfig)
this.logger.log('Reconnected successfully')
}
catch (err) {
this.logger.errorWithError('Failed to reconnect:', err)
}
}
public async loadPlugin(plugin: MineflayerPlugin) {
if (plugin.created)
await plugin.created(this)
@@ -199,7 +184,7 @@ export class Mineflayer extends EventEmitter<EventHandlers> {
}
this.components.cleanup()
this.bot.removeListener('chat', this.handleCommand())
this.bot.end()
this.bot.quit()
this.removeAllListeners()
}
services/minecraft/src/mineflayer/llm-agent.ts
+12 -9
View File
@@ -2,7 +2,7 @@ import type { Client } from '@proj-airi/server-sdk'
import type { Neuri, NeuriContext } from 'neuri'
import type { MineflayerPlugin } from '../libs/mineflayer/plugin'
import { useLogg } from '@guiiai/logg'
import { system, user } from 'neuri/openai'
import { assistant, type ChatCompletion, system, user } from 'neuri/openai'
import { formBotChat } from '../libs/mineflayer/message'
import { genActionAgentPrompt, genStatusPrompt } from '../prompts/agent'
@@ -21,24 +21,26 @@ export function LLMAgent(options: { agent: Neuri, airiClient: Client }): Minefla
const onChat = formBotChat(bot.username, async (username, message) => {
logger.withFields({ username, message }).log('Chat message received')
const statusPrompt = await genStatusPrompt(bot)
bot.memory.chatHistory.push(system(statusPrompt))
// long memory
bot.memory.chatHistory.push(user(`${username}: ${message}`))
const content = await agent.handleStateless([...bot.memory.chatHistory], async (c: NeuriContext) => {
// short memory
const statusPrompt = await genStatusPrompt(bot)
const content = await agent.handleStateless([...bot.memory.chatHistory, system(statusPrompt)], async (c: NeuriContext) => {
logger.log('thinking...')
const handleCompletion = async (c: NeuriContext): Promise<string> => {
const completion = await c.reroute('action', c.messages, { model: 'openai/gpt-4o-mini' }) || { error: { message: 'Unknown error' } }
const completion = await c.reroute('action', c.messages, { model: 'openai/gpt-4o-mini' }) as ChatCompletion | { error: { message: string } } & ChatCompletion
if (!completion || 'error' in completion) {
logger.withFields(c).error('Completion')
logger.withFields({ completion }).error('Completion')
logger.withFields({ messages: c.messages }).log('messages')
throw new Error(completion?.error?.message ?? 'Unknown error')
}
const content = await completion?.firstContent()
logger.withFields({ usage: completion.usage, content }).log('output')
bot.memory.chatHistory.push(...c.messages)
bot.memory.chatHistory.push(assistant(content))
return content
}
@@ -74,14 +76,15 @@ export function LLMAgent(options: { agent: Neuri, airiClient: Client }): Minefla
const handleCompletion = async (c: NeuriContext): Promise<string> => {
const completion = await c.reroute('action', c.messages, { model: 'openai/gpt-4o-mini' }) || { error: { message: 'Unknown error' } }
if (!completion || 'error' in completion) {
logger.withFields(c).error('Completion')
logger.withFields({ completion }).error('Completion')
logger.withFields({ messages: c.messages }).log('messages')
throw new Error(completion?.error?.message ?? 'Unknown error')
}
const content = await completion?.firstContent()
logger.withFields({ usage: completion.usage, content }).log('output')
bot.memory.chatHistory.push(...c.messages)
bot.memory.chatHistory.push(assistant(content))
return content
}