[flow] human friendly servant client error

src/Gargantext/Database/Action/Flow.hs

@@ -113,6 +113,7 @@ import Gargantext.Database.Types
 import Gargantext.Prelude hiding (catch, onException, to)
 import Gargantext.System.Logging ( logLocM, LogLevel(DEBUG, ERROR), MonadLogger )
 import Gargantext.Utils.Jobs.Monad ( JobHandle, MonadJobStatus(..), markFailureNoErr )
+import Servant.Client.Core (ClientError)
 
 ------------------------------------------------------------------------
 -- Imports for upgrade function
@@ -298,14 +299,21 @@ flow c mkCorpusUser la mfslw (count, docsC) jobHandle = do
   (_userId, userCorpusId, listId, msgs) <- runDBTx $ createNodes cfg mkCorpusUser c
   forM_ msgs ce_notify
   -- TODO if public insertMasterDocs else insertUserDocs
-  (runConduit $ zipSources (yieldMany ([1..] :: [Int])) docsC
+  runConduit (zipSources (yieldMany ([1..] :: [Int])) docsC
     .| CList.chunksOf 5
     .| mapM_C (addDocumentsWithProgress userCorpusId)
-    .| sinkNull) `CES.catch` (\(e :: SomeException) -> do
-                                 $(logLocM) ERROR $ "Exception during API call: " <> show e
+    .| sinkNull) `CES.catches`
+      [ CES.Handler $ \(e :: ClientError) -> do
+                        $(logLocM) ERROR ("Client error: " <> show e :: Text)
+                        markFailure 1 (Just e) jobHandle
+                        -- ignore this and proceed with list generation
+                        pure ()
+      , CES.Handler $ \(e :: SomeException) -> do
+                        $(logLocM) ERROR ("Exception during API call: " <> show e :: Text)
                         markFailureNoErr 1 jobHandle
                         -- ignore this and proceed with list generation
-                                 pure ())
+                        pure ()
+      ]
 
   let u = userFromMkCorpusUser mkCorpusUser
     

src/Gargantext/Utils/Jobs/Error.hs

@@ -14,9 +14,9 @@ module Gargantext.Utils.Jobs.Error
   , HumanFriendlyErrorText(..)
   ) where
 
-import Prelude
-import Data.Void
-import qualified Data.Text as T
+import Gargantext.Prelude
+import Data.Text qualified as T
+import Servant.Client.Core (ClientError(..))
 
 -- | This class represents the concept of \"human friendly strings\", by which we mean
 -- error messages and/or diagnostics which needs to be displayed to the end users, and, as such:
@@ -43,3 +43,10 @@ instance ToHumanFriendlyError HumanFriendlyErrorText where
 -- /N.B/ Don't get fooled by this instance, it's just to help inference in case we use \"markFailed Nothing\".
 instance ToHumanFriendlyError Void where
   mkHumanFriendly = absurd
+
+instance ToHumanFriendlyError ClientError where
+  mkHumanFriendly (FailureResponse _ _) = "Server returned an error response"
+  mkHumanFriendly (DecodeFailure d _) = "Decode failure: " <> d
+  mkHumanFriendly (UnsupportedContentType mt _) = "Unsupported content type: " <> show mt
+  mkHumanFriendly (InvalidContentTypeHeader _) = "Invalid content type header"
+  mkHumanFriendly (ConnectionError _) = "Connection error"