Skip to content

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

Python

Don't return full query result (#1827)

Mike Fortman7983fbc55e16
diff --git a/frontend/app/api/queries/useDoclingHealthQuery.ts b/frontend/app/api/queries/useDoclingHealthQuery.ts
index b41effd40..e0ba5dcfd 100644
--- a/frontend/app/api/queries/useDoclingHealthQuery.ts
+++ b/frontend/app/api/queries/useDoclingHealthQuery.ts
@@ -51,7 +51,7 @@ export const useDoclingHealthQuery = (
}
}
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: ["docling-health"],
queryFn: checkDoclingHealth,
@@ -67,6 +67,4 @@ export const useDoclingHealthQuery = (
},
queryClient,
);
-
- return queryResult;
};
diff --git a/frontend/app/api/queries/useGetConversationsQuery.ts b/frontend/app/api/queries/useGetConversationsQuery.ts
index c8b4f4a0f..a3ae9b5cc 100644
--- a/frontend/app/api/queries/useGetConversationsQuery.ts
+++ b/frontend/app/api/queries/useGetConversationsQuery.ts
@@ -107,7 +107,7 @@ export const useGetConversationsQuery = (
const callerEnabled = options?.enabled ?? true;
const enabled = isOnboardingComplete && callerEnabled;
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: ["conversations", endpoint, refreshTrigger],
placeholderData: (prev) => prev,
@@ -122,6 +122,4 @@ export const useGetConversationsQuery = (
},
queryClient,
);
-
- return queryResult;
};
diff --git a/frontend/app/api/queries/useGetModelsQuery.ts b/frontend/app/api/queries/useGetModelsQuery.ts
index d57600310..aaae1f76d 100644
--- a/frontend/app/api/queries/useGetModelsQuery.ts
+++ b/frontend/app/api/queries/useGetModelsQuery.ts
@@ -61,7 +61,7 @@ export const useGetOpenAIModelsQuery = (
}
}
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: ["models", "openai", params],
queryFn: getOpenAIModels,
@@ -72,8 +72,6 @@ export const useGetOpenAIModelsQuery = (
},
queryClient,
);
-
- return queryResult;
};
export const useGetAnthropicModelsQuery = (
@@ -103,7 +101,7 @@ export const useGetAnthropicModelsQuery = (
}
}
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: ["models", "anthropic", params],
queryFn: getAnthropicModels,
@@ -114,8 +112,6 @@ export const useGetAnthropicModelsQuery = (
},
queryClient,
);
-
- return queryResult;
};
export const useGetOllamaModelsQuery = (
@@ -138,7 +134,7 @@ export const useGetOllamaModelsQuery = (
}
}
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: ["models", "ollama", params],
queryFn: getOllamaModels,
@@ -149,8 +145,6 @@ export const useGetOllamaModelsQuery = (
},
queryClient,
);
-
- return queryResult;
};
export const useGetIBMModelsQuery = (
@@ -190,7 +184,7 @@ export const useGetIBMModelsQuery = (
}
}
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: ["models", "ibm", params],
queryFn: getIBMModels,
@@ -201,8 +195,6 @@ export const useGetIBMModelsQuery = (
},
queryClient,
);
-
- return queryResult;
};
/**
diff --git a/frontend/app/api/queries/useGetNudgesQuery.ts b/frontend/app/api/queries/useGetNudgesQuery.ts
index 6afbc897b..67b375bfb 100644
--- a/frontend/app/api/queries/useGetNudgesQuery.ts
+++ b/frontend/app/api/queries/useGetNudgesQuery.ts
@@ -98,7 +98,7 @@ export const useGetNudgesQuery = (
const callerEnabled = options?.enabled ?? true;
const enabled = isOnboardingComplete && isLLMHealthy && callerEnabled;
- const queryResult = useQuery(
+ const { data, isLoading, isError, error, refetch, isFetching } = useQuery(
{
queryKey: ["nudges", chatId, filters, limit, scoreThreshold],
queryFn: getNudges,
@@ -117,5 +117,5 @@ export const useGetNudgesQuery = (
queryClient,
);
- return { ...queryResult, cancel };
+ return { data, isLoading, isError, error, refetch, isFetching, cancel };
};
diff --git a/frontend/app/api/queries/useGetSearchQuery.ts b/frontend/app/api/queries/useGetSearchQuery.ts
index 53eb79e80..6fdc4505a 100644
--- a/frontend/app/api/queries/useGetSearchQuery.ts
+++ b/frontend/app/api/queries/useGetSearchQuery.ts
@@ -245,7 +245,7 @@ export const useGetSearchQuery = (
}
}
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: ["search", queryData, query],
placeholderData: (prev) => prev,
@@ -256,6 +256,4 @@ export const useGetSearchQuery = (
},
queryClient,
);
-
- return queryResult;
};
diff --git a/frontend/app/api/queries/useGetSettingsQuery.ts b/frontend/app/api/queries/useGetSettingsQuery.ts
index 6626de142..063af2b0c 100644
--- a/frontend/app/api/queries/useGetSettingsQuery.ts
+++ b/frontend/app/api/queries/useGetSettingsQuery.ts
@@ -96,7 +96,7 @@ export const useGetSettingsQuery = (
}
}
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: ["settings"],
queryFn: getSettings,
@@ -104,6 +104,4 @@ export const useGetSettingsQuery = (
},
queryClient,
);
-
- return queryResult;
};
diff --git a/frontend/app/api/queries/useGetTasksQuery.ts b/frontend/app/api/queries/useGetTasksQuery.ts
index a154127c8..9beeee494 100644
--- a/frontend/app/api/queries/useGetTasksQuery.ts
+++ b/frontend/app/api/queries/useGetTasksQuery.ts
@@ -98,7 +98,7 @@ export const useGetTasksQuery = (
return data.tasks || [];
}
- const queryResult = useQuery(
+ return useQuery(
{
queryKey: [...TASKS_QUERY_KEY],
queryFn: getTasks,
@@ -124,6 +124,4 @@ export const useGetTasksQuery = (
},
queryClient,
);
-
- return queryResult;
};
diff --git a/frontend/app/api/queries/useProviderHealthQuery.ts b/frontend/app/api/queries/useProviderHealthQuery.ts
index 665d220f5..a1b1432d1 100644
--- a/frontend/app/api/queries/useProviderHealthQuery.ts
+++ b/frontend/app/api/queries/useProviderHealthQuery.ts
@@ -125,7 +125,7 @@ export const useProviderHealthQuery = (
const queryKey = ["provider", "health", testCompletion, hasChatError];
const failureCountKey = queryKey.join("-");
- const queryResult = useQuery(
+ return useQuery(
{
queryKey,
queryFn: checkProviderHealth,
@@ -174,6 +174,4 @@ export const useProviderHealthQuery = (
},
queryClient,
);
-
- return queryResult;
};