This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-70_NEW
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-70_NEW by this push:
new 8577f11 WIP.
8577f11 is described below
commit 8577f113202f6dbf673ee1abdab726148cf02e2b
Author: Sergey Kamov <[email protected]>
AuthorDate: Sat Jun 26 11:31:19 2021 +0300
WIP.
---
.../server/nlp/enrichers/ctxword/NCContextWordEnricher.scala | 12 ++++++------
.../nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala | 10 +++++-----
.../apache/nlpcraft/model/ctxword/NCContextWordSpec.scala | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/ctxword/NCContextWordEnricher.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/ctxword/NCContextWordEnricher.scala
index ab7a8f9..50d5403 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/ctxword/NCContextWordEnricher.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/ctxword/NCContextWordEnricher.scala
@@ -154,21 +154,21 @@ object NCContextWordEnricher extends NCServerEnricher {
sample <- cfg.samples;
sampleWords = spaceTokenize(sample);
samplesMap = sampleWords.zipWithIndex.map { case (w, idx)
=> stem(w) -> WordIndex(w, idx) }.toMap;
- sugg <- parseSample(sampleWords, samplesMap, synsStem
+ suggReq <- parseSample(sampleWords, samplesMap, synsStem
)
)
- yield (elemId, Record(sugg, value))).groupBy { case (elemId, _) =>
elemId }.
+ yield (elemId, Record(suggReq, value))).groupBy { case (elemId, _)
=> elemId }.
map { case (elemId, map) => elemId -> map.values.toSeq }
val map = recs.flatMap { case (elemId, recs) => recs.map(p =>
p.request -> ElementValue(elemId, p.value)) }
if (recs.nonEmpty)
syncExec(NCSuggestSynonymManager.suggestWords(recs.flatMap(_._2.map(_.request)).toSeq)).
- map { case (req, suggs) =>
- map(req).elementId -> suggs.groupBy(p => stem(p.word)).map {
case (stem, suggs) =>
- stem -> normalizeScore(suggs.map(_.score).max)
+ map { case (req, suggs) =>
+ map(req).elementId -> suggs.groupBy(p => stem(p.word)).map
{ case (stem, suggs) =>
+ stem -> normalizeScore(suggs.map(_.score).max)
+ }
}
- }
else
Map.empty[String, Map[String, Double]]
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
index ef25f51..1e8203a 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
@@ -156,7 +156,7 @@ object NCSuggestSynonymManager extends NCService {
* @return
*/
def suggestModel(mdlId: String, minScoreOpt: Option[Double], parent: Span
= null): Future[NCSuggestSynonymResult] =
- startScopedSpan("suggest", parent, "mdlId" -> mdlId) { _ =>
+ startScopedSpan("suggestModel", parent, "mdlId" -> mdlId) { _ =>
val now = U.now()
val promise = Promise[NCSuggestSynonymResult]()
@@ -457,21 +457,21 @@ object NCSuggestSynonymManager extends NCService {
/**
*
- * @param sens
+ * @param reqs
* @param minScoreOpt
* @param parent
* @return
*/
- def suggestWords(sens: Seq[NCSuggestionRequest], minScoreOpt:
Option[Double] = None, parent: Span = null):
+ def suggestWords(reqs: Seq[NCSuggestionRequest], minScoreOpt:
Option[Double] = None, parent: Span = null):
Future[Map[NCSuggestionRequest, Seq[NCWordSuggestion]]] =
- startScopedSpan("suggest", parent) { _ =>
+ startScopedSpan("suggestWords", parent) { _ =>
val promise = Promise[Map[NCSuggestionRequest,
Seq[NCWordSuggestion]]]()
case class Result(request: NCSuggestionRequest, suggestions:
Seq[NCWordSuggestion])
val data = new CopyOnWriteArrayList[Result]()
val cli = HttpClients.createDefault
- val batches = sens.sliding(BATCH_SIZE,
BATCH_SIZE).map(_.toSeq).toSeq
+ val batches = reqs.sliding(BATCH_SIZE,
BATCH_SIZE).map(_.toSeq).toSeq
val cnt = new AtomicInteger(0)
for (batch <- batches)
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/ctxword/NCContextWordSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/ctxword/NCContextWordSpec.scala
index ce3ec97..77346ab 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/ctxword/NCContextWordSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/ctxword/NCContextWordSpec.scala
@@ -75,7 +75,7 @@ class NCContextWordSpecModel extends NCModel {
"What is the local temperature?",
"This is the first day of heavy rain",
- "It is the beautiful day, the sun is shining ",
+ "It is the beautiful day, the sun is shining",
)
)
@NCIntent("intent=classification term(toks)~{has(tok_groups(),
'testGroup')}*")
