Skip to content

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

Python

feat: Settings UX should let you remove a model provider

Mike Pawlowskia578776454d8
diff --git a/frontend/app/settings/_components/anthropic-settings-dialog.tsx b/frontend/app/settings/_components/anthropic-settings-dialog.tsx
index f1b7e1542..4652a26e6 100644
--- a/frontend/app/settings/_components/anthropic-settings-dialog.tsx
+++ b/frontend/app/settings/_components/anthropic-settings-dialog.tsx
@@ -13,21 +13,15 @@ import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
- DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
import { useAuth } from "@/contexts/auth-context";
import {
AnthropicSettingsForm,
type AnthropicSettingsFormData,
} from "./anthropic-settings-form";
+import ModelProviderDialogFooter from "./model-provider-dialog-footer";
const AnthropicSettingsDialog = ({
open,
@@ -189,75 +183,21 @@ const AnthropicSettingsDialog = ({
)}
</AnimatePresence>
- {showRemoveConfirm ? (
- <DialogFooter className="mt-4 flex items-center gap-2 rounded-lg border border-red-500/10 bg-red-500/5 px-4 py-3 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
- <div className="border-l-2 border-destructive pl-3 mr-auto text-sm text-red-100">
- Remove configuration?
- </div>
- <Button
- variant="ghost"
- type="button"
- onClick={() => setShowRemoveConfirm(false)}
- >
- Cancel
- </Button>
- <Button
- type="button"
- variant="destructive"
- disabled={removeMutation.isPending}
- onClick={() =>
- removeMutation.mutate({ remove_anthropic_config: true })
- }
- >
- {removeMutation.isPending ? "Removing..." : "Remove"}
- </Button>
- </DialogFooter>
- ) : (
- <DialogFooter className="mt-4 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
- {isAnthropicConfigured && (
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="mr-auto">
- <Button
- variant="ghost"
- type="button"
- className="text-destructive hover:text-destructive"
- disabled={!canRemoveAnthropic}
- onClick={() => setShowRemoveConfirm(true)}
- >
- Remove
- </Button>
- </span>
- </TooltipTrigger>
- {!canRemoveAnthropic && (
- <TooltipContent>
- Configure another model provider before removing
- Anthropic
- </TooltipContent>
- )}
- </Tooltip>
- </TooltipProvider>
- )}
- <Button
- variant="outline"
- type="button"
- onClick={() => setOpen(false)}
- >
- Cancel
- </Button>
- <Button
- type="submit"
- disabled={settingsMutation.isPending || isValidating}
- >
- {settingsMutation.isPending
- ? "Saving..."
- : isValidating
- ? "Validating..."
- : "Save"}
- </Button>
- </DialogFooter>
- )}
+ <ModelProviderDialogFooter
+ showRemoveConfirm={showRemoveConfirm}
+ onCancelRemove={() => setShowRemoveConfirm(false)}
+ onConfirmRemove={() =>
+ removeMutation.mutate({ remove_anthropic_config: true })
+ }
+ isRemovePending={removeMutation.isPending}
+ isConfigured={isAnthropicConfigured}
+ canRemove={canRemoveAnthropic}
+ removeDisabledTooltip="Configure another model provider before removing Anthropic"
+ onRequestRemove={() => setShowRemoveConfirm(true)}
+ onCancel={() => setOpen(false)}
+ isSavePending={settingsMutation.isPending}
+ isValidating={isValidating}
+ />
</form>
</FormProvider>
</DialogContent>
diff --git a/frontend/app/settings/_components/model-provider-dialog-footer.tsx b/frontend/app/settings/_components/model-provider-dialog-footer.tsx
new file mode 100644
index 000000000..1e891ca04
--- /dev/null
+++ b/frontend/app/settings/_components/model-provider-dialog-footer.tsx
@@ -0,0 +1,94 @@
+import { Button } from "@/components/ui/button";
+import { DialogFooter } from "@/components/ui/dialog";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/components/ui/tooltip";
+
+type ModelProviderDialogFooterProps = {
+ showRemoveConfirm: boolean;
+ onCancelRemove: () => void;
+ onConfirmRemove: () => void;
+ isRemovePending: boolean;
+
+ isConfigured: boolean;
+ canRemove: boolean;
+ removeDisabledTooltip: string;
+ onRequestRemove: () => void;
+
+ onCancel: () => void;
+ isSavePending: boolean;
+ isValidating: boolean;
+};
+
+const ModelProviderDialogFooter = ({
+ showRemoveConfirm,
+ onCancelRemove,
+ onConfirmRemove,
+ isRemovePending,
+ isConfigured,
+ canRemove,
+ removeDisabledTooltip,
+ onRequestRemove,
+ onCancel,
+ isSavePending,
+ isValidating,
+}: ModelProviderDialogFooterProps) => {
+ if (showRemoveConfirm) {
+ return (
+ <DialogFooter className="mt-4 flex items-center gap-2 rounded-lg border border-red-500/10 bg-red-500/5 px-4 py-3 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
+ <div className="border-l-2 border-destructive pl-3 mr-auto text-sm text-red-100">
+ Remove configuration?
+ </div>
+ <Button variant="ghost" type="button" onClick={onCancelRemove}>
+ Cancel
+ </Button>
+ <Button
+ type="button"
+ variant="destructive"
+ disabled={isRemovePending}
+ onClick={onConfirmRemove}
+ >
+ {isRemovePending ? "Removing..." : "Remove"}
+ </Button>
+ </DialogFooter>
+ );
+ }
+
+ return (
+ <DialogFooter className="mt-4 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
+ {isConfigured && (
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span className="mr-auto">
+ <Button
+ variant="ghost"
+ type="button"
+ className="text-destructive hover:text-destructive"
+ disabled={!canRemove}
+ onClick={onRequestRemove}
+ >
+ Remove
+ </Button>
+ </span>
+ </TooltipTrigger>
+ {!canRemove && (
+ <TooltipContent>{removeDisabledTooltip}</TooltipContent>
+ )}
+ </Tooltip>
+ </TooltipProvider>
+ )}
+ <Button variant="outline" type="button" onClick={onCancel}>
+ Cancel
+ </Button>
+ <Button type="submit" disabled={isSavePending || isValidating}>
+ {isSavePending ? "Saving..." : isValidating ? "Validating..." : "Save"}
+ </Button>
+ </DialogFooter>
+ );
+};
+
+export default ModelProviderDialogFooter;
diff --git a/frontend/app/settings/_components/ollama-settings-dialog.tsx b/frontend/app/settings/_components/ollama-settings-dialog.tsx
index 0437d796f..b60665bf3 100644
--- a/frontend/app/settings/_components/ollama-settings-dialog.tsx
+++ b/frontend/app/settings/_components/ollama-settings-dialog.tsx
@@ -13,21 +13,15 @@ import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
- DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
import { useAuth } from "@/contexts/auth-context";
import {
OllamaSettingsForm,
type OllamaSettingsFormData,
} from "./ollama-settings-form";
+import ModelProviderDialogFooter from "./model-provider-dialog-footer";
const OllamaSettingsDialog = ({
open,
@@ -182,75 +176,21 @@ const OllamaSettingsDialog = ({
)}
</AnimatePresence>
- {showRemoveConfirm ? (
- <DialogFooter className="mt-4 flex items-center gap-2 rounded-lg border border-red-500/10 bg-red-500/5 px-4 py-3 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
- <div className="border-l-2 border-destructive pl-3 mr-auto text-sm text-red-100">
- Remove configuration?
- </div>
- <Button
- variant="ghost"
- type="button"
- onClick={() => setShowRemoveConfirm(false)}
- >
- Cancel
- </Button>
- <Button
- type="button"
- variant="destructive"
- disabled={removeMutation.isPending}
- onClick={() =>
- removeMutation.mutate({ remove_ollama_config: true })
- }
- >
- {removeMutation.isPending ? "Removing..." : "Remove"}
- </Button>
- </DialogFooter>
- ) : (
- <DialogFooter className="mt-4 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
- {isOllamaConfigured && (
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="mr-auto">
- <Button
- variant="ghost"
- type="button"
- className="text-destructive hover:text-destructive"
- disabled={!canRemoveOllama}
- onClick={() => setShowRemoveConfirm(true)}
- >
- Remove
- </Button>
- </span>
- </TooltipTrigger>
- {!canRemoveOllama && (
- <TooltipContent>
- Configure another model provider before removing
- Ollama
- </TooltipContent>
- )}
- </Tooltip>
- </TooltipProvider>
- )}
- <Button
- variant="outline"
- type="button"
- onClick={() => setOpen(false)}
- >
- Cancel
- </Button>
- <Button
- type="submit"
- disabled={settingsMutation.isPending || isValidating}
- >
- {settingsMutation.isPending
- ? "Saving..."
- : isValidating
- ? "Validating..."
- : "Save"}
- </Button>
- </DialogFooter>
- )}
+ <ModelProviderDialogFooter
+ showRemoveConfirm={showRemoveConfirm}
+ onCancelRemove={() => setShowRemoveConfirm(false)}
+ onConfirmRemove={() =>
+ removeMutation.mutate({ remove_ollama_config: true })
+ }
+ isRemovePending={removeMutation.isPending}
+ isConfigured={isOllamaConfigured}
+ canRemove={canRemoveOllama}
+ removeDisabledTooltip="Configure another model provider before removing Ollama"
+ onRequestRemove={() => setShowRemoveConfirm(true)}
+ onCancel={() => setOpen(false)}
+ isSavePending={settingsMutation.isPending}
+ isValidating={isValidating}
+ />
</form>
</FormProvider>
</DialogContent>
diff --git a/frontend/app/settings/_components/openai-settings-dialog.tsx b/frontend/app/settings/_components/openai-settings-dialog.tsx
index b0930e9d9..0eb08f9e4 100644
--- a/frontend/app/settings/_components/openai-settings-dialog.tsx
+++ b/frontend/app/settings/_components/openai-settings-dialog.tsx
@@ -13,21 +13,15 @@ import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
- DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
import { useAuth } from "@/contexts/auth-context";
import {
OpenAISettingsForm,
type OpenAISettingsFormData,
} from "./openai-settings-form";
+import ModelProviderDialogFooter from "./model-provider-dialog-footer";
const OpenAISettingsDialog = ({
open,
@@ -189,75 +183,21 @@ const OpenAISettingsDialog = ({
)}
</AnimatePresence>
- {showRemoveConfirm ? (
- <DialogFooter className="mt-4 flex items-center gap-2 rounded-lg border border-red-500/10 bg-red-500/5 px-4 py-3 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
- <div className="border-l-2 border-destructive pl-3 mr-auto text-sm text-red-100">
- Remove configuration?
- </div>
- <Button
- variant="ghost"
- type="button"
- onClick={() => setShowRemoveConfirm(false)}
- >
- Cancel
- </Button>
- <Button
- type="button"
- variant="destructive"
- disabled={removeMutation.isPending}
- onClick={() =>
- removeMutation.mutate({ remove_openai_config: true })
- }
- >
- {removeMutation.isPending ? "Removing..." : "Remove"}
- </Button>
- </DialogFooter>
- ) : (
- <DialogFooter className="mt-4 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
- {isOpenAIConfigured && (
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="mr-auto">
- <Button
- variant="ghost"
- type="button"
- className="text-destructive hover:text-destructive"
- disabled={!canRemoveOpenAI}
- onClick={() => setShowRemoveConfirm(true)}
- >
- Remove
- </Button>
- </span>
- </TooltipTrigger>
- {!canRemoveOpenAI && (
- <TooltipContent>
- Configure another model provider before removing
- OpenAI
- </TooltipContent>
- )}
- </Tooltip>
- </TooltipProvider>
- )}
- <Button
- variant="outline"
- type="button"
- onClick={() => setOpen(false)}
- >
- Cancel
- </Button>
- <Button
- type="submit"
- disabled={settingsMutation.isPending || isValidating}
- >
- {settingsMutation.isPending
- ? "Saving..."
- : isValidating
- ? "Validating..."
- : "Save"}
- </Button>
- </DialogFooter>
- )}
+ <ModelProviderDialogFooter
+ showRemoveConfirm={showRemoveConfirm}
+ onCancelRemove={() => setShowRemoveConfirm(false)}
+ onConfirmRemove={() =>
+ removeMutation.mutate({ remove_openai_config: true })
+ }
+ isRemovePending={removeMutation.isPending}
+ isConfigured={isOpenAIConfigured}
+ canRemove={canRemoveOpenAI}
+ removeDisabledTooltip="Configure another model provider before removing OpenAI"
+ onRequestRemove={() => setShowRemoveConfirm(true)}
+ onCancel={() => setOpen(false)}
+ isSavePending={settingsMutation.isPending}
+ isValidating={isValidating}
+ />
</form>
</FormProvider>
</DialogContent>
diff --git a/frontend/app/settings/_components/watsonx-settings-dialog.tsx b/frontend/app/settings/_components/watsonx-settings-dialog.tsx
index 6c87e3385..d6b1d9334 100644
--- a/frontend/app/settings/_components/watsonx-settings-dialog.tsx
+++ b/frontend/app/settings/_components/watsonx-settings-dialog.tsx
@@ -13,21 +13,15 @@ import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
- DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
import { useAuth } from "@/contexts/auth-context";
import {
WatsonxSettingsForm,
type WatsonxSettingsFormData,
} from "./watsonx-settings-form";
+import ModelProviderDialogFooter from "./model-provider-dialog-footer";
const WatsonxSettingsDialog = ({
open,
@@ -198,75 +192,21 @@ const WatsonxSettingsDialog = ({
)}
</AnimatePresence>
- {showRemoveConfirm ? (
- <DialogFooter className="mt-4 flex items-center gap-2 rounded-lg border border-red-500/10 bg-red-500/5 px-4 py-3 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
- <div className="border-l-2 border-destructive pl-3 mr-auto text-sm text-red-100">
- Remove configuration?
- </div>
- <Button
- variant="ghost"
- type="button"
- onClick={() => setShowRemoveConfirm(false)}
- >
- Cancel
- </Button>
- <Button
- type="button"
- variant="destructive"
- disabled={removeMutation.isPending}
- onClick={() =>
- removeMutation.mutate({ remove_watsonx_config: true })
- }
- >
- {removeMutation.isPending ? "Removing..." : "Remove"}
- </Button>
- </DialogFooter>
- ) : (
- <DialogFooter className="mt-4 animate-in fade-in-0 slide-in-from-bottom-2 duration-150">
- {isWatsonxConfigured && (
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="mr-auto">
- <Button
- variant="ghost"
- type="button"
- className="text-destructive hover:text-destructive"
- disabled={!canRemoveWatsonx}
- onClick={() => setShowRemoveConfirm(true)}
- >
- Remove
- </Button>
- </span>
- </TooltipTrigger>
- {!canRemoveWatsonx && (
- <TooltipContent>
- Configure another model provider before removing IBM
- watsonx.ai
- </TooltipContent>
- )}
- </Tooltip>
- </TooltipProvider>
- )}
- <Button
- variant="outline"
- type="button"
- onClick={() => setOpen(false)}
- >
- Cancel
- </Button>
- <Button
- type="submit"
- disabled={settingsMutation.isPending || isValidating}
- >
- {settingsMutation.isPending
- ? "Saving..."
- : isValidating
- ? "Validating..."
- : "Save"}
- </Button>
- </DialogFooter>
- )}
+ <ModelProviderDialogFooter
+ showRemoveConfirm={showRemoveConfirm}
+ onCancelRemove={() => setShowRemoveConfirm(false)}
+ onConfirmRemove={() =>
+ removeMutation.mutate({ remove_watsonx_config: true })
+ }
+ isRemovePending={removeMutation.isPending}
+ isConfigured={isWatsonxConfigured}
+ canRemove={canRemoveWatsonx}
+ removeDisabledTooltip="Configure another model provider before removing IBM watsonx.ai"
+ onRequestRemove={() => setShowRemoveConfirm(true)}
+ onCancel={() => setOpen(false)}
+ isSavePending={settingsMutation.isPending}
+ isValidating={isValidating}
+ />
</form>
</FormProvider>
</DialogContent>