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
commit 2ef4dfd5b9ad1aa5a38e5099742bf95595d6ccb8 Merge: 486bb34 f050c52 Author: Sergey Kamov <[email protected]> AuthorDate: Sat Jul 10 22:39:13 2021 +0300 Merge branch 'master' into NLPCRAFT-70_NEW .../apache/nlpcraft/examples/alarm/AlarmModel.java | 14 +-- .../alarm/src/main/resources/alarm_samples.txt | 25 +++++ .../alarm/src/main/resources/intents.idl | 6 +- nlpcraft-examples/phone/pom.xml | 31 +++++- .../apache/nlpcraft/examples/phone/PhoneModel.java | 5 + .../examples/phone/NCModelValidationSpec.scala | 42 ++++++++ .../openweathermap/OpenWeatherMapService.java | 12 +-- .../org/apache/nlpcraft/common/util/NCUtils.scala | 60 +++++++---- .../scala/org/apache/nlpcraft/model/NCIntent.java | 4 +- .../org/apache/nlpcraft/model/NCIntentMatch.java | 1 + .../org/apache/nlpcraft/model/NCIntentRef.java | 6 +- .../org/apache/nlpcraft/model/NCIntentSample.java | 50 ++++++---- .../apache/nlpcraft/model/NCIntentSampleRef.java | 111 +++++++++++++++++++++ .../org/apache/nlpcraft/model/NCIntentSkip.java | 1 + .../org/apache/nlpcraft/model/NCIntentTerm.java | 1 + .../model/tools/cmdline/NCCliCommands.scala | 10 +- .../model/tools/test/NCTestAutoModelValidator.java | 23 +++-- .../nlpcraft/model/tools/test/package-info.java | 7 +- .../probe/mgrs/conn/NCConnectionManager.scala | 2 +- .../probe/mgrs/deploy/NCDeployManager.scala | 40 +++++--- .../server/sugsyn/NCSuggestSynonymManager.scala | 2 +- nlpcraft/src/test/resources/samples.txt | 20 ++++ .../nlpcraft/common/makro/NCMacroParserSpec.scala | 2 + .../apache/nlpcraft/model/NCIntentSampleSpec.scala | 9 +- openapi/nlpcraft_swagger.yml | 2 +- 25 files changed, 385 insertions(+), 101 deletions(-)
