This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/master by this push:
new 0099912 WIP
new 9e57433 Merge branch 'master' of
https://github.com/apache/incubator-nlpcraft
0099912 is described below
commit 0099912d91454c195e3046bc2c4eb98e616d047e
Author: Aaron Radzinski <[email protected]>
AuthorDate: Mon Feb 21 13:48:33 2022 -0800
WIP
---
.../main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java | 1 -
.../apache/nlpcraft/internal/conversation/NCConversationData.scala | 1 -
.../org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManager.scala | 1 -
.../scala/org/apache/nlpcraft/internal/impl/NCModelClientImpl.scala | 4 ++--
.../matcher/{NCIntentsManager.scala => NCIntentSolverManager.scala} | 4 +---
.../nlpcraft/internal/intent/matcher/NCIntentSolverVariant.scala | 1 -
.../src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala | 4 ++--
.../nlpcraft/internal/conversation/NCConversationManagerSpec.scala | 2 +-
.../scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala | 3 +--
.../nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala | 2 +-
.../src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala | 2 --
11 files changed, 8 insertions(+), 17 deletions(-)
diff --git
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
index 1f849f5..e73c308 100644
---
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
+++
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
@@ -213,7 +213,6 @@ public class WeatherModel implements NCModel {
if (dateEntOpt.isPresent()) { // Date token overrides any
indicators.
NCEntity dateEnt = dateEntOpt.get();
- // TODO: set from NNE.
from = Instant.now();
to = Instant.now();
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/conversation/NCConversationData.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/conversation/NCConversationData.scala
index f9d97ff..d5354ea 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/conversation/NCConversationData.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/conversation/NCConversationData.scala
@@ -197,7 +197,6 @@ case class NCConversationData(
* @return
*/
def getEntities: Seq[NCEntity] =
- // TODO: copy?
stm.synchronized {
val reqIds = ctx.map(_.getRequestId).distinct.zipWithIndex.toMap
ctx.groupBy(_.getRequestId).toSeq.sortBy(p =>
reqIds(p._1)).reverse.flatMap(_._2)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManager.scala
index adac2f1..84fe89d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/dialogflow/NCDialogFlowManager.scala
@@ -117,7 +117,6 @@ class NCDialogFlowManager(cfg: NCModelConfig) extends
LazyLogging:
* @return Dialog flow.
*/
def getDialogFlow(usrId: String): Seq[NCDialogFlowItem] =
- // TODO: copy?
flow.synchronized { flow.get(usrId) } match
case Some(buf) => buf.toSeq
case None => Seq.empty
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelClientImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelClientImpl.scala
index b4e79a1..3cf85b0 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelClientImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelClientImpl.scala
@@ -49,7 +49,7 @@ class NCModelClientImpl(mdl: NCModel) extends LazyLogging:
private val convMgr = NCConversationManager(mdl.getConfig)
private val dlgMgr = NCDialogFlowManager(mdl.getConfig)
private val plMgr = NCModelPipelineManager(mdl.getConfig, mdl.getPipeline)
- private val intentsMgr = NCIntentsManager(dlgMgr, intents.map(p =>
p.intent -> p.function).toMap)
+ private val intentsMgr = NCIntentSolverManager(dlgMgr, intents.map(p =>
p.intent -> p.function).toMap)
init()
@@ -160,7 +160,7 @@ class NCModelClientImpl(mdl: NCModel) extends LazyLogging:
ask(sample, null, userId).getIntentId !=
i.intent.id)
(s"Unexpected intent ID: '${r.getIntentId}'")
catch case e: Throwable =>
- logger.warn("Unexpected error.", e) // TODO:
+ logger.warn("Unexpected error.", e)
Option(e.getLocalizedMessage)
res += Result(i.intent.id, sample, err, now - start)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentsManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentSolverManager.scala
similarity index 99%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentsManager.scala
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentSolverManager.scala
index b7c38c6..d27dae3 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentsManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentSolverManager.scala
@@ -34,7 +34,7 @@ import scala.language.postfixOps
/**
* Intent solver that finds the best matching intent given user sentence.
*/
-class NCIntentsManager(dialog: NCDialogFlowManager, intents: Map[NCIDLIntent,
NCIntentMatch => NCResult]) extends LazyLogging:
+class NCIntentSolverManager(dialog: NCDialogFlowManager, intents:
Map[NCIDLIntent, NCIntentMatch => NCResult]) extends LazyLogging:
/**
* NOTE: not thread-safe.
*/
@@ -520,7 +520,6 @@ class NCIntentsManager(dialog: NCDialogFlowManager,
intents: Map[NCIDLIntent, NC
// Collect to the 'max' from sentence & conversation, if possible.
for (ents <- Seq(senEnts, convEnts); ent <- ents.filter(!_.used) if
usedEnts.lengthCompare(term.max) < 0)
- // TODO: idx == matchesCnt - ok?
val NCIDLStackItem(res, uses) =
term.pred.apply(NCIDLEntity(ent.entity, matchesCnt), idlCtx)
res match
@@ -549,7 +548,6 @@ class NCIntentsManager(dialog: NCDialogFlowManager,
intents: Map[NCIDLIntent, NC
// Sum of conversation depths for each entities from the
conversation.
// Negated to make sure that bigger (smaller negative number) is
better.
- // TODO: check formula.
def getConversationDepth(e: IntentEntity): Option[Int] =
val depth = convEnts.indexOf(e)
Option.when(depth >= 0)(depth + 1)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentSolverVariant.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentSolverVariant.scala
index bb7a3e2..339372e 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentSolverVariant.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/intent/matcher/NCIntentSolverVariant.scala
@@ -58,5 +58,4 @@ case class NCIntentSolverVariant(entities: Seq[NCEntity])
extends Ordered[NCInte
weights.zip(other.weights).flatMap { (w1, w2) => compareWeight(w1, w2)
}.to(LazyList).headOption.getOrElse(0)
- // TODO:
override def toString: String = s"Weights: ${weights.mkString("[", ",",
"]")}"
\ No newline at end of file
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
index 59b259e..b4a7f3c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
@@ -786,8 +786,8 @@ object NCUtils extends LazyLogging:
} (ec)).foreach(Await.result(_, Duration.Inf))
if !errs.isEmpty then
- errs.forEach(e => logger.error("Error during service starting.",
e)) // TODO: error message.
- E("Some service cannot be started.") // TODO: error message.
+ errs.forEach(e => logger.error("Parallel execution error.", e))
+ E("Parallel execution failed - see previous error log.")
/**
* Shuts down executor service and waits for its finish.
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/conversation/NCConversationManagerSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/conversation/NCConversationManagerSpec.scala
index c402a99..cf23b87 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/conversation/NCConversationManagerSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/conversation/NCConversationManagerSpec.scala
@@ -65,7 +65,7 @@ class NCConversationManagerSpec:
val t = NCTestToken()
val reqId = "req1"
- // TODO: Drop method and use saved conversation instead - error is
thrown
+ // TODO: Drop method and use saved conversation instead - error is
thrown.
def getConversation: NCConversationData = mgr.getConversation("user1")
def checkSize(size: Int): Unit =
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala
index 676d7c3..3e045c3 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/impl/NCModelPingPongSpec.scala
@@ -33,7 +33,7 @@ import scala.util.Using
*
*/
class NCModelPingPongSpec:
- private var client: NCModelClient = null
+ private var client: NCModelClient = _
private case class R(resType: NCResultType, txt: String) extends NCResult:
this.setType(resType)
@@ -48,7 +48,6 @@ class NCModelPingPongSpec:
@NCIntent("intent=confirmCommand term(confirm)={# == 'confirm'}")
def onConfirmCommand(im: NCIntentMatch, @NCIntentTerm("confirm")
confirm: NCEntity): NCResult =
- // TODO: I can compare only with last matched.
val lastIntentId =
im.getContext.
getConversation.
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala
index 4cfe8eb..4fe4b8c 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/internal/intent/compiler/functions/NCIDLFunctions.scala
@@ -150,7 +150,7 @@ private[functions] object NCIDLFunctions:
def mkEntity(
id: String = UUID.randomUUID().toString,
reqId: String = UUID.randomUUID().toString,
- value: String = null, // TODO: add tests for usage.
+ value: String = null,
groups: Set[String] = null,
meta: Map[String, AnyRef] = Map.empty[String, AnyRef],
tokens: NCTestToken*
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala
index 5a27e9e..bbaf8a6 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/NCTestPipeline.scala
@@ -47,7 +47,5 @@ case class NCTestPipeline(tokParser: NCTokenParser) extends
NCPropertyMapAdapter
copy.getTokenValidators.addAll(this.getTokenValidators)
copy.getEntityValidators.addAll(this.getEntityValidators)
- // TODO: variant filter?
-
copy
