Merge remote-tracking branch 'origin/184-dev-add-nlp-to-gargantext-ini' into dev-merge

gargantext.cabal

@@ -47,6 +47,7 @@ library
       Gargantext.Core
       Gargantext.Core.NLP
       Gargantext.Core.Methods.Similarities
+      Gargantext.Core.NLP
       Gargantext.Core.NodeStory
       Gargantext.Core.Text
       Gargantext.Core.Text.Context

gargantext.ini_toModify

@@ -86,6 +86,13 @@ MAIL_FROM     =
 MAIL_LOGIN_TYPE = Normal
 
 [nlp]
+# Possible choices (see Gargantext.Core.NLP):
+# - spacy:// (for http:// Spacy)
+# - spacys:// (for https:// Spacy)
+# - corenlp:// (for http:// CoreNLP)
+# - corenlps:// (for https:// CoreNLP)
+# - johnsnow:// (for http:// JohnSnow)
+# - johnsnows:// (for https:// JohnSnow)
 EN = corenlp://localhost:9000
 FR = spacy://localhost:8001
 All = corenlp://localhost:9000

src/Gargantext/Core/NLP.hs

@@ -28,14 +28,26 @@ nlpServerConfigFromURI uri@(URI { uriScheme = "corenlp:" }) =
   Just $ NLPServerConfig { server = CoreNLP
                          , url = uri { uriScheme = "http:" }
                          }
+nlpServerConfigFromURI uri@(URI { uriScheme = "corenlps:" }) =
+  Just $ NLPServerConfig { server = CoreNLP
+                         , url = uri { uriScheme = "https:" }
+                         }
 nlpServerConfigFromURI uri@(URI { uriScheme = "johnsnow:" }) =
   Just $ NLPServerConfig { server = JohnSnowServer
                          , url = uri { uriScheme = "http:" }
                          }
+nlpServerConfigFromURI uri@(URI { uriScheme = "johnsnows:" }) =
+  Just $ NLPServerConfig { server = JohnSnowServer
+                         , url = uri { uriScheme = "https:" }
+                         }
 nlpServerConfigFromURI uri@(URI { uriScheme = "spacy:" }) =
   Just $ NLPServerConfig { server = Spacy
                          , url = uri { uriScheme = "http:" }
                          }
+nlpServerConfigFromURI uri@(URI { uriScheme = "spacys:" }) =
+  Just $ NLPServerConfig { server = Spacy
+                         , url = uri { uriScheme = "https:" }
+                         }
 nlpServerConfigFromURI _ = Nothing