Skip to content

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

Python

PR comments

Mike Fortman27a04c65d1a8
diff --git a/frontend/app/chat/_components/assistant-message.tsx b/frontend/app/chat/_components/assistant-message.tsx
index a08f86661..f2d717dfa 100644
--- a/frontend/app/chat/_components/assistant-message.tsx
+++ b/frontend/app/chat/_components/assistant-message.tsx
@@ -2,7 +2,6 @@ import { GitBranch } from "lucide-react";
import { motion } from "motion/react";
import DogIcon from "@/components/icons/dog-icon";
import { MarkdownRenderer } from "@/components/markdown-renderer";
-import { useIsCloudBrand } from "@/contexts/brand-context";
import { cn } from "@/lib/utils";
import type {
FunctionCall,
@@ -45,8 +44,6 @@ export function AssistantMessage({
isInitialGreeting = false,
usage,
}: AssistantMessageProps) {
- const isCloudBrand = useIsCloudBrand();
-
return (
<motion.div
initial={animate ? { opacity: 0, y: -20 } : { opacity: 1, y: 0 }}
@@ -85,11 +82,6 @@ export function AssistantMessage({
<DogIcon
className="h-6 w-6 transition-colors duration-300"
disabled={isCompleted || isInactive}
- disabledFill={
- isCloudBrand && (isCompleted || isInactive)
- ? "#525252"
- : undefined
- }
/>
</motion.div>
</div>
diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
index 3e9f38b45..399a3cebc 100644
--- a/frontend/app/layout.tsx
+++ b/frontend/app/layout.tsx
@@ -1,5 +1,5 @@
import type { Metadata } from "next";
-import { Chivo, Inter, JetBrains_Mono } from "next/font/google";
+import { Chivo, IBM_Plex_Sans, Inter, JetBrains_Mono } from "next/font/google";
import "./globals.css";
import { LayoutWrapper } from "@/components/layout-wrapper";
import { ThemeProvider } from "@/components/theme-provider";
@@ -27,6 +27,12 @@ const chivo = Chivo({
subsets: ["latin"],
});
+const ibmPlexSans = IBM_Plex_Sans({
+ variable: "--font-ibm-plex-sans",
+ subsets: ["latin"],
+ weight: ["400", "500", "600", "700"],
+});
+
export const metadata: Metadata = {
title: "OpenRAG",
description: "Open source RAG (Retrieval Augmented Generation) system",
@@ -39,7 +45,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<body
- className={`${inter.variable} ${jetbrainsMono.variable} ${chivo.variable} antialiased overflow-hidden bg-white dark:bg-black`}
+ className={`${inter.variable} ${jetbrainsMono.variable} ${chivo.variable} ${ibmPlexSans.variable} antialiased overflow-hidden bg-white dark:bg-black`}
>
<ThemeProvider
attribute="class"
diff --git a/frontend/app/settings/page.tsx b/frontend/app/settings/page.tsx
index f3f9b3970..e6f224a41 100644
--- a/frontend/app/settings/page.tsx
+++ b/frontend/app/settings/page.tsx
@@ -9,7 +9,6 @@ import {
Plus,
Trash2,
} from "lucide-react";
-import { IBM_Plex_Sans } from "next/font/google";
import Link from "next/link";
import { useRouter, useSearchParams } from "next/navigation";
import { Suspense, useEffect, useState } from "react";
@@ -65,12 +64,6 @@ import { getModelLogo, type ModelProvider } from "./_helpers/model-helpers";
const { MAX_SYSTEM_PROMPT_CHARS } = UI_CONSTANTS;
-const ibmSettingsFont = IBM_Plex_Sans({
- subsets: ["latin"],
- weight: ["400", "500", "600", "700"],
- display: "swap",
-});
-
function KnowledgeSourcesPage() {
const isCloudBrand = useIsCloudBrand();
const { isAuthenticated, isNoAuthMode, isIbmAuthMode } = useAuth();
@@ -568,7 +561,7 @@ function KnowledgeSourcesPage() {
<div
className={cn(
"space-y-8 pb-6",
- isCloudBrand && ibmSettingsFont.className,
+ isCloudBrand && "font-ibm-plex-sans",
isCloudBrand && "ibm-settings-page",
)}
>
diff --git a/frontend/components/AgGrid/agGridStyles.css b/frontend/components/AgGrid/agGridStyles.css
index bf2355c4a..00483dea3 100644
--- a/frontend/components/AgGrid/agGridStyles.css
+++ b/frontend/components/AgGrid/agGridStyles.css
@@ -20,7 +20,7 @@ body {
.ag-header {
border-bottom: 1px solid hsl(var(--border));
- margin-bottom: 0;
+ margin-bottom: 0.5rem;
}
/* Make sure checkboxes are visible */
@@ -73,6 +73,7 @@ body {
.ag-header {
background-color: #e0e0e0 !important;
border-bottom: 1px solid hsl(var(--border));
+ margin-bottom: 0;
}
.ag-header-row {
diff --git a/frontend/components/chat-renderer.tsx b/frontend/components/chat-renderer.tsx
index 18d6a16e8..84fb47e6f 100644
--- a/frontend/components/chat-renderer.tsx
+++ b/frontend/components/chat-renderer.tsx
@@ -16,6 +16,7 @@ import { ProgressBar } from "@/app/onboarding/_components/progress-bar";
import { AnimatedConditional } from "@/components/animated-conditional";
import { Navigation } from "@/components/navigation";
import { useAuth } from "@/contexts/auth-context";
+import { useIsCloudBrand } from "@/contexts/brand-context";
import { useChat } from "@/contexts/chat-context";
import {
ANIMATION_DURATION,
@@ -36,6 +37,7 @@ export function ChatRenderer({
const router = useRouter();
const queryClient = useQueryClient(); // Move hook to component level
const { isAuthenticated, isNoAuthMode } = useAuth();
+ const isCloudBrand = useIsCloudBrand();
const {
endpoint,
refreshTrigger,
@@ -279,6 +281,7 @@ export function ChatRenderer({
animate={{
width: showLayout ? "100%" : "850px",
border: showLayout ? "0" : "1px solid hsl(var(--border))",
+ borderRadius: showLayout || isCloudBrand ? "0" : "16px",
height: showLayout ? "100%" : "800px",
x: x,
y: y,
diff --git a/frontend/components/header.tsx b/frontend/components/header.tsx
index 52d9d8a22..b22db36d3 100644
--- a/frontend/components/header.tsx
+++ b/frontend/components/header.tsx
@@ -49,12 +49,13 @@ export function Header() {
{/* <DiscordLink inviteCode="EqksyE2EX9" /> */}
{process.env.NEXT_PUBLIC_IBM_THEME_DEV === "true" && (
- <BrandSwitcher />
+ <>
+ <BrandSwitcher />
+ {/* Separator */}
+ <div className="w-px h-6 bg-border mx-3" />
+ </>
)}
- {/* Separator */}
- <div className="w-px h-6 bg-border mx-3" />
-
{/* Task Notification Bell */}
<button
onClick={toggleMenu}
diff --git a/frontend/components/icons/dog-icon.tsx b/frontend/components/icons/dog-icon.tsx
index 20004e8c5..2224a77bc 100644
--- a/frontend/components/icons/dog-icon.tsx
+++ b/frontend/components/icons/dog-icon.tsx
@@ -1,17 +1,20 @@
+import { useIsCloudBrand } from "@/contexts/brand-context";
+
+const DOG_ICON_DEFAULT_FILL = "#773EFF";
+const DOG_ICON_DISABLED_FILL = "#71717A";
+const DOG_ICON_IBM_DISABLED_FILL = "#525252";
+
interface DogIconProps extends React.SVGProps<SVGSVGElement> {
disabled?: boolean;
- disabledFill?: string;
}
-const DogIcon = ({
- disabled = false,
- disabledFill,
- stroke,
- ...props
-}: DogIconProps) => {
+const DogIcon = ({ disabled = false, stroke, ...props }: DogIconProps) => {
+ const isCloudBrand = useIsCloudBrand();
const fillColor = disabled
- ? (disabledFill ?? "#71717A")
- : stroke || "#773EFF";
+ ? isCloudBrand
+ ? DOG_ICON_IBM_DISABLED_FILL
+ : DOG_ICON_DISABLED_FILL
+ : stroke || DOG_ICON_DEFAULT_FILL;
// CSS for the stepped animation states
const animationCSS = `
diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
index 72614631a..8131ac5d4 100644
--- a/frontend/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -198,6 +198,7 @@ const config = {
sans: ["var(--font-sans)", ...fontFamily.sans],
mono: ["var(--font-mono)", ...fontFamily.mono],
chivo: ["var(--font-chivo)", ...fontFamily.sans],
+ "ibm-plex-sans": ["var(--font-ibm-plex-sans)", ...fontFamily.sans],
},
fontSize: {
xxs: "11px",