cleanup ollama support

Author: wenxi-onyx

backend/onyx/db/models.py

@@ -2351,7 +2351,6 @@ class ModelConfiguration(Base):
     # - The end-user is configuring a model and chooses not to set a max-input-tokens limit.
     max_input_tokens: Mapped[int | None] = mapped_column(Integer, nullable=True)
 
-    # Whether this model supports image input
     supports_image_input: Mapped[bool | None] = mapped_column(Boolean, nullable=True)
 
     llm_provider: Mapped["LLMProvider"] = relationship(

backend/onyx/llm/factory.py

@@ -285,7 +285,7 @@ def get_llm(
 
     # NOTE: this is needed since Ollama API key is optional
     # User may access Ollama cloud via locally hosted instance (logged in)
-    # or just via the cloud API (not logged in)
+    # or just via the cloud API (not logged in, using API key)
     provider_extra_headers = _build_provider_extra_headers(provider, custom_config)
     if provider_extra_headers:
         extra_headers.update(provider_extra_headers)

backend/onyx/llm/llm_provider_options.py

@@ -200,7 +200,7 @@ def fetch_available_well_known_llms() -> list[WellKnownLLMProviderDescriptor]:
                 CustomConfigKey(
                     name=OLLAMA_API_KEY_CONFIG_KEY,
                     display_name="Ollama API Key",
-                    description="Optional API key used when connecting to Ollama Cloud (API base must be https://ollama.com).",
+                    description="Optional API key used when connecting to Ollama Cloud (i.e. API base is https://ollama.com).",
                     is_required=False,
                     is_secret=True,
                 )

backend/onyx/llm/utils.py

@@ -40,8 +40,6 @@
 from onyx.utils.logger import setup_logger
 from shared_configs.configs import LOG_LEVEL
 
-# Database imports for OLLAMA provider check
-
 
 if TYPE_CHECKING:
     from onyx.server.manage.llm.models import LLMProviderView

backend/onyx/server/manage/llm/api.py

@@ -43,8 +43,8 @@
 from onyx.server.manage.llm.models import LLMProviderUpsertRequest
 from onyx.server.manage.llm.models import LLMProviderView
 from onyx.server.manage.llm.models import ModelConfigurationUpsertRequest
+from onyx.server.manage.llm.models import OllamaFinalModelResponse
 from onyx.server.manage.llm.models import OllamaModelDetails
-from onyx.server.manage.llm.models import OllamaModelResponse
 from onyx.server.manage.llm.models import OllamaModelsRequest
 from onyx.server.manage.llm.models import TestLLMRequest
 from onyx.server.manage.llm.models import VisionProviderResponse
@@ -503,7 +503,7 @@ def _get_ollama_available_model_names(api_base: str) -> set[str]:
 def get_ollama_available_models(
     request: OllamaModelsRequest,
     _: User | None = Depends(current_admin_user),
-) -> list[OllamaModelResponse]:
+) -> list[OllamaFinalModelResponse]:
     """Fetch the list of available models from an Ollama server."""
 
     cleaned_api_base = request.api_base.strip().rstrip("/")
@@ -519,7 +519,7 @@ def get_ollama_available_models(
             detail="No models found from your Ollama server",
         )
 
-    models_with_context_size: list[OllamaModelResponse] = []
+    all_models_with_context_size_and_vision: list[OllamaFinalModelResponse] = []
     show_url = f"{cleaned_api_base}/api/show"
 
     for model_name in model_names:
@@ -567,12 +567,12 @@ def get_ollama_available_models(
         if not supports_image_input:
             supports_image_input = False
 
-        models_with_context_size.append(
-            OllamaModelResponse(
+        all_models_with_context_size_and_vision.append(
+            OllamaFinalModelResponse(
                 name=model_name,
                 max_input_tokens=context_limit,
                 supports_image_input=supports_image_input,
             )
         )
 
-    return models_with_context_size
+    return all_models_with_context_size_and_vision

backend/onyx/server/manage/llm/models.py

@@ -205,7 +205,7 @@ class OllamaModelsRequest(BaseModel):
     api_base: str
 
 
-class OllamaModelResponse(BaseModel):
+class OllamaFinalModelResponse(BaseModel):
     name: str
     max_input_tokens: int
     supports_image_input: bool

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

@@ -2,29 +2,12 @@ import { Button } from "@/components/ui/button";
 import { LoadingAnimation } from "@/components/Loading";
 import Text from "@/components/ui/text";
 import { fetchModels } from "./utils";
-import { WellKnownLLMProviderDescriptor, LLMProviderView } from "./interfaces";
-import { PopupSpec } from "@/components/admin/connectors/Popup";
+import {
+  ProviderFetchModelsConfig,
+  FetchModelsButtonProps,
+} from "./interfaces";
 
-interface FetchModelsButtonProps {
-  llmProviderDescriptor: WellKnownLLMProviderDescriptor;
-  existingLlmProvider?: LLMProviderView;
-  values: any;
-  setFieldValue: any;
-  isFetchingModels: boolean;
-  setIsFetchingModels: (loading: boolean) => void;
-  fetchModelsError: string;
-  setFetchModelsError: (error: string) => void;
-  setPopup?: (popup: PopupSpec) => void;
-}
-
-interface ProviderConfig {
-  buttonText: string;
-  loadingText: string;
-  helperText: string | React.ReactNode;
-  isDisabled: (values: any) => boolean;
-}
-
-const providerConfigs: Record<string, ProviderConfig> = {
+const providerConfigs: Record<string, ProviderFetchModelsConfig> = {
   bedrock: {
     buttonText: "Fetch Available Models for Region",
     loadingText: "Fetching Models...",

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

@@ -1,3 +1,5 @@
+import { PopupSpec } from "@/components/admin/connectors/Popup";
+
 export interface CustomConfigKey {
   name: string;
   display_name: string;
@@ -78,3 +80,22 @@ export interface LLMProviderDescriptor {
   groups: number[];
   model_configurations: ModelConfiguration[];
 }
+
+export interface ProviderFetchModelsConfig {
+  buttonText: string;
+  loadingText: string;
+  helperText: string | React.ReactNode;
+  isDisabled: (values: any) => boolean;
+}
+
+export interface FetchModelsButtonProps {
+  llmProviderDescriptor: WellKnownLLMProviderDescriptor;
+  existingLlmProvider?: LLMProviderView;
+  values: any;
+  setFieldValue: any;
+  isFetchingModels: boolean;
+  setIsFetchingModels: (loading: boolean) => void;
+  fetchModelsError: string;
+  setFetchModelsError: (error: string) => void;
+  setPopup?: (popup: PopupSpec) => void;
+}

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

@@ -11,11 +11,7 @@ import {
   OpenAISVG,
   QwenIcon,
 } from "@/components/icons/icons";
-import {
-  ModelConfiguration,
-  WellKnownLLMProviderDescriptor,
-  LLMProviderView,
-} from "./interfaces";
+import { WellKnownLLMProviderDescriptor, LLMProviderView } from "./interfaces";
 import { PopupSpec } from "@/components/admin/connectors/Popup";
 
 export const getProviderIcon = (