OpenConceptLab/ocl_issues#2322 | Auto match dialog | algos selection

Author: snyaggarwal

src/components/map-projects/AutoMatchDialog.jsx

@@ -13,16 +13,20 @@ import Button from '@mui/material/Button';
 import RadioGroup from '@mui/material/RadioGroup';
 import Radio from '@mui/material/Radio';
 import FormLabel from '@mui/material/FormLabel';
+import Chip from '@mui/material/Chip'
 
 import DoubleArrowIcon from '@mui/icons-material/DoubleArrow';
 
+import map from 'lodash/map'
+
 import CloseIconButton from '../common/CloseIconButton'
 import RepoChip from '../repos/RepoVersionChip'
 import AIAssistantButton from './AIAssistantButton'
 
 
-const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnmappedOnly, rowStatuses, autoRunAIAnalysis, setAutoRunAIAnalysis, AIModels, AIModel, setAIModel, repoVersion, onSubmit, inAIAssistantGroup}) => {
+const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnmappedOnly, rowStatuses, autoRunAIAnalysis, setAutoRunAIAnalysis, AIModels, AIModel, setAIModel, repoVersion, onSubmit, inAIAssistantGroup, algosSelected}) => {
   const { t } = useTranslation()
+  const [algos, setAlgos] = React.useState(true)
   const selectedRows = autoMatchUnmappedOnly ? rowStatuses.unmapped.length : (rowStatuses.unmapped.length + rowStatuses.readyForReview.length)
   const totalRows = rowStatuses.unmapped.length + rowStatuses.readyForReview.length + rowStatuses.reviewed.length
 
@@ -45,7 +49,7 @@ const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnma
     return t('map_project.auto_match_note_no_counts');
   };
 
-  const isDisabled = !repoVersion?.version_url && selectedRows > 0
+  const isDisabled = !repoVersion?.version_url || selectedRows === 0 || (!algos && !autoRunAIAnalysis)
 
   return (
     <Dialog
@@ -98,6 +102,23 @@ const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnma
             getHelperTextForAutoMatchUnmapped()
           }
         </FormHelperText>
