This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-41
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-41 by this push:
new 2f0bd2d REST server gzip Accept-Encoding support added.
2f0bd2d is described below
commit 2f0bd2dd90ef1f9ef48be28f24d1cfb23771a4bb
Author: Sergey Kamov <[email protected]>
AuthorDate: Tue Aug 11 18:57:35 2020 +0300
REST server gzip Accept-Encoding support added.
---
.../probe/mgrs/conn/NCConnectionManager.scala | 5 +++-
.../nlpcraft/server/probe/NCProbeManager.scala | 28 ++++++++++++++--------
.../server/suggestion/NCSuggestionsManager.scala | 13 +++++-----
3 files changed, 28 insertions(+), 18 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/conn/NCConnectionManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/conn/NCConnectionManager.scala
index cc6dd1f..838bccb 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/conn/NCConnectionManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/conn/NCConnectionManager.scala
@@ -245,7 +245,10 @@ object NCConnectionManager extends NCService {
mdl.getElements.asScala.map(p ⇒ p.getId →
p.getSynonyms).toMap.asJava
),
new util.HashMap[String, util.List[String]]
- (m.intentsSamples.map(p ⇒ p._1 → new
util.ArrayList[String](p._2.asJava)).asJava)
+ (m.intentsSamples.map {
+ case (intentId, samples) ⇒
+ intentId → new
util.ArrayList[String](samples.asJava) }.asJava
+ )
)
})
), cryptoKey)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
index 1eea061..6fab888 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
@@ -591,18 +591,26 @@ object NCProbeManager extends NCService {
mdlVer,
enabledBuiltInToks,
macros,
- elemSyns,
+ elementsSynonyms,
intentsSamples
) ⇒
- NCProbeModelMdo(
- id = mdlId,
- name = mdlName,
- version = mdlVer,
- enabledBuiltInTokens =
enabledBuiltInToks.asScala.toSet,
- macros = macros.asScala.toMap,
- elementsSynonyms = elemSyns.asScala.map(p ⇒
p._1 → p._2.asScala).toMap,
- intentsSamples.asScala.map(p ⇒ p._1 →
p._2.asScala).toMap
- )
+ require(mdlId != null)
+ require(mdlName != null)
+ require(mdlVer != null)
+ require(enabledBuiltInToks != null)
+ require(macros != null)
+ require(elementsSynonyms != null)
+ require(intentsSamples != null)
+
+ NCProbeModelMdo(
+ id = mdlId,
+ name = mdlName,
+ version = mdlVer,
+ enabledBuiltInTokens =
enabledBuiltInToks.asScala.toSet,
+ macros = macros.asScala.toMap,
+ elementsSynonyms =
elementsSynonyms.asScala.map(p ⇒ p._1 → p._2.asScala).toMap,
+ intentsSamples =
intentsSamples.asScala.map(p ⇒ p._1 → p._2.asScala).toMap
+ )
}.toSet
val probeTokTypes =
models.flatMap(_.enabledBuiltInTokens).map(_.takeWhile(_ != ':'))
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/suggestion/NCSuggestionsManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/suggestion/NCSuggestionsManager.scala
index f9d184a..f647095 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/suggestion/NCSuggestionsManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/suggestion/NCSuggestionsManager.scala
@@ -43,7 +43,7 @@ import scala.collection._
/**
* TODO:
*/
-object NCSuggestionsManager extends NCService {
+object NCSuggestionsManager extends NCService {
private final val DFLT_LIMIT: Int = 20
private final val DFLT_MIN_SCORE: Double = 0
@@ -122,16 +122,15 @@ object NCSuggestionsManager extends NCService {
"limit" → limitOpt.getOrElse(() ⇒ null),
"minScore" → minScoreOpt.getOrElse(() ⇒ null)
) { _ ⇒
- var url = Config.urlOpt.getOrElse(throw new NCE("Context word
server is not configured"))
-
- url = s"$url/suggestions"
+ val url = s"${Config.urlOpt.getOrElse(throw new NCE("Context word
server is not configured"))}/suggestions"
val mdl = NCProbeManager.getModel(mdlId)
+ require(mdl.intentsSamples != null && mdl.elementsSynonyms != null
&& mdl.macros != null)
+
val parser = new NCMacroParser()
- if (mdl.macros != null)
- mdl.macros.foreach { case (name, str) ⇒ parser.addMacro(name,
str) }
+ mdl.macros.foreach { case (name, str) ⇒ parser.addMacro(name, str)
}
val examples =
mdl.
@@ -226,7 +225,7 @@ object NCSuggestionsManager extends NCService {
require(batch.size == resps.size, s"Batch:
${batch.size}, responses: ${resps.size}")
- reqs.zip(resps).foreach { case (req, resp) ⇒ debugs +=
req → resp}
+ reqs.zip(resps).foreach { case (req, resp) ⇒ debugs +=
req → resp }
val i = cnt.addAndGet(batch.size)
