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 2021/05/15 02:59:54 UTC
[incubator-nlpcraft] branch master updated: Moving to 0.8.0.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/master by this push:
new 0948bff Moving to 0.8.0.
0948bff is described below
commit 0948bffcd36ebba558423bd2882172172e5afa5d
Author: unknown <ar...@datalingvo.com>
AuthorDate: Fri May 14 19:59:39 2021 -0700
Moving to 0.8.0.
---
README.md | 4 ++--
docker/readme.md | 12 +++++-----
nlpcraft-examples/alarm/pom.xml | 2 +-
nlpcraft-examples/echo/pom.xml | 2 +-
nlpcraft-examples/helloworld/pom.xml | 2 +-
nlpcraft-examples/lightswitch/pom.xml | 4 ++--
.../lightswitch/LightSwitchScalaModel.scala | 27 +++++++++++-----------
nlpcraft-examples/minecraft/pom.xml | 4 ++--
nlpcraft-examples/phone/pom.xml | 2 +-
nlpcraft-examples/sql/pom.xml | 2 +-
nlpcraft-examples/time/pom.xml | 2 +-
nlpcraft-examples/weather/pom.xml | 2 +-
nlpcraft-stanford/pom.xml | 2 +-
nlpcraft/pom.xml | 2 +-
.../apache/nlpcraft/common/version/NCVersion.scala | 3 ++-
.../model/tools/test/NCTestAutoModelValidator.java | 3 ++-
.../test/impl/NCTestAutoModelValidatorImpl.scala | 12 ++++++----
openapi/nlpcraft_swagger.yml | 2 +-
pom.xml | 4 ++--
19 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/README.md b/README.md
index 2cfd9c9..28b27db 100644
--- a/README.md
+++ b/README.md
@@ -105,11 +105,11 @@ Add NLPCraft dependency to your project:
<dependency>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft</artifactId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
</dependency>
</dependencies>
```
-NOTE: **0.7.5** should be the latest NLPCraft version.
+NOTE: **0.8.0** should be the latest NLPCraft version.
### Define Data Model
Declare the static part of the data model using YAML which we will later load in our model implementation. You can declare entire
diff --git a/docker/readme.md b/docker/readme.md
index 1ea5b41..719c934 100644
--- a/docker/readme.md
+++ b/docker/readme.md
@@ -28,9 +28,9 @@ also prepare your own images following the instructions below.
#### Using Server Image
1. [Install](https://docs.docker.com/install/) docker.
- 2. Pull actual NLPCraft server image: ```docker pull nlpcraftserver/server:0.7.5```,
+ 2. Pull actual NLPCraft server image: ```docker pull nlpcraftserver/server:0.8.0```,
where `0.7.5` is the desired version.
- 3. Run image: ```docker run -m 8G -p 8081:8081 -p 8201:8201 -p 8202:8202 nlpcraftserver/server:0.7.5```
+ 3. Run image: ```docker run -m 8G -p 8081:8081 -p 8201:8201 -p 8202:8202 nlpcraftserver/server:0.8.0```
**NOTE**:
Default docker image run REST server with default configuration (see file `build/nlpcraft.conf`). See [configuration](https://nlpcraft.apache.org/server-and-probe.html)
@@ -40,13 +40,13 @@ also prepare your own images following the instructions below.
You can prepare your own NLPCraft server image following these instructions:
1. Build the release with maven: ```mvn clean package -P release```
2. Prepare docker image with `prepare.sh` (modify it if necessary):
- ```./prepare.sh docker_acct server 0.7.5```, where
- * `0.7.5` - maven build version, prepared on previous step.
+ ```./prepare.sh docker_acct server 0.8.0```, where
+ * `0.8.0` - maven build version, prepared on previous step.
* `docker_acct` - change it to your own [DockerHub](https://hub.docker.com) account.
- Note that docker image name will be `docker_acct/server:0.7.5`
+ Note that docker image name will be `docker_acct/server:0.8.0`
3. Login to [DockerHub](https://hub.docker.com): ```docker login```
- 4. Push prepared docker image: ```docker push docker_acct/server:0.7.5```
+ 4. Push prepared docker image: ```docker push docker_acct/server:0.8.0```
5. Logout from [DockerHub](https://hub.docker.com): ```docker logout```
**NOTE**:
diff --git a/nlpcraft-examples/alarm/pom.xml b/nlpcraft-examples/alarm/pom.xml
index e7790f7..763b8f6 100644
--- a/nlpcraft-examples/alarm/pom.xml
+++ b/nlpcraft-examples/alarm/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/echo/pom.xml b/nlpcraft-examples/echo/pom.xml
index c1fe84c..0e58925 100644
--- a/nlpcraft-examples/echo/pom.xml
+++ b/nlpcraft-examples/echo/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/helloworld/pom.xml b/nlpcraft-examples/helloworld/pom.xml
index 3ad1c32..7f897a9 100644
--- a/nlpcraft-examples/helloworld/pom.xml
+++ b/nlpcraft-examples/helloworld/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/lightswitch/pom.xml b/nlpcraft-examples/lightswitch/pom.xml
index 470a86d..f2bce0d 100644
--- a/nlpcraft-examples/lightswitch/pom.xml
+++ b/nlpcraft-examples/lightswitch/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,7 +35,7 @@
<nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
- <kotlin.ver>1.4.32</kotlin.ver>
+ <kotlin.ver>1.5.0</kotlin.ver>
<groovy.ver>3.0.7</groovy.ver>
<gmavenplus.ver>1.12.1</gmavenplus.ver>
</properties>
diff --git a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModel.scala b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModel.scala
index 69acdbe..fe178d8 100644
--- a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModel.scala
+++ b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchScalaModel.scala
@@ -42,19 +42,20 @@ class LightSwitchScalaModel extends NCModelFileAdapter("lightswitch_model.yaml")
@NCIntentRef("ls")
@NCIntentSample(Array(
"Turn the lights off in the entire house.",
- "Switch on the illumination in the master bedroom closet.",
- "Get the lights on.",
- "Lights up in the kitchen.",
- "Please, put the light out in the upstairs bedroom.",
- "Set the lights on in the entire house.",
- "Turn the lights off in the guest bedroom.",
- "Could you please switch off all the lights?",
- "Dial off illumination on the 2nd floor.",
- "Please, no lights!",
- "Kill off all the lights now!",
- "No lights in the bedroom, please.",
- "Light up the garage, please!",
- "Kill the illumination now!"
+ "Turn off all lights now"
+// "Switch on the illumination in the master bedroom closet.",
+// "Get the lights on.",
+// "Lights up in the kitchen.",
+// "Please, put the light out in the upstairs bedroom.",
+// "Set the lights on in the entire house.",
+// "Turn the lights off in the guest bedroom.",
+// "Could you please switch off all the lights?",
+// "Dial off illumination on the 2nd floor.",
+// "Please, no lights!",
+// "Kill off all the lights now!",
+// "No lights in the bedroom, please.",
+// "Light up the garage, please!",
+// "Kill the illumination now!"
))
def onMatch(
@NCIntentTerm("act") actTok: NCToken,
diff --git a/nlpcraft-examples/minecraft/pom.xml b/nlpcraft-examples/minecraft/pom.xml
index 7beff06..5f01310 100644
--- a/nlpcraft-examples/minecraft/pom.xml
+++ b/nlpcraft-examples/minecraft/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,7 +35,7 @@
<nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
- <kotlin.ver>1.4.32</kotlin.ver>
+ <kotlin.ver>1.5.0</kotlin.ver>
</properties>
<dependencies>
diff --git a/nlpcraft-examples/phone/pom.xml b/nlpcraft-examples/phone/pom.xml
index 1039140..365496f 100644
--- a/nlpcraft-examples/phone/pom.xml
+++ b/nlpcraft-examples/phone/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/sql/pom.xml b/nlpcraft-examples/sql/pom.xml
index 7e7873a..df6d1b3 100644
--- a/nlpcraft-examples/sql/pom.xml
+++ b/nlpcraft-examples/sql/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/time/pom.xml b/nlpcraft-examples/time/pom.xml
index 88f2d5a..ca52709 100644
--- a/nlpcraft-examples/time/pom.xml
+++ b/nlpcraft-examples/time/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/weather/pom.xml b/nlpcraft-examples/weather/pom.xml
index f18c77f..1716cb2 100644
--- a/nlpcraft-examples/weather/pom.xml
+++ b/nlpcraft-examples/weather/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-stanford/pom.xml b/nlpcraft-stanford/pom.xml
index f2e4fe4..b50eea7 100644
--- a/nlpcraft-stanford/pom.xml
+++ b/nlpcraft-stanford/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft/pom.xml b/nlpcraft/pom.xml
index 24f275a..9a198c1 100644
--- a/nlpcraft/pom.xml
+++ b/nlpcraft/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
index 041a990..739ba17 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
@@ -55,7 +55,8 @@ object NCVersion extends LazyLogging {
Version("0.7.2", LocalDate.of(2020, 11, 19)),
Version("0.7.3", LocalDate.of(2020, 12, 31)),
Version("0.7.4", LocalDate.of(2021, 1, 31)),
- Version("0.7.5", LocalDate.of(2021, 4, 30))
+ Version("0.7.5", LocalDate.of(2021, 4, 30)),
+ Version("0.8.0", LocalDate.of(2021, 5, 30)),
).sortBy(_.version)
// +=================================================+
// | UPDATE THIS SEQUENCE FOR EACH RELEASE MANUALLY. |
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java
index 885149f..67b49d7 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java
@@ -54,7 +54,8 @@ import org.apache.nlpcraft.model.tools.test.impl.*;
* @see NCIntentRef
*/
public class NCTestAutoModelValidator {
- private final static String PROP_MODELS = "NLPCRAFT_TEST_MODELS";
+ /** Optional, comma-separate list of class names for the models to test. */
+ public final static String PROP_MODELS = "NLPCRAFT_TEST_MODELS";
/**
* Performs validation based on {@link NCIntentSample} annotations.
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
index d53d387..79599f5 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/impl/NCTestAutoModelValidatorImpl.scala
@@ -21,7 +21,7 @@ import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.common.ascii.NCAsciiTable
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe
-import org.apache.nlpcraft.model.tools.test.NCTestClientBuilder
+import org.apache.nlpcraft.model.tools.test.{NCTestAutoModelValidator, NCTestClientBuilder}
import org.apache.nlpcraft.probe.mgrs.model.NCModelManager
import scala.collection.JavaConverters._
@@ -30,7 +30,6 @@ import scala.collection.JavaConverters._
* Implementation for `NCTestAutoModelValidator` class.
*/
private [test] object NCTestAutoModelValidatorImpl extends LazyLogging {
- private final val PROP_MODELS = "NLPCRAFT_TEST_MODELS"
private final val PROP_PROBE_CFG = "NLPCRAFT_PROBE_CONFIG"
/**
@@ -40,9 +39,14 @@ private [test] object NCTestAutoModelValidatorImpl extends LazyLogging {
*/
@throws[Exception]
def isValid: Boolean = {
- val classes = U.sysEnv(PROP_MODELS) match {
+ val prop = NCTestAutoModelValidator.PROP_MODELS
+
+ val classes = U.sysEnv(prop) match {
case Some(s) ⇒ U.splitTrimFilter(s, ",")
- case None ⇒ null
+ case None ⇒
+ logger.info(s"You can use $C-D$prop=my.Model1,my.Model2$RST to specify model(s) to test with model validator.")
+
+ null
}
val cfgFile = U.sysEnv(PROP_PROBE_CFG).orNull
diff --git a/openapi/nlpcraft_swagger.yml b/openapi/nlpcraft_swagger.yml
index b0d4cfc..f8b0114 100644
--- a/openapi/nlpcraft_swagger.yml
+++ b/openapi/nlpcraft_swagger.yml
@@ -21,7 +21,7 @@ info:
REST API for <a href="https://nlpcraft.apache.org">Apache NLPCraft</a> - an open source library for
adding Natural Language Interface to any applications. For Data Model APIs see
<a href="https://nlpcraft.apache.org/apis/latest/index.html">Javadoc</a> documentation.
- version: 0.7.5
+ version: 0.8.0
title: Apache NLPCraft API
host: localhost:8081
basePath: /api/v1
diff --git a/pom.xml b/pom.xml
index c11b5e2..b85025e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<name>NLPCraft Parent</name>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
- <version>0.7.5</version>
+ <version>0.8.0</version>
<packaging>pom</packaging>
<url>https://nlpcraft.apache.org</url>
@@ -67,7 +67,7 @@
<connection>scm:git:ssh://git@github.com/apache/incubator-nlpcraft.git</connection>
<developerConnection>scm:git:ssh://git@github.com/apache/incubator-nlpcraft.git</developerConnection>
<!-- Set actual tag name here -->
- <tag>v0.7.5</tag>
+ <tag>v0.8.0</tag>
</scm>
<properties>