Skip to content

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

Python

feat: Release branch parity (#1433)

Mike Fortman7dded21416f5
diff --git a/frontend/app/chat/_components/function-calls.tsx b/frontend/app/chat/_components/function-calls.tsx
index 19c39bc07..35ef83e39 100644
--- a/frontend/app/chat/_components/function-calls.tsx
+++ b/frontend/app/chat/_components/function-calls.tsx
@@ -133,7 +133,7 @@ export function FunctionCalls({
return items.map((result, idx: number) => (
<div
key={idx}
- className="p-2 bg-muted/30 rounded border border-muted/50"
+ className="fc-result p-2 bg-muted/30 rounded"
>
{/* Handle tool_call format (file_path in data) */}
{result.data?.file_path && (
diff --git a/frontend/app/chat/_components/user-message.tsx b/frontend/app/chat/_components/user-message.tsx
index f4e218679..e795fcdd8 100644
--- a/frontend/app/chat/_components/user-message.tsx
+++ b/frontend/app/chat/_components/user-message.tsx
@@ -2,6 +2,7 @@ import { FileText, User } from "lucide-react";
import { motion } from "motion/react";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { useAuth } from "@/contexts/auth-context";
+import { useIsCloudBrand } from "@/contexts/brand-context";
import { cn } from "@/lib/utils";
import { Message } from "./message";
@@ -19,6 +20,7 @@ export function UserMessage({
files,
}: UserMessageProps) {
const { user } = useAuth();
+ const isCloudBrand = useIsCloudBrand();
return (
<motion.div
@@ -41,7 +43,11 @@ export function UserMessage({
/>
<AvatarFallback
className={cn(
- isCompleted ? "text-placeholder-foreground" : "text-primary",
+ isCompleted
+ ? "text-placeholder-foreground"
+ : isCloudBrand
+ ? "text-foreground"
+ : "text-primary",
"text-sm bg-accent/20 rounded-lg transition-colors duration-300",
)}
>
diff --git a/frontend/app/globals.css b/frontend/app/globals.css
index 07901046b..81a5e7913 100644
--- a/frontend/app/globals.css
+++ b/frontend/app/globals.css
@@ -229,14 +229,24 @@
--icon-disabled: #525252;
/* Contextual layer (~Gray 100); use hsl(var(--layer-contextual)) */
/* Layer / contextual surfaces (IBM Gray 10 light, Gray 100 dark) */
- --layer-contextual: 0 0% 95.7%;
+ --layer-contextual: 0 0% 96%;
--layer-contextual-foreground: 0 0% 9%;
--text-text-01: 0 0% 9%;
--link-primary: 217 100% 45%;
--button-tertiary: 217 100% 45%;
--badge: 0 0% 22.4%; /* #393939 */
- --badge-foreground: 0 0% 95.7%; /* #F4F4F4 */
+ --badge-foreground: 0 0% 96%; /* #F4F4F4 */
+ }
+
+ /* IBM: match OSS switch colors — black track when checked, white thumb always */
+ [data-theme="ibm"] [role="switch"][data-state="checked"] {
+ background-color: hsl(var(--foreground));
+ }
+ [data-theme="ibm"]
+ [role="switch"][data-state="unchecked"]
+ > span[data-state="unchecked"] {
+ background-color: hsl(var(--foreground));
}
/* IBM Dark */
@@ -310,13 +320,13 @@
--placeholder: 0 0% 44%; /* #6F6F6F */
--layer-contextual: 0 0% 15%;
- --layer-contextual-foreground: 0 0% 95.7%;
- --text-text-01: 0 0% 95.7%;
+ --layer-contextual-foreground: 0 0% 96%;
+ --text-text-01: 0 0% 96%;
--link-primary: 217 100% 74%;
--button-tertiary: 217 100% 74%;
--badge: 0 0% 32%; /* #525252 */
- --badge-foreground: 0 0% 95.7%; /* #F4F4F4 */
+ --badge-foreground: 0 0% 96%; /* #F4F4F4 */
}
/* IBM Settings: section titles (productive heading-04); beats CardTitle utilities */
@@ -365,7 +375,11 @@
border: none;
border-radius: 0;
border-bottom: 2px solid hsl(var(--input));
- background-color: hsl(var(--muted));
+ background-color: hsl(var(--layer-contextual));
+ }
+
+ [data-theme="ibm"].dark .primary-input {
+ background-color: hsl(var(--layer-contextual));
}
[data-theme="ibm"] .primary-input:hover {
@@ -386,14 +400,14 @@
border: none;
border-radius: 0;
border-bottom: 2px solid hsl(var(--input));
- background-color: hsl(var(--card));
+ background-color: hsl(var(--layer-contextual));
}
[data-theme="ibm"]
.ibm-settings-page
button[role="combobox"]:hover:not(:disabled) {
border-bottom-color: hsl(var(--foreground));
- background-color: hsl(var(--card));
+ background-color: hsl(var(--layer-contextual));
}
[data-theme="ibm"] .ibm-settings-page button[role="combobox"]:focus {
@@ -464,7 +478,8 @@
}
[data-theme="ibm"] .fc-card pre,
- [data-theme="ibm"] .fc-card .fc-value {
+ [data-theme="ibm"] .fc-card .fc-value,
+ [data-theme="ibm"] .fc-card .fc-result {
background-color: rgba(120, 169, 255, 0.2); /* #78A9FF at 20% */
}
@@ -507,7 +522,8 @@
}
[data-theme="ibm"].dark .fc-card pre,
- [data-theme="ibm"].dark .fc-card .fc-value {
+ [data-theme="ibm"].dark .fc-card .fc-value,
+ [data-theme="ibm"].dark .fc-card .fc-result {
background-color: rgba(15, 98, 254, 0.2); /* #0F62FE at 20% */
}
diff --git a/frontend/app/knowledge/page.tsx b/frontend/app/knowledge/page.tsx
index 6f983671e..e78e2c589 100644
--- a/frontend/app/knowledge/page.tsx
+++ b/frontend/app/knowledge/page.tsx
@@ -23,6 +23,7 @@ import "@/components/AgGrid/registerAgGridModules";
import "@/components/AgGrid/agGridStyles.css";
import { toast } from "sonner";
import { KnowledgeActionsDropdown } from "@/components/knowledge-actions-dropdown";
+import { KnowledgeBatchActionsBar } from "@/components/knowledge-batch-actions-bar";
import { KnowledgeSearchBar } from "@/components/knowledge-search-bar";
import { KnowledgeSearchInput } from "@/components/knowledge-search-input";
import { StatusBadge } from "@/components/ui/status-badge";
@@ -666,7 +667,35 @@ function SearchPage() {
</h2>
</div>
{isCloudBrand ? (
- <KnowledgeSearchBar />
+ <div className="relative overflow-hidden h-12 shrink-0">
+ <div
+ className={cn(
+ "transition-transform duration-200 ease-in-out",
+ selectedRows.length > 0
+ ? "-translate-y-full pointer-events-none select-none"
+ : "translate-y-0",
+ )}
+ >
+ <KnowledgeSearchBar />
+ </div>
+ <div
+ className={cn(
+ "absolute top-0 left-0 right-0 h-12 transition-transform duration-200 ease-in-out",
+ selectedRows.length > 0
+ ? "translate-y-0"
+ : "translate-y-full pointer-events-none select-none",
+ )}
+ >
+ <KnowledgeBatchActionsBar
+ selectedCount={selectedRows.length}
+ onDelete={() => setShowBulkDeleteDialog(true)}
+ onCancel={() => {
+ setSelectedRows([]);
+ gridRef.current?.api.deselectAll();
+ }}
+ />
+ </div>
+ </div>
) : (
/* Search Input Area */
<div className="flex-1 flex items-center flex-shrink-0 flex-wrap-reverse gap-3 mb-6">
diff --git a/frontend/app/settings/_components/connector-card.tsx b/frontend/app/settings/_components/connector-card.tsx
index cfde6dde8..13562c6d5 100644
--- a/frontend/app/settings/_components/connector-card.tsx
+++ b/frontend/app/settings/_components/connector-card.tsx
@@ -165,7 +165,7 @@ export default function ConnectorCard({
className={cn(
"w-full cursor-pointer",
isCloudBrand
- ? "rounded-none border-primary bg-layer-contextual text-layer-contextual-foreground hover:bg-primary hover:text-primary-foreground hover:border-primary"
+ ? "rounded-none border-layer-contextual-foreground bg-layer-contextual text-layer-contextual-foreground hover:bg-primary hover:text-primary-foreground hover:border-primary"
: "group-hover:bg-background group-hover:border-zinc-700 group-hover:text-primary",
)}
size="sm"
diff --git a/frontend/app/settings/_components/connector-cards.tsx b/frontend/app/settings/_components/connector-cards.tsx
index 021de5558..b8b29541c 100644
--- a/frontend/app/settings/_components/connector-cards.tsx
+++ b/frontend/app/settings/_components/connector-cards.tsx
@@ -14,6 +14,7 @@ import IBMCOSIcon from "@/components/icons/ibm-cos-icon";
import OneDriveIcon from "@/components/icons/one-drive-logo";
import SharePointIcon from "@/components/icons/share-point-logo";
import { useAuth } from "@/contexts/auth-context";
+import { useIsCloudBrand } from "@/contexts/brand-context";
import ConnectorCard, { type Connector } from "./connector-card";
import ConnectorsSkeleton from "./connectors-skeleton";
import IBMCOSSettingsDialog from "./ibm-cos-settings-dialog";
@@ -21,6 +22,7 @@ import S3SettingsDialog from "./s3-settings-dialog";
export default function ConnectorCards() {
const { isAuthenticated, isNoAuthMode, isIbmAuthMode } = useAuth();
+ const isCloudBrand = useIsCloudBrand();
const router = useRouter();
const [ibmCOSDialogOpen, setIBMCOSDialogOpen] = useState(false);
const [s3DialogOpen, setS3DialogOpen] = useState(false);
@@ -53,6 +55,8 @@ export default function ConnectorCards() {
const connectors = queryConnectors
.filter((c) => {
if (c.type === "ibm_cos" || c.type === "aws_s3") return isIbmAuthMode;
+ if (isCloudBrand && (c.type === "google_drive" || c.type === "onedrive"))
+ return false;
return true;
})
.map((c) => ({
diff --git a/frontend/app/settings/_components/model-provider-card.tsx b/frontend/app/settings/_components/model-provider-card.tsx
index 80aa0201b..c4539a15e 100644
--- a/frontend/app/settings/_components/model-provider-card.tsx
+++ b/frontend/app/settings/_components/model-provider-card.tsx
@@ -76,7 +76,7 @@ export default function ModelProviderCard({
isConfigured && !isCloudBrand && "border-primary",
isCloudBrand &&
isEditSetup &&
- "rounded-none border border-button-tertiary bg-layer-contextual text-layer-contextual-foreground shadow-none hover:bg-layer-contextual hover:text-layer-contextual-foreground",
+ "rounded-none border border-layer-contextual-foreground bg-layer-contextual text-layer-contextual-foreground shadow-none hover:bg-layer-contextual hover:text-layer-contextual-foreground",
isCloudBrand && !isEditSetup && !isUnhealthy && "rounded-none",
isUnhealthy && isCloudBrand && "rounded-none",
)}
diff --git a/frontend/components/AgGrid/agGridStyles.css b/frontend/components/AgGrid/agGridStyles.css
index 11995b2da..4465aad2f 100644
--- a/frontend/components/AgGrid/agGridStyles.css
+++ b/frontend/components/AgGrid/agGridStyles.css
@@ -117,6 +117,7 @@ body {
.ag-paging-panel {
color: #525252;
+ border-top: 1px solid hsl(var(--border));
}
}
@@ -159,5 +160,6 @@ body {
.ag-paging-panel {
color: #c6c6c6;
+ border-top: 1px solid hsl(var(--border));
}
}
diff --git a/frontend/components/cloud-picker/picker-header.tsx b/frontend/components/cloud-picker/picker-header.tsx
index 65738a2ec..78fef32fc 100644
--- a/frontend/components/cloud-picker/picker-header.tsx
+++ b/frontend/components/cloud-picker/picker-header.tsx
@@ -47,7 +47,7 @@ export const PickerHeader = ({
return (
<Card>
<CardContent className="flex flex-col items-center text-center py-8">
- <p className="text-sm text-primary mb-4">
+ <p className="text-sm text-foreground mb-4">
Select files or folders from {getProviderName(provider)} to ingest.
</p>
<Button
diff --git a/frontend/components/icons/dog-icon.tsx b/frontend/components/icons/dog-icon.tsx
index 2224a77bc..266f824b3 100644
--- a/frontend/components/icons/dog-icon.tsx
+++ b/frontend/components/icons/dog-icon.tsx
@@ -14,7 +14,9 @@ const DogIcon = ({ disabled = false, stroke, ...props }: DogIconProps) => {
? isCloudBrand
? DOG_ICON_IBM_DISABLED_FILL
: DOG_ICON_DISABLED_FILL
- : stroke || DOG_ICON_DEFAULT_FILL;
+ : isCloudBrand
+ ? "currentColor"
+ : stroke || DOG_ICON_DEFAULT_FILL;
// CSS for the stepped animation states
const animationCSS = `
diff --git a/frontend/components/knowledge-batch-actions-bar.tsx b/frontend/components/knowledge-batch-actions-bar.tsx
new file mode 100644
index 000000000..90d9cacc7
--- /dev/null
+++ b/frontend/components/knowledge-batch-actions-bar.tsx
@@ -0,0 +1,39 @@
+import { X } from "lucide-react";
+
+interface KnowledgeBatchActionsBarProps {
+ selectedCount: number;
+ onDelete: () => void;
+ onCancel: () => void;
+}
+
+export const KnowledgeBatchActionsBar = ({
+ selectedCount,
+ onDelete,
+ onCancel,
+}: KnowledgeBatchActionsBarProps) => {
+ return (
+ <div className="flex h-12 w-full items-stretch bg-primary text-primary-foreground">
+ <span className="flex items-center px-4 text-sm font-medium">
+ {selectedCount} item{selectedCount !== 1 ? "s" : ""} selected
+ </span>
+ <div className="ml-auto flex items-stretch">
+ <button
+ type="button"
+ onClick={onDelete}
+ className="flex h-full items-center px-4 text-sm font-medium transition-colors hover:bg-primary-foreground/10"
+ >
+ Delete
+ </button>
+ <span className="self-center h-4 w-px bg-primary-foreground" />
+ <button
+ type="button"
+ aria-label="Cancel selection"
+ onClick={onCancel}
+ className="flex h-full w-12 flex-shrink-0 items-center justify-center transition-colors hover:bg-primary-foreground/10"
+ >
+ <X className="h-4 w-4" />
+ </button>
+ </div>
+ </div>
+ );
+};
diff --git a/frontend/components/knowledge-dropdown.tsx b/frontend/components/knowledge-dropdown.tsx
index 0af0f25c7..492e2f0d3 100644
--- a/frontend/components/knowledge-dropdown.tsx
+++ b/frontend/components/knowledge-dropdown.tsx
@@ -601,7 +601,12 @@ export function KnowledgeDropdown() {
};
const cloudConnectorItems = Object.entries(cloudConnectors)
- .filter(([, info]) => info.available)
+ .filter(([type, info]) => {
+ if (!info.available) return false;
+ if (isCloudBrand && (type === "google_drive" || type === "onedrive"))
+ return false;
+ return true;
+ })
.map(([type, info]) => ({
label: info.name,
icon: connectorIconMap[type as keyof typeof connectorIconMap] || PlugZap,
diff --git a/frontend/components/theme-switcher-buttons.tsx b/frontend/components/theme-switcher-buttons.tsx
index 59b14447d..8a0a80ab0 100644
--- a/frontend/components/theme-switcher-buttons.tsx
+++ b/frontend/components/theme-switcher-buttons.tsx
@@ -25,7 +25,7 @@ export const ThemeSwitcherButtons = () => {
type="button"
className={`h-6 w-6 rounded-full flex items-center justify-center ${
selectedTheme === "light"
- ? "bg-amber-400 text-primary"
+ ? "bg-amber-400 text-foreground"
: "text-foreground hover:bg-amber-400 hover:text-background"
}`}
onClick={() => handleThemeChange("light")}
diff --git a/frontend/components/ui/slider.tsx b/frontend/components/ui/slider.tsx
index e12cab8ad..1053726b7 100644
--- a/frontend/components/ui/slider.tsx
+++ b/frontend/components/ui/slider.tsx
@@ -20,7 +20,7 @@ const Slider = React.forwardRef<
<SliderPrimitive.Track className="relative h-[5px] w-full grow overflow-hidden rounded-full bg-muted">
<SliderPrimitive.Range className="absolute h-full bg-muted-foreground" />
</SliderPrimitive.Track>
- <SliderPrimitive.Thumb className="block h-4 w-4 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50" />
+ <SliderPrimitive.Thumb className="block h-4 w-4 rounded-full border-2 border-foreground bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50" />
</SliderPrimitive.Root>
));
Slider.displayName = SliderPrimitive.Root.displayName;