From d1bb34446f9d0683a1fea3d52b2beb00633e6028 Mon Sep 17 00:00:00 2001 From: Qu Yi Date: Sun, 20 Apr 2025 11:04:57 +0800 Subject: [PATCH 1/4] New Model Support: Mercury (diffusion large language models) --- README.md | 3 ++- keys.example.json | 3 ++- profiles/mercury.json | 15 +++++++++++++++ src/models/prompter.js | 7 ++++++- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 profiles/mercury.json diff --git a/README.md b/README.md index 8c4a4e8..ebd251c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Do not connect this bot to public servers with coding enabled. This project allo - [Minecraft Java Edition](https://www.minecraft.net/en-us/store/minecraft-java-bedrock-edition-pc) (up to v1.21.1, recommend v1.20.4) - [Node.js Installed](https://nodejs.org/) (at least v14) -- One of these: [OpenAI API Key](https://openai.com/blog/openai-api) | [Gemini API Key](https://aistudio.google.com/app/apikey) | [Anthropic API Key](https://docs.anthropic.com/claude/docs/getting-access-to-claude) | [Replicate API Key](https://replicate.com/) | [Hugging Face API Key](https://huggingface.co/) | [Groq API Key](https://console.groq.com/keys) | [Ollama Installed](https://ollama.com/download). | [Mistral API Key](https://docs.mistral.ai/getting-started/models/models_overview/) | [Qwen API Key [Intl.]](https://www.alibabacloud.com/help/en/model-studio/developer-reference/get-api-key)/[[cn]](https://help.aliyun.com/zh/model-studio/getting-started/first-api-call-to-qwen?) | [Novita AI API Key](https://novita.ai/settings?utm_source=github_mindcraft&utm_medium=github_readme&utm_campaign=link#key-management) | +- One of these: [OpenAI API Key](https://openai.com/blog/openai-api) | [Gemini API Key](https://aistudio.google.com/app/apikey) | [Anthropic API Key](https://docs.anthropic.com/claude/docs/getting-access-to-claude) | [Replicate API Key](https://replicate.com/) | [Hugging Face API Key](https://huggingface.co/) | [Groq API Key](https://console.groq.com/keys) | [Ollama Installed](https://ollama.com/download). | [Mistral API Key](https://docs.mistral.ai/getting-started/models/models_overview/) | [Qwen API Key [Intl.]](https://www.alibabacloud.com/help/en/model-studio/developer-reference/get-api-key)/[[cn]](https://help.aliyun.com/zh/model-studio/getting-started/first-api-call-to-qwen?) | [Novita AI API Key](https://novita.ai/settings?utm_source=github_mindcraft&utm_medium=github_readme&utm_campaign=link#key-management) | [Mercury API](https://platform.inceptionlabs.ai/docs) ## Install and Run @@ -53,6 +53,7 @@ You can configure the agent's name, model, and prompts in their profile like `an | `openrouter` | `OPENROUTER_API_KEY` | `openrouter/anthropic/claude-3.5-sonnet` | [docs](https://openrouter.ai/models) | | `glhf.chat` | `GHLF_API_KEY` | `glhf/hf:meta-llama/Llama-3.1-405B-Instruct` | [docs](https://glhf.chat/user-settings/api) | | `hyperbolic` | `HYPERBOLIC_API_KEY` | `hyperbolic/deepseek-ai/DeepSeek-V3` | [docs](https://docs.hyperbolic.xyz/docs/getting-started) | +| `mercury(EA)` | `MERCURY_API_KEY` | `mercury-coder-small` | [docs](https://www.inceptionlabs.ai/) | If you use Ollama, to install the models used by default (generation and embedding), execute the following terminal command: `ollama pull llama3.1 && ollama pull nomic-embed-text` diff --git a/keys.example.json b/keys.example.json index 99286c5..eb08814 100644 --- a/keys.example.json +++ b/keys.example.json @@ -13,5 +13,6 @@ "GHLF_API_KEY": "", "HYPERBOLIC_API_KEY": "", "NOVITA_API_KEY": "", - "OPENROUTER_API_KEY": "" + "OPENROUTER_API_KEY": "", + "MERCURY_API_KEY":"" } diff --git a/profiles/mercury.json b/profiles/mercury.json new file mode 100644 index 0000000..cac6d49 --- /dev/null +++ b/profiles/mercury.json @@ -0,0 +1,15 @@ +{ + "name": "Mercury", + + "cooldown": 5000, + + "model": { + "api": "mercury", + "url": "https://api.inceptionlabs.ai/v1", + "model": "mercury-coder-small" + }, + + "embedding": "openai", + + "description":"Official Website Introduction:The world’s first diffusion large language models" +} \ No newline at end of file diff --git a/src/models/prompter.js b/src/models/prompter.js index 46f7760..e988fc1 100644 --- a/src/models/prompter.js +++ b/src/models/prompter.js @@ -21,6 +21,7 @@ import { DeepSeek } from './deepseek.js'; import { Hyperbolic } from './hyperbolic.js'; import { GLHF } from './glhf.js'; import { OpenRouter } from './openrouter.js'; +import { Mercury} from "./mercury.js"; export class Prompter { constructor(agent, fp) { @@ -159,8 +160,10 @@ export class Prompter { profile.api = 'xai'; else if (profile.model.includes('deepseek')) profile.api = 'deepseek'; - else if (profile.model.includes('mistral')) + else if (profile.model.includes('mistral')) profile.api = 'mistral'; + else if (profile.model.includes('mercury')) + profile.api = 'mercury'; else throw new Error('Unknown model:', profile.model); } @@ -198,6 +201,8 @@ export class Prompter { model = new DeepSeek(profile.model, profile.url, profile.params); else if (profile.api === 'openrouter') model = new OpenRouter(profile.model.replace('openrouter/', ''), profile.url, profile.params); + else if (profile.api === 'mercury') + model = new Mercury(profile.model, profile.url, profile.params); else throw new Error('Unknown API:', profile.api); return model; From a100486896f5a69849148aa0a52994fbd3e2bc9c Mon Sep 17 00:00:00 2001 From: Qu Yi Date: Sun, 20 Apr 2025 11:06:31 +0800 Subject: [PATCH 2/4] Add `mercury.js` --- src/models/mercury.js | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 src/models/mercury.js diff --git a/src/models/mercury.js b/src/models/mercury.js new file mode 100644 index 0000000..485cc8d --- /dev/null +++ b/src/models/mercury.js @@ -0,0 +1,92 @@ +import OpenAIApi from 'openai'; +import { getKey, hasKey } from '../utils/keys.js'; +import { strictFormat } from '../utils/text.js'; + +export class Mercury { + constructor(model_name, url, params) { + this.model_name = model_name; + this.params = params; + let config = {}; + if (url) + config.baseURL = url; + + config.apiKey = getKey('MERCURY_API_KEY'); + + this.openai = new OpenAIApi(config); + } + + async sendRequest(turns, systemMessage, stop_seq='***') { + if (typeof stop_seq === 'string') { + stop_seq = [stop_seq]; + } else if (!Array.isArray(stop_seq)) { // 处理其他非字符串非数组的无效输入 + stop_seq = []; // 或抛出错误,或其他处理方式 + } + let messages = [{'role': 'system', 'content': systemMessage}].concat(turns); + messages = strictFormat(messages); + const pack = { + model: this.model_name || "mercury-coder-small", + messages, + stop: stop_seq, + ...(this.params || {}) + }; + + + let res = null; + + try { + console.log('Awaiting mercury api response from model', this.model_name) + // console.log('Messages:', messages); + let completion = await this.openai.chat.completions.create(pack); + if (completion.choices[0].finish_reason == 'length') + throw new Error('Context length exceeded'); + console.log('Received.') + res = completion.choices[0].message.content; + } + catch (err) { + if ((err.message == 'Context length exceeded' || err.code == 'context_length_exceeded') && turns.length > 1) { + console.log('Context length exceeded, trying again with shorter context.'); + return await this.sendRequest(turns.slice(1), systemMessage, stop_seq); + } else if (err.message.includes('image_url')) { + console.log(err); + res = 'Vision is only supported by certain models.'; + } else { + console.log(err); + res = 'My brain disconnected, try again.'; + } + } + return res; + } + + async sendVisionRequest(messages, systemMessage, imageBuffer) { + const imageMessages = [...messages]; + imageMessages.push({ + role: "user", + content: [ + { type: "text", text: systemMessage }, + { + type: "image_url", + image_url: { + url: `data:image/jpeg;base64,${imageBuffer.toString('base64')}` + } + } + ] + }); + + return this.sendRequest(imageMessages, systemMessage); + } + + async embed(text) { + if (text.length > 8191) + text = text.slice(0, 8191); + const embedding = await this.openai.embeddings.create({ + model: this.model_name || "text-embedding-3-small", + input: text, + encoding_format: "float", + }); + return embedding.data[0].embedding; + } + +} + + + From 23095ce0ed4121e6f1fa84619202922fa132b204 Mon Sep 17 00:00:00 2001 From: Qu Yi Date: Sun, 20 Apr 2025 11:41:04 +0800 Subject: [PATCH 3/4] Update `mercury.js` --- src/models/mercury.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models/mercury.js b/src/models/mercury.js index 485cc8d..d4c4c3e 100644 --- a/src/models/mercury.js +++ b/src/models/mercury.js @@ -18,8 +18,8 @@ export class Mercury { async sendRequest(turns, systemMessage, stop_seq='***') { if (typeof stop_seq === 'string') { stop_seq = [stop_seq]; - } else if (!Array.isArray(stop_seq)) { // 处理其他非字符串非数组的无效输入 - stop_seq = []; // 或抛出错误,或其他处理方式 + } else if (!Array.isArray(stop_seq)) { + stop_seq = []; } let messages = [{'role': 'system', 'content': systemMessage}].concat(turns); messages = strictFormat(messages); From b1932cf93e7b02f0190fc3455dcb0dda48791aca Mon Sep 17 00:00:00 2001 From: Qu Yi Date: Fri, 2 May 2025 09:50:48 +0800 Subject: [PATCH 4/4] feat:add new model support `mercury`(diffusion large language models) --- settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.js b/settings.js index b782097..55cbf4d 100644 --- a/settings.js +++ b/settings.js @@ -21,6 +21,7 @@ const settings = { // "./profiles/grok.json", // "./profiles/mistral.json", // "./profiles/deepseek.json", + //"./profiles/mercury.json", // using more than 1 profile requires you to /msg each bot indivually // individual profiles override values from the base profile