You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2021/09/27 13:47:09 UTC
[incubator-nlpcraft] branch NLPCRAFT-383 updated (113797b ->
6bb97f7)
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a change to branch NLPCRAFT-383
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 113797b Merge branch 'master' into NLPCRAFT-383
add 6b12761 NCElement definition annotations added.
add a8226c9 WIP on NLPCRAFT-384
add 02d2e7d Merge branch 'master' into NLPCRAFT-384
add 0420c7e pom.xml(s) updates.
add 7d67b92 Update pom.xml
add 61e0fa6 WIP on NLPCRAFT-384
add fb1ef92 WIP.
add aedcbe9 WIP on NLPCRAFT-384
add 408a77e Fix for NLPCRAFT-417 + WIP on NLPCRAFT-384
add 4a8589a Fix for NLPCRAFT-418
add aa5e49c Update NCCli.scala
add 4196f60 Fix for NLPCRAFT-416 + WIP NLPCRAFT-384
add b3693e4 Update pom.xml
add 4562f42 WIP.
add ddd733b WIP.
add 8bf6de2 WIP.
add 334a191 WIP.
add 9001a54 WIP.
add 82ad934 Fix for NLPCRAFT-425
add 5d2ad16 WIP
add f6112d5 Merge branch 'master' into NLPCRAFT-384
add f1a1b88 Renaming.
add 002c2e8 WIP.
add 97dd87f Fix for NLPCRAFT-424
add 758227b Merge branch 'master' into NLPCRAFT-384
add d163091 Merge branch 'master' into NLPCRAFT-384
add 7b0a699 Merge branch 'master' into NLPCRAFT-384
add 8b3d530 WIP.
add d1961d4 WIP
add 33ce608 WIP.
add 050ae4f Update NCUtils.scala
add 6a6cf4b Merge branch 'NLPCRAFT-384'
add 6f62460 Update NCDeployManager.scala
add 7881cfb Update NCDeployManager.scala
add eecccbf Fix for NLPCRAFT-445
add 4297ad9 Default `nlpEngine` fixed.
add 78386a0 Update alarm_intents.idl
add fbb64bc Fix for NLPCRAFT-448
add 4154550 Fix for NLPCRAFT-451
add ff4831b Merge branch 'master' into NLPCRAFT-446
add efd0c24 Basic cleanup on Minecraft example.
add 0789526 Fix for NLPCRAFT-455
add 3e4faad Stop words processing related issues.
add daee912 Minor fixes.
add 766bc3b CLI fixes.
new 6bb97f7 Merge branch 'master' into NLPCRAFT-383
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-examples/alarm/pom.xml | 3 +-
.../apache/nlpcraft/examples/alarm/AlarmModel.java | 2 +-
.../resources/{intents.idl => alarm_intents.idl} | 8 +-
.../alarm/src/main/resources/alarm_model.json | 2 +-
nlpcraft-examples/{helloworld => cargps}/README.md | 11 +-
nlpcraft-examples/{alarm => cargps}/pom.xml | 4 +-
.../nlpcraft/examples/cargps/CarGpsModel.scala | 65 +++
.../src/main/resources/cargps_intents.idl} | 29 +-
.../cargps/src/main/resources/cargps_model.yaml | 100 +++++
.../src/main/resources/probe.conf | 4 +-
.../samples/cargps_add_waypoint_samples.txt | 7 +-
.../resources/samples/cargps_cancel_samples.txt | 16 +-
.../resources/samples/cargps_navigate_samples.txt | 7 +-
.../samples/cargps_remove_waypoint_samples.txt | 7 +-
.../examples/cargps/NCCarGpsModelSpec.scala | 18 +-
.../examples/cargps}/NCModelValidationSpec.scala | 4 +-
nlpcraft-examples/minecraft-mod/build.gradle | 4 +-
nlpcraft-examples/minecraft/pom.xml | 2 +-
.../minecraft/MinecraftFillMatchProcessor.kt | 4 +-
.../minecraft/MinecraftModel.kt | 9 +-
.../minecraft/MinecraftValueLoader.kt | 2 +-
.../minecraft/src/main/resources/minecraft.yaml | 12 +-
.../minecraft/src/main/resources/probe.conf | 2 +-
.../minecraft/NCMinecraftModelSpec.kt | 2 +-
.../minecraft/NCModelValidationSpec.scala | 4 +-
nlpcraft-examples/time/pom.xml | 2 +-
.../nlp/core/stanford/NCStanfordTokenizer.scala | 21 +
.../src/main/resources/stopwords/stop_words.txt | 5 +-
.../org/apache/nlpcraft/common/NCService.scala | 2 +-
.../apache/nlpcraft/common/nlp/NCNlpSentence.scala | 25 +-
.../nlpcraft/common/nlp/NCNlpSentenceNote.scala | 141 ++++---
.../nlpcraft/common/nlp/NCNlpSentenceToken.scala | 36 +-
.../common/nlp/NCNlpSentenceTokenBuffer.scala | 9 +-
.../org/apache/nlpcraft/common/util/NCUtils.scala | 12 +-
.../org/apache/nlpcraft/model/NCAddElement.java} | 34 +-
.../apache/nlpcraft/model/NCAddElementClass.java} | 36 +-
.../org/apache/nlpcraft/model/NCCustomParser.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCElement.java | 2 +-
.../apache/nlpcraft/model/NCModelFileAdapter.java | 5 +
.../org/apache/nlpcraft/model/NCModelView.java | 11 +
.../apache/nlpcraft/model/impl/NCTokenImpl.scala | 31 +-
.../apache/nlpcraft/model/impl/NCTokenLogger.scala | 17 +-
.../nlpcraft/model/impl/json/NCModelJson.java | 7 +
.../model/intent/compiler/NCIdlCompiler.scala | 10 +-
.../model/intent/solver/NCIntentSolver.scala | 3 +-
.../model/intent/solver/NCIntentSolverEngine.scala | 23 +-
.../nlpcraft/model/tools/cmdline/NCCli.scala | 15 +-
.../nlpcraft/model/tools/cmdline/NCCliBase.scala | 2 +-
.../org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 +
.../nlpcraft/probe/mgrs/NCProbeIdlToken.scala | 65 +++
.../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 8 +-
.../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 229 +---------
.../nlpcraft/probe/mgrs/NCProbeVariants.scala | 3 +
.../probe/mgrs/deploy/NCDeployManager.scala | 454 +++++++++++++++-----
.../mgrs/dialogflow/NCDialogFlowManager.scala | 2 +-
.../nlpcraft/probe/mgrs/model/NCModelManager.scala | 7 +
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 47 +--
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 461 ++++++++++++---------
.../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 187 ++++-----
.../enrichers/stopword/NCStopWordEnricher.scala | 23 +-
.../probe/mgrs/sentence/NCSentenceManager.scala | 120 ++++--
.../probe/mgrs/synonyms/NCSynonymsManager.scala | 436 +++++++++++++++++++
.../nlp/enrichers/NCServerEnrichmentManager.scala | 21 +-
.../nlp/enrichers/numeric/NCNumericEnricher.scala | 158 ++++---
.../nlpcraft/server/probe/NCProbeManager.scala | 6 +-
.../nlpcraft/server/query/NCQueryManager.scala | 2 +-
.../scala/org/apache/nlpcraft/NCTestElement.scala | 2 +
.../model/stm/indexes/NCSpecModelAdapter.scala | 25 +-
.../model/stop/NCStopWordsAllowedSpec.scala | 72 ++++
.../nlpcraft/model/stop/NCStopWordsBaseSpec.scala | 73 ++++
.../model/stop/NCStopWordsInsideSpec.scala | 72 ++++
.../apache/nlpcraft/probe/mgrs/deploy/readme.txt} | 2 +-
.../mgrs/deploy1/NCElementAnnotationsSpec.scala | 122 ++++++
.../mgrs/deploy1/pack/NCElementAnnotations2.scala} | 22 +-
.../apache/nlpcraft/probe/mgrs/deploy1/readme.txt} | 2 +-
.../nlp/enrichers/limit/NCEnricherLimitSpec.scala | 6 -
.../model/NCEnricherNestedModelSpec.scala | 3 +-
.../model/NCEnricherNestedModelSpec4.scala | 79 +++-
.../nlp/enrichers/sort/NCEnricherSortSpec.scala | 3 +-
pom.xml | 3 +-
80 files changed, 2414 insertions(+), 1082 deletions(-)
rename nlpcraft-examples/alarm/src/main/resources/{intents.idl => alarm_intents.idl} (83%)
copy nlpcraft-examples/{helloworld => cargps}/README.md (88%)
copy nlpcraft-examples/{alarm => cargps}/pom.xml (98%)
create mode 100644 nlpcraft-examples/cargps/src/main/java/org/apache/nlpcraft/examples/cargps/CarGpsModel.scala
copy nlpcraft-examples/{helloworld/src/test/java/org/apache/nlpcraft/examples/helloworld/NCModelValidationSpec.scala => cargps/src/main/resources/cargps_intents.idl} (57%)
create mode 100644 nlpcraft-examples/cargps/src/main/resources/cargps_model.yaml
copy nlpcraft-examples/{phone => cargps}/src/main/resources/probe.conf (98%)
copy nlpcraft/src/test/resources/samples.txt => nlpcraft-examples/cargps/src/main/resources/samples/cargps_add_waypoint_samples.txt (91%)
copy nlpcraft/src/main/resources/application.conf => nlpcraft-examples/cargps/src/main/resources/samples/cargps_cancel_samples.txt (72%)
copy nlpcraft/src/test/resources/samples.txt => nlpcraft-examples/cargps/src/main/resources/samples/cargps_navigate_samples.txt (87%)
copy nlpcraft/src/test/resources/samples.txt => nlpcraft-examples/cargps/src/main/resources/samples/cargps_remove_waypoint_samples.txt (91%)
copy nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/__javadoc_fix.java => nlpcraft-examples/cargps/src/test/java/org/apache/nlpcraft/examples/cargps/NCCarGpsModelSpec.scala (68%)
copy nlpcraft-examples/{minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft => cargps/src/test/java/org/apache/nlpcraft/examples/cargps}/NCModelValidationSpec.scala (93%)
rename nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/MinecraftFillMatchProcessor.kt (96%)
rename nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/MinecraftModel.kt (90%)
rename nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/MinecraftValueLoader.kt (98%)
rename nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/NCMinecraftModelSpec.kt (96%)
rename nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/NCModelValidationSpec.scala (93%)
copy nlpcraft/src/{test/scala/org/apache/nlpcraft/NCTestEnvironment.java => main/scala/org/apache/nlpcraft/model/NCAddElement.java} (69%)
copy nlpcraft/src/{test/scala/org/apache/nlpcraft/NCTestEnvironment.java => main/scala/org/apache/nlpcraft/model/NCAddElementClass.java} (68%)
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeIdlToken.scala
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/synonyms/NCSynonymsManager.scala
create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/model/stop/NCStopWordsAllowedSpec.scala
create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/model/stop/NCStopWordsBaseSpec.scala
create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/model/stop/NCStopWordsInsideSpec.scala
copy nlpcraft/src/{main/python/ctxword/jupyter/py_requirements => test/scala/org/apache/nlpcraft/probe/mgrs/deploy/readme.txt} (92%)
create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/deploy1/NCElementAnnotationsSpec.scala
copy nlpcraft/src/{main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverInput.scala => test/scala/org/apache/nlpcraft/probe/mgrs/deploy1/pack/NCElementAnnotations2.scala} (70%)
copy nlpcraft/src/{main/python/ctxword/jupyter/py_requirements => test/scala/org/apache/nlpcraft/probe/mgrs/deploy1/readme.txt} (92%)
[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-383
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-383
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 6bb97f7f24c7d42d4acbdf7deb39d4a6576e2ed1
Merge: 113797b 766bc3b
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Mon Sep 27 16:45:35 2021 +0300
Merge branch 'master' into NLPCRAFT-383
# Conflicts:
# nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
nlpcraft-examples/alarm/pom.xml | 3 +-
.../apache/nlpcraft/examples/alarm/AlarmModel.java | 2 +-
.../resources/{intents.idl => alarm_intents.idl} | 8 +-
.../alarm/src/main/resources/alarm_model.json | 2 +-
nlpcraft-examples/cargps/README.md | 45 ++
nlpcraft-examples/{alarm => cargps}/pom.xml | 4 +-
.../nlpcraft/examples/cargps/CarGpsModel.scala | 65 +++
.../src/main/resources/cargps_intents.idl} | 29 +-
.../cargps/src/main/resources/cargps_model.yaml | 100 +++++
.../src/main/resources/probe.conf | 4 +-
.../samples/cargps_add_waypoint_samples.txt | 21 +
.../resources/samples/cargps_cancel_samples.txt | 28 ++
.../resources/samples/cargps_navigate_samples.txt | 21 +
.../samples/cargps_remove_waypoint_samples.txt | 21 +
.../examples/cargps/NCCarGpsModelSpec.scala} | 23 +-
.../examples/cargps}/NCModelValidationSpec.scala | 4 +-
nlpcraft-examples/minecraft-mod/build.gradle | 4 +-
nlpcraft-examples/minecraft/pom.xml | 2 +-
.../minecraft/MinecraftFillMatchProcessor.kt | 4 +-
.../minecraft/MinecraftModel.kt | 9 +-
.../minecraft/MinecraftValueLoader.kt | 2 +-
.../minecraft/src/main/resources/minecraft.yaml | 12 +-
.../minecraft/src/main/resources/probe.conf | 2 +-
.../minecraft/NCMinecraftModelSpec.kt | 2 +-
.../minecraft/NCModelValidationSpec.scala | 4 +-
nlpcraft-examples/time/pom.xml | 2 +-
.../nlp/core/stanford/NCStanfordTokenizer.scala | 21 +
.../src/main/resources/stopwords/stop_words.txt | 5 +-
.../org/apache/nlpcraft/common/NCService.scala | 2 +-
.../apache/nlpcraft/common/nlp/NCNlpSentence.scala | 25 +-
.../nlpcraft/common/nlp/NCNlpSentenceNote.scala | 141 ++++---
.../nlpcraft/common/nlp/NCNlpSentenceToken.scala | 36 +-
.../common/nlp/NCNlpSentenceTokenBuffer.scala | 9 +-
.../org/apache/nlpcraft/common/util/NCUtils.scala | 12 +-
.../org/apache/nlpcraft/model/NCAddElement.java | 42 +-
.../apache/nlpcraft/model/NCAddElementClass.java | 51 +++
.../org/apache/nlpcraft/model/NCCustomParser.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCElement.java | 2 +-
.../apache/nlpcraft/model/NCModelFileAdapter.java | 5 +
.../org/apache/nlpcraft/model/NCModelView.java | 11 +
.../apache/nlpcraft/model/impl/NCTokenImpl.scala | 31 +-
.../apache/nlpcraft/model/impl/NCTokenLogger.scala | 17 +-
.../nlpcraft/model/impl/json/NCModelJson.java | 7 +
.../model/intent/compiler/NCIdlCompiler.scala | 10 +-
.../model/intent/solver/NCIntentSolver.scala | 3 +-
.../model/intent/solver/NCIntentSolverEngine.scala | 23 +-
.../nlpcraft/model/tools/cmdline/NCCli.scala | 15 +-
.../nlpcraft/model/tools/cmdline/NCCliBase.scala | 2 +-
.../org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 +
.../nlpcraft/probe/mgrs/NCProbeIdlToken.scala | 65 +++
.../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 8 +-
.../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 229 +---------
.../nlpcraft/probe/mgrs/NCProbeVariants.scala | 3 +
.../probe/mgrs/deploy/NCDeployManager.scala | 454 +++++++++++++++-----
.../mgrs/dialogflow/NCDialogFlowManager.scala | 2 +-
.../nlpcraft/probe/mgrs/model/NCModelManager.scala | 7 +
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 47 +--
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 461 ++++++++++++---------
.../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 187 ++++-----
.../enrichers/stopword/NCStopWordEnricher.scala | 23 +-
.../probe/mgrs/sentence/NCSentenceManager.scala | 120 ++++--
.../probe/mgrs/synonyms/NCSynonymsManager.scala | 436 +++++++++++++++++++
.../nlp/enrichers/NCServerEnrichmentManager.scala | 21 +-
.../nlp/enrichers/numeric/NCNumericEnricher.scala | 158 ++++---
.../nlpcraft/server/probe/NCProbeManager.scala | 6 +-
.../nlpcraft/server/query/NCQueryManager.scala | 2 +-
.../scala/org/apache/nlpcraft/NCTestElement.scala | 2 +
.../model/stm/indexes/NCSpecModelAdapter.scala | 25 +-
.../model/stop/NCStopWordsAllowedSpec.scala | 72 ++++
.../nlpcraft/model/stop/NCStopWordsBaseSpec.scala | 73 ++++
.../model/stop/NCStopWordsInsideSpec.scala | 72 ++++
.../apache/nlpcraft/probe/mgrs/deploy/readme.txt | 18 +
.../mgrs/deploy1/NCElementAnnotationsSpec.scala | 122 ++++++
.../mgrs/deploy1/pack/NCElementAnnotations2.scala | 30 +-
.../apache/nlpcraft/probe/mgrs/deploy1/readme.txt | 18 +
.../nlp/enrichers/limit/NCEnricherLimitSpec.scala | 6 -
.../model/NCEnricherNestedModelSpec.scala | 3 +-
.../model/NCEnricherNestedModelSpec4.scala | 79 +++-
.../nlp/enrichers/sort/NCEnricherSortSpec.scala | 3 +-
pom.xml | 3 +-
80 files changed, 2605 insertions(+), 1047 deletions(-)
diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index c01801e,332dd26..827846f
--- 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
@@@ -1691,10 -1896,10 +1896,10 @@@ object NCDeployManager extends NCServic
if (unusedIntents.nonEmpty)
logger.warn(s"Intents are unused (have no callback): [" +
s"mdlId=$mdlId, " +
- s"origin=${mdl.getOrigin}, " +
+ s"origin=${wrappedMdl.getOrigin}, " +
s"intentIds=${unusedIntents.map(_.id).mkString("(", ", ", ")")}]"
)
--
++
intents.toSet
}