DEV to STAGING

backend/src/graphDB_dataAccess.py

@@ -354,7 +354,7 @@ def get_duplicate_nodes_list(self):
         score_value = float(os.environ.get('DUPLICATE_SCORE_VALUE'))
         text_distance = int(os.environ.get('DUPLICATE_TEXT_DISTANCE'))
         query_duplicate_nodes = """
-                MATCH (n:!Chunk&!Document&!`__Community__`) with n 
+                MATCH (n:!Chunk&!Session&!Document&!`__Community__`) with n 
                 WHERE n.embedding is not null and n.id is not null // and size(toString(n.id)) > 3
                 WITH n ORDER BY count {{ (n)--() }} DESC, size(toString(n.id)) DESC // updated
                 WITH collect(n) as nodes

frontend/src/components/Dropdown.tsx

@@ -1,8 +1,8 @@
-import { Dropdown, Tip } from '@neo4j-ndl/react';
+import { Dropdown, Tip, useMediaQuery } from '@neo4j-ndl/react';
 import { OptionType, ReusableDropdownProps } from '../types';
-import { memo, useMemo, useReducer } from 'react';
+import { memo, useMemo } from 'react';
 import { capitalize, capitalizeWithUnderscore } from '../utils/Utils';
-// import { LLMDropdownLabel } from '../utils/Constants';
+import { prodllms } from '../utils/Constants';
 const DropdownComponent: React.FC<ReusableDropdownProps> = ({
   options,
   placeholder,
@@ -13,64 +13,55 @@ const DropdownComponent: React.FC<ReusableDropdownProps> = ({
   isDisabled,
   value,
 }) => {
-  const [disableTooltip, toggleDisableState] = useReducer((state) => !state, false);
   const isProdEnv = process.env.VITE_ENV === 'PROD';
-  const supportedModels = process.env.VITE_LLM_MODELS_PROD;
+  const isLargeDesktop = useMediaQuery(`(min-width:1440px )`);
   const handleChange = (selectedOption: OptionType | null | void) => {
     onSelect(selectedOption);
   };
   const allOptions = useMemo(() => options, [options]);
   return (
     <>
       <div className={view === 'ContentView' ? 'w-[150px]' : ''}>
-        <Tip allowedPlacements={['top']} isDisabled={disableTooltip}>
-          <Tip.Trigger>
-            <Dropdown
-              type='select'
-              aria-label='A selection dropdown'
-              label='LLM Models'
-              selectProps={{
-                onChange: handleChange,
-                options: allOptions?.map((option) => {
-                  const label =
-                    typeof option === 'string' ? capitalizeWithUnderscore(option) : capitalize(option.label);
-                  const value = typeof option === 'string' ? option : option.value;
-                  const isModelSupported = !isProdEnv || supportedModels?.includes(value);
-                  return {
-                    label,
-                    value,
-                    isDisabled: !isModelSupported,
-                  };
-                }),
-                placeholder: placeholder || 'Select an option',
-                defaultValue: defaultValue
-                  ? { label: capitalizeWithUnderscore(defaultValue), value: defaultValue }
-                  : undefined,
-                menuPlacement: 'auto',
-                isDisabled: isDisabled,
-                value: value,
-                onMenuOpen: () => {
-                  toggleDisableState();
-                },
-                onMenuClose: () => {
-                  toggleDisableState();
-                },
-              }}
-              size='medium'
-              fluid
-            />
-          </Tip.Trigger>
-          <Tip.Content>LLM Model used for Extraction & Chat</Tip.Content>
-        </Tip>
+        <Dropdown
+          type='select'
+          aria-label='A selection dropdown'
+          label='LLM Models'
+          helpText={<div className='!w-max'> LLM Model used for Extraction & Chat</div>}
+          selectProps={{
+            onChange: handleChange,
+            // @ts-ignore
+            options: allOptions?.map((option) => {
+              const label = typeof option === 'string' ? capitalizeWithUnderscore(option) : capitalize(option.label);
+              const value = typeof option === 'string' ? option : option.value;
+              const isModelSupported = !isProdEnv || prodllms?.includes(value);
+              return {
+                label: !isModelSupported ? (
+                  <Tip allowedPlacements={isLargeDesktop ? ['left'] : ['right']}>
+                    <Tip.Trigger>
+                      <span>{label}</span>
+                    </Tip.Trigger>
+                    <Tip.Content>Available In Development Version</Tip.Content>
+                  </Tip>
+                ) : (
+                  <span>{label}</span>
+                ),
+                value,
+                isDisabled: !isModelSupported,
+              };
+            }),
+            placeholder: placeholder || 'Select an option',
+            defaultValue: defaultValue
+              ? { label: capitalizeWithUnderscore(defaultValue), value: defaultValue }
+              : undefined,
+            menuPlacement: 'auto',
+            isDisabled: isDisabled,
+            value: value,
+          }}
+          size='medium'
+          fluid
+        />
         {children}
       </div>
-      {/* {isProdEnv && (<Typography className={'pt-4 absolute top-14 self-start'} variant='body-small'>
-        {LLMDropdownLabel.disabledModels}
-        <a href="https://dev-frontend-dcavk67s4a-uc.a.run.app/" target="_blank" style={{ textDecoration: 'underline' }}>
-          {LLMDropdownLabel.devEnv}
-        </a>
-        {'.'}
-      </Typography>)} */}
     </>
   );
 };

frontend/src/components/Graph/GraphViewModal.tsx

@@ -228,12 +228,6 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
         return {
           ...node,
           selected: match,
-          size:
-            match && viewPoint === graphLabels.showGraphView
-              ? 100
-              : match && viewPoint !== graphLabels.showGraphView
-              ? 50
-              : graphLabels.nodeSize,
         };
       });
       // deactivating any active relationships
@@ -439,7 +433,6 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
                         newScheme={newScheme}
                         searchQuery={searchQuery}
                         setSearchQuery={setSearchQuery}
-                        viewPoint={viewPoint}
                         setNodes={setNodes}
                         setRelationships={setRelationships}
                       />

frontend/src/components/Graph/ResultOverview.tsx

@@ -14,7 +14,6 @@ interface OverViewProps {
   newScheme: Scheme;
   searchQuery: string;
   setSearchQuery: Dispatch<SetStateAction<string>>;
-  viewPoint: string;
   setNodes: Dispatch<SetStateAction<ExtendedNode[]>>;
   setRelationships: Dispatch<SetStateAction<ExtendedRelationship[]>>;
 }
@@ -24,7 +23,6 @@ const ResultOverview: React.FunctionComponent<OverViewProps> = ({
   newScheme,
   searchQuery,
   setSearchQuery,
-  viewPoint,
   setNodes,
   setRelationships,
 }) => {
@@ -92,12 +90,6 @@ const ResultOverview: React.FunctionComponent<OverViewProps> = ({
       return {
         ...node,
         selected: isActive,
-        size:
-          isActive && viewPoint === graphLabels.showGraphView
-            ? 100
-            : isActive && viewPoint !== graphLabels.showGraphView
-            ? 50
-            : graphLabels.nodeSize,
       };
     });
     // deactivating any active relationships

frontend/src/utils/Constants.ts

@@ -46,6 +46,11 @@ export const supportedLLmsForRagas = [
   'fireworks_llama_v3_70b',
   'bedrock_claude_3_5_sonnet',
 ];
+export const prodllms =
+  process.env.VITE_LLM_MODELS_PROD?.trim() != ''
+    ? (process.env.VITE_LLM_MODELS_PROD?.split(',') as string[])
+    : ['openai_gpt_4o', 'openai_gpt_4o_mini', 'diffbot', 'gemini_1.5_flash'];
+
 export const chatModeLables = {
   vector: 'vector',
   graph: 'graph',
@@ -140,7 +145,7 @@ export const tooltips = {
 };
 
 export const buttonCaptions = {
-  exploreGraphWithBloom: 'Explore Graph with Bloom',
+  exploreGraphWithBloom: 'Explore Graph',
   showPreviewGraph: 'Preview Graph',
   deleteFiles: 'Delete Files',
   generateGraph: 'Generate Graph',