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 f28c5cd WIP.
f28c5cd is described below
commit f28c5cdde12de3bee8814f6c2fd1669a7c954b07
Author: Sergey Kamov <[email protected]>
AuthorDate: Fri Aug 14 17:33:22 2020 +0300
WIP.
---
.../common/nlp/numeric/NCNumericManager.scala | 2 +-
.../common/opencensus/NCOpenCensusTrace.scala | 10 ++++----
.../model/intent/impl/NCIntentScanner.scala | 2 +-
.../probe/mgrs/deploy/NCDeployManager.scala | 2 +-
.../mgrs/model/NCModelSynonymDslCompiler.scala | 2 +-
.../nlpcraft/server/rest/NCBasicRestApi.scala | 11 ++++----
.../server/suggestion/NCSuggestionsManager.scala | 30 +++++++++++++---------
7 files changed, 32 insertions(+), 27 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala
index 10643b9..2ebb756 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/numeric/NCNumericManager.scala
@@ -124,7 +124,7 @@ object NCNumericManager extends NCService {
override def start(parent: Span = null): NCService =
startScopedSpan("start", parent) { _ ⇒
genNums = mapResource("numeric/numeric.txt", "utf-8", logger, {
- _.filter(s => !s.isEmpty && !s.trim.startsWith("#")).
+ _.filter(s ⇒ !s.isEmpty && !s.trim.startsWith("#")).
map(_.split("=")).
map(s ⇒ (s(1), s(0).toInt)).
toMap
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/opencensus/NCOpenCensusTrace.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/opencensus/NCOpenCensusTrace.scala
index e56dd75..967b2f3 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/opencensus/NCOpenCensusTrace.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/opencensus/NCOpenCensusTrace.scala
@@ -148,24 +148,24 @@ trait NCOpenCensusTrace {
span().setStatus(Status.OK)
}
catch {
- case NonFatal(suppressed) =>
+ case NonFatal(suppressed) ⇒
span().setStatus(Status.INTERNAL.withDescription(suppressed.getMessage))
e.addSuppressed(suppressed)
- case fatal: Throwable if NonFatal(e) =>
+ case fatal: Throwable if NonFatal(e) ⇒
span().setStatus(Status.INTERNAL.withDescription(e.getMessage))
fatal.addSuppressed(e)
throw fatal
- case fatal: InterruptedException =>
+ case fatal: InterruptedException ⇒
fatal.addSuppressed(e)
throw fatal
- case fatal: Throwable =>
+ case fatal: Throwable ⇒
span().setStatus(Status.INTERNAL.withDescription(fatal.getMessage))
e.addSuppressed(fatal)
@@ -191,7 +191,7 @@ trait NCOpenCensusTrace {
try
f(span)
catch {
- case e: Throwable =>
+ case e: Throwable ⇒
ex = e
throw e
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentScanner.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentScanner.scala
index 507f7ea..3a6b79d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentScanner.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentScanner.scala
@@ -162,7 +162,7 @@ object NCIntentScanner extends LazyLogging {
checkMinMax(m, tokParamTypes, termIds.map(allLimits), ctxFirstParam)
// Prepares invocation method.
- (ctx: NCIntentMatch) => {
+ (ctx: NCIntentMatch) ⇒ {
invoke(
m,
obj,
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index cf61a1a..f6d5b21 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.probe.mgrs.deploy
import java.io._
-import java.util.jar.{JarInputStream => JIS}
+import java.util.jar.{JarInputStream ⇒ JIS}
import io.opencensus.trace.Span
import org.apache.nlpcraft.common._
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
index 6ee4c20..18328d7 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
@@ -36,7 +36,7 @@ import scala.collection.mutable.ArrayBuffer
object NCModelSynonymDslCompiler extends LazyLogging {
private type Predicate = java.util.function.Function[NCToken,
java.lang.Boolean]
- def toJavaFunc(alias: String, func: NCToken ⇒ Boolean): Predicate = (tok:
NCToken) => {
+ def toJavaFunc(alias: String, func: NCToken ⇒ Boolean): Predicate = (tok:
NCToken) ⇒ {
val res = func(tok)
// Store predicate's alias, if any, in token metadata if this token
satisfies this predicate.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
index a4b7092..0e67b02 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
@@ -630,8 +630,8 @@ class NCBasicRestApi extends NCRestApi with LazyLogging
with NCOpenCensusTrace w
case class Req(
acsTok: String,
mdlId: String,
- limitOpt: Option[Int],
- minScoreOpt: Option[Double]
+ limit: Option[Int],
+ minScore: Option[Double]
)
case class Suggestion(
@@ -653,8 +653,8 @@ class NCBasicRestApi extends NCRestApi with LazyLogging
with NCOpenCensusTrace w
startScopedSpan(
"check$",
"mdlId" → req.mdlId,
- "limit" → req.limitOpt.getOrElse(() ⇒ null),
- "minScore" → req.minScoreOpt.getOrElse(() ⇒ null),
+ "limit" → req.limit.getOrElse(() ⇒ null),
+ "minScore" → req.minScore.getOrElse(() ⇒ null),
"acsTok" → req.acsTok
) { span ⇒
checkLength("acsTok", req.acsTok, 256)
@@ -666,8 +666,7 @@ class NCBasicRestApi extends NCRestApi with LazyLogging
with NCOpenCensusTrace w
throw new NCE(s"Probe not found: ${req.mdlId}")
val res: Map[String, Seq[Suggestion]] =
- NCSuggestionsManager.
- suggest(req.mdlId, req.limitOpt, req.minScoreOpt,
span).
+ NCSuggestionsManager.suggest(req.mdlId, req.minScore,
req.limit, span).
map { case (elemId, suggs) ⇒
elemId → suggs.map(p ⇒ Suggestion(p.suggestion,
p.ctxWorldServerScore, p.suggestedCount))
}.toMap
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 f647095..a2256f1 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
@@ -111,16 +111,22 @@ object NCSuggestionsManager extends NCService {
seq
}
+ /**
+ *
+ * @param mdlId Model ID.
+ * @param minScoreOpt Context word server minimal suggestion score
(default DFLT_MIN_SCORE). Increase it for suggestions count increasing,
decrease it to be more precise.
+ * @param limitOpt TODO: inverse parameter.
+ *
+ * @param parent Parent.
+ */
@throws[NCE]
- def suggest(
- mdlId: String, limitOpt: Option[Int], minScoreOpt: Option[Double],
parent: Span = null
- ): Map[String, Seq[NCSuggestion]] =
+ def suggest(mdlId: String, minScoreOpt: Option[Double], limitOpt:
Option[Int], parent: Span = null): Map[String, Seq[NCSuggestion]] =
startScopedSpan(
"suggest",
parent,
"modelId" → mdlId,
- "limit" → limitOpt.getOrElse(() ⇒ null),
- "minScore" → minScoreOpt.getOrElse(() ⇒ null)
+ "minScore" → minScoreOpt.getOrElse(() ⇒ null),
+ "limit" → limitOpt.getOrElse(() ⇒ null)
) { _ ⇒
val url = s"${Config.urlOpt.getOrElse(throw new NCE("Context word
server is not configured"))}/suggestions"
@@ -187,9 +193,9 @@ object NCSuggestionsManager extends NCService {
val allReqsCnt = allReqs.map(_._2.size).sum
- logger.info(s"Examples count: ${examples.size}")
- logger.info(s"Synonyms count: ${elemSyns.map(_._2.size).sum}")
- logger.info(s"Requests prepared: $allReqsCnt")
+ logger.debug(
+ s"Data prepared [examples=${examples.size},
synonyms=${elemSyns.map(_._2.size).sum}, requests=$allReqsCnt]"
+ )
val allSuggs = new java.util.concurrent.ConcurrentHashMap[String,
JList[Suggestion]]()
val cdl = new CountDownLatch(1)
@@ -210,7 +216,7 @@ object NCSuggestionsManager extends NCService {
RestRequest(
sentences = batch.map(p ⇒
RestRequestSentence(p.sentence, Seq(p.index).asJava)).asJava,
min_score =
minScoreOpt.getOrElse(DFLT_MIN_SCORE),
- limit = limitOpt.getOrElse(DFLT_LIMIT)
+ limit = limitOpt.getOrElse(DFLT_LIMIT)
+ 1
)
),
"UTF-8"
@@ -229,7 +235,7 @@ object NCSuggestionsManager extends NCService {
val i = cnt.addAndGet(batch.size)
- logger.info(s"Executed: $i requests.")
+ logger.debug(s"Executed: $i requests.")
allSuggs.
computeIfAbsent(elemId, (_: String) ⇒ new
CopyOnWriteArrayList[Suggestion]()).
@@ -287,7 +293,7 @@ object NCSuggestionsManager extends NCService {
}
}
- logger.whenInfoEnabled({
+ logger.whenDebugEnabled({
var i = 1
debugs.groupBy(_._1.example).foreach { case (_, m) ⇒
@@ -297,7 +303,7 @@ object NCSuggestionsManager extends NCService {
zipWithIndex.map { case (w, i) ⇒ if (i ==
req.index) s"<<<$w>>>" else w }.
mkString(" ")
- logger.info(
+ logger.debug(
s"$i. " +
s"Request=$s, " +
s"suggestions=[${suggs.map(_.word).mkString(",
")}], " +
