Revert "chatmode changes"

This reverts commit 60e32c3.

Author: prakriti-solankey

frontend/src/components/ChatBot/Chatbot.tsx

@@ -394,7 +394,6 @@ const Chatbot: React.FC<ChatbotProps> = (props) => {
           chunk_ids={chunkModal}
           response_time={responseTime}
           total_tokens={tokensUsed}
-          mode={chatMode}
         />
       </Modal>
     </div>

frontend/src/components/ChatBot/Info/InfoModal.tsx

@@ -17,7 +17,7 @@ import { calcWordColor } from '@neo4j-devtools/word-color';
 import ReactMarkdown from 'react-markdown';
 import { GlobeAltIconOutline } from '@neo4j-ndl/react/icons';
 import { youtubeLinkValidation } from '../../../utils/Utils';
-const InfoModal: React.FC<chatInfoMessage> = ({ sources, model, total_tokens, response_time, chunk_ids, mode }) => {
+const InfoModal: React.FC<chatInfoMessage> = ({ sources, model, total_tokens, response_time, chunk_ids }) => {
   const [activeTab, setActiveTab] = useState<number>(3);
   const [infoEntities, setInfoEntities] = useState<Entity[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
@@ -106,7 +106,7 @@ const InfoModal: React.FC<chatInfoMessage> = ({ sources, model, total_tokens, re
       </Box>
       <Tabs size='large' fill='underline' onChange={onChangeTabs} value={activeTab}>
         <Tabs.Tab tabId={3}>Sources used</Tabs.Tab>
-        {mode === 'graph+vector' && (<Tabs.Tab tabId={4}>Top Entities used</Tabs.Tab>)}
+        <Tabs.Tab tabId={4}>Top Entities used</Tabs.Tab>
         <Tabs.Tab tabId={5}>Chunks</Tabs.Tab>
       </Tabs>
       <Flex className='p-4'>

frontend/src/components/FileTable.tsx

@@ -15,6 +15,7 @@ import {
   useReactTable,
   getCoreRowModel,
   createColumnHelper,
+  ColumnFiltersState,
   getFilteredRowModel,
   getPaginationRowModel,
   CellContext,
@@ -26,7 +27,7 @@ import { useFileContext } from '../context/UsersFiles';
 import { getSourceNodes } from '../services/GetFiles';
 import { v4 as uuidv4 } from 'uuid';
 import { statusCheck, capitalize } from '../utils/Utils';
-import { SourceNode, CustomFile, FileTableProps, UserCredentials, statusupdate, alertStateType, ColumnFiltersState } from '../types';
+import { SourceNode, CustomFile, FileTableProps, UserCredentials, statusupdate, alertStateType } from '../types';
 import { useCredentials } from '../context/UserCredentials';
 import { MagnifyingGlassCircleIconSolid } from '@neo4j-ndl/react/icons';
 import CustomAlert from './UI/Alert';
@@ -361,14 +362,14 @@ const FileTable: React.FC<FileTableProps> = ({ isExpanded, connectionStatus, set
                     item?.fileSource === 's3 bucket' && localStorage.getItem('accesskey') === item?.awsAccessKeyId
                       ? item?.status
                       : item?.fileSource === 'local file'
-                        ? item?.status
-                        : item?.status === 'Completed' || item.status === 'Failed'
-                          ? item?.status
-                          : item?.fileSource == 'Wikipedia' ||
-                            item?.fileSource == 'youtube' ||
-                            item?.fileSource == 'gcs bucket'
-                            ? item?.status
-                            : 'N/A',
+                      ? item?.status
+                      : item?.status === 'Completed' || item.status === 'Failed'
+                      ? item?.status
+                      : item?.fileSource == 'Wikipedia' ||
+                        item?.fileSource == 'youtube' ||
+                        item?.fileSource == 'gcs bucket'
+                      ? item?.status
+                      : 'N/A',
                   model: item?.model ?? model,
                   id: uuidv4(),
                   source_url: item?.url != 'None' && item?.url != '' ? item.url : '',
@@ -381,8 +382,8 @@ const FileTable: React.FC<FileTableProps> = ({ isExpanded, connectionStatus, set
                   language: item?.language ?? '',
                   processingProgress:
                     item?.processed_chunk != undefined &&
-                      item?.total_chunks != undefined &&
-                      !isNaN(Math.floor((item?.processed_chunk / item?.total_chunks) * 100))
+                    item?.total_chunks != undefined &&
+                    !isNaN(Math.floor((item?.processed_chunk / item?.total_chunks) * 100))
                       ? Math.floor((item?.processed_chunk / item?.total_chunks) * 100)
                       : undefined,
                   // total_pages: item?.total_pages ?? 0,
@@ -577,6 +578,11 @@ const FileTable: React.FC<FileTableProps> = ({ isExpanded, connectionStatus, set
     getFilteredRowModel: getFilteredRowModel(),
     getPaginationRowModel: getPaginationRowModel(),
     onColumnFiltersChange: setColumnFilters,
+    // initialState: {
+    //   pagination: {
+    //     pageSize: pageSizeCalculation < 0 ? 9 : pageSizeCalculation,
+    //   },
+    // },
     state: {
       columnFilters,
       rowSelection,
@@ -622,8 +628,7 @@ const FileTable: React.FC<FileTableProps> = ({ isExpanded, connectionStatus, set
 
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     table.getColumn('status')?.setFilterValue(e.target.checked);
-    // if (!table.getCanNextPage() || table.getRowCount()) {
-    if (!table.getCanNextPage()) {
+    if (!table.getCanNextPage() || table.getRowCount()) {
       table.setPageIndex(0);
     }
   };

frontend/src/types.ts

@@ -395,7 +395,6 @@ export interface chatInfoMessage extends Partial<Messages> {
   response_time: number;
   chunk_ids: chunk[];
   total_tokens: number;
-  mode:string;
 }
 
 export interface eventResponsetypes {
@@ -522,9 +521,3 @@ export interface Origin {
   vertical: Vertical;
   horizontal: Horizontal;
 }
-
-export type ColumnFiltersState = ColumnFilter[];
-export interface ColumnFilter {
-  id: string;
-  value: unknown;
-}

frontend/src/utils/Constants.ts

@@ -37,25 +37,25 @@ export const llms =
   process.env?.LLM_MODELS?.trim() != ''
     ? process.env.LLM_MODELS?.split(',')
     : [
-      'diffbot',
-      'openai-gpt-3.5',
-      'openai-gpt-4o',
-      'gemini-1.0-pro',
-      'gemini-1.5-pro',
-      'LLM_MODEL_CONFIG_azure-ai-gpt-35',
-      'LLM_MODEL_CONFIG_azure-ai-gpt-4o',
-      'LLM_MODEL_CONFIG_ollama_llama3',
-      'LLM_MODEL_CONFIG_groq-llama3-70b',
-      'LLM_MODEL_CONFIG_anthropic-claude-3-5-sonnet',
-      'LLM_MODEL_CONFIG_fireworks-llama-v3-70b',
-      'LLM_MODEL_CONFIG_bedrock-claude-3-5-sonnet',
-    ];
+        'diffbot',
+        'openai-gpt-3.5',
+        'openai-gpt-4o',
+        'gemini-1.0-pro',
+        'gemini-1.5-pro',
+        'LLM_MODEL_CONFIG_azure-ai-gpt-35',
+        'LLM_MODEL_CONFIG_azure-ai-gpt-4o',
+        'LLM_MODEL_CONFIG_ollama_llama3',
+        'LLM_MODEL_CONFIG_groq-llama3-70b',
+        'LLM_MODEL_CONFIG_anthropic-claude-3-5-sonnet',
+        'LLM_MODEL_CONFIG_fireworks-llama-v3-70b',
+        'LLM_MODEL_CONFIG_bedrock-claude-3-5-sonnet',
+      ];
 
 export const defaultLLM = llms?.includes('openai-gpt-3.5')
   ? 'openai-gpt-3.5'
   : llms?.includes('gemini-1.0-pro')
-    ? 'gemini-1.0-pro'
-    : 'diffbot';
+  ? 'gemini-1.0-pro'
+  : 'diffbot';
 
 export const chunkSize = process.env.CHUNK_SIZE ? parseInt(process.env.CHUNK_SIZE) : 1 * 1024 * 1024;
 export const timeperpage = process.env.TIME_PER_PAGE ? parseInt(process.env.TIME_PER_PAGE) : 50;
@@ -157,8 +157,8 @@ export const buttonCaptions = {
 };
 
 export const ChatModeOptions = [
-  { Icon: VisualizeBloomIcon, value: 'vector' },
-  { Icon: 'abc', value: 'graph+vector' },
+  { Icon: VisualizeBloomIcon, value: 'graph+vector' },
+  { Icon: 'abc', value: 'vector' },
 ];
 
 export const taskParam: string[] = ['update_similarity_graph', 'create_fulltext_index'];