OpenConceptLab/ocl_issues#2311 | using new output

Author: snyaggarwal

src/components/map-projects/AICandidatesAnalysis.jsx

@@ -21,6 +21,7 @@ import get from 'lodash/get'
 const AICandidatesAnalysis = ({ analysis, onClose, sx, isCoreUser }) => {
   const { t } = useTranslation();
   const [openDetails, setOpenDetails] = React.useState(false)
+  let output = analysis?.output || analysis
 
   const getModelName = () => {
     let model = analysis?.model || 'AI Model'
@@ -30,9 +31,9 @@ const AICandidatesAnalysis = ({ analysis, onClose, sx, isCoreUser }) => {
   }
 
   const getRecommendationTitle = () => {
-    let recommendation = analysis?.recommendation
-    if(recommendation && analysis?.primary_candidate?.match_strength){
-      recommendation += ` (${analysis.primary_candidate.match_strength})`
+    let recommendation = output?.recommendation
+    if(recommendation && output?.primary_candidate?.match_strength){
+      recommendation += ` (${output.primary_candidate.match_strength})`
     }
     return recommendation
   }
@@ -55,10 +56,10 @@ const AICandidatesAnalysis = ({ analysis, onClose, sx, isCoreUser }) => {
       <>
       <Typography gutterBottom component='p' sx={{mb: 0, fontSize: 12, marginTop: '-2px'}}>
       {
-        get(analysis, 'recommendation') &&
+        get(output, 'recommendation') &&
           <span style={{fontWeight: 'bold', marginRight: '8px'}}>{getRecommendationTitle()}:</span>
       }
-      {get(analysis, 'rationale.narrative') || get(analysis, 'rationale')}
+      {get(output, 'rationale.narrative') || get(output, 'rationale')}
       </Typography>
         <Typography gutterBottom sx={{ color: 'text.secondary', fontSize: 13, mb: 0, textAlign: 'right' }}>
           {getModelName()}

src/components/map-projects/Candidates.jsx

@@ -27,7 +27,6 @@ import SortIcon from '@mui/icons-material/Sort';
 import GroupIcon from '@mui/icons-material/Layers';
 
 import find from 'lodash/find'
-import get from 'lodash/get'
 import isEmpty from 'lodash/isEmpty'
 import flatten from 'lodash/flatten'
 import values from 'lodash/values'
@@ -307,7 +306,7 @@ const Candidates = ({rowIndex, alert, setAlert, candidates, setShowItem, showIte
   let allCandidates = compact(rawResults)
   const isNoneLoaded = every(rawResults, r => r === null)
   const canFetchMore = allCandidates?.length > 0
-  let AIRecommendedCandidateId = get(analysis, 'primary_candidate.concept_id')
+  let AIRecommendedCandidateId = analysis?.output?.primary_candidate?.concept_id || analysis?.primary_candidate?.concept_id
   const algoStagesValue = values(omit(rowStage, 'recommend'))
   const areAlgoRun = uniq(algoStagesValue).length === 1 && algoStagesValue[0] === 1
   const { label } = getRowProgressLabel(rowStage, algosSelected);

src/components/map-projects/MapProject.jsx

@@ -1723,7 +1723,7 @@ const MapProject = () => {
       const rowStateLabel = VIEWS[rowState].label
       let concept = mapSelected[index]
       let _repo = concept?.repo
-      const aiRecommendation = get(analysis, index)
+      const aiRecommendation = get(analysis, index)?.output || get(analysis, index)
       const aiCandidate = get(aiRecommendation, 'primary_candidate')
       const aiCandidateID = aiCandidate?.concept_id
       const aiScore = compact([aiCandidate?.confidence_level, aiCandidate?.match_strength]).join(':')
@@ -2521,7 +2521,7 @@ const MapProject = () => {
         }
 
         markAlgo(__index, 'recommend', 1)
-        log({created_at: timestamp, action: 'AIRecommendation', description: get(response.data, 'rationale'), extras: {...response.data, model: find(AIModels, {id: AIModel})}}, __index)
+        log({created_at: timestamp, action: 'AIRecommendation', description: get(response.data, 'output.rationale') || get(response.data, 'rationale'), extras: {...response.data, model: find(AIModels, {id: AIModel})}}, __index)
         setAnalysis(prev => ({...prev, [__index]: {...response.data, model: AIModel, timestamp: timestamp, user: user.username || user.id}}))
         return true
       } catch (err) {