OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.
Python
fix: icon display in table for connectors and url (#1887)
Wallgau81c88574c45e
diff --git a/frontend/app/connectors/page.tsx b/frontend/app/connectors/page.tsxindex bc114962b..6f79f6d7d 100644--- a/frontend/app/connectors/page.tsx+++ b/frontend/app/connectors/page.tsx@@ -55,7 +55,7 @@ export default function ConnectorsPage() {if (response.status === 201) {const taskId = result.task_id;if (taskId) {- addTask(taskId);+ addTask(taskId, { connectorType: connector.type });setSyncResult({processed: 0,total: selectedFiles.length,diff --git a/frontend/app/upload/[provider]/page.tsx b/frontend/app/upload/[provider]/page.tsxindex 480776377..8306192eb 100644--- a/frontend/app/upload/[provider]/page.tsx+++ b/frontend/app/upload/[provider]/page.tsx@@ -112,7 +112,7 @@ export default function UploadProviderPage() {onSuccess: (result) => {const taskIds = result.task_ids;if (taskIds && taskIds.length > 0) {- addTask(taskIds[0]);+ addTask(taskIds[0], { connectorType: connector.type });router.push("/knowledge");}},diff --git a/frontend/components/connectors/aws-s3/bucket-view.tsx b/frontend/components/connectors/aws-s3/bucket-view.tsxindex 148145856..f2887084c 100644--- a/frontend/components/connectors/aws-s3/bucket-view.tsx+++ b/frontend/components/connectors/aws-s3/bucket-view.tsx@@ -7,7 +7,7 @@ import { SharedBucketView } from "../shared-bucket-view";export interface S3BucketViewProps {connector: any;syncMutation: ReturnType<typeof useSyncConnector>;- addTask: (id: string) => void;+ addTask: (id: string, options?: { connectorType?: string }) => void;onBack: () => void;onDone: () => void;}diff --git a/frontend/components/connectors/shared-bucket-view.tsx b/frontend/components/connectors/shared-bucket-view.tsxindex 86d5f23b0..49121cb8d 100644--- a/frontend/components/connectors/shared-bucket-view.tsx+++ b/frontend/components/connectors/shared-bucket-view.tsx@@ -19,7 +19,7 @@ export interface SharedBucketViewProps {onRefetch: () => void;invalidateQueryKey: readonly unknown[];syncMutation: ReturnType<typeof useSyncConnector>;- addTask: (id: string) => void;+ addTask: (id: string, options?: { connectorType?: string }) => void;onBack: () => void;onDone: () => void;}@@ -82,7 +82,7 @@ export function SharedBucketView({onSuccess: (result) => {invalidate();if (result.task_ids?.length) {- addTask(result.task_ids[0]);+ addTask(result.task_ids[0], { connectorType: connector.type });onDone();} else {toast.info("No files found in the selected buckets.");diff --git a/frontend/contexts/task-context.tsx b/frontend/contexts/task-context.tsxindex bd7784be2..8471e3743 100644--- a/frontend/contexts/task-context.tsx+++ b/frontend/contexts/task-context.tsx@@ -24,9 +24,13 @@ import TaskDialog from "@/components/task-dialog";import { useAuth } from "@/contexts/auth-context";import { useOnboardingState } from "@/hooks/use-onboarding-state";import { trackProcessFailure, trackProcessSuccess } from "@/lib/analytics";-import { getKnowledgeFileIdentity } from "@/lib/knowledge-table-state";+import {+ getKnowledgeFileIdentity,+ inferTaskFileConnectorType,+} from "@/lib/knowledge-table-state";import {didTaskReachCompleted,+ didTaskReachTerminalState,finalizeProcessingOverlaysForEnhancedTask,findTaskFileOverlayIndex,getEnhancedListDisappearedFilePaths,@@ -57,7 +61,7 @@ export interface TaskFile {interface TaskContextType {tasks: Task[];files: TaskFile[];- addTask: (taskId: string) => void;+ addTask: (taskId: string, options?: { connectorType?: string }) => void;addFiles: (files: Partial<TaskFile>[], taskId: string) => void;/** Mark knowledge-table overlays as processing when a retry starts. */markTaskFilesProcessing: (taskId: string, sourceUrls: string[]) => void;@@ -95,6 +99,23 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {const [taskDialogTaskId, setTaskDialogTaskId] = useState<string | null>(null);const [isTaskDialogOpen, setIsTaskDialogOpen] = useState(false);const previousTasksRef = useRef<Task[]>([]);+ const taskConnectorTypesRef = useRef<Map<string, string>>(new Map());++ const clearTaskConnectorType = useCallback((taskId: string) => {+ taskConnectorTypesRef.current.delete(taskId);+ }, []);++ const clearTaskConnectorTypesWithoutOverlays = useCallback(+ (prevFiles: TaskFile[], nextFiles: TaskFile[]) => {+ const nextTaskIds = new Set(nextFiles.map((file) => file.task_id));+ for (const file of prevFiles) {+ if (!nextTaskIds.has(file.task_id)) {+ taskConnectorTypesRef.current.delete(file.task_id);+ }+ }+ },+ [],+ );const openTaskDialog = useCallback((taskId: string) => {setTaskDialogTaskId(taskId);setIsTaskDialogOpen(true);@@ -136,6 +157,8 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {},);+ clearTaskConnectorType(variables.taskId);+// Update file to display as cancelledsetFiles((prevFiles) =>prevFiles.map((file) => {@@ -222,6 +245,13 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {// Handle task status changes and file updatesuseEffect(() => {+ const currentTaskIds = new Set(tasks.map((task) => task.task_id));+ for (const previousTask of previousTasksRef.current) {+ if (!currentTaskIds.has(previousTask.task_id)) {+ clearTaskConnectorType(previousTask.task_id);+ }+ }+if (tasks.length === 0) {// Store current tasks as previous for next comparisonpreviousTasksRef.current = tasks;@@ -307,19 +337,25 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {filePath,fileName,);+ const existingFile =+ existingFileIndex >= 0+ ? prevFiles[existingFileIndex]+ : undefined;- // Detect connector type based on file path or other indicators- let connectorType = "local";- if (filePath.includes("/") && !filePath.startsWith("/")) {- // Likely S3 key format (bucket/path/file.ext)- connectorType = "s3";- }+ const connectorType = inferTaskFileConnectorType(+ filePath,+ fileName,+ existingFile?.connector_type &&+ existingFile.connector_type !== "local"+ ? existingFile.connector_type+ : taskConnectorTypesRef.current.get(currentTask.task_id),+ );const fileEntry: TaskFile = {filename: fileName,- mimetype: "", // We don't have this info from the task+ mimetype: existingFile?.mimetype || "",source_url: filePath,- size: 0, // We don't have this info from the task+ size: existingFile?.size || 0,connector_type: connectorType,status: mappedStatus,task_id: currentTask.task_id,@@ -450,7 +486,14 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {});}}+ }+ const taskJustReachedTerminal = didTaskReachTerminalState(+ previousTask,+ currentTask,+ );++ if (didTaskReachCompleted(previousTask, currentTask)) {const completedHasFailures = hasFailedFileEntries(currentTask);async function refetchKnowledgeAfterTaskCompletion() {@@ -498,6 +541,8 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {}}+ clearTaskConnectorType(currentTask.task_id);+setFiles((prevFiles) =>prevFiles.filter((file) => {if (file.task_id !== currentTask.task_id) {@@ -532,7 +577,11 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {}}void refetchKnowledgeAfterTaskCompletion();- } else if (+ } else if (taskJustReachedTerminal) {+ clearTaskConnectorType(currentTask.task_id);+ }++ if (shouldShowToast &&previousTask &&!isTerminalFailedTask(previousTask) &&@@ -579,10 +628,20 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {// Store current tasks as previous for next comparisonpreviousTasksRef.current = tasks;- }, [tasks, refetchSearch, isOnboardingActive]);+ }, [+ tasks,+ refetchSearch,+ isOnboardingActive,+ clearTaskConnectorType,+ queryClient,+ ]);const addTask = useCallback(- (_taskId: string) => {+ (taskId: string, options?: { connectorType?: string }) => {+ const connectorType = options?.connectorType?.trim();+ if (connectorType) {+ taskConnectorTypesRef.current.set(taskId, connectorType);+ }// React Query will automatically handle polling when tasks are active// Just trigger a refetch to get the latest datasetTimeout(() => {@@ -593,13 +652,15 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {);const refreshTasks = useCallback(async () => {- setFiles((prevFiles) =>- prevFiles.filter(+ setFiles((prevFiles) => {+ const nextFiles = prevFiles.filter((file) => file.status !== "active" && file.status !== "failed",- ),- );+ );+ clearTaskConnectorTypesWithoutOverlays(prevFiles, nextFiles);+ return nextFiles;+ });await refetchTasks();- }, [refetchTasks]);+ }, [refetchTasks, clearTaskConnectorTypesWithoutOverlays]);const cancelTask = useCallback(async (taskId: string) => {diff --git a/frontend/enhancements/connectors/ibm-cos/components/bucket-view.tsx b/frontend/enhancements/connectors/ibm-cos/components/bucket-view.tsxindex 11b3922fc..326c38b3e 100644--- a/frontend/enhancements/connectors/ibm-cos/components/bucket-view.tsx+++ b/frontend/enhancements/connectors/ibm-cos/components/bucket-view.tsx@@ -7,7 +7,7 @@ import { useIBMCOSBucketStatusQuery } from "../useIBMCOSBucketStatusQuery";export interface IBMCOSBucketViewProps {connector: any;syncMutation: ReturnType<typeof useSyncConnector>;- addTask: (id: string) => void;+ addTask: (id: string, options?: { connectorType?: string }) => void;onBack: () => void;onDone: () => void;}diff --git a/frontend/lib/connectors/types.ts b/frontend/lib/connectors/types.tsindex fe639b580..7227eac17 100644--- a/frontend/lib/connectors/types.ts+++ b/frontend/lib/connectors/types.ts@@ -17,7 +17,7 @@ export interface ConnectorBucketViewProps {// Loosely typed to match the existing connector shape from useGetConnectorsQuery.connector: any;syncMutation: ReturnType<typeof useSyncConnector>;- addTask: (id: string) => void;+ addTask: (id: string, options?: { connectorType?: string }) => void;onBack: () => void;onDone: () => void;}diff --git a/frontend/lib/knowledge-table-state.ts b/frontend/lib/knowledge-table-state.tsindex 82466f417..af7faabde 100644--- a/frontend/lib/knowledge-table-state.ts+++ b/frontend/lib/knowledge-table-state.ts@@ -28,6 +28,69 @@ export function getKnowledgeFileIdentity(file?: {return "";}+function isMeaningfulConnectorType(connectorType?: string): boolean {+ const normalized = connectorType?.trim();+ return Boolean(normalized && normalized !== "local");+}++function looksLikeHttpUrl(value: string): boolean {+ return /^https?:\/\//i.test(value.trim());+}++/** Infer connector_type for task overlays when the API does not return it. */+export function inferTaskFileConnectorType(+ filePath: string,+ fileName?: string,+ taskConnectorType?: string,+): string {+ if (isMeaningfulConnectorType(taskConnectorType)) {+ return taskConnectorType!.trim();+ }++ for (const candidate of [filePath, fileName ?? ""]) {+ const normalized = candidate.trim();+ if (!normalized) {+ continue;+ }+ if (looksLikeHttpUrl(normalized)) {+ return normalized.includes("openr.ag") ? "openrag_docs" : "url";+ }+ }++ if (filePath.includes("/") && !filePath.startsWith("/")) {+ return "aws_s3";+ }++ return "local";+}++/** Pick the connector icon source when merging backend rows with task overlays. */+export function resolveKnowledgeRowConnectorType(+ backendType?: string,+ taskType?: string,+ status: SearchFile["status"] = "active",+): string {+ const rowStatus = status ?? "active";++ if (rowStatus === "active") {+ if (isMeaningfulConnectorType(backendType)) {+ return backendType!.trim();+ }+ if (isMeaningfulConnectorType(taskType)) {+ return taskType!.trim();+ }+ return backendType?.trim() || taskType?.trim() || "local";+ }++ if (isMeaningfulConnectorType(taskType)) {+ return taskType!.trim();+ }+ if (isMeaningfulConnectorType(backendType)) {+ return backendType!.trim();+ }+ return taskType?.trim() || backendType?.trim() || "local";+}+export function buildKnowledgeTableRows(searchData: SearchFile[],taskFiles: TaskFile[],@@ -67,7 +130,11 @@ export function buildKnowledgeTableRows(...file,filename: taskFile.filename,source_url: taskFile.source_url,- connector_type: taskFile.connector_type,+ connector_type: resolveKnowledgeRowConnectorType(+ file.connector_type,+ taskFile.connector_type,+ backendStatus,+ ),status: backendStatus,error: taskFile.error,embedding_model: taskFile.embedding_model ?? file.embedding_model,diff --git a/frontend/lib/task-utils.ts b/frontend/lib/task-utils.tsindex 0ce6b797e..28d0c7e21 100644--- a/frontend/lib/task-utils.ts+++ b/frontend/lib/task-utils.ts@@ -302,6 +302,27 @@ export function isTaskInProgressStatus(status: Task["status"]): boolean {);}+export function isTerminalTaskStatus(status: Task["status"]): boolean {+ return (+ status === "completed" ||+ status === "failed" ||+ status === "error" ||+ status === "skipped"+ );+}++/** True when a task has just entered a terminal status. */+export function didTaskReachTerminalState(+ previousTask: Task | undefined,+ currentTask: Task,+): boolean {+ return (+ !!previousTask &&+ !isTerminalTaskStatus(previousTask.status) &&+ isTerminalTaskStatus(currentTask.status)+ );+}+/** True when a task has just transitioned to completed. */export function didTaskReachCompleted(previousTask: Task | undefined,