Commit 37059466 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/596-dev-ngrams-initial-sync-fix' into dev

parents 3905abd2 0253ad6c
...@@ -194,9 +194,9 @@ type AddWithFile = Summary "Add with MultipartData to corpus endpoint" ...@@ -194,9 +194,9 @@ type AddWithFile = Summary "Add with MultipartData to corpus endpoint"
addToCorpusWithQuery :: ( FlowCmdM env err m addToCorpusWithQuery :: ( FlowCmdM env err m
, MonadJobStatus m, , MonadJobStatus m
HasNodeStoryImmediateSaver env , HasNodeStoryImmediateSaver env
, HasNodeArchiveStoryImmediateSaver env) , HasNodeArchiveStoryImmediateSaver env )
=> User => User
-> CorpusId -> CorpusId
-> WithQuery -> WithQuery
......
...@@ -21,15 +21,20 @@ import Conduit ...@@ -21,15 +21,20 @@ import Conduit
import Control.Lens ((^.)) import Control.Lens ((^.))
import Data.Aeson import Data.Aeson
import Data.Either (Either(..), rights) import Data.Either (Either(..), rights)
import Data.List qualified as List
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Data.Swagger import Data.Swagger
import Data.Text (Text) import Data.Text (Text)
import Data.Text qualified as T
import GHC.Generics (Generic) import GHC.Generics (Generic)
import Gargantext.API.Admin.EnvTypes (Env, GargJob(..)) import Gargantext.API.Admin.EnvTypes (Env, GargJob(..))
import Gargantext.API.Admin.Orchestrator.Types (JobLog(..), AsyncJobs) import Gargantext.API.Admin.Orchestrator.Types (JobLog(..), AsyncJobs)
import Gargantext.API.Admin.Types (HasSettings) import Gargantext.API.Admin.Types (HasSettings)
import Gargantext.API.Ngrams (commitStatePatch, Versioned(..))
import Gargantext.API.Prelude (GargM, GargError) import Gargantext.API.Prelude (GargM, GargError)
import Gargantext.Core (Lang(..)) import Gargantext.Core (Lang(..))
import Gargantext.Core.NodeStory (HasNodeStoryImmediateSaver, HasNodeArchiveStoryImmediateSaver, currentVersion)
import Gargantext.Core.Text.Corpus.Parsers.Date (split')
import Gargantext.Core.Text.Corpus.Parsers.FrameWrite import Gargantext.Core.Text.Corpus.Parsers.FrameWrite
import Gargantext.Core.Text.List.Social (FlowSocialListWith) import Gargantext.Core.Text.List.Social (FlowSocialListWith)
import Gargantext.Core.Text.Terms (TermType(..)) import Gargantext.Core.Text.Terms (TermType(..))
...@@ -39,15 +44,13 @@ import Gargantext.Database.Action.Flow.Types (FlowCmdM) ...@@ -39,15 +44,13 @@ import Gargantext.Database.Action.Flow.Types (FlowCmdM)
import Gargantext.Database.Admin.Types.Hyperdata.Document (HyperdataDocument(..)) import Gargantext.Database.Admin.Types.Hyperdata.Document (HyperdataDocument(..))
import Gargantext.Database.Admin.Types.Hyperdata.Frame import Gargantext.Database.Admin.Types.Hyperdata.Frame
import Gargantext.Database.Admin.Types.Node import Gargantext.Database.Admin.Types.Node
import Gargantext.Database.Query.Table.Node (getChildrenByType, getClosestParentIdByType', getNodeWith) import Gargantext.Database.Query.Table.Node (getChildrenByType, getClosestParentIdByType', getNodeWith, getOrMkList)
import Gargantext.Database.Schema.Node (node_hyperdata, node_name, node_date) import Gargantext.Database.Schema.Node (node_hyperdata, node_name, node_date)
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Utils.Jobs (serveJobsAPI, MonadJobStatus(..)) import Gargantext.Utils.Jobs (serveJobsAPI, MonadJobStatus(..))
import Gargantext.Core.Text.Corpus.Parsers.Date (split') import Protolude (mempty)
import Servant import Servant
import Text.Read (readMaybe) import Text.Read (readMaybe)
import qualified Data.List as List
import qualified Data.Text as T
-- import qualified Gargantext.Defaults as Defaults -- import qualified Gargantext.Defaults as Defaults
------------------------------------------------------------------------ ------------------------------------------------------------------------
...@@ -72,12 +75,16 @@ api uId nId = ...@@ -72,12 +75,16 @@ api uId nId =
serveJobsAPI DocumentFromWriteNodeJob $ \jHandle p -> serveJobsAPI DocumentFromWriteNodeJob $ \jHandle p ->
documentsFromWriteNodes uId nId p jHandle documentsFromWriteNodes uId nId p jHandle
documentsFromWriteNodes :: (HasSettings env, FlowCmdM env err m, MonadJobStatus m) documentsFromWriteNodes :: ( HasSettings env
=> UserId , FlowCmdM env err m
-> NodeId , MonadJobStatus m
-> Params , HasNodeStoryImmediateSaver env
-> JobHandle m , HasNodeArchiveStoryImmediateSaver env )
-> m () => UserId
-> NodeId
-> Params
-> JobHandle m
-> m ()
documentsFromWriteNodes uId nId Params { selection, lang, paragraphs } jobHandle = do documentsFromWriteNodes uId nId Params { selection, lang, paragraphs } jobHandle = do
markStarted 2 jobHandle markStarted 2 jobHandle
markProgress 1 jobHandle markProgress 1 jobHandle
...@@ -113,6 +120,11 @@ documentsFromWriteNodes uId nId Params { selection, lang, paragraphs } jobHandle ...@@ -113,6 +120,11 @@ documentsFromWriteNodes uId nId Params { selection, lang, paragraphs } jobHandle
(Just selection) (Just selection)
jobHandle jobHandle
listId <- getOrMkList cId uId
v <- currentVersion listId
_ <- commitStatePatch listId (Versioned v mempty)
markProgress 1 jobHandle markProgress 1 jobHandle
------------------------------------------------------------------------ ------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment