fix: perfect gpustack compatibility, fix openai edge case

Author: bhouston

mycoder.config.js

@@ -18,6 +18,9 @@ export default {
   //model: 'llama3.2:3b',
   //provider: 'xai',
   //model: 'grok-2-latest',
+  //provider: 'openai',
+  //model: 'qwen2.5-coder:14b',
+  //baseUrl: 'http://192.168.2.66:80/v1-openai',
   maxTokens: 4096,
   temperature: 0.7,
 

packages/agent/src/core/llm/__tests__/openai.test.ts

@@ -177,7 +177,7 @@ describe('OpenAIProvider', () => {
       'role' in toolUseMessage
     ) {
       expect(toolUseMessage.role).toBe('assistant');
-      expect(toolUseMessage.content).toBe(null);
+      expect(toolUseMessage.content).toBe(''); // required by gpustack' implementation of openai SDK.
 
       if (
         'tool_calls' in toolUseMessage &&

packages/agent/src/core/llm/provider.ts

@@ -57,12 +57,6 @@ export const providerConfig: Record<string, ProviderConfig> = {
     model: 'gpt-4o-2024-05-13',
     factory: (model, options) => new OpenAIProvider(model, options),
   },
-  gpustack: {
-    docsUrl: 'https://mycoder.ai/docs/provider/local-openai',
-    model: 'llama3.2',
-    baseUrl: 'http://localhost:80',
-    factory: (model, options) => new OpenAIProvider(model, options),
-  },
   ollama: {
     docsUrl: 'https://mycoder.ai/docs/provider/ollama',
     model: 'llama3.2',

packages/agent/src/core/llm/providers/openai.ts

@@ -154,7 +154,7 @@ export class OpenAIProvider implements LLMProvider {
           // so we'll include it as a function call in an assistant message
           return {
             role: 'assistant',
-            content: null,
+            content: '',
             tool_calls: [
               {
                 id: msg.id,

packages/cli/src/commands/$default.ts

@@ -114,18 +114,25 @@ export async function executePrompt(
       throw new Error(`Unknown provider: ${config.provider}`);
     }
 
-    const { keyName } = providerSettings;
+    // only validate key if baseUrl is not set, otherwise we assume the user is using a local provider
     let apiKey: string | undefined = undefined;
+    const { keyName } = providerSettings;
     if (keyName) {
       // Then fall back to environment variable
+      logger.info(`Looking API key in env: ${keyName}`);
       apiKey = process.env[keyName];
-      if (!apiKey) {
-        logger.error(getProviderApiKeyError(config.provider));
-        throw new Error(`${config.provider} API key not found`);
+      if (!config.baseUrl) {
+        if (!apiKey) {
+          logger.error(getProviderApiKeyError(config.provider));
+          throw new Error(`${config.provider} API key not found`);
+        }
       }
     }
 
     logger.info(`LLM: ${config.provider}/${config.model}`);
+    if (apiKey) {
+      logger.info(`Using API key: ${apiKey.slice(0, 4)}...`);
+    }
     if (config.baseUrl) {
       // For Ollama, we check if the base URL is set
       logger.info(`Using base url: ${config.baseUrl}`);

packages/docs/docs/providers/anthropic.md

@@ -32,9 +32,6 @@ export default {
   provider: 'anthropic',
   model: 'claude-3-7-sonnet-20250219',
 
-  // Optional: Set API key directly (environment variable is preferred)
-  // anthropicApiKey: 'your_api_key_here',
-
   // Other MyCoder settings
   maxTokens: 4096,
   temperature: 0.7,

packages/docs/docs/providers/index.mdx

@@ -11,9 +11,8 @@ MyCoder supports multiple Language Model (LLM) providers, giving you flexibility
 MyCoder currently supports the following LLM providers:
 
 - [**Anthropic**](./anthropic.md) - Claude models from Anthropic
-- [**OpenAI**](./openai.md) - GPT models from OpenAI
+- [**OpenAI**](./openai.md) - GPT models from OpenAI (and OpenAI compatible providers)
 - [**Ollama**](./ollama.md) - Self-hosted open-source models via Ollama
-- [**Local OpenAI Compatible**](./local-openai.md) - GPUStack and other OpenAI-compatible servers
 - [**xAI**](./xai.md) - Grok models from xAI
 
 ## Configuring Providers
@@ -54,5 +53,4 @@ For detailed instructions on setting up each provider, see the provider-specific
 - [Anthropic Configuration](./anthropic.md)
 - [OpenAI Configuration](./openai.md)
 - [Ollama Configuration](./ollama.md)
-- [Local OpenAI Compatible Configuration](./local-openai.md)
 - [xAI Configuration](./xai.md)

packages/docs/docs/providers/local-openai.md

@@ -38,10 +38,6 @@ export default {
   provider: 'openai',
   model: 'gpt-4o',
 
-  // Optional: Set API key directly (environment variable is preferred)
-  // openaiApiKey: 'your_api_key_here',
-  // openaiOrganization: 'your_organization_id',
-
   // Other MyCoder settings
   maxTokens: 4096,
   temperature: 0.7,
@@ -60,6 +56,24 @@ MyCoder supports all OpenAI models that have tool/function calling capabilities.
 
 You can use any other OpenAI model that supports function calling with MyCoder. The OpenAI provider is not limited to just these listed models.
 
+## Using OpenAI Compatible Providers
+
+A number of providers offer OpenAI compatible REST API endpoints, such as xAI and [GPUStack](https://gpustack.ai). To point the OpenAI provider to a different provider REST API set the `baseUrl` and also, if applicable, the `OPENAI_API_KEY` to their required key. For example:
+
+```javascript
+export default {
+  // Provider selection
+  provider: 'openai',
+  model: 'qwen2.5',
+  baseUrl: 'http://localhost/v1-openai',
+
+  // Other MyCoder settings
+  maxTokens: 4096,
+  temperature: 0.7,
+  // ...
+};
+```
+
 ## Best Practices
 
 - GPT-4o provides the best balance of performance and cost for most MyCoder tasks

packages/docs/docs/providers/openai.md

@@ -32,9 +32,6 @@ export default {
   provider: 'xai',
   model: 'grok-2-latest',
 
-  // Optional: Set API key directly (environment variable is preferred)
-  // xaiApiKey: 'your_api_key_here',
-
   // Other MyCoder settings
   maxTokens: 4096,
   temperature: 0.7,
@@ -77,4 +74,4 @@ If you encounter issues with xAI's Grok:
 - For tool-calling issues, ensure your functions are properly formatted
 - Monitor your token usage to avoid unexpected costs
 
-For more information, visit the [xAI Documentation](https://x.ai/docs).
+For more information, visit the [xAI Documentation](https://x.ai/docs).