Skip to content

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

Python

feature flag for new connectors

Mike Fortman6d42b541b286
diff --git a/frontend/app/settings/_components/connector-cards.tsx b/frontend/app/settings/_components/connector-cards.tsx
index 1121fad94..021de5558 100644
--- a/frontend/app/settings/_components/connector-cards.tsx
+++ b/frontend/app/settings/_components/connector-cards.tsx
@@ -1,18 +1,18 @@
"use client";
-import { useCallback, useState } from "react";
import { useRouter } from "next/navigation";
+import { useCallback, useState } from "react";
import { useConnectConnectorMutation } from "@/app/api/mutations/useConnectConnectorMutation";
import { useDisconnectConnectorMutation } from "@/app/api/mutations/useDisconnectConnectorMutation";
import {
type Connector as QueryConnector,
useGetConnectorsQuery,
} from "@/app/api/queries/useGetConnectorsQuery";
+import AwsLogo from "@/components/icons/aws-logo";
import GoogleDriveIcon from "@/components/icons/google-drive-logo";
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 AwsLogo from "@/components/icons/aws-logo";
import { useAuth } from "@/contexts/auth-context";
import ConnectorCard, { type Connector } from "./connector-card";
import ConnectorsSkeleton from "./connectors-skeleton";
@@ -20,7 +20,7 @@ import IBMCOSSettingsDialog from "./ibm-cos-settings-dialog";
import S3SettingsDialog from "./s3-settings-dialog";
export default function ConnectorCards() {
- const { isAuthenticated, isNoAuthMode } = useAuth();
+ const { isAuthenticated, isNoAuthMode, isIbmAuthMode } = useAuth();
const router = useRouter();
const [ibmCOSDialogOpen, setIBMCOSDialogOpen] = useState(false);
const [s3DialogOpen, setS3DialogOpen] = useState(false);
@@ -50,10 +50,15 @@ export default function ConnectorCards() {
);
}, []);
- const connectors = queryConnectors.map((c) => ({
- ...c,
- icon: getConnectorIcon(c.icon),
- })) as Connector[];
+ const connectors = queryConnectors
+ .filter((c) => {
+ if (c.type === "ibm_cos" || c.type === "aws_s3") return isIbmAuthMode;
+ return true;
+ })
+ .map((c) => ({
+ ...c,
+ icon: getConnectorIcon(c.icon),
+ })) as Connector[];
const handleConnect = async (connector: Connector) => {
connectMutation.mutate({
@@ -121,10 +126,7 @@ export default function ConnectorCards() {
open={ibmCOSDialogOpen}
setOpen={setIBMCOSDialogOpen}
/>
- <S3SettingsDialog
- open={s3DialogOpen}
- setOpen={setS3DialogOpen}
- />
+ <S3SettingsDialog open={s3DialogOpen} setOpen={setS3DialogOpen} />
</>
);
}
diff --git a/frontend/components/knowledge-dropdown.tsx b/frontend/components/knowledge-dropdown.tsx
index a5e1563d5..0895f9ba1 100644
--- a/frontend/components/knowledge-dropdown.tsx
+++ b/frontend/components/knowledge-dropdown.tsx
@@ -36,6 +36,7 @@ import {
} from "@/components/ui/dropdown-menu";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
+import { useAuth } from "@/contexts/auth-context";
import { useTask } from "@/contexts/task-context";
import {
duplicateCheck,
@@ -81,6 +82,7 @@ const FolderIconWithColor = ({ className }: { className?: string }) => (
);
export function KnowledgeDropdown() {
+ const { isIbmAuthMode } = useAuth();
const { addTask } = useTask();
const { refetch: refetchTasks } = useGetTasksQuery();
const queryClient = useQueryClient();
@@ -521,7 +523,7 @@ export function KnowledgeDropdown() {
icon: FolderIconWithColor,
onClick: () => folderInputRef.current?.click(),
},
- ...(s3Configured
+ ...(isIbmAuthMode && s3Configured
? [
{
label: "Amazon S3",
@@ -530,7 +532,7 @@ export function KnowledgeDropdown() {
},
]
: []),
- ...(ibmCosConfigured
+ ...(isIbmAuthMode && ibmCosConfigured
? [
{
label: "IBM Cloud Object Storage",
diff --git a/frontend/contexts/auth-context.tsx b/frontend/contexts/auth-context.tsx
index 004045314..7eb0182b2 100644
--- a/frontend/contexts/auth-context.tsx
+++ b/frontend/contexts/auth-context.tsx
@@ -23,6 +23,7 @@ interface AuthContextType {
isLoading: boolean;
isAuthenticated: boolean;
isNoAuthMode: boolean;
+ isIbmAuthMode: boolean;
login: () => void;
logout: () => Promise<void>;
refreshAuth: () => Promise<void>;
@@ -46,6 +47,7 @@ export function AuthProvider({ children }: AuthProviderProps) {
const [user, setUser] = useState<User | null>(null);
const [isLoading, setIsLoading] = useState(true);
const [isNoAuthMode, setIsNoAuthMode] = useState(false);
+ const [isIbmAuthMode, setIsIbmAuthMode] = useState(false);
const checkAuth = useCallback(async () => {
try {
@@ -60,6 +62,8 @@ export function AuthProvider({ children }: AuthProviderProps) {
const data = await response.json();
+ setIsIbmAuthMode(!!data.ibm_auth_mode);
+
// Check if we're in no-auth mode
if (data.no_auth_mode) {
setIsNoAuthMode(true);
@@ -176,6 +180,7 @@ export function AuthProvider({ children }: AuthProviderProps) {
isLoading,
isAuthenticated: !!user,
isNoAuthMode,
+ isIbmAuthMode,
login,
logout,
refreshAuth,
diff --git a/src/config/settings.py b/src/config/settings.py
index b1df97074..b31fe2679 100644
--- a/src/config/settings.py
+++ b/src/config/settings.py
@@ -51,6 +51,8 @@ GOOGLE_OAUTH_CLIENT_ID = os.getenv("GOOGLE_OAUTH_CLIENT_ID")
GOOGLE_OAUTH_CLIENT_SECRET = os.getenv("GOOGLE_OAUTH_CLIENT_SECRET")
DOCLING_OCR_ENGINE = os.getenv("DOCLING_OCR_ENGINE")
+IBM_AUTH_ENABLED = os.getenv("IBM_AUTH_ENABLED", "false").lower() in ("true", "1", "yes")
+
# Ingestion configuration
DISABLE_INGEST_WITH_LANGFLOW = os.getenv(
"DISABLE_INGEST_WITH_LANGFLOW", "false"
diff --git a/src/connectors/connection_manager.py b/src/connectors/connection_manager.py
index 3ebe266a1..65674bda6 100644
--- a/src/connectors/connection_manager.py
+++ b/src/connectors/connection_manager.py
@@ -1,4 +1,5 @@
import json
+import os
import uuid
import aiofiles
from typing import Dict, List, Any, Optional
@@ -365,13 +366,13 @@ class ConnectionManager:
"name": IBMCOSConnector.CONNECTOR_NAME,
"description": IBMCOSConnector.CONNECTOR_DESCRIPTION,
"icon": IBMCOSConnector.CONNECTOR_ICON,
- "available": True, # Credentials provided via settings form
+ "available": os.environ.get("IBM_AUTH_ENABLED", "").lower() in ("1", "true", "yes"),
},
"aws_s3": {
"name": S3Connector.CONNECTOR_NAME,
"description": S3Connector.CONNECTOR_DESCRIPTION,
"icon": S3Connector.CONNECTOR_ICON,
- "available": True, # Credentials provided via settings form
+ "available": os.environ.get("IBM_AUTH_ENABLED", "").lower() in ("1", "true", "yes"),
},
}
diff --git a/src/services/auth_service.py b/src/services/auth_service.py
index 277638c6a..54e9b4b0a 100644
--- a/src/services/auth_service.py
+++ b/src/services/auth_service.py
@@ -492,6 +492,8 @@ class AuthService:
async def get_user_info(self, request) -> Optional[dict]:
"""Get current user information from request"""
+ from config.settings import IBM_AUTH_ENABLED
+
# In no-auth mode, return a consistent response
if is_no_auth_mode():
return {"authenticated": False, "user": None, "no_auth_mode": True}
@@ -501,6 +503,7 @@ class AuthService:
if user:
user_data = {
"authenticated": True,
+ "ibm_auth_mode": IBM_AUTH_ENABLED,
"user": {
"user_id": user.user_id,
"email": user.email,
@@ -512,7 +515,7 @@ class AuthService:
else None,
},
}
-
+
return user_data
else:
- return {"authenticated": False, "user": None}
+ return {"authenticated": False, "ibm_auth_mode": IBM_AUTH_ENABLED, "user": None}