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 2020/08/02 15:14:58 UTC
[incubator-nlpcraft] branch NLPCRAFT-41 updated (f32181f -> 8c201cb)
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a change to branch NLPCRAFT-41
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from f32181f Merge remote-tracking branch 'origin/master' into NLPCRAFT-41
add ed741ed - Added @NCIntentSample annotation. - Test framework extended (model test based on intent examples) - IntentId field added into REST API request results (check, ask sync) - IntentId field added into log table (Note, that DB must be re-initialized)
new 8c201cb Merge branch 'master' into NLPCRAFT-41
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/pom.xml | 20 +-
nlpcraft/src/main/resources/sql/create_schema.sql | 1 +
.../scala/org/apache/nlpcraft/examples/README.md | 1 -
.../apache/nlpcraft/examples/alarm/AlarmModel.java | 21 +-
.../apache/nlpcraft/examples/alarm/AlarmTest.java | 63 ------
.../org/apache/nlpcraft/examples/alarm/README.md | 9 +-
.../nlpcraft/examples/alarm/alarm_model.json | 5 -
.../apache/nlpcraft/examples/echo/EchoTest.java | 62 ------
.../org/apache/nlpcraft/examples/echo/README.md | 11 +-
.../examples/helloworld/HelloWorldModel.java | 4 +-
.../apache/nlpcraft/examples/helloworld/README.md | 9 +-
.../examples/lightswitch/LightSwitchModel.scala | 15 +-
.../examples/lightswitch/LightSwitchTest.java | 71 -------
.../apache/nlpcraft/examples/lightswitch/README.md | 7 +-
.../examples/lightswitch/lightswitch_model.yaml | 5 -
.../apache/nlpcraft/examples/phone/PhoneModel.java | 19 +-
.../apache/nlpcraft/examples/phone/PhoneTest.java | 66 ------
.../org/apache/nlpcraft/examples/phone/README.md | 9 +-
.../nlpcraft/examples/phone/phone_model.json | 5 -
.../org/apache/nlpcraft/examples/sql/README.md | 6 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala | 4 +-
.../org/apache/nlpcraft/examples/time/README.md | 9 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 43 ++--
.../apache/nlpcraft/examples/time/TimeTest.java | 72 -------
.../apache/nlpcraft/examples/time/time_model.yaml | 6 -
.../org/apache/nlpcraft/examples/weather/README.md | 11 +-
.../nlpcraft/examples/weather/WeatherModel.java | 26 ++-
.../examples/weather/WeatherResultWrapper.java | 55 -----
.../nlpcraft/examples/weather/WeatherTest.java | 109 ----------
.../scala/org/apache/nlpcraft/model/NCIntent.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentRef.java | 2 +-
.../{NCIntentExample.java => NCIntentSample.java} | 22 +-
.../org/apache/nlpcraft/model/NCIntentTerm.java | 2 +-
.../apache/nlpcraft/model/NCModelFileAdapter.java | 7 -
.../org/apache/nlpcraft/model/NCModelView.java | 24 ---
.../scala/org/apache/nlpcraft/model/NCResult.java | 19 ++
.../apache/nlpcraft/model/impl/NCModelImpl.scala | 3 +-
.../nlpcraft/model/impl/json/NCModelJson.java | 17 --
.../model/intent/impl/NCIntentSolver.scala | 3 +
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 1 -
.../model/tools/test/NCTestAutoModelValidator.java | 139 +++++++++++++
.../model/tools/test/NCTestClientBuilder.java | 30 ++-
.../nlpcraft/model/tools/test/NCTestResult.java | 3 +
.../test/impl/NCTestAutoModelValidatorImpl.scala | 224 +++++++++++++++++++++
.../nlpcraft/probe/embedded/NCEmbeddedResult.java | 3 +
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 38 ++--
.../nlpcraft/server/mdo/NCQueryStateMdo.scala | 1 +
.../nlpcraft/server/probe/NCProbeManager.scala | 6 +-
.../server/proclog/NCProcessLogManager.scala | 12 +-
.../nlpcraft/server/query/NCQueryManager.scala | 17 +-
.../nlpcraft/server/rest/NCBasicRestApi.scala | 3 +-
.../apache/nlpcraft/server/sql/NCSqlManager.scala | 7 +-
nlpcraft/src/test/resources/log4j2.xml | 2 +-
.../nlpcraft/NCTestAutoModelValidatorSpec.scala} | 12 +-
.../nlpcraft/examples/sql/NCSqlExampleTest.scala} | 2 +-
.../nlpcraft/examples/sql/NCSqlModelSpec.scala | 1 -
.../model/conversation/ConversationTest.java} | 28 +--
openapi/nlpcraft_swagger.yml | 6 +
pom.xml | 25 +--
sql/mysql/schema.sql | 1 +
sql/oracle/schema.sql | 1 +
sql/postgres/schema.sql | 1 +
62 files changed, 669 insertions(+), 739 deletions(-)
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/AlarmTest.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/examples/echo/EchoTest.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/examples/lightswitch/LightSwitchTest.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/examples/phone/PhoneTest.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeTest.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherResultWrapper.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherTest.java
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/{NCIntentExample.java => NCIntentSample.java} (65%)
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
copy nlpcraft/src/{main/scala/org/apache/nlpcraft/model/package.scala => test/scala/org/apache/nlpcraft/NCTestAutoModelValidatorSpec.scala} (71%)
rename nlpcraft/src/{main/scala/org/apache/nlpcraft/examples/sql/SqlTest.scala => test/scala/org/apache/nlpcraft/examples/sql/NCSqlExampleTest.scala} (99%)
rename nlpcraft/src/{main/scala/org/apache/nlpcraft/examples/helloworld/HelloWorldTest.java => test/scala/org/apache/nlpcraft/model/conversation/ConversationTest.java} (72%)
[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-41
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-41
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 8c201cb7a59cc7952dc6d09fa6d3adf7446ebff9
Merge: f32181f ed741ed
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Sun Aug 2 18:14:47 2020 +0300
Merge branch 'master' into NLPCRAFT-41
# Conflicts:
# nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/weather_model.json
nlpcraft/pom.xml | 20 +-
nlpcraft/src/main/resources/sql/create_schema.sql | 1 +
.../scala/org/apache/nlpcraft/examples/README.md | 1 -
.../apache/nlpcraft/examples/alarm/AlarmModel.java | 21 +-
.../apache/nlpcraft/examples/alarm/AlarmTest.java | 63 ------
.../org/apache/nlpcraft/examples/alarm/README.md | 9 +-
.../nlpcraft/examples/alarm/alarm_model.json | 5 -
.../apache/nlpcraft/examples/echo/EchoTest.java | 62 ------
.../org/apache/nlpcraft/examples/echo/README.md | 11 +-
.../examples/helloworld/HelloWorldModel.java | 4 +-
.../apache/nlpcraft/examples/helloworld/README.md | 9 +-
.../examples/lightswitch/LightSwitchModel.scala | 15 +-
.../examples/lightswitch/LightSwitchTest.java | 71 -------
.../apache/nlpcraft/examples/lightswitch/README.md | 7 +-
.../examples/lightswitch/lightswitch_model.yaml | 5 -
.../apache/nlpcraft/examples/phone/PhoneModel.java | 19 +-
.../apache/nlpcraft/examples/phone/PhoneTest.java | 66 ------
.../org/apache/nlpcraft/examples/phone/README.md | 9 +-
.../nlpcraft/examples/phone/phone_model.json | 5 -
.../org/apache/nlpcraft/examples/sql/README.md | 6 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala | 4 +-
.../org/apache/nlpcraft/examples/time/README.md | 9 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 43 ++--
.../apache/nlpcraft/examples/time/TimeTest.java | 72 -------
.../apache/nlpcraft/examples/time/time_model.yaml | 6 -
.../org/apache/nlpcraft/examples/weather/README.md | 11 +-
.../nlpcraft/examples/weather/WeatherModel.java | 26 ++-
.../nlpcraft/examples/weather/WeatherTest.java | 109 ----------
.../scala/org/apache/nlpcraft/model/NCIntent.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentRef.java | 2 +-
.../{NCIntentExample.java => NCIntentSample.java} | 22 +-
.../org/apache/nlpcraft/model/NCIntentTerm.java | 2 +-
.../apache/nlpcraft/model/NCModelFileAdapter.java | 7 -
.../org/apache/nlpcraft/model/NCModelView.java | 24 ---
.../scala/org/apache/nlpcraft/model/NCResult.java | 19 ++
.../apache/nlpcraft/model/impl/NCModelImpl.scala | 3 +-
.../nlpcraft/model/impl/json/NCModelJson.java | 17 --
.../model/intent/impl/NCIntentSolver.scala | 3 +
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 1 -
.../model/tools/test/NCTestAutoModelValidator.java | 139 +++++++++++++
.../model/tools/test/NCTestClientBuilder.java | 30 ++-
.../nlpcraft/model/tools/test/NCTestResult.java | 3 +
.../test/impl/NCTestAutoModelValidatorImpl.scala | 224 +++++++++++++++++++++
.../nlpcraft/probe/embedded/NCEmbeddedResult.java | 3 +
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 38 ++--
.../nlpcraft/server/mdo/NCQueryStateMdo.scala | 1 +
.../nlpcraft/server/probe/NCProbeManager.scala | 6 +-
.../server/proclog/NCProcessLogManager.scala | 12 +-
.../nlpcraft/server/query/NCQueryManager.scala | 17 +-
.../nlpcraft/server/rest/NCBasicRestApi.scala | 3 +-
.../apache/nlpcraft/server/sql/NCSqlManager.scala | 7 +-
nlpcraft/src/test/resources/log4j2.xml | 2 +-
.../nlpcraft/NCTestAutoModelValidatorSpec.scala} | 44 +---
.../nlpcraft/examples/sql/NCSqlExampleTest.scala} | 2 +-
.../nlpcraft/examples/sql/NCSqlModelSpec.scala | 1 -
.../model/conversation/ConversationTest.java} | 28 +--
openapi/nlpcraft_swagger.yml | 6 +
pom.xml | 25 +--
sql/mysql/schema.sql | 1 +
sql/oracle/schema.sql | 1 +
sql/postgres/schema.sql | 1 +
61 files changed, 672 insertions(+), 713 deletions(-)