Merge pull request #87 from snipsco/release/0.60.1

Release 0.60.1

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.60.1] - 2018-10-09
+### Added
+- Entity injection API for both custom entities and builtin gazetteer entities
+
+### Fixed
+- Swift wrapper
+- `DeterministicIntentParser` now relies on the custom entity parser
+
 ## [0.60.0] - 2018-10-05
 ### Added
 - Support for 3 new builtin entities in French: `snips/musicAlbum`, `snips/musicArtist` and `snips/musicTrack`
@@ -108,6 +116,7 @@ being statically hardcoded, reducing the binary size by 31Mb.
 - Improve support for japanese
 - Rename python package to `snips_nlu_rust`
 
+[0.60.1]: https://github.com/snipsco/snips-nlu-rs/compare/0.60.0...0.60.1
 [0.60.0]: https://github.com/snipsco/snips-nlu-rs/compare/0.59.0...0.60.0
 [0.59.0]: https://github.com/snipsco/snips-nlu-rs/compare/0.58.3...0.59.0
 [0.58.3]: https://github.com/snipsco/snips-nlu-rs/compare/0.58.2...0.58.3

data/tests/models/nlu_engine/builtin_entity_parser/metadata.json

@@ -1,4 +1,4 @@
 {
   "language": "en",
   "gazetteer_parser": null
-}
+}

data/tests/models/nlu_engine/custom_entity_parser/metadata.json

@@ -1,4 +1,5 @@
 {
   "language": "en",
-  "parser_directory": "parser"
-}
+  "parser_directory": "parser",
+  "parser_usage": 2
+}

data/tests/models/nlu_engine/custom_entity_parser/parser/parser_1/metadata.json

@@ -1 +1 @@
-{"version":"0.5.0-SNAPSHOT","parser_filename":"parser","threshold":1.0,"stop_words":[],"edge_cases":[]}
+{"version":"0.5.0","parser_filename":"parser","threshold":1.0,"stop_words":[],"edge_cases":[]}

data/tests/models/nlu_engine/deterministic_intent_parser/intent_parser.json

@@ -22,17 +22,17 @@
   "language_code": "en",
   "patterns": {
     "MakeCoffee": [
-      "^\\s*Make\\s*me\\s*(?P<group_0>%SNIPSNUMBER%)\\s*cups\\s*of\\s*coffee\\s*$",
       "^\\s*Brew\\s*(?P<group_3>%SNIPSNUMBER%)\\s*coffee\\s*cups\\s*$",
-      "^\\s*give\\s*me\\s*(?P<group_4>%SNIPSNUMBER%)\\s*coffees\\s*please\\s*$",
       "^\\s*make\\s*me\\s*(?P<group_2>%SNIPSNUMBER%)\\s*cups\\s*of\\s*coffee\\s*$",
-      "^\\s*Brew\\s*me\\s*(?P<group_1>%SNIPSNUMBER%)\\s*coffee\\s*cups\\s*$",
-      "^\\s*Make\\s*me\\s*(?P<group_5>%SNIPSNUMBER%)\\s*cup\\s*of\\s*coffee\\s*$"
+      "^\\s*Make\\s*me\\s*(?P<group_5>%SNIPSNUMBER%)\\s*cup\\s*of\\s*coffee\\s*$",
+      "^\\s*give\\s*me\\s*(?P<group_4>%SNIPSNUMBER%)\\s*coffees\\s*please\\s*$",
+      "^\\s*Make\\s*me\\s*(?P<group_0>%SNIPSNUMBER%)\\s*cups\\s*of\\s*coffee\\s*$",
+      "^\\s*Brew\\s*me\\s*(?P<group_1>%SNIPSNUMBER%)\\s*coffee\\s*cups\\s*$"
     ],
     "MakeTea": [
-      "^\\s*Make\\s*(?P<group_6>%SNIPSNUMBER%)\\s*(?P<group_7>boiling|iced|cold|hot)\\s*teas\\s*$",
-      "^\\s*Please\\s*can\\s*I\\s*get\\s*(?P<group_8>%SNIPSNUMBER%)\\s*(?P<group_9>boiling|iced|cold|hot)\\s*teas\\s*\\?\\s*$",
-      "^\\s*Prepare\\s*(?P<group_10>%SNIPSNUMBER%)\\s*cups\\s*of\\s*(?P<group_11>boiling|iced|cold|hot)\\s*tea\\s*$",
+      "^\\s*Please\\s*can\\s*I\\s*get\\s*(?P<group_8>%SNIPSNUMBER%)\\s*(?P<group_9>%TEMPERATURE%)\\s*teas\\s*\\?\\s*$",
+      "^\\s*Prepare\\s*(?P<group_10>%SNIPSNUMBER%)\\s*cups\\s*of\\s*(?P<group_11>%TEMPERATURE%)\\s*tea\\s*$",
+      "^\\s*Make\\s*(?P<group_6>%SNIPSNUMBER%)\\s*(?P<group_7>%TEMPERATURE%)\\s*teas\\s*$",
       "^\\s*Make\\s*me\\s*(?P<group_12>%SNIPSNUMBER%)\\s*tea\\s*$"
     ]
   },
@@ -45,4 +45,4 @@
       "number_of_cups": "snips/number"
     }
   }
-}
+}