[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new f59e9ba WIP.
f59e9ba is described below
commit f59e9ba9a453b90496522fd0eefb6681fb9aa891
Author: Aaron Radzinzski
AuthorDate: Wed Mar 25 12:32:32 2020 -0700
WIP.
---
docs/_layouts/default.html | 11 ---
docs/images/asf_logo.png | Bin 0 -> 152842 bytes
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index a990207..c0fcb1c 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -114,6 +114,9 @@ layout: compress
Copyright 2020 Apache Software Foundation
+
+https://apache.org;>
+
News
•
Docs
@@ -135,13 +138,7 @@ layout: compress
-https://www.googletagmanager.com/gtag/js?id=UA-48766736-2";>
-
-window.dataLayer = window.dataLayer || [];
-function gtag(){dataLayer.push(arguments);}
-gtag('js', new Date());
-gtag('config', 'UA-48766736-2');
-
+
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-13 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push: new b536d88 WIP. b536d88 is described below commit b536d88c8e404db187e8ae05f576ce1861b005a7 Author: Aaron Radzinzski AuthorDate: Wed Mar 25 12:04:46 2020 -0700 WIP. --- docs/community.html | 4 ++-- docs/favicon.ico| Bin 34494 -> 0 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/community.html b/docs/community.html index 0917ce0..c8f67da 100644 --- a/docs/community.html +++ b/docs/community.html @@ -286,7 +286,7 @@ layout: interior Konstantin Boudnik - +Apache Software Foundation @@ -301,7 +301,7 @@ layout: interior Nikita Ivanov - +GridGain Systems, Apache Ignite diff --git a/docs/favicon.ico b/docs/favicon.ico deleted file mode 100644 index 555c667..000 Binary files a/docs/favicon.ico and /dev/null differ
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 41e997d WIP.
41e997d is described below
commit 41e997d9a784b8e4647b007a84807f2352dc87b1
Author: Aaron Radzinzski
AuthorDate: Tue Mar 24 17:11:12 2020 -0700
WIP.
---
.../nlpcraft/model/tools/sqlgen/NCSqlColumn.java | 31 +++---
.../nlpcraft/model/tools/sqlgen/NCSqlTable.java| 49 --
2 files changed, 43 insertions(+), 37 deletions(-)
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
index 0be1657..0694257 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
@@ -26,20 +26,20 @@ import org.apache.nlpcraft.model.*;
*
* elements:
* - id: "col:orders_customer_id"
- * groups:
- * - "column"
- * synonyms:
- * - "{customer_id|customer ID}"
- * - "orders {customer_id|customer ID}"
- * - "{customer_id|customer ID} OF orders"
- * metadata:
- * sql:name: "customer_id"
- * sql:tablename: "orders"
- * sql:datatype: 12
- * sql:isnullable: true
- * sql:ispk: false
- * description: "Auto-generated from 'orders.customer_id' column."
- * valueLoader: "org.apache.nlpcraft.examples.sql.db.SqlValueLoader"
+ * groups:
+ * - "column"
+ * synonyms:
+ * - "{customer_id|customer ID}"
+ * - "orders {customer_id|customer ID}"
+ * - "{customer_id|customer ID} OF orders"
+ * metadata:
+ * sql:name: "customer_id"
+ * sql:tablename: "orders"
+ * sql:datatype: 12
+ * sql:isnullable: true
+ * sql:ispk: false
+ * description: "Auto-generated from 'orders.customer_id' column."
+ * valueLoader: "org.apache.nlpcraft.examples.sql.db.SqlValueLoader"
*
* Few notes:
*
@@ -60,7 +60,8 @@ import org.apache.nlpcraft.model.*;
* @see NCSqlSchemaBuilder#makeSchema(NCModel)
* @see NCSqlExtractorBuilder#build(NCSqlSchema, NCVariant)
* @see NCSqlExtractor#extractColumn(NCToken)
- * @see NCSqlTable#getColumns()
+ * @see NCSqlTable#getColumns()
+ * @see NCSqlSchema#getAllColumns()
*/
public interface NCSqlColumn {
/**
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.java
index 9e13e17..46e1c75 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.java
@@ -27,42 +27,46 @@ import java.util.Optional;
* In JSON/YAML generated model the table is the model element (example):
*
* elements:
- * - id: "col:orders_customer_id"
- * groups:
- * - "column"
- * synonyms:
- * - "{customer_id|customer ID}"
- * - "orders {customer_id|customer ID}"
- * - "{customer_id|customer ID} OF orders"
- * metadata:
- * sql:name: "customer_id"
- * sql:tablename: "orders"
- * sql:datatype: 12
- * sql:isnullable: true
- * sql:ispk: false
- * description: "Auto-generated from 'orders.customer_id' column."
- * valueLoader: "org.apache.nlpcraft.examples.sql.db.SqlValueLoader"
+ * - id: "tbl:orders"
+ * groups:
+ * - "table"
+ * synonyms:
+ * - "orders"
+ * metadata:
+ * sql:name: "orders"
+ * sql:defaultselect:
+ * - "order_id"
+ * - "order_date"
+ * - "required_date"
+ * sql:defaultsort:
+ * - "orders.order_id#desc"
+ * sql:extratables:
+ * - "customers"
+ * - "shippers"
+ * - "employees"
+ * sql:defaultdate: "orders.order_date"
+ * description: "Auto-generated from 'orders' table."
*
* Few notes:
*
*
- * All model elements representing SQL column have ID in a form of
col:sql_table_name.
+ * All model elements representing SQL column have ID in a form of
tbl:sql_table_name.
*
*
- * All model elements representing SQL column belong to
column group.
+ * All model elements representing SQL column belong to
table group.
*
*
* These model elements have auto-generated synonyms and set of
mandatory metadata.
*
*
- * User can freely add group membership, change synonyms, add new
metadata, add or change value loader.
+ * User can freely add group membership, change synonyms, or add new
metadata.
*
*
*
* @see NCSqlSchemaBuilder#makeSchema(NCModel)
* @see NCSqlExtractorBuilder#build(NCSqlSchema, NCVariant)
- * @see
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new d323bd9 WIP.
d323bd9 is described below
commit d323bd9d7edd139146c5f20bf88fb107afb197bb
Author: Aaron Radzinzski
AuthorDate: Tue Mar 24 17:01:57 2020 -0700
WIP.
---
.../nlpcraft/model/tools/sqlgen/NCSqlColumn.java | 8 +++--
.../model/tools/sqlgen/NCSqlExtractor.java | 27 +++---
.../nlpcraft/model/tools/sqlgen/NCSqlTable.java| 42 +++---
3 files changed, 59 insertions(+), 18 deletions(-)
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
index 3968bb3..0be1657 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
@@ -43,8 +43,12 @@ import org.apache.nlpcraft.model.*;
*
* Few notes:
*
- * All model elements representing SQL column have ID in a form of
col:sql_table_name.
- * All model elements representing SQL column belong to
column group.
+ *
+ * All model elements representing SQL column have ID in a form of
col:sql_table_name.
+ *
+ *
+ * All model elements representing SQL column belong to
column group.
+ *
*
* These model elements have auto-generated synonyms and set of
mandatory metadata.
*
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
index 2772aba..e728b62 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
@@ -25,8 +25,8 @@ import org.apache.nlpcraft.model.*;
* of this interface are created using {@link NCSqlExtractorBuilder} builder.
*
* Note that {@link NCSqlExtractorBuilder} builder requires {@link
NCSqlSchema} and {@link NCVariant}
- * objects when creating an instance of SQL extractor. Many methods in this
interface will search
- * that parsing variant and schema to find necessary referenced tokens.
+ * objects when creating an instance of SQL extractor. Methods in this
interface will search
+ * these parsing variant and schema to find necessary referenced tokens.
*
* Note also that wherever necessary the implementation will scan part
(constituent) tokens as well
* (see {@link NCToken#findPartTokens(String...)} for more information).
@@ -35,7 +35,7 @@ import org.apache.nlpcraft.model.*;
*/
public interface NCSqlExtractor {
/**
- * Extracts limit object from the token.
+ * Extracts limit object from given nlpcraft:limit token.
*
* @param limitTok Limit token with ID nlpcraft:limit.
* @return SQL limit object extracted from given token.
@@ -44,33 +44,36 @@ public interface NCSqlExtractor {
NCSqlLimit extractLimit(NCToken limitTok);
/**
+ * Extracts sort object from given nlpcraft:sort token.
*
- * @param sortTok
- * @return
+ * @param sortTok Sort token with ID nlpcraft:sort.
+ * @return SQL sort object extracted from given token.
* @throws NCException Thrown in case of any errors.
*/
NCSqlSort extractSort(NCToken sortTok);
/**
+ * Extract table object from the token.
*
- * @param tblTok
- * @return
+ * @param tblTok A token that belongs to a table group.
+ * @return SQL table object extracted from the given token.
* @throws NCException Thrown in case of any errors.
*/
NCSqlTable extractTable(NCToken tblTok);
/**
+ * Extract column object from the token.
*
- * @param colTok
- * @return
+ * @param colTok A token that belongs to a column group.
+ * @return SQL column object extracted from the given token.
* @throws NCException Thrown in case of any errors.
*/
NCSqlColumn extractColumn(NCToken colTok);
/**
- *
- * @param dateTok
- * @return
+ * Extract date range object from given nlpcraft:date token.
+ * @param dateTok Date token with ID nlpcraft:date.
+ * @return A data range object extracted from given token.
* @throws NCException Thrown in case of any errors.
*/
NCSqlDateRange extractDateRange(NCToken dateTok);
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.java
index 8b0abcf..9e13e17 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlTable.java
@@ -24,11 +24,45 @@ import java.util.Optional;
/**
*
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-13 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push: new 319e7d6 WIP. 319e7d6 is described below commit 319e7d648dde23bb0d626f7605635efdcd9233d1 Author: Aaron Radzinzski AuthorDate: Tue Mar 24 15:53:41 2020 -0700 WIP. --- docs/data-model.html | 57 - docs/integrations.html | 19 --- .../apache/nlpcraft/examples/sql/SqlModel.scala| 10 -- .../nlpcraft/examples/sql/db/SqlBuilder.scala | 32 ++--- .../sql/db/SqlCondition.java} | 9 +- .../sql/db/SqlFunction.java} | 5 +- .../sql/db/SqlInCondition.java}| 7 +- .../sql/db/SqlSimpleCondition.java}| 4 +- .../apache/nlpcraft/examples/sql/sql_model.yaml| 1 - .../org/apache/nlpcraft/model/NCModelView.java | 3 - .../apache/nlpcraft/model/impl/NCTokenLogger.scala | 14 --- .../model/tools/sqlgen/NCSqlExtractor.java | 40 +- .../model/tools/sqlgen/NCSqlModelGenerator.java| 7 +- .../nlpcraft/model/tools/sqlgen/NCSqlSort.java | 3 +- .../model/tools/sqlgen/impl/NCSqlBeans.scala | 42 --- .../tools/sqlgen/impl/NCSqlExtractorImpl.scala | 111 + .../org/apache/nlpcraft/probe/NCProbeBoot.scala| 1 - .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 2 - .../aggregation/NCAggregationEnricher.scala| 135 - .../nlp/enrichers/post/NCPostEnrichProcessor.scala | 11 +- .../mgrs/nlp/enrichers/NCEnrichersTestBeans.scala | 35 +- 21 files changed, 37 insertions(+), 511 deletions(-) diff --git a/docs/data-model.html b/docs/data-model.html index 5a29711..bebff85 100644 --- a/docs/data-model.html +++ b/docs/data-model.html @@ -1863,25 +1863,6 @@ intents: -nlpcraft:aggregation - -This token denotes an aggregation function: -min, -max, -avg, -sum, or -group. Note this token always need another token that it references. - - - - -Show the average price (assuming that 'price' is also -detected as a token). - - - - - nlpcraft:relation This token denotes a relation function: @@ -2015,7 +1996,6 @@ intents: Token ID nlpcraft:coordinate Token ID nlpcraft:sort Token ID nlpcraft:limit -Token ID nlpcraft:aggregation Token ID nlpcraft:relation Token ID stanford:xxx Token ID spacy:xxx @@ -3000,43 +2980,6 @@ intents: -Token ID nlpcraft:aggregation - -This token denotes an aggregation function. -Additionally to nlpcraft:nlp:xxx properties this type of token will have the following -metadata properties all of which are mandatory unless otherwise noted. - - - - -Property -Java Type -Description - - - - -nlpcraft:aggregation:indexes -java.util.ListInteger -Index (always only one) of the reference token (i.e. the token being aggregated on). - - -nlpcraft:aggregation:type -java.lang.String - -Type of the aggregation. One of the following values: - -sum -min -max -avg -group - - - - - - Token ID nlpcraft:sort This token denotes a sorting or ordering function. diff --git a/docs/integrations.html b/docs/integrations.html index 857c5d8..61d7c8b 100644 --- a/docs/integrations.html +++ b/docs/integrations.html @@ -284,25 +284,6 @@ id: integrations -nlpcraft:aggregation - -This token denotes an aggregation function: -min, -max, -avg, -sum, or -group. Note
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 947dbb5 WIP.
947dbb5 is described below
commit 947dbb5bb08558b77624a023ac18794a0dde31db
Author: Aaron Radzinzski
AuthorDate: Mon Mar 23 15:39:14 2020 -0700
WIP.
---
.../model/tools/sqlgen/NCSqlAggregate.java | 45 -
.../model/tools/sqlgen/NCSqlExtractor.java | 9 -
.../tools/sqlgen/impl/NCSqlExtractorImpl.scala | 47 --
3 files changed, 101 deletions(-)
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.java
deleted file mode 100644
index 7cb44b8..000
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlAggregate.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.nlpcraft.model.tools.sqlgen;
-
-import org.apache.nlpcraft.model.*;
-import java.util.*;
-
-/**
- * Object presentation of SQL aggregate. You can get an instance of this
interface by
- * using {@link NCSqlExtractor#extractAggregate(NCToken, NCToken)} method.
- *
- * @see NCSqlSchemaBuilder#makeSchema(NCModel)
- * @see NCSqlExtractorBuilder#build(NCSqlSchema, NCVariant)
- * @see NCSqlExtractor#extractAggregate(NCToken, NCToken)
- */
-public interface NCSqlAggregate {
-/**
- * Gets potentially empty list of SQL functions for this SQL aggregate.
- *
- * @return List of SQL functions for this aggregate. Can be empty.
- */
-List getSelect();
-
-/**
- * Gets potentially empty list of group-by columns for this SQL aggregate.
- *
- * @return List of group-by columns. Can be empty.
- */
-List getGroupBy();
-}
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
index 20c5262..c16949c 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
@@ -90,15 +90,6 @@ public interface NCSqlExtractor {
NCSqlSort extractSort(NCToken sortTok);
/**
- *
- * @param aggrFunTok
- * @param aggrGrpTok
- * @return
- * @throws NCException Thrown in case of any errors.
- */
-NCSqlAggregate extractAggregate(NCToken aggrFunTok, NCToken aggrGrpTok);
-
-/**
*
* @param tblTok
* @return
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlExtractorImpl.scala
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlExtractorImpl.scala
index 2eb470d..00de62a 100644
---
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlExtractorImpl.scala
+++
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlExtractorImpl.scala
@@ -271,53 +271,6 @@ class NCSqlExtractorImpl(schema: NCSqlSchema, variant:
NCVariant) extends NCSqlE
/**
*
- * @param aggrFun
- * @param aggrGrpTok
- * @return
- */
-override def extractAggregate(aggrFun: NCToken, aggrGrpTok: NCToken):
NCSqlAggregate = {
-if (aggrFun != null)
-checkTokenId(aggrFun, "nlpcraft:aggregation")
-
-val select = aggrFun match {
-case null ⇒ Seq.empty
-case _ ⇒
-Seq(
-NCSqlFunctionImpl(
-
extractColumn(findAnyColumnToken(getLinkBySingleIndex(variant, aggrFun))),
-aggrFun.meta(s"${aggrFun.getId}:type")
-)
-)
-
-}
-
-val grpBy = aggrGrpTok match {
-case null ⇒ Seq.empty
-case aggrGrp ⇒
-val grpTok = getLinkBySingleIndex(variant, aggrGrp)
-
-// If reference is column - group by column.
-findAnyColumnTokenOpt(grpTok) match {
-case
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 85d47aa WIP.
85d47aa is described below
commit 85d47aa4891ef3412e3ad97bef36735a341aa7c1
Author: Aaron Radzinzski
AuthorDate: Mon Mar 23 03:40:11 2020 -0700
WIP.
---
.../apache/nlpcraft/examples/sql/SqlModel.scala| 6 +-
.../nlpcraft/examples/sql/db/SqlValueLoader.scala | 9 +--
.../scala/org/apache/nlpcraft/model/NCElement.java | 13 +
.../scala/org/apache/nlpcraft/model/NCToken.java | 2 +-
.../model/tools/sqlgen/NCSqlAggregate.java | 7 ++-
.../nlpcraft/model/tools/sqlgen/NCSqlColumn.java | 66 --
.../model/tools/sqlgen/NCSqlCondition.java | 3 +
.../model/tools/sqlgen/NCSqlDateRange.java | 6 +-
.../model/tools/sqlgen/NCSqlExtractor.java | 28 ++---
.../model/tools/sqlgen/NCSqlSchemaBuilder.java | 9 ++-
.../tools/sqlgen/impl/NCSqlExtractorImpl.scala | 44 +--
11 files changed, 146 insertions(+), 47 deletions(-)
diff --git a/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
b/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
index ad4eead..5232364 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++ b/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -37,7 +37,7 @@ class SqlModel extends
NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
m.put("columns", res.columns.asJava)
m.put("rows", res.rows.map(_.asJava).asJava)
-// Added to result fo debug reasons.
+// Added to result for debug reasons.
m.put("sql", sql)
m.put("parameters", params)
@@ -114,8 +114,8 @@ class SqlModel extends
NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
try {
query =
SqlBuilder(SCHEMA).
-withTables(tabs.map(t ⇒ ext.extractTable(t)): _*).
-withColumns(cols.map(col ⇒ ext.extractColumn(col)): _*).
+withTables(tabs.map(ext.extractTable): _*).
+withColumns(cols.map(ext.extractColumn): _*).
withAndConditions(ext.extractInConditions(condVals:
_*).asScala: _*).
withAndConditions(
condDates.map(t ⇒ extractColumnAndCondition(t,
"nlpcraft:date")).flatMap(h ⇒
diff --git
a/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
index b8b673b..1b14539 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
+++ b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
@@ -31,14 +31,11 @@ import scala.language.implicitConversions
*/
class SqlValueLoader extends NCValueLoader with LazyLogging {
override def load(e: NCElement): java.util.Set[NCValue] = {
-if (!e.getGroups.contains("column"))
+if (!e.isMemberOf("column"))
throw new IllegalArgumentException(s"Unexpected element:
${e.getId}")
-val tab: String = e.meta("sql:tablename")
-val col: String = e.meta("sql:name")
-
-if (tab == null || col == null)
-throw new IllegalArgumentException(s"Missed required metadata for
element: ${e.getId}")
+val tab: String = e.metax("sql:tablename")
+val col: String = e.metax("sql:name")
SqlAccess.select(new SqlQuery {
override def getSql: String = s"SELECT $col FROM $tab WHERE $col
IS NOT NULL"
diff --git a/src/main/scala/org/apache/nlpcraft/model/NCElement.java
b/src/main/scala/org/apache/nlpcraft/model/NCElement.java
index d853ea5..880ee33 100644
--- a/src/main/scala/org/apache/nlpcraft/model/NCElement.java
+++ b/src/main/scala/org/apache/nlpcraft/model/NCElement.java
@@ -113,6 +113,19 @@ public interface NCElement extends NCMetadata,
Serializable {
}
/**
+ * Shortcut method to test if this element is a member of given group. It
is equivalent to:
+ *
+ * return getGroups().contains(grp);
+ *
+ *
+ * @param grp Token group to test.
+ * @return {@code True} if this element belongs to the given group, {@code
false} otherwise.
+ */
+default boolean isMemberOf(String grp) {
+return getGroups().contains(grp);
+}
+
+/**
* Gets optional user-defined element's metadata. When a {@link NCToken
token} for this element
* is detected in the input this metadata is merged into {@link
NCToken#getMetadata()} method returned metadata.
*
diff --git a/src/main/scala/org/apache/nlpcraft/model/NCToken.java
b/src/main/scala/org/apache/nlpcraft/model/NCToken.java
index 9b59723..2b97664 100644
---
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 43f6613 WIP.
43f6613 is described below
commit 43f661393f9fabb0b2448a5bcdea528d289fa550
Author: Aaron Radzinzski
AuthorDate: Sun Mar 22 22:13:46 2020 -0700
WIP.
---
.../org/apache/nlpcraft/common/NCException.scala | 2 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala| 26 +-
.../nlpcraft/examples/sql/SqlModelTest.scala | 4 +-
.../nlpcraft/examples/sql/db/SqlBuilder.scala | 14 +-
.../org/apache/nlpcraft/model/NCIntentSkip.java| 6 +-
.../org/apache/nlpcraft/model/NCMetadata.java | 27 +-
.../org/apache/nlpcraft/model/NCRejection.java | 4 +-
.../model/tools/sqlgen/NCSqlException.java | 45 --
.../model/tools/sqlgen/NCSqlExtractor.java | 23 +-
.../nlpcraft/model/tools/sqlgen/NCSqlJoin.java | 3 +-
.../nlpcraft/model/tools/sqlgen/NCSqlJoinType.java | 15 +-
.../model/tools/sqlgen/NCSqlSchemaBuilder.java | 9 +-
.../model/tools/sqlgen/impl/NCSqlBeans.scala | 67 +++
.../tools/sqlgen/impl/NCSqlExtractorImpl.scala | 495 +
.../tools/sqlgen/impl/NCSqlSchemaBuilderImpl.scala | 171 +++
15 files changed, 542 insertions(+), 369 deletions(-)
diff --git a/src/main/scala/org/apache/nlpcraft/common/NCException.scala
b/src/main/scala/org/apache/nlpcraft/common/NCException.scala
index 2422735..d5dcece 100644
--- a/src/main/scala/org/apache/nlpcraft/common/NCException.scala
+++ b/src/main/scala/org/apache/nlpcraft/common/NCException.scala
@@ -25,7 +25,7 @@ package org.apache.nlpcraft.common
*/
class NCException(msg: String, cause: Throwable = null) extends
RuntimeException(msg, U.getOriginCause(cause)) {
/**
- * Java-compatible ctor.
+ * Java-compatible constructor.
*
* @param msg Error message.
*/
diff --git a/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
b/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
index c80e1c0..ad4eead 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++ b/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -21,7 +21,6 @@ import com.google.gson.Gson
import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.examples.sql.db._
import org.apache.nlpcraft.model._
-import org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractors._
import org.apache.nlpcraft.model.tools.sqlgen._
import scala.collection.JavaConverters._
@@ -58,12 +57,11 @@ class SqlModel extends
NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
cols.size match {
case 1 ⇒ cols.head
-case 0 ⇒ throw new NCSqlException(s"No columns found for token:
$tok")
-case _ ⇒ throw new NCSqlException("Too many columns found for
token: $tok")
+case 0 ⇒ throw new Exception(s"No columns found for token: $tok")
+case _ ⇒ throw new Exception("Too many columns found for token:
$tok")
}
}
-
/**
* Complex element contains 2 tokens: column + date ot numeric condition.
*
@@ -109,35 +107,35 @@ class SqlModel extends
NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
@NCIntentTerm("sort") sortTokOpt: Option[NCToken],
@NCIntentTerm("limit") limitTokOpt: Option[NCToken]
): NCResult = {
-val ns = ctx.getVariant
+val ext = NCSqlExtractorBuilder.build(SCHEMA, ctx.getVariant)
var query: SqlQuery = null
try {
query =
SqlBuilder(SCHEMA).
-withTables(tabs.map(t ⇒ extractTable(SCHEMA, t)): _*).
-withColumns(cols.map(col ⇒ extractColumn(SCHEMA, col)):
_*).
-withAndConditions(extractValuesConditions(SCHEMA,
condVals: _*).asScala: _*).
+withTables(tabs.map(t ⇒ ext.extractTable(t)): _*).
+withColumns(cols.map(col ⇒ ext.extractColumn(col)): _*).
+withAndConditions(ext.extractInConditions(condVals:
_*).asScala: _*).
withAndConditions(
condDates.map(t ⇒ extractColumnAndCondition(t,
"nlpcraft:date")).flatMap(h ⇒
-extractDateRangeConditions(SCHEMA, h.column,
h.condition).asScala
+ext.extractDateRangeConditions(h.column,
h.condition).asScala
): _*
).
withAndConditions(
condNums.map(t ⇒ extractColumnAndCondition(t,
"nlpcraft:num")).flatMap(h ⇒
-extractNumConditions(SCHEMA, h.column,
h.condition).asScala
+ext.extractNumConditions(h.column,
h.condition).asScala
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 8124404 WIP.
8124404 is described below
commit 8124404b20799e33bd970f55868d0f90ffb34220
Author: Aaron Radzinzski
AuthorDate: Sun Mar 22 15:54:50 2020 -0700
WIP.
---
.../scala/org/apache/nlpcraft/model/NCToken.java | 26 +
.../model/tools/sqlgen/NCSqlExtractor.java | 107 ++
...hemaBuilder.java => NCSqlExtractorBuilder.java} | 28 +++--
.../model/tools/sqlgen/NCSqlExtractors.java| 71
.../model/tools/sqlgen/NCSqlSchemaBuilder.java | 9 +-
...tractorsImpl.scala => NCSqlExtractorImpl.scala} | 119 ++---
6 files changed, 256 insertions(+), 104 deletions(-)
diff --git a/src/main/scala/org/apache/nlpcraft/model/NCToken.java
b/src/main/scala/org/apache/nlpcraft/model/NCToken.java
index cb18e8a..9b59723 100644
--- a/src/main/scala/org/apache/nlpcraft/model/NCToken.java
+++ b/src/main/scala/org/apache/nlpcraft/model/NCToken.java
@@ -161,6 +161,19 @@ public interface NCToken extends NCMetadata {
List getAliases();
/**
+ * Tests whether or not this token has given alias. It is equivalent to:
+ *
+ * return getAliases().contains(alias);
+ *
+ *
+ * @param alias Alias to test.
+ * @return True if this token has alias alias,
{@code false} otherwise.
+ */
+default boolean isOfAlias(String alias) {
+return getAliases().contains(alias);
+}
+
+/**
* Gets the value if this token was detected via element's value (or its
synonyms). Otherwise
* returns {@code null}. Only applicable for user-defined model elements
(built-in tokens
* do not have values).
@@ -180,6 +193,19 @@ public interface NCToken extends NCMetadata {
List getGroups();
/**
+ * Tests whether or not this token belongs to the given group. It is
equivalent to:
+ *
+ * return getGroups().contains(grp);
+ *
+ *
+ * @param grp Group to test.
+ * @return True if this token belongs to the group
grp, {@code false} otherwise.
+ */
+default boolean isOfGroup(String grp) {
+return getGroups().contains(grp);
+}
+
+/**
* Gets start character index of this token in the original text.
*
* @return Start character index of this token.
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
new file mode 100644
index 000..fa1eb07
--- /dev/null
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractor.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nlpcraft.model.tools.sqlgen;
+
+import org.apache.nlpcraft.model.*;
+import java.util.*;
+
+/**
+ * Utility methods for extracting various SQL components from {@link NCToken}
tokens. Instances
+ * of this interface are created using {@link NCSqlExtractorBuilder} builder.
+ *
+ * @see NCSqlExtractorBuilder
+ */
+public interface NCSqlExtractor {
+/**
+ * Extracts limit object from the token.
+ *
+ * @param limitTok Limit token with ID nlpcraft:limit.
+ * @return SQL limit object extracted from given token.
+ * @throws NCSqlException Thrown in case of any errors.
+ */
+NCSqlLimit extractLimit(NCToken limitTok);
+
+/**
+ * Extracts date range conditions object from given tokens.
+ *
+ * @param colTok Token representing detected SQL column (i.e. detected
model element that belongs
+ * to column group).
+ * @param dateTok Date range token with ID nlpcraft:date.
+ * @return List of date range conditions extracted from given parameters.
+ * @throws NCSqlException Thrown in case of any errors.
+ */
+List extractDateRangeConditions(NCToken colTok,
NCToken dateTok);
+
+/**
+ *
+ * @param colTok
+ * @param numTok
+ * @return
+ * @throws NCSqlException Thrown in case of any errors.
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 31c35d1 WIP.
31c35d1 is described below
commit 31c35d1c59a0023098c1a84cb0af8e271c7dd0b7
Author: Aaron Radzinzski
AuthorDate: Fri Mar 20 13:47:04 2020 -0700
WIP.
---
.../apache/nlpcraft/examples/sql/SqlModel.scala| 15 ++-
.../nlpcraft/model/tools/sqlgen/NCSqlColumn.java | 8
.../model/tools/sqlgen/NCSqlException.java | 2 +-
.../{NCSqlUtils.java => NCSqlExtractors.java} | 47 --
.../model/tools/sqlgen/NCSqlModelGenerator.java| 13 --
.../nlpcraft/model/tools/sqlgen/NCSqlSchema.java | 17 +++-
.../model/tools/sqlgen/NCSqlSchemaBuilder.java | 8 +++-
.../nlpcraft/model/tools/sqlgen/NCSqlSort.java | 16 ++--
.../nlpcraft/model/tools/sqlgen/NCSqlTable.java| 17 +---
...qlUtilsImpl.scala => NCSqlExtractorsImpl.scala} | 12 +++---
10 files changed, 107 insertions(+), 48 deletions(-)
diff --git a/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
b/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
index 0cc04d5..c80e1c0 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++ b/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -21,7 +21,7 @@ import com.google.gson.Gson
import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.examples.sql.db._
import org.apache.nlpcraft.model._
-import org.apache.nlpcraft.model.tools.sqlgen.NCSqlUtils._
+import org.apache.nlpcraft.model.tools.sqlgen.NCSqlExtractors._
import org.apache.nlpcraft.model.tools.sqlgen._
import scala.collection.JavaConverters._
@@ -52,6 +52,17 @@ class SqlModel extends
NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
GSON.toJson(m)
}
+
+private def findColumnToken(tok: NCToken): NCToken = {
+val cols = (Seq(tok) ++ tok.findPartTokens().asScala).flatMap(p ⇒ if
(p.getGroups.contains("column")) Some(p) else None)
+
+cols.size match {
+case 1 ⇒ cols.head
+case 0 ⇒ throw new NCSqlException(s"No columns found for token:
$tok")
+case _ ⇒ throw new NCSqlException("Too many columns found for
token: $tok")
+}
+}
+
/**
* Complex element contains 2 tokens: column + date ot numeric condition.
@@ -66,7 +77,7 @@ class SqlModel extends
NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
require(parts.size == 2)
val condTok = parts.find(_.getId == condTokId).get
-val colTok = findAnyColumnToken(parts.filter(_ != condTok).head)
+val colTok = findColumnToken(parts.filter(_ != condTok).head)
Condition(colTok, condTok)
}
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
index 4af1bb4..2b4d0fb 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlColumn.java
@@ -27,6 +27,14 @@ import org.apache.nlpcraft.model.*;
public interface NCSqlColumn {
/**
* Gets name of the table this column belongs to.
+ *
+ * In JSON/YAML generated model the table name is declared with the
following element
+ * metadata (example):
+ *
+ * sql:extratables:
+ * - "other_part_table"
+ * - "another_part_table"
+ *
*
* @return Name of the table this column belongs to.
*/
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.java
index 17dde35..e5e7c83 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlException.java
@@ -20,7 +20,7 @@ package org.apache.nlpcraft.model.tools.sqlgen;
/**
* Exception thrown by various classes in model stub generator utility.
*
- * @see NCSqlUtils
+ * @see NCSqlExtractors
* @see NCSqlSchemaBuilder
*/
public class NCSqlException extends RuntimeException {
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractors.java
similarity index 51%
rename from
src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.java
rename to
src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractors.java
index 3d254e2..f085c8b 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlUtils.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlExtractors.java
@@ -17,52 +17,55 @@
package org.apache.nlpcraft.model.tools.sqlgen;
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new e9f3b61 WIP.
e9f3b61 is described below
commit e9f3b618fba53bb1b4349757e1c2aebd06a166f1
Author: Aaron Radzinzski
AuthorDate: Thu Mar 19 12:59:38 2020 -0700
WIP.
---
.../apache/nlpcraft/examples/sql/SqlModel.scala| 2 +-
.../nlpcraft/examples/sql/db/SqlAccess.scala | 3 +--
.../nlpcraft/examples/sql/db/SqlBuilder.scala | 4 ++--
.../sql/db/SqlQuery.java} | 4 ++--
.../nlpcraft/examples/sql/db/SqlValueLoader.scala | 3 +--
.../model/tools/sqlgen/NCSqlAggregate.java | 6 +
.../nlpcraft/model/tools/sqlgen/NCSqlColumn.java | 6 -
.../model/tools/sqlgen/NCSqlCondition.java | 7 ++
.../model/tools/sqlgen/NCSqlModelGenerator.java| 1 +
.../nlpcraft/model/tools/sqlgen/NCSqlSchema.java | 13 ++
.../model/tools/sqlgen/NCSqlSchemaBuilder.java | 12 ++
.../nlpcraft/model/tools/sqlgen/NCSqlTable.java| 28 +++---
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 5 ++--
.../model/tools/sqlgen/impl/NCSqlUtilsImpl.scala | 4
14 files changed, 72 insertions(+), 26 deletions(-)
diff --git a/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
b/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
index 23effdc..0cc04d5 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++ b/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -100,7 +100,7 @@ class SqlModel extends
NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
): NCResult = {
val ns = ctx.getVariant
-var query: NCSqlQuery = null
+var query: SqlQuery = null
try {
query =
diff --git a/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
index ef2d0be..30505fb 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
+++ b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
@@ -23,7 +23,6 @@ import com.github.vertical_blank.sqlformatter.SqlFormatter
import com.jakewharton.fliptables.FlipTable
import com.typesafe.scalalogging.LazyLogging
import org.h2.jdbcx.JdbcDataSource
-import org.apache.nlpcraft.model.tools.sqlgen.NCSqlQuery
import resource.managed
import scala.collection.JavaConverters._
@@ -36,7 +35,7 @@ object SqlAccess extends LazyLogging {
private var conn: Connection = _
-def select(qry: NCSqlQuery, logResult: Boolean): SqlResult = {
+def select(qry: SqlQuery, logResult: Boolean): SqlResult = {
if (conn == null)
conn = {
val ds = new JdbcDataSource
diff --git
a/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
index f9435f4..6815c0d 100644
--- a/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
+++ b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
@@ -271,7 +271,7 @@ case class SqlBuilder(schema: NCSqlSchema) extends
LazyLogging {
}
@throws[NCSqlException]
-def build(): NCSqlQuery = {
+def build(): SqlQuery = {
// Collects data.
if (freeDateRangeOpt.isDefined &&
this.conds.exists(cond ⇒
isDate(schemaCols(Key(cond.getColumn.getTable, cond.getColumn.getColumn
@@ -361,7 +361,7 @@ case class SqlBuilder(schema: NCSqlSchema) extends
LazyLogging {
)
}
-new NCSqlQuery {
+new SqlQuery {
def getSql: String =
s"""
|SELECT
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.java
b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlQuery.java
similarity index 91%
rename from
src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.java
rename to src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlQuery.java
index 2063aab..5735730 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlQuery.java
+++ b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlQuery.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model.tools.sqlgen;
+package org.apache.nlpcraft.examples.sql.db;
import java.util.List;
-public interface NCSqlQuery {
+public interface SqlQuery {
String getSql();
List getParameters();
}
diff --git
a/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
b/src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
index 88b0b26..b8b673b 100644
---
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP on sqlgen documentation.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 84cd731 WIP on sqlgen documentation.
84cd731 is described below
commit 84cd7312e492e38aa5eb2814cd0891c14f157f81
Author: Aaron Radzinzski
AuthorDate: Wed Mar 18 15:17:49 2020 -0700
WIP on sqlgen documentation.
---
.../model/tools/sqlgen/NCSqlModelGenerator.java| 26 +-
.../nlpcraft/model/tools/sqlgen/package-info.java | 2 +-
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.java
index a9708c1..c74e085 100644
---
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.java
+++
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.java
@@ -17,19 +17,35 @@
package org.apache.nlpcraft.model.tools.sqlgen;
+import org.apache.nlpcraft.model.*;
import org.apache.nlpcraft.model.tools.sqlgen.impl.NCSqlModelGeneratorImpl;
/**
* Command line utility to generate NLPCraft model stub from given SQL RDBMS.
*
- * You need to provide JDBC URL and driver, database schema, as well as set of
tables and columns for which you
- * want to generate NLPCraft model stub. After the model stub is generated you
need to further configure and customize
- * it for your specific needs.
- *
- * Run this class with --help parameter to get a full
documentation:
+ * You need to provide JDBC URL and driver, database schema, as well as
optional set of tables and columns for which you
+ * want to generate NLPCraft model stub. Run this class with
--help parameter to get a full documentation:
*
* java -cp apache-nlpcraft-x.x.x-all-deps.jar
org.apache.nlpcraft.model.tools.sqlgen.NCSqlModelGenerator --help
*
+ *
+ * After the model stub is generated:
+ *
+ *
+ * Modify and extend generated model stub to your own needs. In most
cases, you'll need
+ * to add, remove or modify auto-generated synonyms, add intents, etc.
Note, however, that generated model
+ * is fully complete and can be used as is.
+ *
+ *
+ * Use generated YAML/JSON-based model together with {@link
NCModelFileAdapter}
+ * class to instantiate model from this file.
+ *
+ *
+ * Use {@link NCSqlSchemaBuilder#makeSchema(NCModel)} method to get an
object representation of the
+ * SQL data schema for the model. You can use this object
representation along with many utility
+ * methods in {@link NCSqlUtils} class to efficiently auto-generate
SQL queries against the original RDBMS.
+ *
+ *
*/
public class NCSqlModelGenerator {
/**
diff --git
a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/package-info.java
b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/package-info.java
index a0c66bb..c882985 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/package-info.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/package-info.java
@@ -18,7 +18,7 @@
/**
* Contains model stub generator for SQL RDBMS.
*
- * Run the following from the command line to get a full documentation:
+ * Run the following from the command line to get a full documentation on how
to run model stub generator:
*
* java -cp apache-nlpcraft-x.x.x-all-deps.jar
org.apache.nlpcraft.model.tools.sqlgen.NCSqlModelGenerator --help
*
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-13 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push: new 0ab387c WIP. 0ab387c is described below commit 0ab387c9948f3cedc4e5ed3122c30fe82cdf298b Author: Aaron Radzinzski AuthorDate: Mon Mar 16 10:41:47 2020 -0700 WIP. --- docs/examples/weather_bot.html | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/examples/weather_bot.html b/docs/examples/weather_bot.html index 4dfdc25..cf4e779 100644 --- a/docs/examples/weather_bot.html +++ b/docs/examples/weather_bot.html @@ -25,10 +25,9 @@ id: weather_bot Overview -This simple example provides a "alarm clock" implementation where you can ask to set the timer -for a specific duration from now expressed in hours, minutes and/or seconds. You can say "ping me in 3 minutes", -"buzz me in an hour and 15 minutes", or "set my alarm for 30 secs". When the timers is up it will -simply print out "BEEP BEEP BEEP" in the data probe console. +This example demonstrates relatively complete NLI-based weather service with JSON output and a non-trivial +intent matching logic. It uses https://www.apixu.com;>https://www.apixu.com +REST service for the actual weather information. Complexity:
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP on community page.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 2d01821 WIP on community page.
2d01821 is described below
commit 2d0182185128a0ade1078df8902b2a8905e05819
Author: Aaron Radzinzski
AuthorDate: Mon Mar 16 10:38:34 2020 -0700
WIP on community page.
---
docs/_includes/quick-links.html| 2 +-
.../css/style.scss => _scss/community.scss}| 62 ++
docs/_scss/misc.scss | 5 +-
docs/assets/css/style.scss | 1 +
docs/community.html| 131 -
docs/download.html | 4 +-
6 files changed, 151 insertions(+), 54 deletions(-)
diff --git a/docs/_includes/quick-links.html b/docs/_includes/quick-links.html
index 15b7fa6..e381b1d 100644
--- a/docs/_includes/quick-links.html
+++ b/docs/_includes/quick-links.html
@@ -36,7 +36,7 @@
-mailto:d...@nlpcraft.apache.org;>Dev List
+http://mail-archives.apache.org/mod_mbox/nlpcraft-dev/;>Dev List
diff --git a/docs/assets/css/style.scss b/docs/_scss/community.scss
similarity index 51%
copy from docs/assets/css/style.scss
copy to docs/_scss/community.scss
index 2ad7b1e..a4b308e 100644
--- a/docs/assets/css/style.scss
+++ b/docs/_scss/community.scss
@@ -1,6 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,49 +15,16 @@
* limitations under the License.
*/
-/*
- * Constants.
- * --
- */
-$font-size: 14px;
-$default-font: "Helvetica Neue";
-
-@import 'fonts';
-@import 'colors';
-@import 'misc';
-@import 'header';
-@import 'footer';
-@import 'sh';
-@import 'index';
-@import '404';
-@import 'buttons';
-@import 'download';
-@import 'three-cols';
-@import 'basic-concepts';
-@import 'use-cases';
-@import 'server-and-probes';
-@import 'metrics-and-tracing';
-@import 'integrations';
-
-html {
-position: relative;
-min-height: 100%;
-height: 100%;
-}
-
-body {
-background-color: $background-color;
-color: $foreground-color;
-min-height: 100%;
-height: 100%;
-}
-
-em.high {
-font-style: normal;
-padding: 2px 4px 3px 4px;
-background-color: #d36da6;
-color: #fff;
-border-radius: 1px;
-}
-
-
+#community {
+table.checks {
+i.fas {
+&.fa-check, &.fa-check-double {
+color: $color-turquoise;
+}
+
+&.fa-times {
+color: $color-alizarin
+}
+}
+}
+}
\ No newline at end of file
diff --git a/docs/_scss/misc.scss b/docs/_scss/misc.scss
index 10450c9..c5fceb5 100644
--- a/docs/_scss/misc.scss
+++ b/docs/_scss/misc.scss
@@ -286,7 +286,6 @@ $bq-success-border-color: $brand-success;
}
.gradient-table {
-width: 100%;
margin-top: 0;
border-collapse: collapse;
border-radius: 2px;
@@ -335,8 +334,12 @@ $bq-success-border-color: $brand-success;
border-left: 1px solid #eee;
}
}
+
}
+.max-width {
+width: 100%;
+}
a[target=javadoc] {
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
"Courier New", monospace;
font-size: 87.5%;
diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss
index 2ad7b1e..70d8461 100644
--- a/docs/assets/css/style.scss
+++ b/docs/assets/css/style.scss
@@ -41,6 +41,7 @@ $default-font: "Helvetica Neue";
@import 'server-and-probes';
@import 'metrics-and-tracing';
@import 'integrations';
+@import 'community';
html {
position: relative;
diff --git a/docs/community.html b/docs/community.html
index 39facc2..792d659 100644
--- a/docs/community.html
+++ b/docs/community.html
@@ -252,12 +252,141 @@ layout: interior
approved by the PMC voting process.
+
+Committers PMC
+
+Visit the https://github.com/apache/incubator-nlpcraft/graphs/contributors;>Apache
NLPCraft Contributors page to
+see a list of top contributors and committers for the main
project.
+The table below summarizes http://people.apache.org/phonebook.html?podling=nlpcraft;>committers and
PMC members
+of Apache NLPCraft:
+
+
+
+
+Name
+Organization
+PMC Member?
+
+
+
+
+Aaron Radzinski
+DataLingvo
+
+
+
+Dmitriy Monakhov
+
+
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 5c42c96 WIP.
5c42c96 is described below
commit 5c42c96915064cd2eda78e3db99b3cd4a405320b
Author: Aaron Radzinzski
AuthorDate: Sun Mar 15 15:22:25 2020 -0700
WIP.
---
pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f3ceb0..04d80cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,8 +623,6 @@
Apache NLPCraft
${project.version}
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP on community page.
This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-13 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push: new 34642e7 WIP on community page. 34642e7 is described below commit 34642e703f099b40f61e727d6d3faa88694bacde Author: Aaron Radzinzski AuthorDate: Sun Mar 15 11:53:41 2020 -0700 WIP on community page. --- docs/community.html | 60 + 1 file changed, 60 insertions(+) diff --git a/docs/community.html b/docs/community.html index d8f2606..c739277 100644 --- a/docs/community.html +++ b/docs/community.html @@ -92,6 +92,66 @@ layout: interior suited for the quick start. Still haven't found anything suitable? As always, check the latest discussions on https://mail-archives.apache.org/mod_mbox/nlpcraft-dev/;>d...@nlpcraft.apache.org +Git Workflow + +NLPCraft project uses Git as its version control system. The same Git workflow rules apply to all +sub-projects: + + + +master branch represents latest released version (i.e. the latest release). + + +Each release has corresponding Git tag. + + + + +release branch represent a root branch for the current release that is under development. + + +During release the release branch gets merged to master, Git tag +is created and work on the next release continues with release branch. + + +master branch gets updated only during release process. + + + + +Committers use feature branches for their work, while contributors use pull-requests from GitHub mirror. + + +Feature branches should be named after their JIRA tickets, i.e. for ticket NLPCRAFT-012 +the branch should be named NLPCRAFT-012. + + + + +Committers create feature branches off the release branch. + + +Merging should use Git squashing to minimize number of intermittent commits. + + +Creating GitHub Pull-Request + +++ +---++-+ +|| replica | |fork| | +| Apache Git | ==> | GitHub Mirror | -> | John Doe's Fork | +|| | || | +++ +---++-+ + ^^^ + ||| + |++ | origin + | upstream | | + | | | + |+-+ + |*Apache Git remote handle for committers* | | + +| Local clone | +| | ++-+ +
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP on community page.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new ebd5ef1 WIP on community page.
ebd5ef1 is described below
commit ebd5ef13c8d0f71f505529a859324b54fc58499b
Author: Aaron Radzinzski
AuthorDate: Sat Mar 14 22:40:22 2020 -0700
WIP on community page.
---
docs/community.html | 86 +
1 file changed, 86 insertions(+)
diff --git a/docs/community.html b/docs/community.html
new file mode 100644
index 000..5865b6a
--- /dev/null
+++ b/docs/community.html
@@ -0,0 +1,86 @@
+---
+active_crumb: Community
+layout: interior
+---
+
+
+
+
+ {{ page.active_crumb }}
+
+
+
+
+
+Introduction
+Overview
+Installation
+Getting Started
+
+
+
+
+Start Contributing
+
+Before you get involved in Apache NLPCraft development, please
sign up to the
+dev mailing list by sending an empty email to mailto:dev-subscr...@ignite.apache.org;>dev-subscr...@ignite.apache.org
+and follow simple instructions in the reply. Once subscribed,
say "Hello" to everyone in the community.
+Tell us as much as you can about your areas of expertise
mentioning how exactly you would like to
+contribute. We are a friendly and inclusive community and will
try to simplify your "onboarding"
+considering your strengths or areas of interest.
+
+
+Also, make sure to share your JIRA ID in the same email (create
+a https://issues.apache.org/jira/projects/NLPCRAFT;>new one if you
don't have an ASF JIRA account yet).
+One of our community members will add you to the contributors'
list and you will be able to
+go ahead and book NLPCraft tasks you would like to work on.
+
+NLPCraft Dev List
+
+This list is the primary and the default communication channel
- mailto:d...@nlpcraft.apache.org;>d...@nlpcraft.apache.org
+
+
+Send an email to mailto:dev-subscr...@ignite.apache.org;>dev-subscr...@ignite.apache.org
+to subscribe to the list. If you are an ASF committer, then
it's better to use your @apache.org
+address for NLPCraft communications.
+
+
+All the discussions related to contributions, changes, new
ideas have to be started on the dev list
+first. Remember the mantra - "If it's not on the dev list,
it didn't happen". The project is
+being developed and moved forward by individuals living across
the globe and speaking different
+languages. Thus, https://www.apache.org/foundation/how-it-works.html#communication;>asynchronous
written communication
+is a preferred way of engagement at ASF as well as within the
NLPCraft community.
+
+
+For the sake of openness, speed and transparency, the
community members are free to use Slack, Skype or
+meet via the tools like Google Meeting. But, as mentioned
above, if any conversation took place between
+contributors using channels like Slack, a summary of the
discussion/decision has to be shared via the
+dev list letting other contributors share their opinions. As a
summary, final decisions are made only
+on the dev list.
+
+
+
+
+
+On This Page
+Start Contributing
+Committers PMC
+{% include quick-links.html %}
+
+
+
\ No newline at end of file
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 4411c99 WIP.
4411c99 is described below
commit 4411c9966fb1aa061e3a57a85ffa7d098b701c21
Author: Aaron Radzinzski
AuthorDate: Sat Mar 14 14:38:19 2020 -0700
WIP.
---
docs/download.html | 4
1 file changed, 4 insertions(+)
diff --git a/docs/download.html b/docs/download.html
index bd02b13..cf9940c 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -177,6 +177,10 @@ layout: interior
Building Binaries
+
+To build binaries from the source release download the source release and run
+the following commands:
+
# Unpack the source package.
$ unzip -q apache-nlpcraft-{{site.latest_version}}-src.zip
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 94d45de WIP.
94d45de is described below
commit 94d45de0683bf46110f15b9b4ce81c1f4a7573a0
Author: Aaron Radzinzski
AuthorDate: Sat Mar 14 13:38:16 2020 -0700
WIP.
---
docs/_layouts/release-notes.html | 37 +-
...e-notes-0.8.2.html => release-notes-0.5.0.html} | 12 +++
2 files changed, 5 insertions(+), 44 deletions(-)
diff --git a/docs/_layouts/release-notes.html b/docs/_layouts/release-notes.html
index 4bd4255..fec5ec7 100644
--- a/docs/_layouts/release-notes.html
+++ b/docs/_layouts/release-notes.html
@@ -49,42 +49,7 @@ layout: default
New
Enhancements
Fixes
-Quick Links
-
-https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/apache/nlpcraft/examples;>Examples
-
-
-Javadoc
-
-
-https://nlpcraft.docs.apiary.io;
-target="apiary">REST API
-
-
-Download
-
-
-Blogs
-
-Support
-
-
-mailto:d...@nlpcraft.apache.org;>Dev List
-
-
-
-
-https://stackoverflow.com/questions/ask;>Stack Overflow
-
-
-
-
-https://github.com/apache/incubator-nlpcraft;>GitHub
-
-
+{% include quick-links.html %}
diff --git a/docs/release-notes-0.8.2.html b/docs/release-notes-0.5.0.html
similarity index 59%
rename from docs/release-notes-0.8.2.html
rename to docs/release-notes-0.5.0.html
index d3ce884..799f6ab 100644
--- a/docs/release-notes-0.8.2.html
+++ b/docs/release-notes-0.5.0.html
@@ -1,5 +1,5 @@
---
-rel_ver: 0.8.2
+rel_ver: 0.5.0
layout: release-notes
---
@@ -24,11 +24,9 @@ layout: release-notes
New
-Fixed https://github.com/apache/incubator-nlpcraft/issues/185;>Issue #185.
+Fixed https://issues.apache.org/jira/projects/NLPCRAFT/issues/NLPCRAFT-13;>Issue
#13.
-Introduced command line utility to build NLPCraft model stub
from any SQL JDBC-based data source.
-See NCSqlModelGenerator
-class for more details.
+Finished migration to ASF infrastructure.
@@ -41,9 +39,7 @@ layout: release-notes
類 Fixes
-Fixed https://github.com/apache/incubator-nlpcraft/issues/186;>Issue
#186.
-Fixed https://github.com/apache/incubator-nlpcraft/issues/188;>Issue
#188.
-Fixed https://github.com/apache/incubator-nlpcraft/issues/187;>Issue
#187.
+Fixed https://issues.apache.org/jira/projects/NLPCRAFT/issues/NLPCRAFT-2;>Issue
#2.
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new eaae6b3 WIP.
eaae6b3 is described below
commit eaae6b301adb481b0e22c3afe7a77daa66dcee2f
Author: Aaron Radzinzski
AuthorDate: Sat Mar 14 13:32:17 2020 -0700
WIP.
---
docs/_data/releases.yml | 17 +
docs/download.html | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/docs/_data/releases.yml b/docs/_data/releases.yml
index 7c08bf8..e808b87 100644
--- a/docs/_data/releases.yml
+++ b/docs/_data/releases.yml
@@ -15,14 +15,15 @@
# limitations under the License.
#
-- version: 0.8.2
- date: Jan 14, 2020
- zip_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip
- md5_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip.md5
- sha1_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip.sha1
- sha256_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip.sha256
- pgp_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip.sig
- github_link: https://github.com/apache/incubator-nlpcraft/tree/0.8.2
+- version: 0.5.0
+ date: Apr 16, 2020
+ zip_name: apache-nlpcraft-0.5.0.zip
+ zip_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.5.0/apache-nlpcraft-0.5.0.zip
+ md5_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.5.0/apache-nlpcraft-0.5.0.zip.md5
+ sha1_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.5.0/apache-nlpcraft-0.5.0.zip.sha1
+ sha256_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.5.0/apache-nlpcraft-0.5.0.zip.sha256
+ pgp_url:
https://github.com/apache/incubator-nlpcraft/releases/download/0.5.0/apache-nlpcraft-0.5.0.zip.sig
+ github_link: https://github.com/apache/incubator-nlpcraft/tree/0.5.0
dockerhub_link: https://hub.docker.com/r/nlpcraftserver/server
backward_compatible: yes
diff --git a/docs/download.html b/docs/download.html
index 517d71a..8423ea5 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -159,7 +159,7 @@ layout: interior
{% for rel in site.data.releases %}
- nlpcraft-{{rel.version}}.zip
+ {{rel.zip_name}}
{% unless rel.backward_compatible %}{% endunless %}
{{rel.version}}
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new a7a1ca3 WIP.
a7a1ca3 is described below
commit a7a1ca3ec159198bf192623d6321a236cb5c7ab9
Author: Aaron Radzinzski
AuthorDate: Fri Mar 13 15:15:19 2020 -0700
WIP.
---
docs/download.html | 22 +++---
docs/getting-started.html | 8
docs/server-and-probe.html | 30 +++---
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/docs/download.html b/docs/download.html
index 8e2afe6..60905a0 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -217,28 +217,28 @@ layout: interior
# Run these two commands and compare generated hashes:
-$ openssl dgst -md5 nlpcraft-{{site.latest_version}}.zip
-$ cat nlpcraft-{{site.latest_version}}.zip.md5
+$ openssl dgst -md5
apache-nlpcraft-{{site.latest_version}}.zip
+$ cat apache-nlpcraft-{{site.latest_version}}.zip.md5
# Run these two commands and compare generated hashes:
-$ openssl dgst -sha256 nlpcraft-{{site.latest_version}}.zip
-$ cat nlpcraft-{{site.latest_version}}.zip.sha256
+$ openssl dgst -sha256
apache-nlpcraft-{{site.latest_version}}.zip
+$ cat apache-nlpcraft-{{site.latest_version}}.zip.sha256
# Run these two commands and compare generated hashes:
-$ openssl dgst -sha1 nlpcraft-{{site.latest_version}}.zip
-$ cat nlpcraft-{{site.latest_version}}.zip.sha1
+$ openssl dgst -sha1
apache-nlpcraft-{{site.latest_version}}.zip
+$ cat apache-nlpcraft-{{site.latest_version}}.zip.sha1
# NOTE: make sure to have GPGTools (gpgtools.org)
installed.
-$ gpg --verify nlpcraft-{{site.latest_version}}.zip.sig
nlpcraft-{{site.latest_version}}.zip
+$ gpg --verify
apache-nlpcraft-{{site.latest_version}}.zip.sig
apache-nlpcraft-{{site.latest_version}}.zip
@@ -254,22 +254,22 @@ layout: interior
-$ md5sum --check nlpcraft-{{site.latest_version}}.zip.md5
+$ md5sum --check
apache-nlpcraft-{{site.latest_version}}.zip.md5
-$ sha256sum --check
nlpcraft-{{site.latest_version}}.zip.sha256
+$ sha256sum --check
apache-nlpcraft-{{site.latest_version}}.zip.sha256
-$ sha1sum --check nlpcraft-{{site.latest_version}}.zip.sha1
+$ sha1sum --check
apache-nlpcraft-{{site.latest_version}}.zip.sha1
-$ gpg --verify nlpcraft-{{site.latest_version}}.zip.sig
nlpcraft-{{site.latest_version}}.zip
+$ gpg --verify
apache-nlpcraft-{{site.latest_version}}.zip.sig
apache-nlpcraft-{{site.latest_version}}.zip
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 2577381..1dab06f 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -57,7 +57,7 @@ id: getting_started
$ cd build
-$ java -jar nlpcraft-{{site.latest_version}}-all-deps.jar
-server
+$ java -jar
apache-nlpcraft-{{site.latest_version}}-all-deps.jar -server
You can can also start it via Docker:
@@ -67,7 +67,7 @@ id: getting_started
REST server starts with default configuration
(nlpcraft.conf and
-ignite.xml files located in the same folder
as nlpcraft-{{site.latest_version}}-all-deps.jar
+ignite.xml files located in the same folder
as apache-nlpcraft-{{site.latest_version}}-all-deps.jar
file). You should see the output similar to this:
@@ -95,11 +95,11 @@ id: getting_started
$ cd build
-$ java -jar nlpcraft-{{site.latest_version}}-all-deps.jar
-probe
+
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new c856b79 WIP.
c856b79 is described below
commit c856b79eae49124fb907a07f6978aab1e141781f
Author: Aaron Radzinzski
AuthorDate: Fri Mar 13 13:38:02 2020 -0700
WIP.
---
docs/_data/blogs.yml | 56
docs/_scss/blogs.scss | 124 -
docs/assets/css/style.scss | 1 -
docs/fonts/stylesheet.css | 21 +---
docs/getting-started.html | 4 +-
docs/server-and-probe.html | 4 +-
6 files changed, 18 insertions(+), 192 deletions(-)
diff --git a/docs/_data/blogs.yml b/docs/_data/blogs.yml
deleted file mode 100644
index 58e2258..000
--- a/docs/_data/blogs.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-- title: О пользе кодирования при разработке NLP моделей
- url: blogs/о_пользе_кодирования_при_разработке_NLP_моделей.html
- excerpt: В данной статье мы попытается пояснить, отчего не стоит пытаться
избегать кодирования при построении моделей обработки пользовательских запросов.
- author: Dmitriy Monakhov
- avatar_url: images/monakhov.png
- publish_date: Jul 31, 2019
- flag-ico: images/ru-flag-128x128.png
-
-- title: Short-Term Memory - Maintaining Conversational Context
- url: blogs/short-term-memory-maintaining-conversational-context.html
- excerpt: In this article, I’ll try to give a high-level overview of STM —
Short-Term Memory...
- author: Aaron Radzinksi
- avatar_url: images/lion.jpg
- publish_date: Jul 26, 2019
- flag-ico: images/us-flag-128x128.png
-
-- title: Light switch with Natural Language Interface
- url: blogs/lightswitch_with_natural_language_interface.html
- excerpt: In this blog I’ll show how to build a natural language interface
for a typical home light switch...
- author: Aaron Radzinksi
- avatar_url: images/lion.jpg
- publish_date: Jul 16, 2019
- flag-ico: images/us-flag-128x128.png
-
-- title: Here’s Why Developing Natural Language Interface Is Hard
- url: blogs/why_natural_language_interface_is_hard.html
- excerpt: In this article I would like to show why NLI (Natural Language
Interface) is often so hard to do.
- author: NLPCraft
- avatar_url: images/nlpcraft_logo.png
- publish_date: Sep 27, 2018
- flag-ico: images/us-flag-128x128.png
-
-- title: Использование именованных сущностей в NLPCraft
- url: blogs/использование_именованных_сущностей_nlpcraft.html
- excerpt: Первая задача, с решения которой начинается процесс работы каждой
NLP системы, это...
- author: Dmitriy Monakhov
- avatar_url: images/monakhov.png
- publish_date: July 18, 2019
- flag-ico: images/ru-flag-128x128.png
diff --git a/docs/_scss/blogs.scss b/docs/_scss/blogs.scss
deleted file mode 100644
index 8b9700c..000
--- a/docs/_scss/blogs.scss
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#blog {
-.blog-header {
-margin-bottom: 20px;
-border-bottom: 1px solid #dfdfdf;
-padding-bottom: 15px;
-
-.blog-title {
-color: $color-slack2;
-font-weight: 500;
-margin-top: 0;
-display: inline-block;
-margin-bottom: 5px;
-font-size: 150%;
-}
-
-
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new a4b5a53 WIP.
a4b5a53 is described below
commit a4b5a5370e20257fa68a0c357ad8193cba24ed96
Author: Aaron Radzinzski
AuthorDate: Fri Mar 13 13:32:56 2020 -0700
WIP.
---
docs/_data/news.yml| 21 +-
docs/_includes/quick-links.html| 3 -
docs/_layouts/default.html | 2 +-
...ightswitch_with_natural_language_interface.html | 281 ---
...-memory-maintaining-conversational-context.html | 381 -
.../why_natural_language_interface_is_hard.html| 210
...\321\201\321\202\320\265\320\271_nlpcraft.html" | 295
...6\320\264\320\265\320\273\320\265\320\271.html" | 269 ---
docs/index.html| 5 +-
9 files changed, 5 insertions(+), 1462 deletions(-)
diff --git a/docs/_data/news.yml b/docs/_data/news.yml
index 58ee185..8e0f773 100644
--- a/docs/_data/news.yml
+++ b/docs/_data/news.yml
@@ -15,27 +15,12 @@
# limitations under the License.
#
-- title: Использование именованных сущностей (NE) в NLPCraft
- url:
https://medium.com/@dmonakhov_47478/%D0%B8%D1%81%D0%BF%D0%BE%D0%BB%D1%8C%D0%B7%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B5-%D0%B8%D0%BC%D0%B5%D0%BD%D0%BE%D0%B2%D0%B0%D0%BD%D0%BD%D1%8B%D1%85-%D1%81%D1%83%D1%89%D0%BD%D0%BE%D1%81%D1%82%D0%B5%D0%B9-ne-%D0%B2-nlpcraft-e7c259a7290b
- excerpt: Первая задача, с решения которой начинается процесс работы каждой
NLP системы, это...
- author: Dmitriy Monakhov
- avatar_url: images/monakhov.png
- publish_date: July 18, 2019
- twitter_id: nlpcraftorg
- medium_id: dmonakhov_47478
-
-- title: Light switch with Natural Language Interface
- url: https://dzone.com/articles/light-switch-with-natural-language-interface
- excerpt: In this blog I’ll show how to build a natural language interface
for a typical home light switch...
- pub_logo_url: images/dzone_logo.png
- publish_date: July 16, 2019
-
-- title: Introducing NLPCraft 0.6
+- title: Introducing Apache NLPCraft 0.5.0
url: https://medium.com/@aradzinski/introducing-nlpcraft-0-6-74cea6a4d203
- excerpt: Google NL and Standford CoreNLP integration, new intent DSL,
bugfixes & improvements.
+ excerpt: Announcing the 1st release of the Apache NLPCraft.
author: Aaron Radzinksi
avatar_url: images/lion.jpg
- publish_date: June 21, 2019
+ publish_date: April 16, 2020
linkedin_id: aaron-radzinski-6b2228167
twitter_id: aaron_radzinski
medium_id: aradzinski
diff --git a/docs/_includes/quick-links.html b/docs/_includes/quick-links.html
index 7e541c0..89e205c 100644
--- a/docs/_includes/quick-links.html
+++ b/docs/_includes/quick-links.html
@@ -28,9 +28,6 @@
Download
-
-Blogs
-
Support
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 4ff9392..a990207 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -91,7 +91,7 @@ layout: compress
Downloads
-Blogs
+Community
Use Cases
diff --git a/docs/blogs/lightswitch_with_natural_language_interface.html
b/docs/blogs/lightswitch_with_natural_language_interface.html
deleted file mode 100644
index e5e6637..000
--- a/docs/blogs/lightswitch_with_natural_language_interface.html
+++ /dev/null
@@ -1,281 +0,0 @@
-title: Light Switch With Natural Language Interface
-author: Aaron Radzinksi
-avatar_url: images/lion.jpg
-publish_date: Jul 16, 2019
-flag-ico: images/us-flag-128x128.png
-layout: blog
-
-
-
-
-
-{{page.title}}
-
-
-{{ page.author }}
-
-{{ page.publish_date }}
-
-
-
-In this blog I’ll show how to build a natural language interface for a
typical home light
-switch so that you could turn the lights on and off with simple
commands like "Turn off all the lights,
-please" or "Get the lights on in the kids bedroom."
-
-
-We’ll concentrate on Natural Language Interface (NLI) part, and I’ll
leave speech-to-text and
-the actual light controlling outside of the scope of this short blog.
You can easily add speech-to-text
-with https://developer.mozilla.org/en-US/docs/Web/API/Web_Speech_API;>WebSpeech,
-if necessary, while https://www.arduino.cc;>Arduino/https://developer.apple.com/homekit;>HomeKit
-can provide simple API to control the lights in your house.
-
-
-For our implementation we’ll use NLPCraft and Scala language (NLPCraft
also supports any JVM-based language
-of your choice like Java, Groovy or Kotlin). NLPCraft is a free
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP on readme files.
This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-13 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push: new 38e5b3c WIP on readme files. 38e5b3c is described below commit 38e5b3c817923a53703e929a43b384f7f05c694f Author: Aaron Radzinzski AuthorDate: Thu Mar 12 19:27:45 2020 -0700 WIP on readme files. --- docker/readme.md | 8 docs/index.html | 10 +- openapi/README.md | 14 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/docker/readme.md b/docker/readme.md index 6c01f58..3732468 100644 --- a/docker/readme.md +++ b/docker/readme.md @@ -1,8 +1,6 @@ https://nlpcraft.org/images/nlpcraft_logo_black.gif; height="80px"> -https://gitter.im/nlpcraftorg/community;>https://badges.gitter.im/nlpcraftorg/community.svg;> -https://travis-ci.org/apache/incubator-nlpcraft#;>https://travis-ci.org/apache/incubator-nlpcraft.svg?branch=master;> -https://search.maven.org/search?q=org.apache.nlpcraft;>https://maven-badges.herokuapp.com/maven-central/org.apache.nlpcraft/nlpcraft/badge.svg; alt="Maven"> +https://gitter.im/apache-nlpcraft/community;>https://badges.gitter.im/apache-nlpcraft/community.svg;> ### Docker Starting with version 0.7.3 NLPCraft provides docker image for NLPCraft server. You can @@ -36,6 +34,8 @@ You can prepare your own NLPCraft server image following these instructions: than allocated by default to the docker containers. Set memory value to 8G (`-m 8G`). ### Copyright -Copyright (C) 2013-2019 [NLPCraft.](https://nlpcraft.org) All Rights Reserved. +Copyright (C) 2020 Apache Software Foundation + +https://www.apache.org/img/ASF20thAnniversary.jpg; height="64px"> diff --git a/docs/index.html b/docs/index.html index 5d1f626..5359941 100644 --- a/docs/index.html +++ b/docs/index.html @@ -35,12 +35,12 @@ layout: default -About NLPCraft +What Is NLPCraft Apache NLPCraft is an open source library for adding natural language Interface -to any applications. Based on semantic modelling it requires no deep learning model training -or pre-existing text corpora. +to any applications. Based on semantic modelling it allows rapid implementation and +requires no deep learning model training or pre-existing text corpora. Apache NLPCraft is simple to use: define a semantic model and intents to interpret @@ -53,7 +53,7 @@ layout: default -Why NLI +Natural Language Natural Language Interface (NLI) enables users to explore any type of data @@ -88,7 +88,7 @@ layout: default href="https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/nlpcraft/examples; aria-label="NLPCraft examples on GitHub">Examples -https://gitter.im/nlpcraftorg/community;>https://badges.gitter.im/nlpcraftorg/community.svg;> +https://gitter.im/apache-nlpcraft/community;>https://badges.gitter.im/apache-nlpcraft/community.svg;> diff --git a/openapi/README.md b/openapi/README.md index c304ee6..72a9379 100644 --- a/openapi/README.md +++ b/openapi/README.md @@ -1,8 +1,6 @@ https://nlpcraft.org/images/nlpcraft_logo_black.gif; height="80px"> https://gitter.im/nlpcraftorg/community;>https://badges.gitter.im/nlpcraftorg/community.svg;> -https://travis-ci.org/apache/incubator-nlpcraft#;>https://travis-ci.org/apache/incubator-nlpcraft.svg?branch=master;> -https://search.maven.org/search?q=org.apache.nlpcraft;>https://maven-badges.herokuapp.com/maven-central/org.apache.nlpcraft/nlpcraft/badge.svg; alt="Maven"> ### REST API For more REST API information: @@ -11,11 +9,17 @@ For more REST API information: For any questions, feedback or suggestions: - * Send us a note at [supp...@nlpcraft.org](mailto:supp...@nlpcraft.org) + * View & run [examples](https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/nlpcraft/examples) + * Latest [Javadoc](https://github.com/apache/incubator-nlpcraft/apis/latest/index.html) and [REST APIs](https://nlpcraft.org/using-rest.html) + * Download & Maven/Grape/Gradle/SBT [instructions](https://nlpcraft.org/download.html) + * File a bug or improvement in [JIRA](https://issues.apache.org/jira/projects/NLPCRAFT) * Post a question at [Stack Overflow](https://stackoverflow.com/questions/ask)
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP on readme files.
This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-13 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push: new 2d99da8 WIP on readme files. 2d99da8 is described below commit 2d99da861c0d79028edc5a6b185eeb80fd3273b8 Author: Aaron Radzinzski AuthorDate: Thu Mar 12 19:16:43 2020 -0700 WIP on readme files. --- src/main/scala/org/nlpcraft/examples/README.md | 9 + src/main/scala/org/nlpcraft/examples/alarm/README.md | 10 ++ src/main/scala/org/nlpcraft/examples/echo/README.md| 10 ++ src/main/scala/org/nlpcraft/examples/helloworld/README.md | 10 ++ src/main/scala/org/nlpcraft/examples/lightswitch/README.md | 10 ++ src/main/scala/org/nlpcraft/examples/phone/README.md | 10 ++ src/main/scala/org/nlpcraft/examples/time/README.md| 10 ++ src/main/scala/org/nlpcraft/examples/weather/README.md | 10 ++ 8 files changed, 47 insertions(+), 32 deletions(-) diff --git a/src/main/scala/org/nlpcraft/examples/README.md b/src/main/scala/org/nlpcraft/examples/README.md index 5b9f5fb..0860221 100644 --- a/src/main/scala/org/nlpcraft/examples/README.md +++ b/src/main/scala/org/nlpcraft/examples/README.md @@ -1,8 +1,6 @@ https://nlpcraft.org/images/nlpcraft_logo_black.gif; height="80px"> https://gitter.im/apache-nlpcraft/community;>https://badges.gitter.im/apache-nlpcraft/community.svg;> -https://travis-ci.org/apache/incubator-nlpcraft#;>https://travis-ci.org/apache/incubator-nlpcraft.svg?branch=master;> -https://search.maven.org/search?q=org.apache.nlpcraft;>https://maven-badges.herokuapp.com/maven-central/org.apache.nlpcraft/nlpcraft/badge.svg; alt="Maven"> ### Examples This folder contains Java and Scala examples of NLPCraft data models. Each example is fully @@ -22,9 +20,12 @@ See [Getting Started](https://nlpcraft.org/getting-started.html) guide for more For any questions, feedback or suggestions: - * Send us a note at [supp...@nlpcraft.org](mailto:supp...@nlpcraft.org) + * Latest [Javadoc](https://github.com/apache/incubator-nlpcraft/apis/latest/index.html) and [REST APIs](https://nlpcraft.org/using-rest.html) + * Download & Maven/Grape/Gradle/SBT [instructions](https://nlpcraft.org/download.html) + * File a bug or improvement in [JIRA](https://issues.apache.org/jira/projects/NLPCRAFT) * Post a question at [Stack Overflow](https://stackoverflow.com/questions/ask) using nlpcraft tag - * If you found a bug or have an idea file new issue on [GitHub](https://github.com/apache/incubator-nlpcraft/issues). + * Access [GitHub](https://github.com/apache/incubator-nlpcraft) mirror repository. + * Join project developers on [d...@nlpcraft.apache.org](mailto:d...@nlpcraft.apache.org) ### Copyright Copyright (C) 2020 Apache Software Foundation diff --git a/src/main/scala/org/nlpcraft/examples/alarm/README.md b/src/main/scala/org/nlpcraft/examples/alarm/README.md index ac65252..4a0d3d4 100644 --- a/src/main/scala/org/nlpcraft/examples/alarm/README.md +++ b/src/main/scala/org/nlpcraft/examples/alarm/README.md @@ -1,8 +1,6 @@ https://nlpcraft.org/images/nlpcraft_logo_black.gif; height="80px"> https://gitter.im/apache-nlpcraft/community;>https://badges.gitter.im/apache-nlpcraft/community.svg;> -https://travis-ci.org/apache/incubator-nlpcraft#;>https://travis-ci.org/apache/incubator-nlpcraft.svg?branch=master;> -https://search.maven.org/search?q=org.apache.nlpcraft;>https://maven-badges.herokuapp.com/maven-central/org.apache.nlpcraft/nlpcraft/badge.svg; alt="Maven"> ### Alarm Example This example provides a simple "alarm clock" interface where you can ask to set the timer for a @@ -29,9 +27,13 @@ See [Getting Started](https://nlpcraft.org/getting-started.html) guide for more For any questions, feedback or suggestions: - * Send us a note at [supp...@nlpcraft.org](mailto:supp...@nlpcraft.org) + * View & run other [examples](https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/nlpcraft/examples) + * Latest [Javadoc](https://github.com/apache/incubator-nlpcraft/apis/latest/index.html) and [REST APIs](https://nlpcraft.org/using-rest.html) + * Download & Maven/Grape/Gradle/SBT [instructions](https://nlpcraft.org/download.html) + * File a bug or improvement in [JIRA](https://issues.apache.org/jira/projects/NLPCRAFT) * Post a question at [Stack Overflow](https://stackoverflow.com/questions/ask) using nlpcraft tag - * If you found a bug or have an idea file new issue on [GitHub](https://github.com/apache/incubator-nlpcraft/issues). + * Access [GitHub](https://github.com/apache/incubator-nlpcraft) mirror repository. + * Join project developers on [d...@nlpcraft.apache.org](mailto:d...@nlpcraft.apache.org) ### Copyright Copyright (C) 2020 Apache Software Foundation diff --git
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP on quick links include.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-13
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push:
new 5218ff8 WIP on quick links include.
5218ff8 is described below
commit 5218ff88e602127c46e7ae17ce244ed4c2e80b92
Author: Aaron Radzinzski
AuthorDate: Thu Mar 12 19:10:39 2020 -0700
WIP on quick links include.
---
docs/_includes/quick-links.html | 54 +
docs/basic-concepts.html| 42 +---
docs/blogs.html | 37 +---
docs/data-model.html| 39 +
docs/docs.html | 37 +---
docs/download.html | 34 +-
docs/first-example.html | 37 +---
docs/getting-started.html | 37 +---
docs/installation.html | 37 +---
docs/integrations.html | 37 +---
docs/intent-matching.html | 37 +---
docs/metrics-and-tracing.html | 39 +
docs/server-and-probe.html | 39 +
docs/use-cases.html | 37 +---
docs/using-rest.html| 37 +---
openapi/nlpcraft_swagger.yml| 6 ++---
16 files changed, 71 insertions(+), 515 deletions(-)
diff --git a/docs/_includes/quick-links.html b/docs/_includes/quick-links.html
new file mode 100644
index 000..7e541c0
--- /dev/null
+++ b/docs/_includes/quick-links.html
@@ -0,0 +1,54 @@
+
+
+Quick Links
+
+https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/nlpcraft/examples;>Examples
+
+
+Javadoc
+
+
+https://github.com/apache/incubator-nlpcraft/blob/master/openapi/nlpcraft_swagger.yml;
target="github">REST API
+
+
+Download
+
+
+Blogs
+
+Support
+
+
+https://issues.apache.org/jira/projects/NLPCRAFT/issues;>JIRA
+
+
+
+
+mailto:d...@nlpcraft.apache.org;>Dev List
+
+
+
+
+https://stackoverflow.com/questions/ask;>Stack Overflow
+
+
+
+
+https://github.com/apache/incubator-nlpcraft;>GitHub
+
+
diff --git a/docs/basic-concepts.html b/docs/basic-concepts.html
index 6d875df..1539c86 100644
--- a/docs/basic-concepts.html
+++ b/docs/basic-concepts.html
@@ -251,47 +251,7 @@ id: basic_concepts
Named Entities
Intent Matching
Conversation
STM
-Quick Links
-
-https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/nlpcraft/examples;>Examples
-
-
-Javadoc
-
-
-https://nlpcraft.docs.apiary.io;
-target="apiary">REST API
-
-
-Download
-
-
-Blogs
-
-Support
-
-
-https://issues.apache.org/jira/projects/NLPCRAFT/issues;>JIRA
-
-
-
-
-mailto:d...@nlpcraft.apache.org;>Dev List
-
-
-
-
-https://stackoverflow.com/questions/ask;>Stack Overflow
-
-
-
-
-https://github.com/apache/incubator-nlpcraft;>GitHub
-
-
+{% include quick-links.html %}
diff --git a/docs/blogs.html b/docs/blogs.html
index ae0f398..c0835ec 100644
--- a/docs/blogs.html
+++ b/docs/blogs.html
@@ -57,42 +57,7 @@ layout: interior
-Quick Links
-
-https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/nlpcraft/examples;>Examples
-
-
-Javadoc
-
-
-https://nlpcraft.docs.apiary.io;
-target="apiary">REST API
-
-
-Download
-
-
-Blogs
-
-Support
-
-
-mailto:d...@nlpcraft.apache.org;>Dev List
-
-
-
-
-https://stackoverflow.com/questions/ask;>Stack Overflow
-
-
-
-
-https://github.com/apache/incubator-nlpcraft;>GitHub
-
-
+{% include quick-links.html %}
diff --git a/docs/data-model.html b/docs/data-model.html
index f2a1443..4275c73 100644
--- a/docs/data-model.html
+++ b/docs/data-model.html
@@ -3293,44 +3293,7 @@ intents:
Model Logic
Built-In Tokens
Token Metadata
-
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-13 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push: new a6355f1 WIP. a6355f1 is described below commit a6355f100da317e73e1569fd26db796946b17f08 Author: Aaron Radzinzski AuthorDate: Thu Mar 12 18:57:21 2020 -0700 WIP. --- docker/readme.md | 2 +- docs/_data/releases.yml| 134 +-- docs/_layouts/blog.html| 10 +- docs/_layouts/default.html | 16 +- docs/_layouts/release-notes.html | 10 +- docs/_scss/index.scss | 4 - docs/basic-concepts.html | 15 +- docs/blogs.html| 10 +- docs/data-model.html | 30 +-- docs/docs.html | 10 +- docs/download.html | 18 +- docs/examples/alarm_clock.html | 12 +- docs/examples/light_switch.html| 12 +- docs/examples/weather_bot.html | 12 +- docs/first-example.html| 10 +- docs/getting-started.html | 14 +- docs/index.html| 35 +-- docs/installation.html | 10 +- docs/integrations.html | 10 +- docs/intent-matching.html | 22 +- docs/legal.html| 255 docs/metrics-and-tracing.html | 6 +- docs/release-notes-0.1.0.html | 46 docs/release-notes-0.2.0.html | 69 -- docs/release-notes-0.3.0.html | 53 docs/release-notes-0.4.0.html | 67 -- docs/release-notes-0.5.0.html | 80 -- docs/release-notes-0.5.1.html | 38 --- docs/release-notes-0.6.0.html | 268 - docs/release-notes-0.7.0.html | 105 docs/release-notes-0.7.1.html | 39 --- docs/release-notes-0.7.2.html | 39 --- docs/release-notes-0.7.3.html | 134 --- docs/release-notes-0.8.1.html | 42 docs/release-notes-0.8.2.html | 8 +- docs/server-and-probe.html | 6 +- docs/use-cases.html| 10 +- docs/using-rest.html | 16 +- openapi/README.md | 4 +- pom.xml| 6 +- src/main/scala/org/nlpcraft/examples/README.md | 2 +- .../scala/org/nlpcraft/examples/alarm/README.md| 2 +- .../scala/org/nlpcraft/examples/echo/README.md | 2 +- .../org/nlpcraft/examples/helloworld/README.md | 2 +- .../org/nlpcraft/examples/lightswitch/README.md| 2 +- .../scala/org/nlpcraft/examples/phone/README.md| 2 +- .../scala/org/nlpcraft/examples/time/README.md | 2 +- .../scala/org/nlpcraft/examples/weather/README.md | 2 +- 48 files changed, 144 insertions(+), 1559 deletions(-) diff --git a/docker/readme.md b/docker/readme.md index f7a4cab..6c01f58 100644 --- a/docker/readme.md +++ b/docker/readme.md @@ -1,7 +1,7 @@ https://nlpcraft.org/images/nlpcraft_logo_black.gif; height="80px"> https://gitter.im/nlpcraftorg/community;>https://badges.gitter.im/nlpcraftorg/community.svg;> -https://travis-ci.org/nlpcrafters/nlpcraft#;>https://travis-ci.org/nlpcrafters/nlpcraft.svg?branch=master;> +https://travis-ci.org/apache/incubator-nlpcraft#;>https://travis-ci.org/apache/incubator-nlpcraft.svg?branch=master;> https://search.maven.org/search?q=org.apache.nlpcraft;>https://maven-badges.herokuapp.com/maven-central/org.apache.nlpcraft/nlpcraft/badge.svg; alt="Maven"> ### Docker diff --git a/docs/_data/releases.yml b/docs/_data/releases.yml index bfe57d1..7c08bf8 100644 --- a/docs/_data/releases.yml +++ b/docs/_data/releases.yml @@ -17,134 +17,12 @@ - version: 0.8.2 date: Jan 14, 2020 - zip_url: https://github.com/nlpcrafters/nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip - md5_url: https://github.com/nlpcrafters/nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip.md5 - sha1_url: https://github.com/nlpcrafters/nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip.sha1 - sha256_url: https://github.com/nlpcrafters/nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip.sha256 - pgp_url: https://github.com/nlpcrafters/nlpcraft/releases/download/0.8.2/nlpcraft-0.8.2.zip.sig - github_link:
[incubator-nlpcraft] branch NLPCRAFT-13 updated: WIP.
This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-13 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git The following commit(s) were added to refs/heads/NLPCRAFT-13 by this push: new 4816cb3 WIP. 4816cb3 is described below commit 4816cb363d477e43c5612fc416c2565f64f0d183 Author: Aaron Radzinzski AuthorDate: Thu Mar 12 16:30:29 2020 -0700 WIP. --- README.md| 2 +- docs/Gemfile | 3 --- docs/_config.yml | 6 ++ docs/index.html | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 985be02..38accc4 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ lock-in: * View & run [examples](https://github.com/apache/incubator-nlpcraft/tree/master/src/main/scala/org/nlpcraft/examples) * Latest [Javadoc](https://github.com/apache/incubator-nlpcraft/apis/latest/index.html) and [REST APIs](https://nlpcraft.org/using-rest.html) * Download & Maven/Grape/Gradle/SBT [instructions](https://nlpcraft.org/download.html) - * File a bug or improvements in [JIRA](https://issues.apache.org/jira/projects/NLPCRAFT) + * File a bug or improvement in [JIRA](https://issues.apache.org/jira/projects/NLPCRAFT) * Post a question at [Stack Overflow](https://stackoverflow.com/questions/ask) using nlpcraft tag * Access [GitHub](https://github.com/apache/incubator-nlpcraft) mirror repository. * Join project developers on [d...@nlpcraft.apache.org](mailto:d...@nlpcraft.apache.org) diff --git a/docs/Gemfile b/docs/Gemfile index 5301edb..1c82245 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -17,9 +17,6 @@ source "https://rubygems.org; -# Use GitHub Pages. -gem "github-pages", group: :jekyll_plugins - # Plugins. group :jekyll_plugins do gem "jekyll-feed", "~> 0.9" diff --git a/docs/_config.yml b/docs/_config.yml index faecd9b..965f2e1 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -25,12 +25,10 @@ github_username: nlpcraft # Manually update to the latest version: # === -latest_version: 0.8.2 -java_client_latest_version: 0.4.0 +latest_version: 0.5.0 +java_client_latest_version: 0.5.0 # === -github: [metadata] - # SASS settings. sass: sass_dir: _scss diff --git a/docs/index.html b/docs/index.html index 35e8039..dfcaaeb 100644 --- a/docs/index.html +++ b/docs/index.html @@ -22,8 +22,8 @@ layout: default -Natural Language Interface -An open source API to convert natural language into actions +Apache NLPCraft +An API to convert natural language into actions GET STARTED
