Merge remote-tracking branch 'origin/dev-hackathon-fixes' into dev-merge

bin/gargantext-cli/Main.hs

@@ -26,8 +26,8 @@ import Data.ByteString.Lazy (writeFile)
 import Data.Either (Either(..))
 import Data.List (cycle, concat, unwords)
 import Data.List.Split (chunksOf)
-import Data.Map (Map)
-import qualified Data.Map    as DM
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict    as DM
 import Data.Text (pack, Text)
 import qualified Data.Text as DT
 import Data.Tuple.Extra (both)
@@ -151,4 +151,3 @@ testTermList :: TermList
 testTermList = [ ([pack "bee"], [[pack "bees"]])
                , ([pack "flower"], [[pack "flowers"]])
                ]
-

gargantext.cabal

@@ -344,6 +344,7 @@ library
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wmissing-signatures -Wunused-binds -Wunused-imports -Werror -freduction-depth=300
   build-depends:
       HSvm
@@ -542,6 +543,7 @@ executable gargantext-admin
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 -Wmissing-signatures
   build-depends:
       base
@@ -569,6 +571,7 @@ executable gargantext-cbor2json
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 -Wmissing-signatures
   build-depends:
       aeson
@@ -600,6 +603,7 @@ executable gargantext-cli
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 -Wmissing-signatures
   build-depends:
       aeson
@@ -638,6 +642,7 @@ executable gargantext-import
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 -Wmissing-signatures
   build-depends:
       base
@@ -666,6 +671,7 @@ executable gargantext-init
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 -Wmissing-signatures
   build-depends:
       base
@@ -693,6 +699,7 @@ executable gargantext-invitations
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 -Wmissing-signatures
   build-depends:
       base
@@ -720,6 +727,7 @@ executable gargantext-phylo
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 -Wmissing-signatures
   build-depends:
       aeson
@@ -761,6 +769,7 @@ executable gargantext-server
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -O2 -Wcompat -Wmissing-signatures -rtsopts -threaded -with-rtsopts=-N -with-rtsopts=-T -fprof-auto
   build-depends:
       base
@@ -795,6 +804,7 @@ executable gargantext-upgrade
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 -Wmissing-signatures
   build-depends:
       base
@@ -839,6 +849,7 @@ test-suite garg-test
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
       DataKinds
       DeriveGeneric
       FlexibleContexts
@@ -883,6 +894,7 @@ test-suite jobqueue-test
       OverloadedStrings
       RankNTypes
       RecordWildCards
+      StrictData
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       async

package.yaml

@@ -32,6 +32,7 @@ default-extensions:
   - OverloadedStrings
   - RankNTypes
   - RecordWildCards
+  - StrictData
 data-files:
   - ekg-assets/index.html
   - ekg-assets/monitor.js

src-test/Core/Text/Examples.hs

@@ -28,7 +28,7 @@ module Core.Text.Examples
 
 {-
 import Data.Array.Accelerate (toList, Matrix)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Ord (Down(..))
 import Data.Text (Text)
 import Data.Tuple.Extra (both)
@@ -43,7 +43,7 @@ import Gargantext.Core.Viz.Graph.Index
 import Gargantext.Prelude
 import qualified Data.Array.Accelerate as DAA
 import qualified Data.List as List
-import qualified Data.Map  as Map
+import qualified Data.Map.Strict  as Map
 import qualified Data.Text as Text
 
 -- | Sentences

src/Gargantext/API/GraphQL.hs

@@ -11,7 +11,7 @@ module Gargantext.API.GraphQL where
 import Data.ByteString.Lazy.Char8
   ( ByteString
   )
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Morpheus
   ( App
   , deriveApp )

src/Gargantext/API/GraphQL/Annuaire.hs

@@ -28,20 +28,20 @@ import Gargantext.Prelude
 import GHC.Generics (Generic)
 
 data AnnuaireContact = AnnuaireContact
-  { ac_title        :: Maybe Text
-  , ac_source       :: Maybe Text
-  , ac_id           :: Int
-  , ac_firstName    :: Maybe Text
-  , ac_lastName     :: Maybe Text
-  , ac_labTeamDepts :: [Text]
-  , ac_organization :: [Text]
-  , ac_role         :: Maybe Text
-  , ac_office       :: Maybe Text
-  , ac_country      :: Maybe Text
-  , ac_city         :: Maybe Text
-  , ac_touchMail    :: Maybe Text
-  , ac_touchPhone   :: Maybe Text
-  , ac_touchUrl     :: Maybe Text
+  { ac_title        :: !(Maybe Text)
+  , ac_source       :: !(Maybe Text)
+  , ac_id           :: !Int
+  , ac_firstName    :: !(Maybe Text)
+  , ac_lastName     :: !(Maybe Text)
+  , ac_labTeamDepts :: ![Text]
+  , ac_organization :: ![Text]
+  , ac_role         :: !(Maybe Text)
+  , ac_office       :: !(Maybe Text)
+  , ac_country      :: !(Maybe Text)
+  , ac_city         :: !(Maybe Text)
+  , ac_touchMail    :: !(Maybe Text)
+  , ac_touchPhone   :: !(Maybe Text)
+  , ac_touchUrl     :: !(Maybe Text)
   }
   deriving (Generic, GQLType, Show)
 

src/Gargantext/API/GraphQL/AsyncTask.hs

@@ -6,8 +6,8 @@ module Gargantext.API.GraphQL.AsyncTask where
 import Control.Concurrent.Async (poll)
 import Control.Concurrent.MVar (readMVar)
 import Control.Lens
-import Data.Map (Map)
-import qualified Data.Map as Map
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 import Control.Monad.Reader (ask, liftIO)
 import Data.Either (Either(..))
 import qualified Data.IntMap.Strict as IntMap

src/Gargantext/API/GraphQL/Context.hs

@@ -13,16 +13,15 @@ import Data.Morpheus.Types
   , lift
   )
 import Data.Text (Text, pack)
-import Data.Time (UTCTime)
 import Data.Time.Format.ISO8601 (iso8601Show)
 import Gargantext.API.Admin.Types (HasSettings)
 import Gargantext.API.Prelude (GargM, GargError)
 import Gargantext.Core.Types.Search (HyperdataRow(..), toHyperdataRow)
 import Gargantext.Core.Mail.Types (HasMail)
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument)
-import Gargantext.Database.Admin.Types.Node (ContextTitle, NodeId(..), NodeTypeId, ParentId, UserId, unNodeId)
+import Gargantext.Database.Admin.Types.Node (ContextTitle, NodeId(..), NodeTypeId, UserId, unNodeId)
 import Gargantext.Database.Prelude (HasConnectionPool, HasConfig)
-import Gargantext.Database.Query.Table.NodeContext (getNodeContext, getContextsForNgrams)
+import Gargantext.Database.Query.Table.NodeContext (getNodeContext, getContextsForNgramsTerms, ContextForNgramsTerms(..))
 import qualified Gargantext.Database.Query.Table.NodeContext as DNC
 import Gargantext.Database.Schema.NodeContext (NodeContext, NodeContextPoly(..))
 import Gargantext.Prelude
