[refactor] searx search refactoring

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

@@ -15,7 +15,6 @@ module Gargantext.API.Node.Corpus.Searx where
 
 import Control.Lens (view)
 import Data.Aeson qualified as Aeson
-import Data.HashMap.Strict qualified as HashMap
 import Data.Text qualified as T
 import Data.Text qualified as Text
 import Data.Time.Calendar (Day, toGregorian)
@@ -27,14 +26,11 @@ import Gargantext.Core.Config.Types (FramesConfig(..))
 import Gargantext.Core.NLP (HasNLPServer, nlpServerGet)
 import Gargantext.Core.NodeStory.Types ( HasNodeStory )
 import Gargantext.Core.Text.Corpus.Query qualified as Query
-import Gargantext.Core.Text.List (buildNgramsLists)
-import Gargantext.Core.Text.List.Group.WithStem ({-StopSize(..),-} GroupParams(..))
 import Gargantext.Core.Text.Terms (TermType(..))
 import Gargantext.Core.Types (HasValidationError)
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Core.Utils.Prefix (unPrefix)
-import Gargantext.Database.Action.Flow (addDocumentsToHyperCorpus) --, DataText(..))
-import Gargantext.Database.Action.Flow.List (flowList_DbRepo)
+import Gargantext.Database.Action.Flow (addDocumentsToHyperCorpus, buildSocialList) --, DataText(..))
 import Gargantext.Database.Action.User (getUserId)
 import Gargantext.Database.Admin.Types.Hyperdata.Corpus (HyperdataCorpus)
 import Gargantext.Database.Admin.Types.Hyperdata.Document (HyperdataDocument(..))
@@ -42,7 +38,6 @@ import Gargantext.Database.Admin.Types.Node (CorpusId, ListId, NodeType(NodeText
 import Gargantext.Database.Query.Table.Node (getOrMkList, insertDefaultNodeIfNotExists)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Tree.Error (HasTreeError)
-import Gargantext.Database.Query.Tree.Root (getOrMkRootWithCorpus, MkCorpusUser (MkCorpusUserMaster))
 import Gargantext.Prelude
 import Gargantext.Utils.Jobs.Monad (JobHandle, MonadJobStatus(..))
 import Network.HTTP.Client
@@ -147,17 +142,12 @@ insertSearxResponse user cId listId l (Right (SearxResponse { _srs_results })) =
   --_ <- flowDataText user (DataNew [docs']) (Multi l) cId Nothing logStatus
   let mCorpus = Nothing :: Maybe HyperdataCorpus
   void $ addDocumentsToHyperCorpus server mCorpus (Multi l) cId docs'
-  (_masterUserId, _masterRootId, masterCorpusId)
-    <- getOrMkRootWithCorpus MkCorpusUserMaster mCorpus
-  let gp = GroupWithPosTag l server HashMap.empty
-    -- gp = case l of
-    --   FR -> GroupWithPosTag l Spacy HashMap.empty
-    --   _       -> GroupWithPosTag l CoreNLP HashMap.empty
-  ngs         <- buildNgramsLists user cId masterCorpusId Nothing gp
-  _userListId <- flowList_DbRepo listId ngs
+
+  _ <- buildSocialList l user cId listId mCorpus Nothing
 
   pure ()
 
+  
 -- TODO Make an async task out of this?
 triggerSearxSearch :: ( MonadBase IO m
                       , HasNodeStory env err m

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

@@ -87,7 +87,7 @@ instance ExtractNgramsT HyperdataDocument
                $  [(SimpleNgrams source, (DM.singleton Sources     1, 1))                    ]
                <> [(SimpleNgrams     i', (DM.singleton Institutes  1, 1)) | i' <- institutes ]
                <> [(SimpleNgrams     a', (DM.singleton Authors     1, 1)) | a' <- authors    ]
-               <> [(EnrichedNgrams   t', (DM.singleton NgramsTerms 1, cnt')) | (t', cnt') <- termsWithCounts'     ]
+               <> [(EnrichedNgrams   t', (DM.singleton NgramsTerms 1, cnt')) | (t', cnt') <- termsWithCounts' ]
 
 instance (ExtractNgramsT a, HasText a) => ExtractNgramsT (Node a)
   where

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

@@ -68,8 +68,6 @@ insertDocNgrams lId m = do
 
 
 
-
-
 -- Given language, ngrams type, a list of terms and a
 -- HyperdataDocument, return ngrams that are in this text, with counts.
 -- This is a pure function (doesn't use corenlp nor PostgreSQL FTS).