Llm code

thehyve · Aug 12, 2024 · 7b32e79 · 7b32e79
1 parent 55b48a1
commit 7b32e79
Show file tree

Hide file tree

Showing 13 changed files with 763 additions and 25 deletions.
diff --git a/projects/mercury/package.json b/projects/mercury/package.json
@@ -4,10 +4,11 @@
   "private": true,
   "scripts": {
     "dev": "yarn build && concurrently \"yarn localdevelopment\" \"yarn saturn\" \"yarn pluto\" \"yarn start\"",
+    "dev-nosat": "yarn build && concurrently \"yarn localdevelopment\"  \"yarn pluto\" \"yarn start\"",
     "dev-be": "concurrently \"yarn localdevelopment\" \"yarn saturn\" \"yarn pluto\"",
     "dev-fe": "yarn build && yarn start",
     "localdevelopment": "cd ../../local-development && docker compose up",
-    "saturn": "wait-on http://localhost:5100/ && wait-on tcp:9432 && cd ../saturn/ && KEYCLOAK_CLIENT_SECRET=********** ./gradlew run",
+    "saturn": "wait-on http://localhost:5100/ && wait-on tcp:9432 && cd ../saturn/ && KEYCLOAK_CLIENT_SECRET=********** LLM_API_KEY=ewogICJ0eXBlIjogInNlcnZpY2VfYWNjb3VudCIsCiAgInByb2plY3RfaWQiOiAiaHl2ZWxsbSIsCiAgInByaXZhdGVfa2V5X2lkIjogIjZkNTNhZjQyZWIzZmU3NjhkMTgyMzAzM2VjMzgxNjA5ZTU2OTcxNzAiLAogICJwcml2YXRlX2tleSI6ICItLS0tLUJFR0lOIFBSSVZBVEUgS0VZLS0tLS1cbk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ3Y2VjRDTGlXOEUxb0tcbkM3Q080SFhKc0w4MEpOcDFobE9HL2NWZUlpUjl2UkdDWnorMi8wbWJiZy9qN216QXRQbnE1WElIaWxGYnQrSEFcbkZIamU1aWJpdkhJYlAvTHE0d1ozeURtUHNSRDU2UURzRmJQY1JpSXpNWlp3cUo5Qjl0a0FSYytMK0xzSFlYK1Vcbi9MZWl6QklPM3hTV2g5UkdaR2ZqWkVHaFJSc2pKSzdlUyt0YVcrVnZLMCtaSjBVK3liNnFFL0JLOFZDZ1hVNldcbkhycnJ6TzFsdEdwZDFONmlLcUlDTUEzaDhSUWZhOVMxbzBzekh1SWJwOVlZTTF1MHFOWHVYK1VRYkN4SFR2OWlcbjVlL3dHUndncDY1YUM1OUs1aXFpQllpeXAvcUhZQTI4QTF0eGVIYXdEVE9lVlNrVlovcnRzeXd1K05JWDlSenVcbnRUOUtiRUFOQWdNQkFBRUNnZ0VBRW05NldPK2xxRDE5OHU0Uk1aUVAvQlJ3SVdLWVczYzVvenpPdGFRTjMzaVVcblVHNktKSjlDQTA1SVQ0cWg3cHM0MHRkN2VSTlRuZkZhTVJOa0xIWUJ6c0xSa1k0RTR2MXFaTnpBdlpDZ3R4UW1cbmN0ZCthMEFWWHZpY0s4L2NLdUZZRWhsKzNBd3o2NXpaN2s4QzNzYVV3T2E3cFYvMFRQRkNXdmdia2E5b25lalNcbk02b1Z5eS9Ubzh6cU03RThXcTRKRmVFREZURnByRXgrbkhvWkk4THpzbkJXVHVxMkV4QlRwRzJBemtjL043QzhcbkFSTGhIOHpXNU5HM1J6N0RSdENpSktXRDB5S2NLU0w4Wlp0RitQa1NGa3VCS3FOS2NxY2hOQytCV0pCemo0TGJcbi9wYysyL0V6aTA3c1RUSHY5Y1JnWnovcXdqNEVXRHZySXpDcmlNMy8yUUtCZ1FEdnorL205a1lsV1hoaS9DVjhcbmY5enZIRmtjZFFObitod05MSVlMZTJDbllCT2xHZXlEa0dPWXZ1VmptY29WaUVDanRyb2lrQUp4QmxBOFJucW9cbmJLWWlJOGwzQ1R2Z0hwWWFPbUxuTC9hL0pOSGoyZFFUdS9jenhUYzNLVElNYkNlcGpzcFdTS3Rmc2dSL051YXlcbkFQem1INVVzZ0UzVmNrRk8vcmExVVR3QWRRS0JnUUM3eVRLMkFVNmdRaHVNcEFrRno3WVg3bnljYS9qSFluN29cbmlVTGxzZmJLYTJ0UDJ2U2cwTWJ4MDhzaTU4RFBrckE5UWFJNjhOaGZ3NkJmWjVYUDRFWWhjb0YyL3ZhTTk3R0tcbnMrRGdEdE05WS8yeGNyZG9KcS82ZFBsc2F1QmVJYkNyd3QvQTF5SkNULzA0ZFMwamRhYWd0cnd2VkhBOTBhcFNcbndYQXZacXJPT1FLQmdEZ3lwR2VkZ3VheHh0SjdnRlZpcVdXbllRS1lNVW9taEhoWjNMZklHK2hkVFgwOVMvMndcbjBvWXpCaEtITWFKR0ljKzd2SGJwQklsMEQwMXd2c0hGWkZGUHphQ0ZtM0J6K256Ky9icHJ0UWtxR2IycGlGZHZcbmp3aWt5TUcyZDdJTmptWGZ2bTdsN0xNcVJuK0JZQ0tLdExsQTRYWmlRdHNvUVVHLzB4VStpaThaQW9HQUJONURcbmJVcDlZbFEwYUtIOEJlV0xuL1V6ejg1UXhjSjg3Y1JaTXFFNWQ2ZnZRVU80NGM1bnllOG1yZ0g2RXFlSDRCNnFcbmVRS3phVkFtQVRNclJCZFpXaGFnMnBmamhtWUplVUlPaTJCM0EzbHJJMFdKRWE4bkVzUWpqemI2R0JhaGdPSnRcbmNJOWpPUHJmNHEzTy9NTlpEWU9QUDE3ZUJneEFjU0xJcU1IdG5ha0NnWUVBb3g2NGhMUXY0Mmtpd2pGWUpNQ0RcbkMva01MUHErOGQ1akZEUGRSQkMyRk0wZjBkVnhlN0FPWFFoZW56WiswMEZ1MUtKREg3cC93M3Q1b0krWGpZUDFcbk1EU3RlQm01VU1VbWYxOXh6VjRVeWFYRDlVeGlnYmY1WXZsbjhnWk5jNEVYVG1xNTEyZTllbEZGVlpyYTF6NmRcbm9GMW1XRnZwMmJXS1g1STl5engvZU1JPVxuLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLVxuIiwKICAiY2xpZW50X2VtYWlsIjogImh5dmUtbGxtLXNlcnZpY2VhY2NvdW50QGh5dmVsbG0uaWFtLmdzZXJ2aWNlYWNjb3VudC5jb20iLAogICJjbGllbnRfaWQiOiAiMTA3ODY2Mjc1NTE5MzUwMzgzOTQ3IiwKICAiYXV0aF91cmkiOiAiaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tL28vb2F1dGgyL2F1dGgiLAogICJ0b2tlbl91cmkiOiAiaHR0cHM6Ly9vYXV0aDIuZ29vZ2xlYXBpcy5jb20vdG9rZW4iLAogICJhdXRoX3Byb3ZpZGVyX3g1MDlfY2VydF91cmwiOiAiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vb2F1dGgyL3YxL2NlcnRzIiwKICAiY2xpZW50X3g1MDlfY2VydF91cmwiOiAiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vcm9ib3QvdjEvbWV0YWRhdGEveDUwOS9oeXZlLWxsbS1zZXJ2aWNlYWNjb3VudCU0MGh5dmVsbG0uaWFtLmdzZXJ2aWNlYWNjb3VudC5jb20iLAogICJ1bml2ZXJzZV9kb21haW4iOiAiZ29vZ2xlYXBpcy5jb20iCn0K ./gradlew run",
     "pluto": "wait-on http://localhost:8090/api/health/ && cd ../pluto/ && KEYCLOAK_CLIENT_SECRET=********** ./gradlew bootRun --args='--spring.profiles.active=local'",
     "start": "craco start",
     "build": "yarn check-format && craco build",

diff --git a/projects/mercury/src/common/contexts/FeaturesContext.js b/projects/mercury/src/common/contexts/FeaturesContext.js
@@ -3,7 +3,7 @@ import React from 'react';
 import {extractJsonData, handleHttpError} from '../utils/httpUtils';
 import useAsync from '../hooks/UseAsync';
 
-export type Feature = 'ExtraStorage' | any; // more to come
+export type Feature = 'ExtraStorage' | 'LlmSearch' | any; // more to come
 
 const FeaturesContext = React.createContext({});
 

diff --git a/projects/mercury/src/dashboard/DashboardPage.js b/projects/mercury/src/dashboard/DashboardPage.js
@@ -2,21 +2,32 @@ import React, {useContext} from 'react';
 
 import withStyles from '@mui/styles/withStyles';
 import {Grid, Link, Paper, Typography, TextField} from '@mui/material';
+import {useHistory} from 'react-router-dom';
+import queryString from 'query-string';
 import styles from './DashboardPage.styles';
 import MetadataViewContext from '../metadata/views/MetadataViewContext';
 import ExternalMetadataSourceContext from '../metadata/metadata-sources/ExternalMetadataSourceContext';
 import UserContext from '../users/UserContext';
 import DomainInfo from './DomainInfo';
 import {APPLICATION_DOCS_URL, APPLICATION_NAME, THE_HYVE_URL} from '../constants';
 import InternalMetadataSourceContext from '../metadata/metadata-sources/InternalMetadataSourceContext';
+import FeaturesContext from '../common/contexts/FeaturesContext';
 
 const DashboardPage = props => {
     const {currentUser, classes} = props;
+    const history = useHistory();
     const {views} = useContext(MetadataViewContext);
     const {externalMetadataSources} = useContext(ExternalMetadataSourceContext);
     const {internalMetadataIcon, internalMetadataLabel} = useContext(InternalMetadataSourceContext);
     const canViewMetadata = currentUser && currentUser.canViewPublicMetadata && views && views.length > 0;
-    const askAIConfigured = false;
+    const {isFeatureEnabled} = useContext(FeaturesContext);
+    const isLlsSearchEnabled = isFeatureEnabled('LlmSearch');
+
+    const handleLlmInputChange = event => {
+        if (event.keyCode === 13) {
+            history.push('/ask/?' + queryString.stringify({q: event.target.value}));
+        }
+    };
 
     return (
         <Grid container spacing={5} className={classes.mainPage} direction="column" justifyContent="flex-start">
@@ -100,7 +111,7 @@ const DashboardPage = props => {
                 </Grid>
             </Grid>
             <Grid item xs={12}>
-                {askAIConfigured && (
+                {isLlsSearchEnabled && (
                     <Paper elevation={3} className={classes.paperContent}>
                         <Typography className={classes.header} variant="h4" paragraph align="center">
                             Ask AI
@@ -114,6 +125,7 @@ const DashboardPage = props => {
                                 placeholder="Type your quetion here..."
                                 variant="outlined"
                                 className={classes.textField}
+                                onKeyDown={event => handleLlmInputChange(event)}
                             />
                         </div>
                     </Paper>

diff --git a/projects/mercury/src/layout/MainMenu.js b/projects/mercury/src/layout/MainMenu.js
@@ -4,7 +4,9 @@ import classNames from 'classnames';
 import {NavLink} from 'react-router-dom';
 import {Button, Icon, Stack} from '@mui/material';
 import {Search, SavedSearch, Folder, FolderSpecial, OpenInNew, VerifiedUser, Widgets} from '@mui/icons-material';
+import ChatIcon from '@mui/icons-material/Chat';
 import HomeIcon from '@mui/icons-material/Home';
+import FeaturesContext from '../common/contexts/FeaturesContext';
 import ServicesContext from '../common/contexts/ServicesContext';
 import UserContext from '../users/UserContext';
 import {isAdmin} from '../users/userUtils';
@@ -63,6 +65,9 @@ const MainMenu = ({open, classes}) => {
     const {externalMetadataSources} = useContext(ExternalMetadataSourceContext);
     const {internalMetadataIcon, internalMetadataLabel} = useContext(InternalMetadataSourceContext);
     const {views} = useContext(MetadataViewContext);
+    const {isFeatureEnabled} = useContext(FeaturesContext);
+    const useLlmSearch = isFeatureEnabled('LlmSearch');
+
     // eslint-disable-next-line no-template-curly-in-string
     const interpolate = s => s.replace('${username}', currentUser.username);
     return (
@@ -111,6 +116,23 @@ const MainMenu = ({open, classes}) => {
                 >
                     {open && 'Collections'}
                 </Button>
+                {useLlmSearch && (
+                    <Button
+                        variant="outlined"
+                        size="small"
+                        className={classNames(
+                            classes.mainMenuButton,
+                            !open && classes.mainMenuButtonSmall,
+                            pathname.startsWith('/search') && classes.mainMenuButtonSelected
+                        )}
+                        key="search"
+                        component={NavLink}
+                        to="/ask"
+                        startIcon={<ChatIcon />}
+                    >
+                        {open && 'Chat'}
+                    </Button>
+                )}
                 {externalStorages &&
                     externalStorages.map(storage => (
                         <Button

diff --git a/projects/mercury/src/layout/__tests__/MainMenu.js b/projects/mercury/src/layout/__tests__/MainMenu.js
@@ -6,36 +6,43 @@ import ServicesContext from '../../common/contexts/ServicesContext';
 import UserContext from '../../users/UserContext';
 import ExternalStoragesContext from '../../external-storage/ExternalStoragesContext';
 import ExternalMetadataSourceContext from '../../metadata/metadata-sources/ExternalMetadataSourceContext';
+import FeaturesContext from '../../common/contexts/FeaturesContext';
 import InternalMetadataSourceContext from '../../metadata/metadata-sources/InternalMetadataSourceContext';
 import MetadataViewContext from '../../metadata/views/MetadataViewContext';
 import MainMenu from '../MainMenu';
 import {DEFAULT_METADATA_VIEW_MENU_LABEL} from '../../constants';
 import theme from '../../App.theme';
 
+const mockFeatureContext = {
+    isFeatureEnabled: jest.fn()
+};
+
 describe('MainMenu', () => {
     const setup = (user, services, externalStorages, externalMetadataSources, internalMetadata, views) => {
         return render(
             <ThemeProvider theme={theme}>
                 <Router>
-                    <ServicesContext.Provider value={{services}}>
-                        <UserContext.Provider value={{currentUser: user}}>
-                            <ExternalStoragesContext.Provider value={{externalStorages}}>
-                                <ExternalMetadataSourceContext.Provider value={{externalMetadataSources}}>
-                                    <InternalMetadataSourceContext.Provider
-                                        value={{
-                                            internalMetadataIcon: internalMetadata.icon,
-                                            internalMetadataLabel:
-                                                internalMetadata.label || DEFAULT_METADATA_VIEW_MENU_LABEL
-                                        }}
-                                    >
-                                        <MetadataViewContext.Provider value={{views}}>
-                                            <MainMenu open />
-                                        </MetadataViewContext.Provider>
-                                    </InternalMetadataSourceContext.Provider>
-                                </ExternalMetadataSourceContext.Provider>
-                            </ExternalStoragesContext.Provider>
-                        </UserContext.Provider>
-                    </ServicesContext.Provider>
+                    <FeaturesContext.Provider value={mockFeatureContext}>
+                        <ServicesContext.Provider value={{services}}>
+                            <UserContext.Provider value={{currentUser: user}}>
+                                <ExternalStoragesContext.Provider value={{externalStorages}}>
+                                    <ExternalMetadataSourceContext.Provider value={{externalMetadataSources}}>
+                                        <InternalMetadataSourceContext.Provider
+                                            value={{
+                                                internalMetadataIcon: internalMetadata.icon,
+                                                internalMetadataLabel:
+                                                    internalMetadata.label || DEFAULT_METADATA_VIEW_MENU_LABEL
+                                            }}
+                                        >
+                                            <MetadataViewContext.Provider value={{views}}>
+                                                <MainMenu open />
+                                            </MetadataViewContext.Provider>
+                                        </InternalMetadataSourceContext.Provider>
+                                    </ExternalMetadataSourceContext.Provider>
+                                </ExternalStoragesContext.Provider>
+                            </UserContext.Provider>
+                        </ServicesContext.Provider>
+                    </FeaturesContext.Provider>
                 </Router>
             </ThemeProvider>
         );