Merge pull request #744 from Sweaterdog/update-andy-model-info

Bring in the Andy 4.2 profile and README guidance from the upstream PR while
converting the profile to this branch's provider-registry schema. LM Studio is
registered as a local OpenAI-compatible provider/embedding provider, and the
OpenAI-compatible adapter now respects an explicit null keyName for no-key
local servers.

Constraint: Preserve the PR merge record and contributor commits instead of squashing
Constraint: Profiles must use the local provider/model schema, not the PR's legacy api/model shorthand
Rejected: Keep the PR profile format unchanged | it bypasses the provider registry used by this branch
Confidence: high
Scope-risk: moderate
Tested: node -e "for (const f of ['settings_llm_providers.example.json','settings_llm_providers.json','profiles/andy-4.2.json']) if (require('fs').existsSync(f)) JSON.parse(require('fs').readFileSync(f,'utf8'))"
Tested: MINDCRAFT_LLM_PROVIDERS_PATH=settings_llm_providers.example.json node --input-type=module provider resolution smoke
Tested: npx eslint src/models/_model_map.js src/models/openai_compatible.js
Tested: git diff --check
Not-tested: Live LM Studio Andy 4.2 request; requires local LM Studio server and model
Co-authored-by: OmX <omx@oh-my-codex.dev>

Author: Ninot1Quyi

README.md

