[ADMIN] LTS stack upgrade

src/Gargantext/API/Ngrams/List.hs

@@ -126,6 +126,10 @@ makeLenses ''WithFile
 instance FromForm WithFile
 instance FromJSON WithFile where
   parseJSON = genericParseJSON $ jsonOptions "_wf_"
+instance ToJSON WithFile where
+  toJSON = genericToJSON $ jsonOptions "_wf_"
+
+
 instance ToSchema WithFile where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_wf_")
 

src/Gargantext/API/Ngrams/Types.hs

@@ -782,6 +782,10 @@ data UpdateTableNgramsCharts = UpdateTableNgramsCharts
 makeLenses ''UpdateTableNgramsCharts
 instance FromJSON UpdateTableNgramsCharts where
   parseJSON = genericParseJSON $ jsonOptions "_utn_"
+
+instance ToJSON UpdateTableNgramsCharts where
+  toJSON = genericToJSON $ jsonOptions "_utn_"
+
 instance ToSchema UpdateTableNgramsCharts where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_utn_")
 

src/Gargantext/API/Node.hs

@@ -192,6 +192,8 @@ nodeAPI :: forall proxy a.
        ( JSONB a
        , FromJSON a
        , ToJSON a
+       , MimeRender JSON a
+       , MimeUnrender JSON a
        ) => proxy a
          -> UserId
          -> NodeId

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

@@ -49,6 +49,9 @@ makeLenses ''AnnuaireWithForm
 instance FromForm AnnuaireWithForm
 instance FromJSON AnnuaireWithForm where
   parseJSON = genericParseJSON $ jsonOptions "_wf_"
+instance ToJSON AnnuaireWithForm where
+  toJSON = genericToJSON $ jsonOptions "_wf_"
+
 instance ToSchema AnnuaireWithForm where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_wf_")
 

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

@@ -155,6 +155,8 @@ data WithQuery = WithQuery
 makeLenses ''WithQuery
 instance FromJSON WithQuery where
   parseJSON = genericParseJSON $ jsonOptions "_wq_"
+instance ToJSON WithQuery where
+  toJSON = genericToJSON $ jsonOptions "_wq_"
 instance ToSchema WithQuery where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_wq_")
 

src/Gargantext/API/Node/Corpus/New/File.hs

@@ -54,6 +54,7 @@ instance Arbitrary FileType
 instance ToParamSchema FileType
 
 instance FromJSON FileType
+instance ToJSON FileType
 
 instance ToParamSchema (MultipartData Mem) where
   toParamSchema _ = toParamSchema (Proxy :: Proxy TODO)

src/Gargantext/API/Node/Types.hs

@@ -33,6 +33,8 @@ makeLenses ''NewWithForm
 instance FromForm NewWithForm
 instance FromJSON NewWithForm where
   parseJSON = genericParseJSON $ jsonOptions "_wf_"
+instance ToJSON NewWithForm where
+  toJSON = genericToJSON $ jsonOptions "_wf_"
 instance ToSchema NewWithForm where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_wf_")
 
@@ -48,6 +50,10 @@ makeLenses ''NewWithFile
 instance FromForm NewWithFile
 instance FromJSON NewWithFile where
   parseJSON = genericParseJSON $ jsonOptions "_wfi_"
+instance ToJSON NewWithFile where
+  toJSON = genericToJSON $ jsonOptions "_wfi_"
+
+
 instance ToSchema NewWithFile where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_wfi_")
 

src/Gargantext/API/Prelude.hs

@@ -71,6 +71,7 @@ type GargServerC env err m =
   ( CmdRandom env err m
   , EnvC  env
   , ErrC      err
+  , MimeRender JSON err
   )
 
 type GargServerT env err m api = GargServerC env err m => ServerT api m

src/Gargantext/API/Server.hs

@@ -37,7 +37,7 @@ import Gargantext.Prelude.Config (gc_url_backend_api)
 import Gargantext.Database.Prelude (hasConfig)
 
 
-serverGargAPI :: Text -> GargServerM env err GargAPI
+serverGargAPI :: MimeRender JSON err => Text -> GargServerM env err GargAPI
 serverGargAPI baseUrl -- orchestrator
        =  auth
      :<|> gargVersion

src/Gargantext/API/ThrowAll.hs

