You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/09/11 20:44:35 UTC
[incubator-nlpcraft] branch NLPCRAFT-41-config updated (59588ba ->
4379c7c)
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a change to branch NLPCRAFT-41-config
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 59588ba Merge branch 'NLPCRAFT-41' into NLPCRAFT-41-config
add f6e071c WIP.
add e5f470f Merge branch 'NLPCRAFT-41' of https://github.com/apache/incubator-nlpcraft into NLPCRAFT-41
new 4379c7c Merge branch 'NLPCRAFT-41' into NLPCRAFT-41-config
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nlpcraft/src/main/resources/nlpcraft.conf | 10 +++++-----
.../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 8 +++-----
.../mgrs/conversation/NCConversationDescriptor.scala | 7 +++----
...datorSpec.scala => NCTestExampleModelsSpec.scala} | 20 +++++++++++++++++---
.../impl/NCSqlModelGeneratorImplSpec.scala} | 6 +++---
5 files changed, 31 insertions(+), 20 deletions(-)
rename nlpcraft/src/test/scala/org/apache/nlpcraft/{NCTestAutoModelValidatorSpec.scala => NCTestExampleModelsSpec.scala} (56%)
rename nlpcraft/src/test/scala/org/apache/nlpcraft/model/tools/{NCSqlModelEngineSpec.scala => sqlgen/impl/NCSqlModelGeneratorImplSpec.scala} (96%)
[incubator-nlpcraft] 01/01: Merge branch 'NLPCRAFT-41' into
NLPCRAFT-41-config
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-41-config
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 4379c7c7501a81cbdcf0dd1559eb364cbcaa05ed
Merge: 59588ba e5f470f
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Fri Sep 11 13:44:21 2020 -0700
Merge branch 'NLPCRAFT-41' into NLPCRAFT-41-config
nlpcraft/src/main/resources/nlpcraft.conf | 10 +++++-----
.../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 8 +++-----
.../mgrs/conversation/NCConversationDescriptor.scala | 7 +++----
...datorSpec.scala => NCTestExampleModelsSpec.scala} | 20 +++++++++++++++++---
.../impl/NCSqlModelGeneratorImplSpec.scala} | 6 +++---
5 files changed, 31 insertions(+), 20 deletions(-)
diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/cmd/NCCommandManager.scala
index bd9d44a,05c4367..05b99b2
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/cmd/NCCommandManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/cmd/NCCommandManager.scala
@@@ -108,13 -108,11 +108,11 @@@ object NCCommandManager extends NCServi
case "S2P_MODEL_INFO" ⇒
val mdlId = msg.data[String]("mdlId")
- val mdlData = NCModelManager.getModelData(mdlId)
+ val mdlData = NCModelManager.getModelData(mdlId).getOrElse(throw new NCE(s"Model not found: $mdlId"))
val macros = mdlData.model.getMacros.asInstanceOf[Serializable]
- val syns = mdlData.model.getElements.asScala.
- map(p ⇒ p.getId → p.getSynonyms).toMap.asJava.asInstanceOf[Serializable]
- val samples = mdlData.samples.map(p ⇒ p._1 → p._2.asJava).
- asJava.asInstanceOf[Serializable]
+ val syns = mdlData.model.getElements.asScala.map(p ⇒ p.getId → p.getSynonyms).toMap.asJava.asInstanceOf[Serializable]
+ val samples = mdlData.samples.map(p ⇒ p._1 → p._2.asJava).asJava.asInstanceOf[Serializable]
NCConnectionManager.send(
NCProbeMessage(
diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/conversation/NCConversationDescriptor.scala
index dbee138,49a6621..9e9f6bc
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/conversation/NCConversationDescriptor.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/conversation/NCConversationDescriptor.scala
@@@ -81,18 -83,18 +81,17 @@@ case class NCConversationDescriptor
attempt += 1
// Conversation cleared by timeout or when there are too much unsuccessful requests.
- if (now - lastUpdateTstamp > CONV_CLEAR_DELAY) {
+ if (now - lastUpdateTstamp > updateTimeoutMs) {
stm.clear()
- logger.info(s"Conversation reset by timeout [" +
+ logger.info(s"Conversation is reset by timeout [" +
s"usrId=$usrId, " +
s"mdlId=$mdlId" +
s"]")
}
- else if (attempt > MAX_DEPTH) {
+ else if (attempt > maxDepth) {
stm.clear()
-
- logger.info(s"Conversation reset after too many unsuccessful requests [" +
-
+ logger.info(s"Conversation is reset after too many unsuccessful requests [" +
s"usrId=$usrId, " +
s"mdlId=$mdlId" +
s"]")