+
+        <FormControl sx={{marginTop: '16px'}}>
+          <FormControlLabel control={<Checkbox checked={algos} onChange={() => setAlgos(!algos)} />} label={t('map_project.retrieve_candidates')} />
+          <FormLabel id="algorithms">
+            {t('map_project.retrieve_candidates_helper_text')}
+          </FormLabel>
+          <div className='col-xs-12 padding-0'>
+            {
+              algosSelected.map(algo => {
+                return (
+                  <Chip variant='outlined' size='small' color='warning' label={algo.id} key={algo.id} sx={{margin: '4px'}} />
+                )
+              })
+            }
+          </div>
+        </FormControl>
+
         {
           inAIAssistantGroup &&
             <>
@@ -139,7 +160,7 @@ const AutoMatchDialog = ({open, onClose, autoMatchUnmappedOnly, setAutoMatchUnma
           sx={{textTransform: 'none', marginLeft: '12px'}}
           endIcon={<DoubleArrowIcon />}
           disabled={isDisabled}
-          onClick={onSubmit}
+          onClick={event => onSubmit(event, algos ? map(algosSelected, val => val?.id) : [])}
         >
           {t('common.submit')}
         </Button>

src/components/map-projects/MapProject.jsx

@@ -1062,7 +1062,7 @@ const MapProject = () => {
   }
 
 
-  const getRowsResults = async (rows) => {
+  const getRowsResults = async (rows, selectedAlgos) => {
     abortRef.current = false;
 
     // Function to process a single batch
@@ -1190,10 +1190,9 @@ const MapProject = () => {
           await Promise.race(activeRequests);
       }
     };
-
-    let subActions = [...map(algosSelected, algo => algo.name || algo.id)]
-    if(!isMultiAlgo)
-      subActions.push('reranker')
+    let _selectedAlgos = filter(algosSelected, algo => selectedAlgos.includes(algo.id))
+    let subActions = [...map(_selectedAlgos, algo => algo.name || algo.id)]
+    subActions.push('reranker')
     if(autoMatchUnmappedOnly)
       subActions.push('unmatched_only')
     if(inAIAssistantGroup && autoRunAIAnalysis)
@@ -1209,24 +1208,23 @@ const MapProject = () => {
         ? filter(rows, row => rowStatuses.unmapped.includes(row.__index))
         : filter(rows, row => !rowStatuses.reviewed.includes(row.__index))
 
-      let nextAlgo = {...getFirstAlgoDef()}
       const algoPromises = []
-      while(nextAlgo?.id) {
-        if(['custom', 'ocl-search', 'ocl-semantic'].includes(nextAlgo.type))
-          algoPromises.push(processWithConcurrency(repo, nextAlgo, rowsToProcess));
-        else if(nextAlgo.type === 'ocl-ciel-bridge' && canBridge)
-          algoPromises.push(fetchBulkBridgeCandidates(rowsToProcess, nextAlgo))
-        else if(nextAlgo.type === 'ocl-scispacy' && canScispacy)
-          algoPromises.push(fetchBulkScispacyCandidates(rowsToProcess, nextAlgo))
-        nextAlgo = getNextAlgoDef(nextAlgo.id)
-      }
+      forEach(_selectedAlgos, algo => {
+        if(['custom', 'ocl-search', 'ocl-semantic'].includes(algo.type))
+          algoPromises.push(processWithConcurrency(repo, algo, rowsToProcess));
+        else if(algo.type === 'ocl-ciel-bridge' && canBridge)
+          algoPromises.push(fetchBulkBridgeCandidates(rowsToProcess, algo))
+        else if(algo.type === 'ocl-scispacy' && canScispacy)
+          algoPromises.push(fetchBulkScispacyCandidates(rowsToProcess, algo))
+      })
       await Promise.all(algoPromises)
-
-      await processRerankWithConcurrency(rowsToProcess, 2)
+      if(_selectedAlgos.length)
+        await processRerankWithConcurrency(rowsToProcess, 2)
       if(inAIAssistantGroup && autoRunAIAnalysis) {
         await new Promise(resolve => setTimeout(resolve, 1000))
         await runBulkAIAnalysis(rowsToProcess)
       } else {
+        setIsLoadingInDecisionView(false)
         setLoadingMatches(false)
         setEndMatchingAt(moment())
       }
@@ -1416,7 +1414,7 @@ const MapProject = () => {
     setMatchDialog(true)
   }
 
-  const onGetCandidatesSubmit = event => {
+  const onGetCandidatesSubmit = (event, selectedAlgos) => {
     event.stopPropagation()
     event.preventDefault()
     setAlert(false)
@@ -1429,7 +1427,7 @@ const MapProject = () => {
       setScispacyCandidatesStartedAt(null)
       setScispacyCandidatesEndedAt(null)
       setLoadingMatches(true)
-      getRowsResults(data)
+      getRowsResults(data, selectedAlgos)
     } else {
       setAlert({message: t('map_project.no_valid_columns_for_matching')})
       setTimeout(() => setAlert(false), 10000)
@@ -2880,7 +2878,8 @@ const MapProject = () => {
               AIModel,
               setAIModel,
               repoVersion,
-              inAIAssistantGroup
+              inAIAssistantGroup,
+              algosSelected
             }}
           />
       </Paper>

src/i18n/locales/en/translations.json

@@ -549,6 +549,7 @@
     "ocl_scispacy_loinc_algorithm": "OCL ScispaCy LOINC Algorithm",
     "ocl_custom_algorithm": "OCL Custom Algorithm",
     "algorithm": "Algorithm",
+    "algorithms": "Algorithms",
     "column_send_to_ai_assistant": "Send to AI Assistant",
     "algo_conflicting_id": "Conflicting ID",
     "algo_conflicting_name": "Conflicting Name",
@@ -565,7 +566,9 @@
     "select_an_algo": "Select an algorithm",
     "selected_rows": "Selected Rows",
     "all_rows": "All Rows",
-    "out_of": "out of"
+    "out_of": "out of",
+    "retrieve_candidates": "Retrieve Candidates",
+    "retrieve_candidates_helper_text": "Your project is configured to use the following match algorithms:"
   },
   "app": {
     "web_version": "Web Version",