Merge branch 'STAGING' into DEV

neo4j-labs · Dec 10, 2024 · c431903 · c431903
2 parents b671189 + 919d19e
commit c431903
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/frontend/example.env b/frontend/example.env
@@ -1,7 +1,7 @@
 VITE_BACKEND_API_URL="http://localhost:8000"
 VITE_BLOOM_URL="https://workspace-preview.neo4j.io/workspace/explore?connectURL={CONNECT_URL}&search=Show+me+a+graph&featureGenAISuggestions=true&featureGenAISuggestionsInternal=true"
 VITE_REACT_APP_SOURCES="local,youtube,wiki,s3,web"
-VITE_LLM_MODELS="diffbot,openai-gpt-3.5,openai-gpt-4o"
+VITE_LLM_MODELS="diffbot,openai_gpt_3.5,openai_gpt_4o"
 VITE_ENV="DEV"
 VITE_TIME_PER_PAGE=50
 VITE_CHUNK_SIZE=5242880

diff --git a/frontend/src/components/ChatBot/Chatbot.tsx b/frontend/src/components/ChatBot/Chatbot.tsx
@@ -249,7 +249,7 @@ const Chatbot: FC<ChatbotProps> = (props) => {
             } else {
               setListMessages((prev) =>
                 prev.map((msg) =>
-                  (msg.id === chatbotMessageId ? { ...msg, modes: { ...msg.modes, [mode]: responseMode } } : msg)
+                  msg.id === chatbotMessageId ? { ...msg, modes: { ...msg.modes, [mode]: responseMode } } : msg
                 )
               );
             }
@@ -264,7 +264,7 @@ const Chatbot: FC<ChatbotProps> = (props) => {
             } else {
               setListMessages((prev) =>
                 prev.map((msg) =>
-                  (msg.id === chatbotMessageId ? { ...msg, modes: { ...msg.modes, [mode]: responseMode } } : msg)
+                  msg.id === chatbotMessageId ? { ...msg, modes: { ...msg.modes, [mode]: responseMode } } : msg
                 )
               );
             }
@@ -273,15 +273,15 @@ const Chatbot: FC<ChatbotProps> = (props) => {
           console.error(`API call failed for mode ${mode}:`, result.reason);
           setListMessages((prev) =>
             prev.map((msg) =>
-              (msg.id === chatbotMessageId
+              msg.id === chatbotMessageId
                 ? {
                     ...msg,
                     modes: {
                       ...msg.modes,
                       [mode]: { message: 'Failed to fetch response for this mode.', error: result.reason },
                     },
                   }
-                : msg)
+                : msg
             )
           );
         }
@@ -294,7 +294,7 @@ const Chatbot: FC<ChatbotProps> = (props) => {
       if (error instanceof Error) {
         setListMessages((prev) =>
           prev.map((msg) =>
-            (msg.id === chatbotMessageId
+            msg.id === chatbotMessageId
               ? {
                   ...msg,
                   isLoading: false,
@@ -306,7 +306,7 @@ const Chatbot: FC<ChatbotProps> = (props) => {
                     },
                   },
                 }
-              : msg)
+              : msg
           )
         );
       }

diff --git a/frontend/src/components/ChatBot/MultiModeMetrics.tsx b/frontend/src/components/ChatBot/MultiModeMetrics.tsx
@@ -192,6 +192,7 @@ export default function MultiModeMetrics({
     ],
     []
   );
+
   const columnswithoutSemanticAndRougeScores = useMemo(
     () => [
       columnHelper.accessor((row) => row.mode, {
@@ -316,6 +317,7 @@ export default function MultiModeMetrics({
   );
   const table = useReactTable(config);
 
+
   return (
     <Box>
       {error?.trim() != '' ? (

diff --git a/frontend/src/components/Layout/PageLayout.tsx b/frontend/src/components/Layout/PageLayout.tsx
@@ -63,7 +63,7 @@ const PageLayout: React.FC = () => {
     showDisconnectButton,
   } = useCredentials();
   const { cancel } = useSpeechSynthesis();
-
+  
   useEffect(() => {
     async function initializeConnection() {
       const session = localStorage.getItem('neo4j.connection');

diff --git a/frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx b/frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx
@@ -104,12 +104,12 @@ export default function DeduplicationTab() {
   const onRemove = (nodeid: string, similarNodeId: string) => {
     setDuplicateNodes((prev) => {
       return prev.map((d) =>
-        (d.e.elementId === nodeid
+        d.e.elementId === nodeid
           ? {
               ...d,
               similar: d.similar.filter((n) => n.elementId != similarNodeId),
             }
-          : d)
+          : d
       );
     });
   };

diff --git a/.../src/components/Popups/GraphEnhancementDialog/PostProcessingCheckList/SelectedJobList.tsx b/.../src/components/Popups/GraphEnhancementDialog/PostProcessingCheckList/SelectedJobList.tsx
@@ -11,11 +11,11 @@ export default function SelectedJobList({
 }) {
   const ongoingPostProcessingTasks = useMemo(
     () =>
-      (isGdsActive
+      isGdsActive
         ? postProcessingTasks.includes('enable_communities')
           ? postProcessingTasks
           : postProcessingTasks.filter((s) => s != 'enable_communities')
-        : postProcessingTasks.filter((s) => s != 'enable_communities')),
+        : postProcessingTasks.filter((s) => s != 'enable_communities'),
     [isGdsActive, postProcessingTasks]
   );
   return (

diff --git a/frontend/src/utils/Utils.ts b/frontend/src/utils/Utils.ts
@@ -395,7 +395,7 @@ export const isFileCompleted = (waitingFile: CustomFile, item: SourceNode) =>
   waitingFile && item.status === 'Completed';
 
 export const calculateProcessedCount = (prev: number, batchSize: number) =>
-  (prev === batchSize ? batchSize - 1 : prev + 1);
+  prev === batchSize ? batchSize - 1 : prev + 1;
 
 export const isProcessingFileValid = (item: SourceNode, userCredentials: UserCredentials) => {
   return item.status === 'Processing' && item.fileName != undefined && userCredentials && userCredentials.database;