Skip to content

OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.

Python

hide ollama in cloud

Mike Fortman314ba8c81c72
diff --git a/frontend/app/onboarding/_components/onboarding-card.tsx b/frontend/app/onboarding/_components/onboarding-card.tsx
index 964795ee4..e84d54d02 100644
--- a/frontend/app/onboarding/_components/onboarding-card.tsx
+++ b/frontend/app/onboarding/_components/onboarding-card.tsx
@@ -13,6 +13,11 @@ import { useOnboardingRollbackMutation } from "@/app/api/mutations/useOnboarding
import { useGetSettingsQuery } from "@/app/api/queries/useGetSettingsQuery";
import { useGetTasksQuery } from "@/app/api/queries/useGetTasksQuery";
import type { ProviderHealthResponse } from "@/app/api/queries/useProviderHealthQuery";
+import {
+ CLOUD_EXCLUDED_PROVIDERS,
+ EMBEDDING_PROVIDER_ORDER,
+ LLM_PROVIDER_ORDER,
+} from "@/app/settings/_helpers/model-helpers";
import { useDoclingHealth } from "@/components/docling-health-banner";
import AnthropicLogo from "@/components/icons/anthropic-logo";
import IBMLogo from "@/components/icons/ibm-logo";
@@ -25,6 +30,7 @@ import {
TooltipContent,
TooltipTrigger,
} from "@/components/ui/tooltip";
+import { useIsCloudBrand } from "@/contexts/brand-context";
import { cn } from "@/lib/utils";
import { AnimatedProviderSteps } from "./animated-provider-steps";
import { AnthropicOnboarding } from "./anthropic-onboarding";
@@ -60,6 +66,7 @@ const OnboardingCard = ({
isCompleted = false,
}: OnboardingCardProps) => {
const { isHealthy: isDoclingHealthy } = useDoclingHealth();
+ const isCloudBrand = useIsCloudBrand();
const [modelProvider, setModelProvider] = useState<string>(
isEmbedding ? "openai" : "anthropic",
@@ -77,9 +84,12 @@ const OnboardingCard = ({
if (!currentSettings?.providers) return;
// Define provider order based on whether it's embedding or not
- const providerOrder = isEmbedding
- ? ["openai", "watsonx", "ollama"]
- : ["anthropic", "openai", "watsonx", "ollama"];
+ const fullOrder = isEmbedding
+ ? EMBEDDING_PROVIDER_ORDER
+ : LLM_PROVIDER_ORDER;
+ const providerOrder = isCloudBrand
+ ? fullOrder.filter((p) => !CLOUD_EXCLUDED_PROVIDERS.includes(p))
+ : fullOrder;
// Find the first provider with an API key
for (const provider of providerOrder) {
@@ -109,7 +119,7 @@ const OnboardingCard = ({
return;
}
}
- }, [currentSettings, isEmbedding]);
+ }, [currentSettings, isEmbedding, isCloudBrand]);
const handleSetModelProvider = (provider: string) => {
setIsLoadingModels(false);
@@ -543,36 +553,40 @@ const OnboardingCard = ({
IBM watsonx.ai
</TabTrigger>
</TabsTrigger>
- <TabsTrigger
- value="ollama"
- className={cn(
- error &&
- modelProvider === "ollama" &&
- "data-[state=active]:border-destructive",
- )}
- >
- <TabTrigger
- selected={modelProvider === "ollama"}
- isLoading={isLoadingModels}
+ {!isCloudBrand && (
+ <TabsTrigger
+ value="ollama"
+ className={cn(
+ error &&
+ modelProvider === "ollama" &&
+ "data-[state=active]:border-destructive",
+ )}
>
- <div
- className={cn(
- "flex items-center justify-center gap-2 w-8 h-8 rounded-md border",
- modelProvider === "ollama" ? "bg-white" : "bg-muted",
- )}
+ <TabTrigger
+ selected={modelProvider === "ollama"}
+ isLoading={isLoadingModels}
>
- <OllamaLogo
+ <div
className={cn(
- "w-4 h-4 shrink-0",
+ "flex items-center justify-center gap-2 w-8 h-8 rounded-md border",
modelProvider === "ollama"
- ? "text-black"
- : "text-muted-foreground",
+ ? "bg-white"
+ : "bg-muted",
)}
- />
- </div>
- Ollama
- </TabTrigger>
- </TabsTrigger>
+ >
+ <OllamaLogo
+ className={cn(
+ "w-4 h-4 shrink-0",
+ modelProvider === "ollama"
+ ? "text-black"
+ : "text-muted-foreground",
+ )}
+ />
+ </div>
+ Ollama
+ </TabTrigger>
+ </TabsTrigger>
+ )}
</TabsList>
{!isEmbedding && (
<TabsContent value="anthropic">
@@ -619,19 +633,21 @@ const OnboardingCard = ({
}
/>
</TabsContent>
- <TabsContent value="ollama">
- <OllamaOnboarding
- setSettings={setSettings}
- setIsLoadingModels={setIsLoadingModels}
- isEmbedding={isEmbedding}
- alreadyConfigured={
- providerAlreadyConfigured && modelProvider === "ollama"
- }
- existingEndpoint={
- currentSettings?.providers?.ollama?.endpoint
- }
- />
- </TabsContent>
+ {!isCloudBrand && (
+ <TabsContent value="ollama">
+ <OllamaOnboarding
+ setSettings={setSettings}
+ setIsLoadingModels={setIsLoadingModels}
+ isEmbedding={isEmbedding}
+ alreadyConfigured={
+ providerAlreadyConfigured && modelProvider === "ollama"
+ }
+ existingEndpoint={
+ currentSettings?.providers?.ollama?.endpoint
+ }
+ />
+ </TabsContent>
+ )}
</Tabs>
<Tooltip>
diff --git a/frontend/app/settings/_components/model-providers.tsx b/frontend/app/settings/_components/model-providers.tsx
index fa215bf10..1fe2a025f 100644
--- a/frontend/app/settings/_components/model-providers.tsx
+++ b/frontend/app/settings/_components/model-providers.tsx
@@ -7,7 +7,12 @@ import OllamaLogo from "@/components/icons/ollama-logo";
import OpenAILogo from "@/components/icons/openai-logo";
import { useProviderHealth } from "@/components/provider-health-banner";
import { useAuth } from "@/contexts/auth-context";
-import type { ModelProvider } from "../_helpers/model-helpers";
+import { useIsCloudBrand } from "@/contexts/brand-context";
+import {
+ ALL_PROVIDERS,
+ CLOUD_EXCLUDED_PROVIDERS,
+ type ModelProvider,
+} from "../_helpers/model-helpers";
import AnthropicSettingsDialog from "./anthropic-settings-dialog";
import ModelProviderCard from "./model-provider-card";
import OllamaSettingsDialog from "./ollama-settings-dialog";
@@ -18,6 +23,7 @@ export const ModelProviders = () => {
const { isAuthenticated, isNoAuthMode } = useAuth();
const searchParams = useSearchParams();
const router = useRouter();
+ const isCloudBrand = useIsCloudBrand();
const { data: settings = {} } = useGetSettingsQuery({
enabled: isAuthenticated || isNoAuthMode,
@@ -27,12 +33,9 @@ export const ModelProviders = () => {
const [dialogOpen, setDialogOpen] = useState<ModelProvider | undefined>();
- const allProviderKeys: ModelProvider[] = [
- "openai",
- "ollama",
- "watsonx",
- "anthropic",
- ];
+ const allProviderKeys = isCloudBrand
+ ? ALL_PROVIDERS.filter((p) => !CLOUD_EXCLUDED_PROVIDERS.includes(p))
+ : ALL_PROVIDERS;
// Handle URL search param to open dialogs
useEffect(() => {
diff --git a/frontend/app/settings/_helpers/model-helpers.tsx b/frontend/app/settings/_helpers/model-helpers.tsx
index eabccf293..72353479d 100644
--- a/frontend/app/settings/_helpers/model-helpers.tsx
+++ b/frontend/app/settings/_helpers/model-helpers.tsx
@@ -5,6 +5,32 @@ import OpenAILogo from "@/components/icons/openai-logo";
export type ModelProvider = "openai" | "anthropic" | "ollama" | "watsonx";
+// Full ordered list of providers for settings / cards
+export const ALL_PROVIDERS: ModelProvider[] = [
+ "openai",
+ "ollama",
+ "watsonx",
+ "anthropic",
+];
+
+// Preferred auto-select order for the LLM onboarding step
+export const LLM_PROVIDER_ORDER: ModelProvider[] = [
+ "anthropic",
+ "openai",
+ "watsonx",
+ "ollama",
+];
+
+// Preferred auto-select order for the embedding onboarding step
+export const EMBEDDING_PROVIDER_ORDER: ModelProvider[] = [
+ "openai",
+ "watsonx",
+ "ollama",
+];
+
+// Providers unavailable in cloud (IBM) deployments
+export const CLOUD_EXCLUDED_PROVIDERS: ModelProvider[] = ["ollama"];
+
export interface ModelOption {
value: string;
label: string;
diff --git a/frontend/contexts/brand-context.tsx b/frontend/contexts/brand-context.tsx
index 1aabd1a8e..48a4be8d2 100644
--- a/frontend/contexts/brand-context.tsx
+++ b/frontend/contexts/brand-context.tsx
@@ -45,3 +45,5 @@ export function BrandProvider({ children }: { children: React.ReactNode }) {
}
export const useBrand = () => useContext(BrandContext);
+
+export const useIsCloudBrand = () => useContext(BrandContext).brand === "ibm";