@@ -38,31 +37,33 @@ data ContextGQL = ContextGQL
   , c_name      :: ContextTitle
   , c_date      :: Text  -- TODO UTCTime
   , c_hyperdata :: Maybe HyperdataRowDocumentGQL
+  , c_score     :: Maybe Double
+  , c_category  :: Maybe Int
   } deriving (Generic, GQLType, Show)
 
 -- We need this type instead of HyperdataRow(HyperdataRowDocument)
 -- because the latter is a sum type (of doc and contact) and we return
 -- docs here only. Without the union type, GraphQL endpoint is simpler.
 data HyperdataRowDocumentGQL =
-  HyperdataRowDocumentGQL { hrd_abstract           :: !Text
-                          , hrd_authors            :: !Text
-                          , hrd_bdd                :: !Text
-                          , hrd_doi                :: !Text
-                          , hrd_institutes         :: !Text
-                          , hrd_language_iso2      :: !Text
-                          , hrd_page               :: !Int
-                          , hrd_publication_date   :: !Text
-                          , hrd_publication_day    :: !Int
-                          , hrd_publication_hour   :: !Int
-                          , hrd_publication_minute :: !Int
-                          , hrd_publication_month  :: !Int
-                          , hrd_publication_second :: !Int
-                          , hrd_publication_year   :: !Int
-                          , hrd_source             :: !Text
-                          , hrd_title              :: !Text
-                          , hrd_url                :: !Text
-                          , hrd_uniqId             :: !Text
-                          , hrd_uniqIdBdd          :: !Text
+  HyperdataRowDocumentGQL { hrd_abstract           :: Text
+                          , hrd_authors            :: Text
+                          , hrd_bdd                :: Text
+                          , hrd_doi                :: Text
+                          , hrd_institutes         :: Text
+                          , hrd_language_iso2      :: Text
+                          , hrd_page               :: Int
+                          , hrd_publication_date   :: Text
+                          , hrd_publication_day    :: Int
+                          , hrd_publication_hour   :: Int
+                          , hrd_publication_minute :: Int
+                          , hrd_publication_month  :: Int
+                          , hrd_publication_second :: Int
+                          , hrd_publication_year   :: Int
+                          , hrd_source             :: Text
+                          , hrd_title              :: Text
+                          , hrd_url                :: Text
+                          , hrd_uniqId             :: Text
+                          , hrd_uniqIdBdd          :: Text
                           } deriving (Generic, GQLType, Show)
 
 data NodeContextGQL = NodeContextGQL
@@ -85,7 +86,7 @@ data NodeContextArgs
 data ContextsForNgramsArgs
   = ContextsForNgramsArgs
     { corpus_id    :: Int
-    , ngrams_ids :: [Int]
+    , ngrams_terms :: [Text]
     } deriving (Generic, GQLType)
 
 data NodeContextCategoryMArgs = NodeContextCategoryMArgs
@@ -109,8 +110,8 @@ resolveNodeContext NodeContextArgs { context_id, node_id } =
 resolveContextsForNgrams
   :: (HasConnectionPool env, HasConfig env, HasMail env)
   => ContextsForNgramsArgs -> GqlM e env [ContextGQL]
-resolveContextsForNgrams ContextsForNgramsArgs { corpus_id, ngrams_ids } =
-  dbContextForNgrams corpus_id ngrams_ids
+resolveContextsForNgrams ContextsForNgramsArgs { corpus_id, ngrams_terms } =
+  dbContextForNgrams corpus_id ngrams_terms
 
 -- DB
 
@@ -128,11 +129,11 @@ dbNodeContext context_id node_id = do
 
 dbContextForNgrams
   :: (HasConnectionPool env, HasConfig env, HasMail env)
-  => Int -> [Int] -> GqlM e env [ContextGQL]
-dbContextForNgrams node_id ngrams_ids = do
-  contextTuples <- lift $ getContextsForNgrams (NodeId node_id) ngrams_ids
-  lift $ printDebug "[dbContextForNgrams] contextTuples" contextTuples
-  pure $ toContextGQL <$> contextTuples
+  => Int -> [Text] -> GqlM e env [ContextGQL]
+dbContextForNgrams node_id ngrams_terms = do
+  contextsForNgramsTerms <- lift $ getContextsForNgramsTerms (NodeId node_id) ngrams_terms
+  --lift $ printDebug "[dbContextForNgrams] contextsForNgramsTerms" contextsForNgramsTerms
+  pure $ toContextGQL <$> contextsForNgramsTerms
 
 -- Conversion functions
 
@@ -146,18 +147,23 @@ toNodeContextGQL (NodeContext { _nc_node_id = NodeId nc_node_id
                  , nc_score = _nc_score
                  , nc_category = _nc_category }
 
-toContextGQL :: (NodeId, Maybe Hash, NodeTypeId, UserId, Maybe ParentId, ContextTitle, UTCTime, HyperdataDocument) -> ContextGQL
-toContextGQL ( c_id
-             , c_hash_id
-             , c_typename
-             , c_user_id
-             , m_c_parent_id
-             , c_name
-             , c_date
-             , hyperdata ) = ContextGQL { c_id = unNodeId c_id
+toContextGQL :: ContextForNgramsTerms -> ContextGQL
+toContextGQL ContextForNgramsTerms { _cfnt_nodeId = c_id
+                                   , _cfnt_hash = c_hash_id
+                                   , _cfnt_nodeTypeId = c_typename
+                                   , _cfnt_userId = c_user_id
+                                   , _cfnt_parentId = m_c_parent_id
+                                   , _cfnt_c_title = c_name
+                                   , _cfnt_date = c_date
+                                   , _cfnt_hyperdata =hyperdata
+                                   , _cfnt_score = c_score
+                                   , _cfnt_category = c_category } =
+  ContextGQL { c_id = unNodeId c_id
              , c_parent_id = unNodeId <$> m_c_parent_id
              , c_date = pack $ iso8601Show c_date
              , c_hyperdata = toHyperdataRowDocumentGQL hyperdata
+             , c_score
+             , c_category
              , .. }
 
 toHyperdataRowDocumentGQL :: HyperdataDocument -> Maybe HyperdataRowDocumentGQL

src/Gargantext/API/GraphQL/User.hs

@@ -42,7 +42,7 @@ resolveUsers UserArgs { user_id } = dbUsers user_id
 -- | Inner function to fetch the user from DB.
 dbUsers
   :: (HasConnectionPool env, HasConfig env, HasMail env)
-  => Int -> GqlM e env ([User (GqlM e env)])
+  => Int -> GqlM e env [User (GqlM e env)]
 dbUsers user_id = lift (map toUser <$> getUsersWithId user_id)
 
 toUser

src/Gargantext/API/GraphQL/UserInfo.hs

@@ -153,7 +153,7 @@ updateUserInfo (UserInfoMArgs { ui_id, .. }) = do
           pure 1
   where
     uh _ Nothing u_hyperdata = u_hyperdata
-    uh lens' (Just val) u_hyperdata = u_hyperdata & lens' .~ Just val
+    uh lens' (Just val) u_hyperdata = u_hyperdata & lens' ?~ val
     uh' _ Nothing u_hyperdata = u_hyperdata
     uh' lens' (Just val) u_hyperdata = u_hyperdata & lens' .~ val
     nId Node {_node_id} = _node_id

src/Gargantext/API/Ngrams/List.hs

@@ -18,7 +18,7 @@ module Gargantext.API.Ngrams.List
 import Control.Lens hiding (elements, Indexed)
 import Data.Either (Either(..))
 import Data.HashMap.Strict (HashMap)
-import Data.Map (Map, toList)
+import Data.Map.Strict (Map, toList)
 import Data.Maybe (catMaybes, fromMaybe)
 import Data.Set (Set)
 import Data.Text (Text, concat, pack, splitOn)
@@ -54,7 +54,7 @@ import qualified Data.ByteString.Lazy as BSL
 import qualified Data.Csv as Csv
 import qualified Data.HashMap.Strict as HashMap
 import qualified Data.List           as List
-import qualified Data.Map            as Map
+import qualified Data.Map.Strict     as Map
 import qualified Data.Set            as Set
 import qualified Data.Text           as Text
 import qualified Data.Vector         as Vec

src/Gargantext/API/Ngrams/Prelude.hs

@@ -16,7 +16,7 @@ module Gargantext.API.Ngrams.Prelude
 
 import Data.Maybe (catMaybes)
 import Control.Lens (view)
-import Data.Map (fromList)
+import Data.Map.Strict (fromList)
 import Data.Hashable (Hashable)
 import Data.Validity
 import Gargantext.API.Ngrams.Types

src/Gargantext/API/Node/Corpus/Export.hs

@@ -16,12 +16,12 @@ Main exports of Gargantext:
 module Gargantext.API.Node.Corpus.Export
   where
 
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Maybe (fromMaybe)
 import Data.Set (Set)
 import Data.Text (Text, pack)
 import qualified Data.List as List
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import qualified Data.HashMap.Strict as HashMap
 import Servant (Headers, Header, addHeader)

src/Gargantext/API/Public.hs

@@ -28,7 +28,7 @@ import Test.QuickCheck (elements)
 import Test.QuickCheck.Arbitrary
 
 import qualified Data.List as List
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 
 import Gargantext.API.Prelude
@@ -160,7 +160,3 @@ defaultPublicData =
              , date = "YY/MM/DD"
              , database = "database"
              , author = "Author" }
-
-
-
-

src/Gargantext/Core/Ext/IMT.hs

@@ -14,13 +14,13 @@ Portability : POSIX
 module Gargantext.Core.Ext.IMT where
 
 import Data.Either (Either(..))
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Text (Text, splitOn)
 
 import qualified Data.Set    as S
 import qualified Data.List   as DL
 import qualified Data.Vector as DV
-import qualified Data.Map    as M
+import qualified Data.Map.Strict    as M
 import qualified Prelude
 
 import Data.Morpheus.Types (GQLType)
@@ -136,5 +136,3 @@ publisBySchool hal_data' = Gargantext.Prelude.map (\(i,n) -> (M.lookup i mapIdSc
                         $ DV.toList
                         $ DV.map (\n -> splitOn ( ", ") (csvHal_instStructId_i n) )
                         $ DV.filter (\n -> csvHal_publication_year n == 2017) hal_data'
-
-

src/Gargantext/Core/Methods/Graph/BAC/Proxemy.hs

@@ -19,8 +19,8 @@ module Gargantext.Core.Methods.Graph.BAC.Proxemy
 
 --import Debug.SimpleReflect
 import Gargantext.Prelude
-import Data.Map (Map)
-import qualified Data.Map as Map
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 import qualified Data.List as List
 --import Gargantext.Core.Viz.Graph.IGraph
 import Gargantext.Core.Viz.Graph.FGL

src/Gargantext/Core/Methods/Graph/MaxClique.hs

@@ -54,8 +54,8 @@ module Gargantext.Core.Methods.Graph.MaxClique
 
 import Data.Maybe (catMaybes)
 import Gargantext.Prelude
-import Data.Map (Map)
-import qualified Data.Map as Map
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 import Data.List (sortOn, nub, concat)
 import Data.Set (Set)
 import Data.Set (fromList, toList, isSubsetOf)

src/Gargantext/Core/Statistics.hs

@@ -14,13 +14,13 @@ module Gargantext.Core.Statistics
   where
 
 
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Gargantext.Prelude
 import Numeric.Statistics.PCA (pcaReduceN)
 import Data.Array.IArray (Array, listArray, elems)
 import qualified Data.Vector.Storable as Vec
 import qualified Data.List as List
-import qualified Data.Map  as Map
+import qualified Data.Map.Strict  as Map
 
 
 data Dimension = Dimension Int
@@ -38,5 +38,3 @@ pcaReduceTo (Dimension d) m = Map.fromList
     m'' = listArray (1, List.length m') m'
 
     (txts,m') = List.unzip $ Map.toList m
-
-

src/Gargantext/Core/Text/List.hs

@@ -19,7 +19,7 @@ module Gargantext.Core.Text.List
 import Control.Lens hiding (both) -- ((^.), view, over, set, (_1), (_2))
 import Data.HashMap.Strict (HashMap)
 import Data.HashSet (HashSet)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Monoid (mempty)
 import Data.Ord (Down(..))
 import Data.Set (Set)
@@ -50,7 +50,7 @@ import Gargantext.Prelude
 import qualified Data.HashMap.Strict as HashMap
 import qualified Data.HashSet as HashSet
 import qualified Data.List    as List
-import qualified Data.Map     as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.Set     as Set
 import qualified Gargantext.Data.HashMap.Strict.Utils as HashMap
 

src/Gargantext/Core/Text/List/Group/WithStem.hs

@@ -20,7 +20,7 @@ module Gargantext.Core.Text.List.Group.WithStem
 import Control.Lens (makeLenses)
 import Data.HashMap.Strict (HashMap)
 import Data.HashSet (HashSet)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Maybe (catMaybes)
 import Gargantext.API.Ngrams.Types
 import Gargantext.Core (Lang(..), PosTagAlgo(..), Form, Lem)
@@ -32,7 +32,7 @@ import Gargantext.Prelude
 import qualified Data.HashMap.Strict   as HashMap
 import qualified Data.HashSet          as Set
 import qualified Data.List             as List
-import qualified Data.Map              as Map
+import qualified Data.Map.Strict       as Map
 import qualified Data.Map.Strict.Patch as PatchMap
 import qualified Data.Patch.Class      as Patch (Replace(..))
 import qualified Data.Text             as Text

src/Gargantext/Core/Text/List/Learn.hs

@@ -19,8 +19,8 @@ module Gargantext.Core.Text.List.Learn
 
 import qualified Data.IntMap as IntMap
 import qualified Data.List   as List
-import Data.Map (Map)
-import qualified Data.Map    as Map
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict    as Map
 import qualified Data.SVM    as SVM
 import qualified Data.Vector as Vec
 

src/Gargantext/Core/Text/List/Merge.hs

@@ -19,7 +19,7 @@ module Gargantext.Core.Text.List.Merge
   where
 
 import Control.Lens (view)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Gargantext.API.Ngrams
 import Gargantext.API.Ngrams.Types
 import Gargantext.Prelude

src/Gargantext/Core/Text/List/Social.hs

@@ -17,7 +17,7 @@ import Control.Lens (view)
 import Control.Monad (mzero)
 import Data.Aeson
 import Data.HashMap.Strict (HashMap)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Monoid (mconcat)
 import Data.Pool
 import Data.Swagger
@@ -36,7 +36,7 @@ import Gargantext.Database.Schema.Ngrams (NgramsType)
 import Gargantext.Prelude
 import Web.Internal.HttpApiData (ToHttpApiData, FromHttpApiData, parseUrlPiece, toUrlPiece)
 import qualified Data.List       as List
-import qualified Data.Map        as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.Scientific as Scientific
 import qualified Data.Text       as T
 import qualified Data.Vector     as V
@@ -186,4 +186,3 @@ getHistory types listsId = do
   pure $ Map.map (Map.filterWithKey (\k _ -> List.elem k types))
        $ Map.filterWithKey (\k _ -> List.elem k listsId)
        $ Map.fromListWith (Map.unionWith (<>)) nsp
-

src/Gargantext/Core/Text/List/Social/Patch.hs

@@ -12,7 +12,7 @@ module Gargantext.Core.Text.List.Social.Patch
   where
 
 import Control.Lens hiding (cons)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Hashable (Hashable)
 import Data.HashMap.Strict (HashMap)
 import Data.Monoid
@@ -23,7 +23,7 @@ import Gargantext.Core.Text.List.Social.Prelude
 import Gargantext.Core.Types (ListId)
 import Gargantext.Database.Schema.Ngrams (NgramsType(..))
 import Gargantext.Prelude
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.List as List
 import qualified Data.HashMap.Strict as HashMap
 import qualified Data.Patch.Class    as Patch (Replace(..))
@@ -145,4 +145,3 @@ score field list n m = (Just mempty <> m)
                      %~ (<> Just n)
 
 ------------------------------------------------------------------------
-

src/Gargantext/Core/Text/List/Social/Prelude.hs

@@ -19,7 +19,7 @@ module Gargantext.Core.Text.List.Social.Prelude
   where
 
 import Control.Lens
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.HashMap.Strict (HashMap)
 import Data.Hashable (Hashable)
 import Data.Monoid
@@ -128,4 +128,3 @@ unPatchMapToMap = Map.fromList . PatchMap.toList
 
 unNgramsTablePatch :: NgramsTablePatch -> HashMap NgramsTerm NgramsPatch
 unNgramsTablePatch (NgramsTablePatch p) = unPatchMapToHashMap p
-

src/Gargantext/Core/Text/Metrics.hs

@@ -19,7 +19,7 @@ module Gargantext.Core.Text.Metrics
 --import Data.Array.Accelerate ((:.)(..), Z(..))
 --import Math.KMeans (kmeans, euclidSq, elements)
 import Control.Lens (makeLenses)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Monoid (Monoid, mempty)
 import Data.HashMap.Strict (HashMap)
 import Data.Semigroup (Semigroup)
@@ -29,7 +29,7 @@ import Gargantext.Core.Viz.Graph.Index
 import Gargantext.Prelude
 import qualified Data.Array.Accelerate as DAA
 import qualified Data.Array.Accelerate.Interpreter as DAA
-import qualified Data.Map  as Map
+import qualified Data.Map.Strict  as Map
 import qualified Data.Vector as V
 import qualified Data.Vector.Storable as Vec
 import qualified Data.HashMap.Strict as HashMap

src/Gargantext/Core/Text/Metrics/Utils.hs

@@ -13,14 +13,15 @@ Portability : POSIX
 module Gargantext.Core.Text.Metrics.Utils where
 
 import Gargantext.Prelude
-import Data.Map (empty, Map, insertWith, toList)
+import Data.Map.Strict (Map, toList)
 import qualified Data.List as L
+import qualified Data.Map.Strict as DM
 
-countElem :: (Ord k) => Data.Map.Map k Int -> k -> Data.Map.Map k Int
-countElem m e = Data.Map.insertWith (+) e 1 m
+countElem :: (Ord k) => DM.Map k Int -> k -> DM.Map k Int
+countElem m e = DM.insertWith (+) e 1 m
 
-freq :: (Ord k) => [k] -> Data.Map.Map k Int
-freq = foldl countElem Data.Map.empty
+freq :: (Ord k) => [k] -> DM.Map k Int
+freq = foldl countElem DM.empty
 
 getMaxFromMap :: Ord a => Map a1 a -> [a1]
 getMaxFromMap m = go [] Nothing (toList m)
@@ -39,5 +40,3 @@ average x = L.sum x / L.genericLength x
 average' :: [Int] -> Double
 average' x = (L.sum y) / (L.genericLength y) where
     y = L.map fromIntegral x
-
-

src/Gargantext/Core/Text/Terms.hs

@@ -38,7 +38,7 @@ module Gargantext.Core.Text.Terms
 import Control.Lens
 import Data.HashMap.Strict (HashMap)
 import Data.Hashable (Hashable)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Text (Text)
 import Data.Traversable
 import GHC.Base (String)

src/Gargantext/Core/Text/Terms/Eleve.hs

@@ -47,9 +47,9 @@ import qualified Data.List as L
 import Data.Monoid
 import Data.Text (Text)
 import qualified Data.Text as T
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Maybe (fromMaybe)
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import Gargantext.Prelude hiding (cs)
 import qualified Data.Tree as Tree
 import Data.Tree (Tree)

src/Gargantext/Core/Types/Main.hs

@@ -21,7 +21,7 @@ import Data.Aeson (FromJSON, ToJSON)
 import Data.Aeson.TH (deriveJSON)
 import Data.Either (Either(..))
 import Data.Hashable (Hashable)
-import Data.Map (fromList, lookup)
+import Data.Map.Strict (fromList, lookup)
 import Data.Maybe (fromMaybe)
 import Data.Semigroup (Semigroup(..))
 import Data.Swagger

src/Gargantext/Core/Viz/Chart.hs

@@ -15,7 +15,7 @@ module Gargantext.Core.Viz.Chart
   where
 
 import Data.List (sortOn)
-import Data.Map (toList)
+import Data.Map.Strict (toList)
 import qualified Data.List as List
 import Data.Maybe (catMaybes)
 import qualified Data.Vector as V
@@ -93,4 +93,3 @@ treeData cId nt lt = do
 
   m  <- getListNgrams ls nt
   pure $ V.fromList $ toTree lt cs' m
-

src/Gargantext/Core/Viz/Graph/API.hs

@@ -142,7 +142,7 @@ recomputeGraph _uId nId partitionMethod bridgeMethod maybeSimilarity maybeStreng
     listVersion   = graph ^? _Just . graph_metadata . _Just . gm_list . lfg_version
     graphMetric   = case maybeSimilarity of
                       Nothing -> graph ^? _Just . graph_metadata . _Just . gm_metric
-                      _       -> maybeSimilarity
+                      Just _  -> maybeSimilarity
     similarity = case graphMetric of
                    Nothing -> withMetric Order1
                    Just m  -> withMetric m
@@ -216,14 +216,12 @@ computeGraph corpusId partitionMethod bridgeMethod similarity strength (nt1,nt2)
               $ -} getCoocByNgrams'' (Diagonal True) (identity, identity) (m1,m2)
 
   -- TODO MultiPartite Here
-  graph <- liftBase
+  liftBase
         $ cooc2graphWith partitionMethod bridgeMethod (MultiPartite (Partite (HashMap.keysSet m1) nt1)
                                               (Partite (HashMap.keysSet m2) nt2)
                                               )
                                 similarity 0 strength myCooc
 
-  pure graph
-
 
 
 defaultGraphMetadata :: HasNodeError err
@@ -246,7 +244,7 @@ defaultGraphMetadata cId t repo gm str = do
                            , LegendField 3 "#FFF" "Cluster3"
                            , LegendField 4 "#FFF" "Cluster4"
                            ]
-                       , _gm_list  = (ListForGraph lId (repo ^. unNodeStory . at lId . _Just . a_version))
+                       , _gm_list  = ListForGraph lId (repo ^. unNodeStory . at lId . _Just . a_version)
                        , _gm_startForceAtlas = True
                        }
                          -- (map (\n -> LegendField n "#FFFFFF" (pack $ show n)) [1..10])

src/Gargantext/Core/Viz/Graph/Bridgeness.hs

@@ -25,7 +25,7 @@ module Gargantext.Core.Viz.Graph.Bridgeness -- (bridgeness)
 
 import Gargantext.Core.Methods.Similarities (Similarity(..))
 -- import Data.IntMap (IntMap)
-import Data.Map (Map, fromListWith, lookup, toList, mapWithKey, elems)
+import Data.Map.Strict (Map, fromListWith, lookup, toList, mapWithKey, elems)
 import Data.Maybe (catMaybes)
 import Data.Ord (Down(..))
 import Debug.Trace (trace)
@@ -33,7 +33,7 @@ import Gargantext.Prelude
 import Graph.Types (ClusterNode(..))
 -- import qualified Data.IntMap as IntMap
 import qualified Data.List   as List
-import qualified Data.Map    as Map
+import qualified Data.Map.Strict    as Map
 -- import qualified Data.Set    as Set
 
 ----------------------------------------------------------------------

src/Gargantext/Core/Viz/Graph/Index.hs

@@ -25,7 +25,7 @@ module Gargantext.Core.Viz.Graph.Index
   where
 
 import Data.Array.Accelerate (Matrix, Elt, Shape, (:.)(..), Z(..))
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Maybe (fromMaybe, catMaybes)
 import Data.Set (Set)
 import Gargantext.Prelude
@@ -131,6 +131,3 @@ testIndices = myMap == ( M.filter (>0) myMap')
     (ti,it) = createIndices myMap
     matrix  = mat2map $ map2mat Square 0 (M.size ti) $ toIndex ti myMap
     myMap'  = fromIndex it matrix
-
-
-

src/Gargantext/Core/Viz/Graph/Legend.hs

@@ -16,8 +16,8 @@ module Gargantext.Core.Viz.Graph.Legend
 {-
 import Data.Ord (Down(..))
 import Gargantext.Prelude
-import Data.Map (Map, fromListWith, lookup, toList, mapWithKey, elems)
-import qualified Data.Map as DM
+import Data.Map.Strict (Map, fromListWith, lookup, toList, mapWithKey, elems)
+import qualified Data.Map.Strict as DM
 import Data.Maybe (catMaybes)
 import Data.List (concat, sortOn)
 import Gargantext.Core.Viz.Graph.Louvain (LouvainNodeId, CommunityId, comId2nodeId)
@@ -45,7 +45,3 @@ take 7 [(CommunityId, take 3 [Label])]
 
 
 -}
-
-
-
-

src/Gargantext/Core/Viz/Graph/Tools.hs

@@ -16,7 +16,7 @@ module Gargantext.Core.Viz.Graph.Tools
 
 import Data.Aeson
 import Data.HashMap.Strict (HashMap)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Maybe (fromMaybe)
 import Data.Swagger hiding (items)
 import GHC.Float (sin, cos)
@@ -39,7 +39,7 @@ import Test.QuickCheck (elements)
 import Test.QuickCheck.Arbitrary
 import qualified Data.HashMap.Strict      as HashMap
 import qualified Data.List                as List
-import qualified Data.Map                 as Map
+import qualified Data.Map.Strict          as Map
 import qualified Data.Set                 as Set
 import qualified Data.HashSet             as HashSet
 import qualified Data.Text                as Text

src/Gargantext/Core/Viz/Graph/Tools/IGraph.hs

@@ -22,7 +22,7 @@ import Graph.Types (ClusterNode(..))
 import IGraph hiding (mkGraph, neighbors, edges, nodes, Node, Graph)
 import Protolude
 import qualified Data.List                   as List
-import qualified Data.Map                    as Map
+import qualified Data.Map.Strict             as Map
 import qualified IGraph                      as IG
 import qualified IGraph.Algorithms.Clique    as IG
 import qualified IGraph.Algorithms.Community as IG

src/Gargantext/Core/Viz/Graph/Tools/Infomap.hs

 module Gargantext.Core.Viz.Graph.Tools.Infomap where
 
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Graph.Types
 import Prelude
 

src/Gargantext/Core/Viz/Graph/Utils.hs

@@ -18,7 +18,7 @@ module Gargantext.Core.Viz.Graph.Utils
   where
 
 import Data.List (unzip)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Matrix hiding (identity)
 import Data.Maybe (catMaybes)
 import Data.Set (Set)
@@ -26,7 +26,7 @@ import Data.Vector (Vector)
 import Gargantext.Core.Text.Metrics.Count (occurrencesWith)
 import Gargantext.Prelude
 import qualified Data.List    as List
-import qualified Data.Map     as Map
+import qualified Data.Map.Strict     as Map
 import qualified Data.Set     as Set
 import qualified Data.Vector  as Vector
 
@@ -110,5 +110,3 @@ getMax (i,j) Nothing (Just d)   = Just ((j,i), d)
 getMax ij   (Just di) (Just dj) = if di >= dj then getMax ij (Just di) Nothing
                                               else getMax ij Nothing   (Just dj)
 getMax _ _ _ = Nothing
-
-

src/Gargantext/Core/Viz/LegacyPhylo.hs

@@ -30,7 +30,7 @@ module Gargantext.Core.Viz.LegacyPhylo where
 import Control.DeepSeq
 import Control.Lens (makeLenses)
 import Data.Aeson.TH (deriveJSON,defaultOptions)
-import Data.Map     (Map)
+import Data.Map.Strict     (Map)
 import Data.Set     (Set)
 import Data.Swagger
 import Data.Text    (Text)
@@ -567,4 +567,3 @@ instance ToSchema EdgeType
 ----------------------------
 -- | TODO XML instances | --
 ----------------------------
-

src/Gargantext/Core/Viz/Phylo.hs

@@ -30,7 +30,7 @@ import Control.DeepSeq (NFData)
 import Control.Lens (makeLenses)
 import Data.Aeson
 import Data.Aeson.TH (deriveJSON)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Set (Set)
 import Data.Swagger
 import Data.Text   (Text, pack)

src/Gargantext/Core/Viz/Phylo/API/Tools.hs

@@ -14,7 +14,7 @@ module Gargantext.Core.Viz.Phylo.API.Tools
 
 import Data.Proxy
 import Data.Aeson (Value, decodeFileStrict, eitherDecode, encode)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Maybe (catMaybes)
 import Data.Set (Set)
 import Data.Text (Text, pack)
@@ -45,7 +45,7 @@ import Prelude
 import System.Process      as Shell
 import qualified Data.ByteString.Lazy                    as Lazy
 import qualified Data.List as List
-import qualified Data.Map  as Map
+import qualified Data.Map.Strict  as Map
 import qualified Data.Set  as Set
 
 

src/Gargantext/Core/Viz/Phylo/Example.hs

@@ -18,7 +18,7 @@ module Gargantext.Core.Viz.Phylo.Example where
 import Control.Lens
 import Data.GraphViz.Types.Generalised (DotGraph)
 import Data.List (sortOn, nub, sort)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Text (Text, toLower)
 import Gargantext.Core.Text.Context (TermList)
 import Gargantext.Core.Text.Terms.Mono (monoTexts)

src/Gargantext/Core/Viz/Phylo/PhyloExport.hs

@@ -19,7 +19,7 @@ import Data.GraphViz.Attributes.Complete hiding (EdgeType, Order)
 import Data.GraphViz.Types.Generalised (DotGraph)
 import Data.GraphViz.Types.Monadic
 import Data.List ((++), sort, nub, null, concat, sortOn, groupBy, union, (\\), (!!), init, partition, notElem, unwords, nubBy, inits, elemIndex)
-import Data.Map (Map, fromList, empty, fromListWith, insert, (!), elems, unionWith, findWithDefault, toList, member)
+import Data.Map.Strict (Map, fromList, empty, fromListWith, insert, (!), elems, unionWith, findWithDefault, toList, member)
 import Data.Text.Lazy (fromStrict, pack, unpack)
 import Data.Vector (Vector)
 import Debug.Trace (trace)
@@ -722,4 +722,3 @@ traceExportGroups groups = trace ("\n" <> "-- | Export "
     <> show(length groups) <> " groups and "
     <> show(length $ nub $ concat $ map (\g -> g ^. phylo_groupNgrams) groups) <> " terms"
   ) groups
-

src/Gargantext/Core/Viz/Phylo/PhyloMaker.hs

@@ -14,7 +14,7 @@ import Control.DeepSeq (NFData)
 import Control.Lens hiding (Level)
 import Control.Parallel.Strategies (parList, rdeepseq, using)
 import Data.List (concat, nub, partition, sort, (++), group, intersect, null, sortOn, groupBy, tail)
-import Data.Map (Map, fromListWith, keys, unionWith, fromList, empty, toList, elems, (!), restrictKeys, foldlWithKey, insert)
+import Data.Map.Strict (Map, fromListWith, keys, unionWith, fromList, empty, toList, elems, (!), restrictKeys, foldlWithKey, insert)
 import Data.Set (Set)
 import Data.Text (Text)
 import Data.Vector (Vector)

src/Gargantext/Core/Viz/Phylo/PhyloTools.hs

@@ -14,7 +14,7 @@ module Gargantext.Core.Viz.Phylo.PhyloTools where
 
 import Control.Lens hiding (Level)
 import Data.List (sort, concat, null, union, (++), tails, sortOn, nub, init, tail, partition, tails, nubBy, group, notElem)
-import Data.Map (Map, elems, fromList, unionWith, keys, member, (!), filterWithKey, fromListWith, empty, restrictKeys)
+import Data.Map.Strict (Map, elems, fromList, unionWith, keys, member, (!), filterWithKey, fromListWith, empty, restrictKeys)
 import Data.Set (Set, disjoint)
 import Data.String (String)
 import Data.Text (Text,unpack)

src/Gargantext/Core/Viz/Phylo/SynchronicClustering.hs

@@ -16,13 +16,13 @@ import Control.Lens hiding (Level)
 import Control.Monad (sequence)
 import Control.Parallel.Strategies (parList, rdeepseq, using)
 import Data.List ((++), null, intersect, nub, concat, sort, sortOn, groupBy)
-import Data.Map  (Map, fromList, fromListWith, foldlWithKey, (!), insert, empty, restrictKeys, elems, mapWithKey, member)
+import Data.Map.Strict  (Map, fromList, fromListWith, foldlWithKey, (!), insert, empty, restrictKeys, elems, mapWithKey, member)
 import Gargantext.Core.Viz.Phylo
 import Gargantext.Core.Viz.Phylo.PhyloExport (processDynamics)
 import Gargantext.Core.Viz.Phylo.PhyloTools
 import Gargantext.Core.Viz.Phylo.TemporalMatching (weightedLogJaccard', filterDiago, reduceDiagos)
 import Gargantext.Prelude
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 
 
 -------------------------

src/Gargantext/Core/Viz/Phylo/TemporalMatching.hs

@@ -15,14 +15,14 @@ import Control.Lens hiding (Level)
 import Control.Parallel.Strategies (parList, rdeepseq, using)
 import Data.Ord
 import Data.List (concat, splitAt, tail, sortOn, sortBy, (++), intersect, null, inits, groupBy, scanl, nub, nubBy, union, dropWhile, partition, or)
-import Data.Map  (Map, fromList, elems, restrictKeys, unionWith, findWithDefault, keys, (!), empty, mapKeys, adjust)
+import Data.Map.Strict  (Map, fromList, elems, restrictKeys, unionWith, findWithDefault, keys, (!), empty, mapKeys, adjust)
 import Debug.Trace (trace)
 import Gargantext.Core.Viz.Phylo
 import Gargantext.Core.Viz.Phylo.PhyloTools
 import Gargantext.Prelude
 import Prelude (tan,pi)
 import Text.Printf
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.List as List
 import qualified Data.Set as Set
 import qualified Data.Vector as Vector

src/Gargantext/Database/Action/Flow.hs

@@ -58,7 +58,7 @@ import Data.Either
 import Data.HashMap.Strict (HashMap)
 import Data.Hashable (Hashable)
 import Data.List (concat)
-import Data.Map (Map, lookup)
+import Data.Map.Strict (Map, lookup)
 import Data.Maybe (catMaybes)
 import Data.Monoid
 import Data.Swagger
@@ -69,7 +69,7 @@ import Servant.Client (ClientError)
 import System.FilePath (FilePath)
 import qualified Data.HashMap.Strict as HashMap
 import qualified Gargantext.Data.HashMap.Strict.Utils as HashMap
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.Conduit.List as CL
 import qualified Data.Conduit      as C
 

src/Gargantext/Database/Action/Flow/List.hs

@@ -20,7 +20,7 @@ module Gargantext.Database.Action.Flow.List
 import Control.Concurrent
 import Control.Lens ((^.), (+~), (%~), at, (.~), _Just)
 import Control.Monad.Reader
-import Data.Map (Map, toList)
+import Data.Map.Strict (Map, toList)
 import Data.Text (Text)
 import Gargantext.API.Ngrams (saveNodeStory)
 import Gargantext.API.Ngrams.Tools (getNodeStoryVar)
@@ -35,7 +35,7 @@ import Gargantext.Database.Query.Table.NodeNgrams (NodeNgramsPoly(..), NodeNgram
 import Gargantext.Database.Schema.Ngrams (NgramsType(..))
 import Gargantext.Prelude
 import qualified Data.List as List
-import qualified Data.Map  as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.Map.Strict.Patch as PM
 import qualified Gargantext.Database.Query.Table.Ngrams as TableNgrams
 

src/Gargantext/Database/Action/Flow/Utils.hs

@@ -13,7 +13,7 @@ Portability : POSIX
 module Gargantext.Database.Action.Flow.Utils
     where
 
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.HashMap.Strict (HashMap)
 import Gargantext.Core.Types (TermsCount)
 import Gargantext.Database.Admin.Types.Node
@@ -23,7 +23,7 @@ import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Types
 import Gargantext.Prelude
 import Control.Lens ((^.))
-import qualified Data.Map as DM
+import qualified Data.Map.Strict as DM
 import qualified Data.HashMap.Strict as HashMap
 
 

src/Gargantext/Database/Action/Metrics.hs

@@ -17,7 +17,7 @@ module Gargantext.Database.Action.Metrics
 
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Data.HashMap.Strict (HashMap)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Set (Set)
 import Database.PostgreSQL.Simple (Query, Only(..))
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
@@ -39,7 +39,7 @@ import Gargantext.Database.Query.Table.Node (defaultList)
 import Gargantext.Database.Query.Table.Node.Select
 import Gargantext.Prelude
 import qualified Data.HashMap.Strict as HM
-import qualified Data.Map            as Map
+import qualified Data.Map.Strict     as Map
 import qualified Data.Set            as Set
 import qualified Data.List           as List
 import qualified Data.Text           as Text

src/Gargantext/Database/Action/Metrics/Lists.hs

@@ -26,7 +26,7 @@ import Gargantext.Database.Action.Flow.Types (FlowCmdM)
 import Gargantext.Prelude hiding (sum, head)
 import Prelude hiding (null, id, map, sum)
 import qualified Data.HashMap.Strict as HashMap
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.Vector as Vec
 import qualified Gargantext.Database.Action.Metrics as Metrics
 {-
@@ -56,4 +56,3 @@ getMetrics' cId maybeListId tabType maybeLimit = do
   _ <- Learn.grid 100 110 metrics' metrics'
   --}
   pure $ Map.fromListWith (<>) $ Vec.toList metrics
-

src/Gargantext/Database/Action/Metrics/NgramsByContext.hs

@@ -19,7 +19,7 @@ module Gargantext.Database.Action.Metrics.NgramsByContext
 -- import Debug.Trace (trace)
 --import Data.Map.Strict.Patch (PatchMap, Replace, diff)
 import Data.HashMap.Strict (HashMap)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Set (Set)
 import Data.Text (Text)
 import Data.Tuple.Extra (first, second, swap)
@@ -34,7 +34,7 @@ import Gargantext.Database.Schema.Ngrams (ngramsTypeId, NgramsType(..))
 import Gargantext.Prelude
 import qualified Data.HashMap.Strict              as HM
 import qualified Data.List                        as List
-import qualified Data.Map                         as Map
+import qualified Data.Map.Strict                  as Map
 import qualified Data.Set                         as Set
 import qualified Database.PostgreSQL.Simple       as DPS
 import qualified Database.PostgreSQL.Simple.Types as DPST

src/Gargantext/Database/Action/Search.hs

@@ -15,7 +15,7 @@ module Gargantext.Database.Action.Search where
 import Control.Arrow (returnA)
 import Control.Lens ((^.))
 import qualified Data.List as List
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import Data.Maybe
 import qualified Data.Set as Set
 import Data.Text (Text, unpack, intercalate)

src/Gargantext/Database/Query/Table/Ngrams.hs

@@ -25,7 +25,7 @@ module Gargantext.Database.Query.Table.Ngrams
 import Control.Lens ((^.))
 import Data.ByteString.Internal (ByteString)
 import Data.HashMap.Strict (HashMap)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Text (Text)
 import Gargantext.Core.Types
 import Gargantext.Database.Prelude (runOpaQuery, Cmd, formatPGSQuery, runPGSQuery)
@@ -39,7 +39,7 @@ import Gargantext.Database.Types
 import Gargantext.Prelude
 import qualified Data.HashMap.Strict        as HashMap
 import qualified Data.List                  as List
-import qualified Data.Map                   as Map
+import qualified Data.Map.Strict            as Map
 import qualified Database.PostgreSQL.Simple as PGS
 
 queryNgramsTable :: Select NgramsRead

src/Gargantext/Database/Query/Table/NodeContext.hs

@@ -30,6 +30,9 @@ module Gargantext.Database.Query.Table.NodeContext
   , getNodeContext
   , updateNodeContextCategory
   , getContextsForNgrams
+  , ContextForNgrams(..)
+  , getContextsForNgramsTerms
+  , ContextForNgramsTerms(..)
   , insertNodeContext
   , deleteNodeContext
   , selectPublicContexts
@@ -103,8 +106,27 @@ updateNodeContextCategory cId nId cat = do
                       WHERE context_id = ?
                       AND node_id = ? |]
 
-getContextsForNgrams :: HasNodeError err => NodeId -> [Int] -> Cmd err [(NodeId, Maybe Hash, NodeTypeId, UserId, Maybe ParentId, ContextTitle, UTCTime, HyperdataDocument)]
-getContextsForNgrams cId ngramsIds = runPGSQuery query (cId, PGS.In ngramsIds)
+data ContextForNgrams =
+  ContextForNgrams { _cfn_nodeId    :: NodeId
+                   , _cfn_hash      :: Maybe Hash
+                   , _cfn_userId    :: UserId
+                   , _cfn_parentId  :: Maybe ParentId
+                   , _cfn_c_title   :: ContextTitle
+                   , _cfn_date      :: UTCTime
+                   , _cfn_hyperdata :: HyperdataDocument }
+getContextsForNgrams :: HasNodeError err
+                     => NodeId
+                     -> [Int]
+                     -> Cmd err [ContextForNgrams]
+getContextsForNgrams cId ngramsIds = do
+  res <- runPGSQuery query (cId, PGS.In ngramsIds)
+  pure $ (\( _cfn_nodeId
+           , _cfn_hash
+           , _cfn_userId
+           , _cfn_parentId
+           , _cfn_c_title
+           , _cfn_date
+           , _cfn_hyperdata) -> ContextForNgrams { .. }) <$> res
   where
     query :: PGS.Query
     query = [sql| SELECT contexts.id, hash_id, typename, user_id, parent_id, name, date, hyperdata
@@ -114,6 +136,46 @@ getContextsForNgrams cId ngramsIds = runPGSQuery query (cId, PGS.In ngramsIds)
                   WHERE nodes_contexts.node_id = ?
                    AND context_node_ngrams.ngrams_id IN ? |]
 
+data ContextForNgramsTerms =
+  ContextForNgramsTerms { _cfnt_nodeId     :: NodeId
+                        , _cfnt_hash       :: Maybe Hash
+                        , _cfnt_nodeTypeId :: NodeTypeId
+                        , _cfnt_userId     :: UserId
+                        , _cfnt_parentId   :: Maybe ParentId
+                        , _cfnt_c_title    :: ContextTitle
+                        , _cfnt_date       :: UTCTime
+                        , _cfnt_hyperdata  :: HyperdataDocument
+                        , _cfnt_score      :: Maybe Double
+                        , _cfnt_category   :: Maybe Int }
+getContextsForNgramsTerms :: HasNodeError err
+                          => NodeId
+                          -> [Text]
+                          -> Cmd err [ContextForNgramsTerms]
+getContextsForNgramsTerms cId ngramsTerms = do
+  res <- runPGSQuery query (cId, PGS.In ngramsTerms)
+  pure $ (\( _cfnt_nodeId
+           , _cfnt_hash
+           , _cfnt_nodeTypeId
+           , _cfnt_userId
+           , _cfnt_parentId
+           , _cfnt_c_title
+           , _cfnt_date
+           , _cfnt_hyperdata
+           , _cfnt_score
+           , _cfnt_category) -> ContextForNgramsTerms { .. }) <$> res
+  where
+    query :: PGS.Query
+    query = [sql| SELECT t.id, t.hash_id, t.typename, t.user_id, t.parent_id, t.name, t.date, t.hyperdata, t.score, t.category
+                FROM (
+                  SELECT DISTINCT ON (contexts.id) contexts.id AS id, hash_id, typename, user_id, parent_id, name, date, hyperdata, nodes_contexts.score AS score, nodes_contexts.category AS category,context_node_ngrams.doc_count AS doc_count
+                    FROM contexts
+                    JOIN context_node_ngrams ON contexts.id = context_node_ngrams.context_id
+                    JOIN nodes_contexts ON contexts.id = nodes_contexts.context_id
+                    JOIN ngrams ON context_node_ngrams.ngrams_id = ngrams.id
+                    WHERE nodes_contexts.node_id = ?
+                     AND ngrams.terms IN ?) t
+                   ORDER BY t.doc_count DESC |]
+
 ------------------------------------------------------------------------
 insertNodeContext :: [NodeContext] -> Cmd err Int
 insertNodeContext ns = mkCmd $ \conn -> fromIntegral <$> (runInsert_ conn

src/Gargantext/Database/Query/Table/NodeNgrams.hs

@@ -27,7 +27,7 @@ module Gargantext.Database.Query.Table.NodeNgrams
   where
 
 import Data.List.Extra (nubOrd)
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Maybe (fromMaybe)
 import Data.Text (Text)
 import Gargantext.Core
@@ -38,7 +38,7 @@ import Gargantext.Database.Schema.NodeNgrams
 import Gargantext.Database.Schema.Prelude (Select, FromRow, sql, fromRow, toField, field, Values(..), QualifiedIdentifier(..), selectTable)
 import Gargantext.Prelude
 import qualified Data.List as List
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
 
 

src/Gargantext/Database/Query/Tree.hs

@@ -43,7 +43,7 @@ import Control.Lens (view, toListOf, at, each, _Just, to, set, makeLenses)
 import Control.Monad.Error.Class (MonadError())
 import Data.List (tail, concat, nub)
 import qualified Data.List as List
-import Data.Map (Map, fromListWith, lookup)
+import Data.Map.Strict (Map, fromListWith, lookup)
 -- import Data.Monoid (mconcat)
 import Data.Proxy
 -- import qualified Data.Set  as Set

src/Gargantext/Database/Schema/Ngrams.hs

@@ -27,7 +27,7 @@ import Data.Aeson
 import Data.Aeson.Types (toJSONKeyText)
 import Data.HashMap.Strict (HashMap)
 import Data.Hashable (Hashable)
-import Data.Map (fromList, lookup)
+import Data.Map.Strict (fromList, lookup)
 import Data.Maybe (fromMaybe)
 import Data.Text (Text, splitOn, pack, strip)
 import Database.PostgreSQL.Simple.FromField (returnError, ResultError(..))

src/Gargantext/Utils/Jobs/Map.hs

@@ -6,11 +6,11 @@ import Control.Concurrent.Async
 import Control.Concurrent.STM
 import Control.Exception
 import Control.Monad
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Time.Clock
 import Prelude
 
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 
 import Gargantext.Utils.Jobs.Settings
 

src/Gargantext/Utils/Jobs/Monad.hs

@@ -9,7 +9,7 @@ import Gargantext.Utils.Jobs.State
 import Control.Concurrent.STM
 import Control.Exception
 import Control.Monad.Except
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Time.Clock
 import Network.HTTP.Client (Manager)
 import Prelude

src/Gargantext/Utils/Jobs/State.hs

@@ -8,14 +8,14 @@ import Control.Concurrent.Async
 import Control.Concurrent.STM
 import Control.Monad
 import Data.List
-import Data.Map (Map)
+import Data.Map.Strict (Map)
 import Data.Maybe
 import Data.Ord
 import Data.Proxy
 import Data.Time.Clock
 import Prelude
 
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Servant.Job.Core as SJ
 import qualified Servant.Job.Types as SJ
 

src/Gargantext/Utils/JohnSnowNLP.hs

@@ -19,8 +19,8 @@ import Data.Aeson (encode, ToJSON, toJSON, FromJSON, parseJSON, Value(..), (.:),
 import Data.Aeson.Types (prependFailure, typeMismatch)
 import Data.Aeson.TH (deriveJSON)
 import qualified Data.List.Safe as LS
-import Data.Map (Map)
-import qualified Data.Map as Map
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 import Data.Maybe (fromMaybe)
 import Data.Text hiding (map, group, filter, concat, zip)
 import Network.HTTP.Simple (parseRequest, httpJSON, setRequestBodyLBS, getResponseBody, Response)

src/Gargantext/Utils/Servant.hs

@@ -2,7 +2,7 @@ module Gargantext.Utils.Servant where
 
 import qualified Data.ByteString.Lazy.Char8 as BSC
 import Data.Csv (defaultEncodeOptions, encodeByNameWith, encodeDefaultOrderedByName, header, namedRecord, (.=), DefaultOrdered, EncodeOptions(..), NamedRecord, Quoting(QuoteNone), ToNamedRecord)
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import qualified Data.Text as T
 import Gargantext.API.Ngrams.Types (mSetToList, NgramsRepoElement(..), NgramsTableMap, NgramsTerm(..), unNgramsTerm)
 import Gargantext.Core.Types.Main (ListType(..))