initial endpoint

Author: pipper

apps/remix-ide/src/app/plugins/remixAIPlugin.tsx

@@ -1,7 +1,7 @@
 import * as packageJson from '../../../../../package.json'
 import { Plugin } from '@remixproject/engine';
 import { trackMatomoEvent } from '@remix-api'
-import { IModel, RemoteInferencer, IRemoteModel, IParams, GenerationParams, AssistantParams, CodeExplainAgent, SecurityAgent, CompletionParams, OllamaInferencer, isOllamaAvailable, getBestAvailableModel } from '@remix/remix-ai-core';
+import { IModel, RemoteInferencer, IRemoteModel, IParams, GenerationParams, AssistantParams, CodeExplainAgent, SecurityAgent, CompletionParams, OllamaInferencer, isOllamaAvailable, getBestAvailableModel, resetOllamaHostOnSettingsChange  } from '@remix/remix-ai-core';
 import { CodeCompletionAgent, ContractAgent, workspaceAgent, IContextType, mcpDefaultServersConfig } from '@remix/remix-ai-core';
 import { MCPInferencer } from '@remix/remix-ai-core';
 import { IMCPServer, IMCPConnectionStatus } from '@remix/remix-ai-core';
@@ -63,6 +63,10 @@ export class RemixAIPlugin extends Plugin {
   }
 
   onActivation(): void {
+    // Expose Ollama reset function globally for settings integration
+    if (typeof window !== 'undefined') {
+      (window as any).resetOllamaHostOnSettingsChange = resetOllamaHostOnSettingsChange;
+    }
 
     if (this.isOnDesktop) {
       this.useRemoteInferencer = true

apps/remix-ide/src/app/tabs/locales/en/settings.json

@@ -69,5 +69,8 @@
   "settings.mcpServerConfigurationDescription": "Connect to Model Context Protocol servers for enhanced AI context",
   "settings.enableMCPEnhancement": "Enable MCP Integration",
   "settings.enableMCPEnhancementDescription": "Manage your MCP server connections",
-  "settings.aiPrivacyPolicyDescription": "Understand how RemixAI processes your data."
+  "settings.aiPrivacyPolicyDescription": "Understand how RemixAI processes your data.",
+  "settings.ollamaConfig": "Ollama Configuration",
+  "settings.ollamaConfigDescription": "Configure Ollama endpoint for local AI model integration",
+  "settings.ollama-endpoint": "ENDPOINT URL"
 }

libs/remix-ai-core/src/index.ts

@@ -9,7 +9,7 @@ import { RemoteInferencer } from './inferencers/remote/remoteInference'
 import { OllamaInferencer } from './inferencers/local/ollamaInferencer'
 import { MCPInferencer } from './inferencers/mcp/mcpInferencer'
 import { RemixMCPServer, createRemixMCPServer } from './remix-mcp-server'
-import { isOllamaAvailable, getBestAvailableModel, listModels, discoverOllamaHost } from './inferencers/local/ollama'
+import { isOllamaAvailable, getBestAvailableModel, listModels, discoverOllamaHost, resetOllamaHostOnSettingsChange } from './inferencers/local/ollama'
 import { FIMModelManager, FIMModelConfig, FIM_MODEL_CONFIGS } from './inferencers/local/fimModelConfig'
 import { ChatHistory } from './prompts/chat'
 import { downloadLatestReleaseExecutable } from './helpers/inferenceServerReleases'
@@ -18,7 +18,7 @@ import { mcpDefaultServersConfig } from './config/mcpDefaultServers'
 export {
   IModel, IModelResponse, ChatCommandParser,
   ModelType, DefaultModels, ICompletions, IParams, IRemoteModel, buildChatPrompt,
-  RemoteInferencer, OllamaInferencer, MCPInferencer, RemixMCPServer, isOllamaAvailable, getBestAvailableModel, listModels, discoverOllamaHost,
+  RemoteInferencer, OllamaInferencer, MCPInferencer, RemixMCPServer, isOllamaAvailable, getBestAvailableModel, listModels, discoverOllamaHost, resetOllamaHostOnSettingsChange,
   FIMModelManager, FIMModelConfig, FIM_MODEL_CONFIGS, createRemixMCPServer,
   InsertionParams, CompletionParams, GenerationParams, AssistantParams,
   ChatEntry, AIRequestType, ChatHistory, downloadLatestReleaseExecutable,

libs/remix-ai-core/src/inferencers/local/ollama.ts

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import { Registry } from '@remix-project/remix-lib';
 
 // Helper function to track events using MatomoManager instance
 function trackMatomoEvent(category: string, action: string, name?: string) {
@@ -14,15 +15,47 @@ function trackMatomoEvent(category: string, action: string, name?: string) {
 // default Ollama ports to check (11434 is the legacy/standard port)
 const OLLAMA_PORTS = [11434, 11435, 11436];
 const OLLAMA_BASE_HOST = 'http://localhost';
+const DEFAULT_OLLAMA_HOST = 'http://localhost:11434';
 
 let discoveredOllamaHost: string | null = null;
 
+function getConfiguredOllamaEndpoint(): string | null {
+  try {
+    const config = Registry.getInstance().get('config').api;
+    const configuredEndpoint = config.get('settings/ollama-endpoint');
+    if (configuredEndpoint && configuredEndpoint !== DEFAULT_OLLAMA_HOST) {
+      _paq.push(['trackEvent', 'ai', 'remixAI', 'ollama_using_configured_endpoint', configuredEndpoint]);
+      return configuredEndpoint;
+    }
+  } catch (error) {
+    _paq.push(['trackEvent', 'ai', 'remixAI', 'ollama_config_access_failed', error.message || 'unknown']);
+  }
+  return null;
+}
+
 export async function discoverOllamaHost(): Promise<string | null> {
   if (discoveredOllamaHost) {
     trackMatomoEvent('ai', 'remixAI', `ollama_host_cache_hit:${discoveredOllamaHost}`);
     return discoveredOllamaHost;
   }
 
+  // First, try to use the configured endpoint from settings
+  const configuredEndpoint = getConfiguredOllamaEndpoint();
+  if (configuredEndpoint) {
+    try {
+      const res = await axios.get(`${configuredEndpoint}/api/tags`, { timeout: 2000 });
+      if (res.status === 200) {
+        discoveredOllamaHost = configuredEndpoint;
+        _paq.push(['trackEvent', 'ai', 'remixAI', 'ollama_configured_endpoint_success', configuredEndpoint]);
+        return configuredEndpoint;
+      }
+    } catch (error) {
+      _paq.push(['trackEvent', 'ai', 'remixAI', 'ollama_configured_endpoint_failed', `${configuredEndpoint}:${error.message || 'unknown'}`]);
+      // Fall back to discovery if configured endpoint fails
+    }
+  }
+
+  // Fall back to port discovery if no configured endpoint or it failed
   for (const port of OLLAMA_PORTS) {
     const host = `${OLLAMA_BASE_HOST}:${port}`;
     trackMatomoEvent('ai', 'remixAI', `ollama_port_check:${port}`);
@@ -75,6 +108,12 @@ export function resetOllamaHost(): void {
   discoveredOllamaHost = null;
 }
 
+export function resetOllamaHostOnSettingsChange(): void {
+  // This function should be called when Ollama settings are updated
+  resetOllamaHost();
+  _paq.push(['trackEvent', 'ai', 'remixAI', 'ollama_reset_on_settings_change']);
+}
+
 export async function pullModel(modelName: string): Promise<void> {
   // in case the user wants to pull a model from registry
   trackMatomoEvent('ai', 'remixAI', `ollama_pull_model_start:${modelName}`);

libs/remix-ui/settings/src/lib/remix-ui-settings.tsx

@@ -128,6 +128,16 @@ const settingsSections: SettingsSection[] = [
           action: 'link',
           link: 'https://remix-ide.readthedocs.io/en/latest/ai.html'
         }
+      },
+      {
+        name: 'ollama-config',
+        label: 'settings.ollamaConfig',
+        description: 'settings.ollamaConfigDescription',
+        type: 'toggle',
+        toggleUIOptions: [{
+          name: 'ollama-endpoint',
+          type: 'text'
+        }]
       }]
     },
     ...(mcpEnabled ? [{

libs/remix-ui/settings/src/lib/settingsReducer.ts

@@ -18,12 +18,14 @@ const sindriAccessToken = config.get('settings/sindri-access-token') || ''
 const etherscanAccessToken = config.get('settings/etherscan-access-token') || ''
 const mcpServersEnable = config.get('settings/mcp/servers/enable') || false
 const mcpServerManagement = config.get('settings/mcp-server-management') || false
+const ollamaEndpoint = config.get('settings/ollama-endpoint') || 'http://localhost:11434'
 
 let githubConfig = config.get('settings/github-config') || false
 let ipfsConfig = config.get('settings/ipfs-config') || false
 let swarmConfig = config.get('settings/swarm-config') || false
 let sindriConfig = config.get('settings/sindri-config') || false
 let etherscanConfig = config.get('settings/etherscan-config') || false
+let ollamaConfig = config.get('settings/ollama-config') || false
 let generateContractMetadata = config.get('settings/generate-contract-metadata')
 let autoCompletion = config.get('settings/auto-completion')
 let showGas = config.get('settings/show-gas')
@@ -50,6 +52,10 @@ if (!etherscanConfig && etherscanAccessToken) {
   config.set('settings/etherscan-config', true)
   etherscanConfig = true
 }
+if (!ollamaConfig && ollamaEndpoint !== 'http://localhost:11434') {
+  config.set('settings/ollama-config', true)
+  ollamaConfig = true
+}
 if (typeof generateContractMetadata !== 'boolean') {
   config.set('settings/generate-contract-metadata', true)
   generateContractMetadata = true
@@ -188,12 +194,21 @@ export const initialState: SettingsState = {
     value: '',
     isLoading: false
   },
+<<<<<<< HEAD
   'mcp/servers/enable': {
     value: mcpServersEnable,
     isLoading: false
   },
   'mcp-server-management': {
     value: mcpServerManagement,
+=======
+  'ollama-config': {
+    value: ollamaConfig,
+    isLoading: false
+  },
+  'ollama-endpoint': {
+    value: ollamaEndpoint,
+>>>>>>> 0571313a4a (initial endpoint)
     isLoading: false
   },
   toaster: {
@@ -206,6 +221,19 @@ export const settingReducer = (state: SettingsState, action: SettingsActions): S
   switch (action.type) {
   case 'SET_VALUE':
     config.set('settings/' + action.payload.name, action.payload.value)
+    
+    // Reset Ollama host cache when endpoint is changed
+    if (action.payload.name === 'ollama-endpoint') {
+      try {
+        // Check if the resetOllamaHostOnSettingsChange function is available globally
+        if (typeof window !== 'undefined' && (window as any).resetOllamaHostOnSettingsChange) {
+          (window as any).resetOllamaHostOnSettingsChange();
+        }
+      } catch (error) {
+        // Ignore errors - Ollama functionality is optional
+      }
+    }
+    
     return { ...state, [action.payload.name]: { ...state[action.payload.name], value: action.payload.value, isLoading: false } }
   case 'SET_LOADING':
     return { ...state, [action.payload.name]: { ...state[action.payload.name], isLoading: true } }

libs/remix-ui/settings/src/types/index.ts

@@ -115,6 +115,8 @@ export interface SettingsState {
   'ai-privacy-policy': ConfigState,
   'mcp/servers/enable': ConfigState,
   'mcp-server-management': ConfigState,
+  'ollama-config': ConfigState,
+  'ollama-endpoint': ConfigState,
   toaster: ConfigState
 }
 export interface SettingsActionPayloadTypes {