Merge pull request #280 from drivecore/feature/local-openai-support

feature: local openai support

Author: bhouston

README.md

@@ -83,8 +83,8 @@ export default {
   profile: false,
   tokenCache: true,
 
-  // Ollama configuration (if using local models)
-  ollamaBaseUrl: 'http://localhost:11434',
+  // Base URL configuration (for providers that need it)
+  baseUrl: 'http://localhost:11434', // Example for Ollama
 };
 ```
 

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/agent/src/tools/getTools.ts

@@ -10,7 +10,6 @@ import { fetchTool } from './io/fetch.js';
 import { textEditorTool } from './io/textEditor.js';
 import { createMcpTool } from './mcp.js';
 import { listBackgroundToolsTool } from './system/listBackgroundTools.js';
-import { respawnTool } from './system/respawn.js';
 import { sequenceCompleteTool } from './system/sequenceComplete.js';
 import { shellMessageTool } from './system/shellMessage.js';
 import { shellStartTool } from './system/shellStart.js';
@@ -39,7 +38,7 @@ export function getTools(options?: GetToolsOptions): Tool[] {
     shellMessageTool as unknown as Tool,
     browseStartTool as unknown as Tool,
     browseMessageTool as unknown as Tool,
-    respawnTool as unknown as Tool,
+    //respawnTool as unknown as Tool,  this is a confusing tool for now.
     sleepTool as unknown as Tool,
     listBackgroundToolsTool as unknown as Tool,
   ];

packages/agent/src/tools/system/respawn.test.ts

@@ -8,9 +8,8 @@ import { respawnTool } from './respawn';
 const toolContext: ToolContext = getMockToolContext();
 
 describe('respawnTool', () => {
-  it('should have correct name and description', () => {
+  it('should have correct name', () => {
     expect(respawnTool.name).toBe('respawn');
-    expect(respawnTool.description).toContain('Resets the agent context');
   });
 
   it('should execute and return confirmation message', async () => {

packages/agent/src/tools/system/respawn.ts

@@ -20,7 +20,7 @@ const returnSchema = z.object({
 export const respawnTool: Tool = {
   name: 'respawn',
   description:
-    'Resets the agent context to just the system prompt and provided context',
+    'Resets the current conversation to just the system prompt and provided input context to this tool.',
   logPrefix: '🔄',
   parameters: parameterSchema,
   returns: returnSchema,

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,