This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 1786be5352734f1f980ae751d54a3a115a8e788e Merge: 8ef891e d314268 Author: Sergey Kamov <[email protected]> AuthorDate: Mon Apr 26 14:38:51 2021 +0300 Merge branch 'NLPCRAFT-91' # Conflicts: # nlpcraft/src/main/resources/nlpcraft.conf # nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala # nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec2.scala # nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestSpec.scala bin/MAVEN-RELEASE.md | 2 +- .../examples => nlpcraft-examples}/alarm/README.md | 0 nlpcraft-examples/alarm/pom.xml | 143 +++ .../apache/nlpcraft/examples/alarm/AlarmModel.java | 2 +- .../alarm/src/main/resources}/alarm_model.json | 2 +- .../alarm/src/main/resources}/intents.idl | 0 .../alarm/src/main/resources/nlpcraft.conf | 148 +++ .../examples/alarm/NCModelsValidationSpec.scala | 19 +- .../examples => nlpcraft-examples}/echo/README.md | 0 nlpcraft-examples/echo/pom.xml | 143 +++ .../apache/nlpcraft/examples/echo/EchoModel.scala | 8 +- .../echo/src/main/resources/nlpcraft.conf | 148 +++ .../examples/echo/NCModelsValidationSpec.scala | 19 +- .../helloworld/README.md | 0 nlpcraft-examples/helloworld/pom.xml | 143 +++ .../examples/helloworld/HelloWorldModel.java | 0 .../helloworld/src/main/resources/nlpcraft.conf | 148 +++ .../helloworld/NCModelsValidationSpec.scala | 19 +- .../lightswitch/README.md | 0 nlpcraft-examples/lightswitch/pom.xml | 211 ++++ .../lightswitch/LightSwitchGroovyModel.groovy | 9 +- .../examples/lightswitch/LightSwitchJavaModel.java | 7 +- .../examples/lightswitch/LightSwitchKotlinModel.kt | 6 +- .../lightswitch/LightSwitchScalaModel.scala | 4 +- .../src/main/resources}/lightswitch_model.yaml | 0 .../lightswitch/src/main/resources/nlpcraft.conf | 151 +++ .../lightswitch/NCModelsValidationSpec.scala | 25 +- nlpcraft-examples/minecraft-mod/.gitignore | 3 + nlpcraft-examples/minecraft-mod/LICENSE.txt | 520 ++++++++++ nlpcraft-examples/minecraft-mod/build.gradle | 88 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54708 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + nlpcraft-examples/minecraft-mod/gradlew | 172 ++++ nlpcraft-examples/minecraft-mod/gradlew.bat | 84 ++ .../nplcraft/example/minecraft/NCExampleMod.java | 243 +++++ .../example/minecraft/utils/GameFilesDump.java | 81 ++ .../src/main/resources/META-INF/mods.toml | 28 +- .../src/main/resources/nlpcraft-settings.json | 21 +- nlpcraft-examples/minecraft/README.md | 58 ++ nlpcraft-examples/minecraft/pom.xml | 190 ++++ .../example/minecraft/FIllMatchProcessor.kt | 82 ++ .../nlpcraft/example/minecraft/MinecraftModel.kt | 111 +++ .../org/apache/nlpcraft/example/minecraft/Utils.kt | 49 +- .../nlpcraft/example/minecraft/ValueLoaders.kt | 72 ++ .../minecraft/src/main/resources/block.json | 811 ++++++++++++++++ .../minecraft/src/main/resources/item.json | 1016 ++++++++++++++++++++ .../minecraft/src/main/resources/minecraft.yaml | 162 ++++ .../minecraft/src/main/resources/nlpcraft.conf | 148 +++ .../example/minecraft/NCMinecraftModelSpec.kt | 24 +- .../example/minecraft/NCModelsValidationSpec.scala | 19 +- .../examples => nlpcraft-examples}/phone/README.md | 0 .../phone}/pom.xml | 44 +- .../apache/nlpcraft/examples/phone/PhoneModel.java | 2 +- .../phone/src/main/resources/nlpcraft.conf | 148 +++ .../phone/src/main/resources}/phone_model.json | 0 .../examples => nlpcraft-examples}/sql/README.md | 0 nlpcraft-examples/sql/pom.xml | 151 +++ .../apache/nlpcraft/examples/sql/SqlModel.scala | 2 +- .../nlpcraft/examples/sql/db/SqlAccess.scala | 0 .../apache/nlpcraft/examples/sql/db/SqlBeans.scala | 0 .../nlpcraft/examples/sql/db/SqlBuilder.scala | 0 .../nlpcraft/examples/sql/db/SqlServer.scala | 2 +- .../nlpcraft/examples/sql/db/SqlValueLoader.scala | 0 .../sql/src/main/resources}/model.png | Bin .../sql/src/main/resources/nlpcraft.conf | 148 +++ .../sql/src/main/resources}/northwind.sql | 0 .../sql/src/main/resources}/sql_model.yaml | 0 .../sql/src/main/resources}/sql_model_init.yaml | 0 .../examples/sql/NCModelsValidationSpec.scala | 28 +- .../nlpcraft/examples/sql/NCSqlExampleSpec.scala | 2 +- .../nlpcraft/examples/sql/NCSqlGeneratorSpec.scala | 0 .../nlpcraft/examples/sql/NCSqlModelSpec.scala | 4 +- .../examples => nlpcraft-examples}/time/README.md | 0 nlpcraft-examples/time/pom.xml | 151 +++ .../apache/nlpcraft/examples/time/TimeModel.java | 8 +- .../nlpcraft/examples/time/TimeModelApp.java | 0 .../time/src/main/resources/nlpcraft.conf | 148 +++ .../time/src/main/resources}/time_model.yaml | 0 .../examples/time/NCModelsValidationSpec.scala | 19 +- .../nlpcraft/examples/time/NCTimeModelSpec.scala | 2 +- .../weather/README.md | 0 nlpcraft-examples/weather/pom.xml | 85 ++ .../nlpcraft/examples/weather/WeatherModel.java | 26 +- .../weather}/darksky/DarkSkyException.java | 2 +- .../examples/weather}/darksky/DarkSkyService.java | 2 +- .../weather/src/main/resources/nlpcraft.conf | 148 +++ .../weather/src/main/resources}/weather_model.json | 0 .../examples/weather/NCModelsValidationSpec.scala | 19 +- nlpcraft-stanford/pom.xml | 2 +- nlpcraft/pom.xml | 13 +- nlpcraft/src/main/resources/nlpcraft.conf | 73 -- .../org/apache/nlpcraft/common/NCException.java | 2 - .../apache/nlpcraft/model/NCModelFileAdapter.java | 4 +- .../org/apache/nlpcraft/probe/NCProbeBoot.scala | 3 +- .../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 2 +- .../probe/mgrs/deploy/NCDeployManager.scala | 3 +- .../apache/nlpcraft/{examples => utils}/README.md | 2 + .../geo => utils}/cities/CitiesDataProvider.java | 4 +- .../{examples/misc/geo => utils}/cities/City.java | 2 +- .../misc/geo => utils}/cities/CityData.java | 2 +- .../misc/geo => utils}/cities/cities_timezones.txt | 0 .../misc/geo => utils}/keycdn/GeoManager.java | 6 +- .../geo => utils}/keycdn/beans/GeoDataBean.java | 2 +- .../geo => utils}/keycdn/beans/ResponseBean.java | 2 +- .../keycdn/beans/ResponseDataBean.java | 2 +- .../apache/nlpcraft/model/NCIntentSampleSpec.scala | 4 +- .../nlpcraft/server/rest/NCRestAskSpec.scala | 20 +- .../nlpcraft/server/rest/NCRestClearSpec.scala | 11 +- .../nlpcraft/server/rest/NCRestErrorsSpec.scala | 28 +- .../nlpcraft/server/rest/NCRestModelSpec.scala | 13 +- .../nlpcraft/server/rest/NCRestProbeSpec.scala | 3 +- .../apache/nlpcraft/server/rest/NCRestSpec.scala | 1 - .../{NCRestProbeSpec.scala => RestTestModel.scala} | 32 +- pom.xml | 126 +-- 114 files changed, 6342 insertions(+), 505 deletions(-)