@@ -44,7 +44,7 @@ instance {-# OVERLAPPING #-} ThrowAll' e b => ThrowAll' e (a -> b) where
 instance {-# OVERLAPPABLE #-} (MonadError e m) => ThrowAll' e (m a) where
   throwAll' = throwError
 
-serverPrivateGargAPI :: GargServerM env err GargPrivateAPI
+serverPrivateGargAPI :: MimeRender JSON err => GargServerM env err GargPrivateAPI
 serverPrivateGargAPI (Authenticated auser) = serverPrivateGargAPI' auser
 serverPrivateGargAPI _                     = throwAll' (_ServerError # err401)
 -- Here throwAll' requires a concrete type for the monad.

src/Gargantext/Core/Text/Corpus/Parsers/Date.hs

@@ -26,7 +26,8 @@ import Data.Time.Clock (UTCTime(..), getCurrentTime)
 import Data.Time.LocalTime (utc)
 import Data.Time.LocalTime.TimeZone.Series (zonedTimeToZoneSeriesTime)
 import Duckling.Api (analyze)
-import Duckling.Core (makeLocale, Some(This), Dimension(Time))
+import Duckling.Core (makeLocale, Dimension(Time))
+import Duckling.Types (Seal(..))
 import Duckling.Resolve (fromUTC, Context(Context, referenceTime, locale), DucklingTime(DucklingTime), Options(..))
 import Duckling.Types (ResolvedToken(..), ResolvedVal(..))
 import Gargantext.Core (Lang(FR,EN))
@@ -128,7 +129,7 @@ parseDateWithDuckling lang input options = do
     contxt <- localContext lang <$> utcToDucklingTime <$> getCurrentTime
     --pure $ parseAndResolve (rulesFor (locale ctx) (HashSet.fromList [(This Time)])) input ctx
     -- TODO check/test Options False or True
-    pure $ analyze input contxt options $ HashSet.fromList [(This Time)]
+    pure $ analyze input contxt options $ HashSet.fromList [(Seal Time)]
 
 
 

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

@@ -77,7 +77,7 @@ partitions_spinglass' :: (Serialize v, Serialize e)
                          => Seed -> IG.Graph 'U v e -> IO [[Int]]
 partitions_spinglass' s g = do
   gen <- IG.withSeed s pure
-  pure $ IG.findCommunity g Nothing Nothing IG.spinglass gen
+  IG.findCommunity g Nothing Nothing IG.spinglass gen
 
 
 data ClusterNode = ClusterNode { cl_node_id :: Int

stack.yaml

-resolver: lts-16.26
+resolver:
+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/10.yaml 
 flags: {}
 extra-package-dbs: []
 packages:
 - .
 #- 'deps/patches-class'
 #- 'deps/patches-map'
-#- 'deps/servant-job'
 #- 'deps/accelerate'
 #- 'deps/accelerate-utility'
 
@@ -59,7 +59,7 @@ extra-deps:
   # NP libs
   #- git: https://github.com/np/servant-job.git # waiting for PR
 - git: https://github.com/delanoe/servant-job.git
-  commit: a9d8ec247b60906ae0ad76ea017cacd6ff36a7a1
+  commit: 5b15f6ffbff6bc8e26c46206d6d227213fc1821f
   #- git: https://github.com/np/patches-map
 - git: https://github.com/delanoe/patches-map
   commit: 76cae88f367976ff091e661ee69a5c3126b94694
@@ -68,8 +68,9 @@ extra-deps:
   commit: d3e971d4e78d1dfcc853f2fb86bde1995faf22ae
 
   # Graph libs
-- git: https://github.com/kaizhang/haskell-igraph.git
-  commit: 34553acc4ebdcae7065311dcefb426e0fd58c5a0
+#- git: https://github.com/kaizhang/haskell-igraph.git
+- git: https://github.com/delanoe/haskell-igraph.git
+  commit: 3c9dc79ff4de2ad7060ff3a527a774dff3aa6f4a
 
   # Accelerate Linear Algebra and specific instances
   # (UndecidableInstances for newer GHC version)
@@ -79,24 +80,25 @@ extra-deps:
   commit: 83ada76e78ac10d9559af8ed6bd4064ec81308e4
 - accelerate-arithmetic-1.0.0.1@sha256:555639232aa5cad411e89247b27871d09352b987a754230a288c690b6de6d888,2096
 
-  # Others dependencies (with stack resolver)
+  # Others dependencies (using stack resolver)
+- constraints-extras-0.3.1.0@sha256:12016ebb91ad5ed2c82bf7e48c6bd6947d164d33c9dca5ac3965de1bb6c780c0,1777
 - KMP-0.2.0.0@sha256:6dfbac03ef00ebd9347234732cb86a40f62ab5a80c0cc6bedb8eb51766f7df28,2562
-- Unique-0.4.7.7@sha256:2269d3528271e25d34542e7c24a4e541e27ec33460e1ea00845da95b82eec6fa,2777
-- dependent-sum-0.4@sha256:40c705604f52374fb72616e10234635104a626ede737ddde899777b719df120b,1907
-- duckling-0.1.6.1@sha256:dab60953f405b45fe93e1e745f8cc83e5166e1788b1f4999cc06382e131153d8,47147
-- fclabels-2.0.4@sha256:efcc20c6c903d0a59e36eb1cb547a7bbbbba93b6e20b84b06e919c350891beb2,4492
+- Unique-0.4.7.8@sha256:9661f45aa31dde119a2114566166ea38b011a45653337045ee4ced75636533c0,2067
+- dependent-sum-0.7.1.0@sha256:0e419237f5b86da3659772afff9cab355c0f8d5b3fdb15a5b30e673d8dc83941,2147
+- duckling-0.2.0.0@sha256:84becd4e48ee3676cdd6fe5745a77ee60e365ea730cd759610c8a7738f3eb4a6,60543
+- fclabels-2.0.5@sha256:817006077632bd29e637956154aa33d3c10a59be0791c308cef955eb951b2675,4473
 - full-text-search-0.2.1.4@sha256:81f6df3327e5b604f99b15e78635e5d6ca996e504c21d268a6d751d7d131aa36,6032
 - fullstop-0.1.4@sha256:80a3e382ef53551bb936e7da8b2825621df0ea169af1212debcb0a90010b30c8,2044
 - hgal-2.0.0.2@sha256:13d58afd0668b9cb881c612eff8488a0e289edd4bbffa893df4beee60cfeb73b,653
 - json-stream-0.4.2.4@sha256:8b7f17d54a6e1e6311756270f8bcf51e91bab4300945400de66118470dcf51b9,4716
 - located-base-0.1.1.1@sha256:7c6395f2b6fbf2d5f76c3514f774423838c0ea94e1c6a5530dd3c94b30c9d1c8,1904
-- logging-effect-1.3.9@sha256:4fd36d7c19f22569d510907c55d6d49cb5d80fb30767c6b3f85736b98f57d7c0,1678
-- probability-0.2.6@sha256:6d85d961d85fd5d1a35b90fe77510f6fcc6a8f20e8ed503219c38378de9cb3cd,2857
+- logging-effect-1.3.12@sha256:72d168dd09887649ba9501627219b6027cbec2d5541931555b7885b133785ce3,1679
+- monoid-extras-0.5.1@sha256:438dbfd7b4dce47d8f0ca577f56caf94bd1e21391afa545cad09fe7cf2e5793d,2333
 - rake-0.0.1@sha256:3380f6567fb17505d1095b7f32222c0b631fa04126ad39726c84262da99c08b3,2025
+- servant-cassava-0.10.1@sha256:07e7b6ca67cf57dcb4a0041a399a25d058844505837c6479e01d62be59d01fdf,1665
 - servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234
-- servant-multipart-0.11.5@sha256:1633f715b5b53d648a1da69839bdc5046599f4f7244944d4bbf852dba38d8f4b,2319
+- servant-mock-0.8.7@sha256:64cb3e52bbd51ab6cb25e3f412a99ea712c6c26f1efd117f01a8d1664df49c67,2306
 - servant-xml-1.0.1.4@sha256:6c9f2986ac42e72fe24b794c660763a1966a18d696b34cd4f4ed15165edd4aa0,851
-- smtp-mail-0.2.0.0@sha256:b91c81f6dbb41a9ceee8c443385118684ecec55006b77f7d3c0e49cffd2468cf,1211
 - stemmer-0.5.2@sha256:823aec56249ec2619f60a2c0d1384b732894dbbbe642856d337ebfe9629a0efd,4082
 - xmlbf-0.6.1@sha256:57867fcb39e0514d17b3328ff5de8d241a18482fc89bb742d9ed820a6a2a5187,1540
 - xmlbf-xeno-0.2@sha256:39f70fced6052524c290cf595f114661c721452e65fc3e0953a44e7682a6a6b0,950