[worker] various fixes

- fix openalex parser
- fix cli message about 'init' needed
- more granular progress reports for node updates
- fix error message when worker fails (though I'm not sure such a
- detailed message is neede for the end user?)

cabal.project

@@ -104,7 +104,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git
-    tag: a80e0ea57379d23f5e18a412606a71471b8ef681
+    tag: d2949cdeaaf3193e2b53e06bcae1d2234581e519
 
 source-repository-package
     type: git

src/Gargantext/API.hs

@@ -101,7 +101,7 @@ startGargantext mode port sf@(SettingsFile settingsFile) = withLoggerHoisted mod
           case r of
             Right True  -> pure ()
             Right False -> panicTrace $
-              "You must run 'gargantext init " <> pack settingsFile <>
+              "You must run 'gargantext init -c " <> pack settingsFile <>
               "' before running gargantext-server (only the first time)."
             Left err -> panicTrace $ "Unexpected exception:" <> show err
         oneHour = Clock.fromNanoSecs 3600_000_000_000

src/Gargantext/API/Node/Update.hs

@@ -10,7 +10,6 @@ Portability : POSIX
 -}
 
 {-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeOperators    #-}
 
 module Gargantext.API.Node.Update
       where
@@ -67,6 +66,7 @@ updateNode nId (UpdateNodeParamsGraph
                     (UpdateNodeConfigGraph metric partitionMethod bridgeMethod strength nt1 nt2)) jobHandle = do
 
   markStarted 2 jobHandle
+  markProgress 1 jobHandle
   -- printDebug "Computing graph: " method
   _ <- recomputeGraph nId partitionMethod bridgeMethod (Just metric) (Just strength) nt1 nt2 True
   -- printDebug "Graph computed: " method
@@ -74,6 +74,7 @@ updateNode nId (UpdateNodeParamsGraph
 
 updateNode nid1 (LinkNodeReq nt nid2) jobHandle = do
   markStarted 2 jobHandle
+  markProgress 1 jobHandle
   _ <- case nt of
     NodeAnnuaire -> pairing nid2 nid1 Nothing -- defaultList
     NodeCorpus   -> pairing nid1 nid2 Nothing -- defaultList
@@ -84,7 +85,7 @@ updateNode nid1 (LinkNodeReq nt nid2) jobHandle = do
 
 -- | `Advanced` to update graphs
 updateNode lId (UpdateNodeParamsList Advanced) jobHandle = do
-  markStarted 3 jobHandle
+  markStarted 4 jobHandle
   corpusId <- view node_parent_id <$> getNode lId
 
   markProgress 1 jobHandle
@@ -92,7 +93,9 @@ updateNode lId (UpdateNodeParamsList Advanced) jobHandle = do
   _ <- case corpusId of
     Just cId -> do
       _ <- Metrics.updatePie cId (Just lId) NgramsTypes.Authors Nothing
+      markProgress 1 jobHandle
       _ <- Metrics.updateTree cId (Just lId) NgramsTypes.Institutes MapTerm
+      markProgress 1 jobHandle
       _ <- Metrics.updatePie cId (Just lId) NgramsTypes.Sources Nothing
       pure ()
     Nothing  -> pure ()
@@ -108,6 +111,7 @@ updateNode lId (UpdateNodeParamsList _mode) jobHandle = do
   _ <- case corpusId of
     Just cId -> do
       _ <- reIndexWith cId lId NgramsTerms (Set.singleton MapTerm)
+      markProgress 1 jobHandle
       _ <- updateNgramsOccurrences cId lId
       pure ()
     Nothing  -> pure ()
@@ -124,7 +128,7 @@ updateNode phyloId (UpdateNodePhylo config) jobHandle = do
   let corpusId = fromMaybe (panicTrace "no corpus id") corpusId'
 
   phy <- timeMeasured "updateNode.flowPhyloAPI" $ flowPhyloAPI (subConfigAPI2config config) mbComputeHistory corpusId
-  markProgress 2 jobHandle
+  markProgress 1 jobHandle
 
 {-
   logStatus JobLog { _scst_succeeded = Just 2
@@ -140,12 +144,12 @@ updateNode phyloId (UpdateNodePhylo config) jobHandle = do
   markComplete jobHandle
 
 updateNode tId (UpdateNodeParamsTexts _mode) jobHandle = do
-  markStarted 3 jobHandle
+  markStarted 2 jobHandle
   corpusId <- view node_parent_id <$> getNode tId
   markProgress 1 jobHandle
 
   _ <- case corpusId of
-    Just cId -> updateDocs cId
+    Just cId -> updateDocs cId jobHandle
     Nothing  -> do
       _ <- panicTrace "[G.A.N.Update] updateNode/UpdateNodeParamsText: no corpus Id given"
       pure ()
@@ -155,7 +159,7 @@ updateNode tId (UpdateNodeParamsTexts _mode) jobHandle = do
 updateNode tId
     (UpdateNodeParamsCorpus methodGraph methodPhylo methodTexts methodList)
     jobHandle = do
-  markStarted 3 jobHandle
+  markStarted 5 jobHandle
   markProgress 1 jobHandle
 
   _ <- getNode tId
@@ -165,8 +169,11 @@ updateNode tId
   childNodeLists <- getChildrenByType tId NodeList
 
   mapM_ (\cId -> updateNode cId (UpdateNodeParamsTexts methodTexts) jobHandle) childTexts
+  markProgress 1 jobHandle
   mapM_ (\cId -> updateNode cId (UpdateNodeParamsGraph methodGraph) jobHandle) childGraphs
+  markProgress 1 jobHandle
   mapM_ (\cId -> updateNode cId (UpdateNodePhylo methodPhylo) jobHandle) childPhylos
+  markProgress 1 jobHandle
   mapM_ (\cId -> updateNode cId (UpdateNodeParamsList methodList) jobHandle) childNodeLists
 
   markComplete jobHandle
@@ -175,14 +182,23 @@ updateNode _nId _p jobHandle = do
   simuLogs jobHandle 10
 ------------------------------------------------------------------------
 
-updateDocs :: (HasNodeStory env err m)
-            => NodeId -> m ()
-updateDocs cId = do
+updateDocs :: ( HasNodeStory env err m
+              , MonadJobStatus m
+              , MonadLogger m )
+           => NodeId
+           -> JobHandle m
+           -> m ()
+updateDocs cId jobHandle = do
+  markStarted 4 jobHandle
   lId <- defaultList cId
   _ <- reIndexWith cId lId NgramsTerms (Set.singleton MapTerm)
+  markProgress 1 jobHandle
   _ <- updateNgramsOccurrences cId lId
+  markProgress 1 jobHandle
   _ <- updateContextScore      cId lId
+  markProgress 1 jobHandle
   _ <- Metrics.updateChart'    cId lId NgramsTypes.Docs Nothing
+  markProgress 1 jobHandle
   -- printDebug "updateContextsScore" (cId, lId, u)
   pure ()
 

src/Gargantext/Core/Worker.hs

@@ -137,7 +137,7 @@ notifyJobFailed env (W.State { name }) bm exc = do
   let ji = JobInfo { _ji_message_id = messageId bm
                    , _ji_mNode_id = getWorkerMNodeId job }
   let jh = WorkerJobHandle { _w_job_info = ji }
-  runWorkerMonad env $ markFailed (Just $ UnsafeMkHumanFriendlyErrorText "Worker job failed") jh
+  runWorkerMonad env $ markFailed (Just $ UnsafeMkHumanFriendlyErrorText $ "Worker job failed: " <> show exc) jh
 
 notifyJobKilled :: (HasWorkerBroker, HasCallStack)
                  => WorkerEnv