This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch master-model
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/master-model by this push:
new 8e8105a WIP.
8e8105a is described below
commit 8e8105aad9dde83c34a63f42ca2f9df745e455ae
Author: Sergey Kamov <[email protected]>
AuthorDate: Thu Oct 7 21:45:27 2021 +0300
WIP.
---
.../scala/org/apache/nlpcraft/model/NCModel.java | 1 +
.../nlpcraft/model/builders/NCElementBuilder.java | 39 ----------------------
.../nlpcraft/model/builders/NCIntentsBuilder.java | 23 +++++++++++++
.../model/builders/NCIntentsSamplesBuilder.java | 23 +++++++++++++
.../model/builders/NCModelConfigBuilder.java | 2 --
.../NCMultiElementsBuilder.java} | 12 +++----
.../model/builders/NCSingleElementBuilder.java | 39 ++++++++++++++++++++++
.../nlpcraft/model/providers/NCIntentsBuilder.java | 29 ----------------
.../nlpcraft/model/providers/NCIntentsData.java | 9 -----
.../java/org/apache/nlpcraft/model/NCSpec.java | 33 +++++++++---------
10 files changed, 110 insertions(+), 100 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java
index 370eb98..224da14 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java
@@ -28,6 +28,7 @@ public interface NCModel {
void start();
void stop();
+ // NLP API.
String ask(String txt, Map<String, Object> data, boolean enableLog, String
userId);
String ask(String txt, String userId);
String ask(String txt);
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCElementBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCElementBuilder.java
deleted file mode 100644
index b39d774..0000000
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCElementBuilder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.nlpcraft.model.builders;
-
-import org.apache.nlpcraft.model.NCElement;
-import org.apache.nlpcraft.model.NCValue;
-import org.apache.nlpcraft.model.NCValueLoader;
-
-import java.util.List;
-import java.util.Map;
-
-public class NCElementBuilder {
- public NCElementBuilder withId(String id) {
- return null;
- }
- public NCElementBuilder withParentId(String id) {
- return null;
- }
- public NCElementBuilder withGroups(String... groups) {
- return null;
- }
- public NCElementBuilder withMetadata(Map<String, Object> meta) {
- return null;
- }
- public NCElementBuilder withDescrition(String desc) {
- return null;
- }
- public NCElementBuilder withValues(List<NCValue> values) {
- return null;
- }
- public NCElementBuilder withValueLoader(NCValueLoader loader) {
- return null;
- }
- public NCElementBuilder withSynonyms(List<String> syns) {
- return null;
- }
-
- public NCElement make() {
- return null;
- }
-}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsBuilder.java
new file mode 100644
index 0000000..a14623e
--- /dev/null
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsBuilder.java
@@ -0,0 +1,23 @@
+package org.apache.nlpcraft.model.builders;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+public class NCIntentsBuilder {
+ public NCIntentsBuilder withFiles(File... files) {
+ return null;
+ }
+ public NCIntentsBuilder withUrls(URL... urls) {
+ return null;
+ }
+ public NCIntentsBuilder withClasses(Class<?> ... classes) {
+ return null;
+ }
+
+ public List<String> getIntentsDls() {
+ // TODO: implement.
+ return null;
+ }
+}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsSamplesBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsSamplesBuilder.java
new file mode 100644
index 0000000..f0f7f09
--- /dev/null
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCIntentsSamplesBuilder.java
@@ -0,0 +1,23 @@
+package org.apache.nlpcraft.model.builders;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+public class NCIntentsSamplesBuilder {
+ public NCIntentsSamplesBuilder withFiles(Map<String, File> files) {
+ return null;
+ }
+ public NCIntentsSamplesBuilder withUrls(Map<String, File> urls) {
+ return null;
+ }
+ public NCIntentsSamplesBuilder withClasses(Class<?> ... classes) {
+ return null;
+ }
+
+ public Map<String, List<List<String>>> getSamples() {
+ // TODO: implement.
+ return null;
+ }
+}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
index f4196d8..cea4073 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
@@ -159,8 +159,6 @@ public class NCModelConfigBuilder {
return null;
}
-
-
public NCModelConfig make() {
return null;
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCElementsBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCMultiElementsBuilder.java
similarity index 50%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCElementsBuilder.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCMultiElementsBuilder.java
index 79486a1..43c21be 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCElementsBuilder.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCMultiElementsBuilder.java
@@ -1,4 +1,4 @@
-package org.apache.nlpcraft.model.providers;
+package org.apache.nlpcraft.model.builders;
import org.apache.nlpcraft.model.NCElement;
import org.apache.nlpcraft.model.NCValueLoader;
@@ -8,17 +8,17 @@ import java.util.List;
import java.util.Map;
import java.io.File;
-public class NCElementsBuilder {
- public NCElementsBuilder withLoaders(Map<String, NCValueLoader> loaders) {
+public class NCMultiElementsBuilder {
+ public NCMultiElementsBuilder withLoaders(Map<String, NCValueLoader>
loaders) {
return null;
}
- public NCElementsBuilder withFiles(File... files) {
+ public NCMultiElementsBuilder withFiles(File... files) {
return null;
}
- public NCElementsBuilder withUrls(URL... url) {
+ public NCMultiElementsBuilder withUrls(URL... url) {
return null;
}
- public NCElementsBuilder withClasses(Class<?>... classes) {
+ public NCMultiElementsBuilder withClasses(Class<?>... classes) {
return null;
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCSingleElementBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCSingleElementBuilder.java
new file mode 100644
index 0000000..296b801
--- /dev/null
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCSingleElementBuilder.java
@@ -0,0 +1,39 @@
+package org.apache.nlpcraft.model.builders;
+
+import org.apache.nlpcraft.model.NCElement;
+import org.apache.nlpcraft.model.NCValue;
+import org.apache.nlpcraft.model.NCValueLoader;
+
+import java.util.List;
+import java.util.Map;
+
+public class NCSingleElementBuilder {
+ public NCSingleElementBuilder withId(String id) {
+ return null;
+ }
+ public NCSingleElementBuilder withParentId(String id) {
+ return null;
+ }
+ public NCSingleElementBuilder withGroups(String... groups) {
+ return null;
+ }
+ public NCSingleElementBuilder withMetadata(Map<String, Object> meta) {
+ return null;
+ }
+ public NCSingleElementBuilder withDescrition(String desc) {
+ return null;
+ }
+ public NCSingleElementBuilder withValues(List<NCValue> values) {
+ return null;
+ }
+ public NCSingleElementBuilder withValueLoader(NCValueLoader loader) {
+ return null;
+ }
+ public NCSingleElementBuilder withSynonyms(List<String> syns) {
+ return null;
+ }
+
+ public NCElement make() {
+ return null;
+ }
+}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsBuilder.java
deleted file mode 100644
index 9934c05..0000000
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.nlpcraft.model.providers;
-
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-
-public class NCIntentsBuilder {
- public NCIntentsBuilder withIntentsFiles(File... files) {
- return null;
- }
- public NCIntentsBuilder withIntentsUrls(URL... urls) {
- return null;
- }
- public NCIntentsBuilder withSamplesFiles(Map<String, File> files) {
- return null;
- }
- public NCIntentsBuilder withSamplesUrls(Map<String, File> urls) {
- return null;
- }
- public NCIntentsBuilder withClasses(Class<?> ... classes) {
- return null;
- }
-
- public NCIntentsData getNCIntentsData() {
- // TODO: implement.
- return null;
- }
-}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsData.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsData.java
deleted file mode 100644
index 7a7ca72..0000000
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/providers/NCIntentsData.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.nlpcraft.model.providers;
-
-import java.util.List;
-import java.util.Map;
-
-public interface NCIntentsData {
- List<String> getIntentsDls();
- public Map<String, List<List<String>>> getSamples();
-}
diff --git a/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
b/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
index 282398f..d6d8a29 100644
--- a/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
+++ b/nlpcraft/src/test/java/org/apache/nlpcraft/model/NCSpec.java
@@ -1,12 +1,12 @@
package org.apache.nlpcraft.model;
import org.apache.nlpcraft.model.annotations.NCIntentRef;
-import org.apache.nlpcraft.model.builders.NCElementBuilder;
+import org.apache.nlpcraft.model.builders.NCSingleElementBuilder;
+import org.apache.nlpcraft.model.builders.NCIntentsSamplesBuilder;
import org.apache.nlpcraft.model.builders.NCModelConfigBuilder;
import org.apache.nlpcraft.model.builders.NCModelBuilder;
-import org.apache.nlpcraft.model.providers.NCElementsBuilder;
-import org.apache.nlpcraft.model.providers.NCIntentsBuilder;
-import org.apache.nlpcraft.model.providers.NCIntentsData;
+import org.apache.nlpcraft.model.builders.NCMultiElementsBuilder;
+import org.apache.nlpcraft.model.builders.NCIntentsBuilder;
import org.junit.jupiter.api.Test;
import java.util.Collections;
@@ -37,14 +37,14 @@ public class NCSpec {
}
);
- NCElementsBuilder elemsProvider =
- new NCElementsBuilder().
+ NCMultiElementsBuilder elemsProvider =
+ new NCMultiElementsBuilder().
withFiles(new java.io.File("path.yaml")).
withLoaders(loaders);
List<NCElement> elements = elemsProvider.getElements();
- elements.add(new
NCElementBuilder().withId("additionalElementId").make());
+ elements.add(new
NCSingleElementBuilder().withId("additionalElementId").make());
class SomeClassWithIntents {
@NCIntentRef("remove:waypoint")
@@ -53,18 +53,21 @@ public class NCSpec {
}
}
- NCIntentsData intentsData =
- new NCIntentsBuilder().
- withClasses(SomeClassWithIntents.class).
- getNCIntentsData();
-
return
new NCModelConfigBuilder().
withDescription("test model").
withElements(elements).
- withIntentsDsl(intentsData.getIntentsDls()).
- withIntentsDslSamples(intentsData.getSamples()).
+ withIntentsDsl(
+ new NCIntentsBuilder().
+ withClasses(SomeClassWithIntents.class).
+ getIntentsDls()
+ ).
+ withIntentsDslSamples(
+ new NCIntentsSamplesBuilder().
+ withClasses(SomeClassWithIntents.class).
+ getSamples()
+ ).
withOnRejection(new BiFunction<NCIntentMatch, NCRejection,
NCResult>() {
@Override
public NCResult apply(NCIntentMatch math, NCRejection rej)
{
@@ -102,7 +105,7 @@ public class NCSpec {
new NCModelConfigBuilder().
withElements(
asList(
- new NCElementBuilder().
+ new NCSingleElementBuilder().
withId("elemeId").
withSynonyms(asList("element")).
make()
