cleanup ollama support

Author: wenxi-onyx

backend/onyx/llm/llm_provider_options.py

@@ -39,6 +39,7 @@ class WellKnownLLMProviderDescriptor(BaseModel):
     model_configurations: list[ModelConfigurationView]
     default_model: str | None = None
     default_fast_model: str | None = None
+    default_api_base: str | None = None
     # set for providers like Azure, which require a deployment name.
     deployment_name_required: bool = False
     # set for providers like Azure, which support a single model per deployment.
@@ -210,6 +211,7 @@ def fetch_available_well_known_llms() -> list[WellKnownLLMProviderDescriptor]:
             ),
             default_model=None,
             default_fast_model=None,
+            default_api_base="http://127.0.0.1:11434",
         ),
         WellKnownLLMProviderDescriptor(
             name=ANTHROPIC_PROVIDER_NAME,

web/src/app/admin/configuration/llm/FetchModelsButton.tsx

@@ -3,11 +3,11 @@ import { LoadingAnimation } from "@/components/Loading";
 import Text from "@/components/ui/text";
 import { fetchModels } from "./utils";
 import {
-  ProviderFetchModelsConfig,
+  ProviderFetchModelsButtonConfig,
   FetchModelsButtonProps,
 } from "./interfaces";
 
-const providerConfigs: Record<string, ProviderFetchModelsConfig> = {
+const providerConfigs: Record<string, ProviderFetchModelsButtonConfig> = {
   bedrock: {
     buttonText: "Fetch Available Models for Region",
     loadingText: "Fetching Models...",

web/src/app/admin/configuration/llm/LLMProviderUpdateForm.tsx

@@ -68,7 +68,8 @@ export function LLMProviderUpdateForm({
     api_key: existingLlmProvider?.api_key ?? "",
     api_base:
       existingLlmProvider?.api_base ??
-      (llmProviderDescriptor.name === "ollama" ? "http://127.0.0.1:11434" : ""),
+      llmProviderDescriptor.default_api_base ??
+      "",
     api_version: existingLlmProvider?.api_version ?? "",
     // For Azure OpenAI, combine api_base and api_version into target_uri
     target_uri:

web/src/app/admin/configuration/llm/interfaces.ts

@@ -16,7 +16,7 @@ export interface ModelConfiguration {
   name: string;
   is_visible: boolean;
   max_input_tokens: number | null;
-  supports_image_input: boolean;
+  supports_image_input: boolean | null;
 }
 
 export interface WellKnownLLMProviderDescriptor {
@@ -33,6 +33,7 @@ export interface WellKnownLLMProviderDescriptor {
   model_configurations: ModelConfiguration[];
   default_model: string | null;
   default_fast_model: string | null;
+  default_api_base: string | null;
   is_public: boolean;
   groups: number[];
 }
@@ -81,7 +82,7 @@ export interface LLMProviderDescriptor {
   model_configurations: ModelConfiguration[];
 }
 
-export interface ProviderFetchModelsConfig {
+export interface ProviderFetchModelsButtonConfig {
   buttonText: string;
   loadingText: string;
   helperText: string | React.ReactNode;
@@ -99,3 +100,22 @@ export interface FetchModelsButtonProps {
   setFetchModelsError: (error: string) => void;
   setPopup?: (popup: PopupSpec) => void;
 }
+
+export interface OllamaModelResponse {
+  name: string;
+  max_input_tokens: number;
+  supports_image_input: boolean;
+}
+
+export interface FetchModelsConfig<
+  TApiResponse = any,
+  TProcessedResponse = ModelConfiguration,
+> {
+  endpoint: string;
+  validationCheck: () => boolean;
+  validationError: string;
+  requestBody: () => Record<string, any>;
+  processResponse: (data: TApiResponse) => TProcessedResponse[];
+  getModelNames: (data: TApiResponse) => string[];
+  successMessage: (count: number) => string;
+}

web/src/app/admin/configuration/llm/utils.ts

@@ -11,7 +11,13 @@ import {
   OpenAISVG,
   QwenIcon,
 } from "@/components/icons/icons";
-import { WellKnownLLMProviderDescriptor, LLMProviderView } from "./interfaces";
+import {
+  WellKnownLLMProviderDescriptor,
+  LLMProviderView,
+  FetchModelsConfig,
+  OllamaModelResponse,
+  ModelConfiguration,
+} from "./interfaces";
 import { PopupSpec } from "@/components/admin/connectors/Popup";
 
 export const getProviderIcon = (
@@ -75,7 +81,7 @@ export const fetchModels = async (
   setPopup?: (popup: PopupSpec) => void
 ) => {
   // Provider-specific configurations
-  const providerConfigs = {
+  const providerConfigs: Record<string, FetchModelsConfig> = {
     bedrock: {
       endpoint: "/api/admin/llm/bedrock/available-models",
       validationCheck: () => !!values.custom_config?.AWS_REGION_NAME,
@@ -88,7 +94,7 @@ export const fetchModels = async (
           values.custom_config?.AWS_BEARER_TOKEN_BEDROCK,
         provider_name: existingLlmProvider?.name,
       }),
-      processResponse: (data: string[]) =>
+      processResponse: (data: string[]): ModelConfiguration[] =>
         data.map((modelName) => {
           const existingConfig =
             llmProviderDescriptor.model_configurations.find(
@@ -112,13 +118,7 @@ export const fetchModels = async (
       requestBody: () => ({
         api_base: values.api_base,
       }),
-      processResponse: (
-        data: {
-          name: string;
-          max_input_tokens: number;
-          supports_image_input: boolean;
-        }[]
-      ) =>
+      processResponse: (data: OllamaModelResponse[]): ModelConfiguration[] =>
         data.map((modelData) => {
           const existingConfig =
             llmProviderDescriptor.model_configurations.find(
@@ -131,13 +131,8 @@ export const fetchModels = async (
             supports_image_input: modelData.supports_image_input,
           };
         }),
-      getModelNames: (
-        data: {
-          name: string;
-          max_input_tokens: number;
-          supports_image_input: boolean;
-        }[]
-      ) => data.map((model) => model.name),
+      getModelNames: (data: OllamaModelResponse[]) =>
+        data.map((model) => model.name),
       successMessage: (count: number) =>
         `Successfully fetched ${count} models from Ollama.`,
     },

web/src/lib/hooks.ts

@@ -1005,30 +1005,6 @@ export function getDisplayNameForModel(modelName: string): string {
   return MODEL_DISPLAY_NAMES[modelName] || modelName;
 }
 
-export const defaultModelsByProvider: { [name: string]: string[] } = {
-  openai: [
-    "gpt-4",
-    "gpt-4o",
-    "gpt-4o-mini",
-    "gpt-4.1",
-    "o3-mini",
-    "o1-mini",
-    "o1",
-    "o4-mini",
-    "o3",
-  ],
-  bedrock: [
-    "meta.llama3-1-70b-instruct-v1:0",
-    "meta.llama3-1-8b-instruct-v1:0",
-    "anthropic.claude-3-opus-20240229-v1:0",
-    "mistral.mistral-large-2402-v1:0",
-    "anthropic.claude-3-5-sonnet-20241022-v2:0",
-    "anthropic.claude-3-7-sonnet-20250219-v1:0",
-  ],
-  anthropic: ["claude-3-opus-20240229", "claude-3-5-sonnet-20241022"],
-  ollama: ["llama3.2", "phi3:mini", "mistral-small"],
-};
-
 // Get source metadata for configured sources - deduplicated by source type
 function getConfiguredSources(
   availableSources: ValidSources[]