@@ -80,11 +80,8 @@ You can configure the agent's name, model, and prompts in their profile like `an
 
 For more comprehensive model configuration and syntax, see [Model Specifications](#model-specifications).
 
-For local models we support [ollama](https://ollama.com/) and we provide our own finetuned models for you to use. 
-To install our models, install ollama and run the following terminal command:
-```bash
-ollama pull sweaterdog/andy-4:micro-q8_0 && ollama pull embeddinggemma
-```
+For local models, we recommend you use **LM Studio** for the Andy series of models. Ollama breaks current models, and should be avoided.
+Please see our [huggingface page for more info.](https://huggingface.co/collections/Mindcraft-CE)
 
 ## Online Servers
 To connect to online servers your bot will need an official Microsoft/Minecraft account. You can use your own personal one, but will need another account if you want to connect too and play with it. To connect, change these lines in `settings.js`:

profiles/andy-4-reasoning.json profiles/andy-4.2.jsonprofiles/andy-4-reasoning.json renamed to profiles/andy-4.2.json

@@ -1,12 +1,12 @@
 {
-    "name": "andy_4_thinking",
+    "name": "andy_4_2",
     "model": {
-        "provider": "ollama_local",
-        "model": "sweaterdog/andy-4:micro-q8_0"
+        "provider": "lmstudio",
+        "model": "andy-4.2"
     },
     "embedding": {
-        "provider": "",
-        "model": ""
+        "provider": "lmstudio",
+        "model": "text-embedding-nomic-embed-text-v1.5"
     },
     "code_model": {
         "provider": "",

profiles/andy-4.json

@@ -10,6 +10,7 @@ const settings = {
 
     "base_profile": "assistant", // survival, assistant, creative, or god_mode
     "load_memory": true, // load memory from previous session
+
     "init_message": "Respond with hello world and your name", // sends to all on spawn
     "only_chat_with": [], // users that the bots listen to and send general messages to. if empty it will chat publicly
 
@@ -88,8 +89,7 @@ const settings = {
         // "profiles/replicate.json",
         // "profiles/llama.json",
         // "profiles/vllm.json",
-        // "profiles/andy-4.json",
-        // "profiles/andy-4-reasoning.json",
+        // "profiles/andy-4.2.json",      // Andy 4.2 via local LM Studio OpenAI-compatible server
         // "profiles/freeguy.json",
     ],
 };

settings.js

@@ -235,6 +235,13 @@
             "baseUrl": "https://api.together.xyz/v1",
             "keyName": "TOGETHER_API_KEY",
             "defaultModel": "meta-llama/Llama-3-70b-chat-hf"
+        },
+        "lmstudio": {
+            "format": "openai-completions",
+            "baseUrl": "http://127.0.0.1:1234/v1",
+            "keyName": null,
+            "defaultModel": "andy-4.2",
+            "comment": "Local LM Studio OpenAI-compatible server. Start LM Studio's local server and load the Andy 4.2 model before using profiles/andy-4.2.json."
         }
     },
     "embeddings": {
@@ -282,6 +289,13 @@
             "format": "replicate",
             "keyName": "REPLICATE_API_KEY",
             "defaultModel": "mark3labs/embeddings-gte-base"
+        },
+        "lmstudio": {
+            "format": "openai-embeddings",
+            "baseUrl": "http://127.0.0.1:1234/v1",
+            "keyName": null,
+            "defaultModel": "text-embedding-nomic-embed-text-v1.5",
+            "comment": "Local LM Studio embeddings endpoint for Andy 4.2 profile examples."
         }
     },
     "schemaVersion": 1

settings_llm_providers.example.json

@@ -86,7 +86,7 @@ function applyProviderRegistry(profile, registry, label) {
         ...(profile.params || {})
     };
     for (const [key, value] of Object.entries(mergedParams)) {
-        if (value === null || value === undefined) {
+        if ((value === null || value === undefined) && key !== 'apiKeyName' && key !== 'api_key_name') {
             delete mergedParams[key];
         }
     }
@@ -101,7 +101,7 @@ function applyProviderRegistry(profile, registry, label) {
 }
 
 function normalizeProviderConfig(providerName, provider) {
-    const keyName = provider.keyName || provider.key_name || provider.apiKeyName || provider.api_key_name;
+    const keyName = firstDefined(provider.keyName, provider.key_name, provider.apiKeyName, provider.api_key_name);
     const baseUrl = provider.baseUrl || provider.base_url || provider.baseURL || provider.url;
     const format = provider.format || provider.apiFormat || provider.api_format || provider.protocol || provider.api;
     const api = provider.adapter || provider.api || apiFromFormat(format);
@@ -111,7 +111,7 @@ function normalizeProviderConfig(providerName, provider) {
         model: provider.model || provider.defaultModel || provider.default_model,
         url: baseUrl,
         params: {
-            ...(keyName ? { apiKeyName: keyName } : {}),
+            ...(keyName !== undefined ? { apiKeyName: keyName } : {}),
             ...(api === 'openai-completions' || api === 'openai-compatible' ? { provider: providerName } : {}),
             ...(api === 'anthropic-messages' ? { provider: providerName } : {}),
             ...(api === 'replicate' ? { provider: providerName } : {}),
@@ -122,6 +122,10 @@ function normalizeProviderConfig(providerName, provider) {
     };
 }
 
+function firstDefined(...values) {
+    return values.find(value => value !== undefined);
+}
+
 function apiFromFormat(format) {
     const normalized = String(format || '').toLowerCase();
     const aliases = {
@@ -195,4 +199,4 @@ export function createModel(profile) {
     }
     const model = new apiMap[profile.api](profile.model, profile.url, profile.params);
     return model;
-}
+}

src/models/_model_map.js

@@ -40,7 +40,11 @@ export class OpenAICompletions {
 
     initClient() {
         this.params = this.params || {};
-        const apiKeyName = this.params.apiKeyName || this.params.api_key_name || 'OPENAI_API_KEY';
+        const hasExplicitApiKeyName = Object.prototype.hasOwnProperty.call(this.params, 'apiKeyName') ||
+            Object.prototype.hasOwnProperty.call(this.params, 'api_key_name');
+        const apiKeyName = hasExplicitApiKeyName
+            ? (this.params.apiKeyName ?? this.params.api_key_name)
+            : 'OPENAI_API_KEY';
         this.provider = this.params.provider || this.params.providerName || this.params.provider_name || inferProviderName(this.url) || 'openai';
         this.default_model = this.params.defaultModel || this.params.default_model || this.default_model || this.model_name;