Merge pull request #132 from snipsco/release/0.64.2

Release 0.64.2

.travis.yml

@@ -7,22 +7,25 @@ jobs:
   include:
     - if: branch = master or head_branch =~ /^release\/.+$/
       os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       language: generic
+      sudo: true
       env:
         - TOXENV=py27
         - PYTHON_TESTS=true
     - if: branch = master or head_branch =~ /^release\/.+$/
       os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       language: generic
+      sudo: true
       env:
         - TOXENV=py36
         - PYTHON_TESTS=true
     - if: branch = master or head_branch =~ /^release\/.+$/
       os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       language: generic
+      sudo: true
       env:
         - MACOS_SWIFT_TESTS=true
         - IOS_SWIFT_TESTS=true

.travis/before_install.sh

@@ -7,6 +7,8 @@ if [[ -z ${TRAVIS_RUST_VERSION+w} ]]; then
 fi
 
 if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
+  sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg -target /
+
   if [[ ${PYTHON_TESTS} == true ]]; then
     # install pyenv
     git clone --depth 1 https://github.com/pyenv/pyenv ~/.pyenv

CHANGELOG.md

@@ -1,9 +1,20 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.64.2] - 2019-04-09
+### Fixed
+- Fix handling of ambiguous utterances in `DeterministicIntentParser` [#129](https://github.com/snipsco/snips-nlu-rs/pull/129)
+- Stop normalizing confidence scores when there is an intents filter [#130](https://github.com/snipsco/snips-nlu-rs/pull/130)
+
+### Added
+- Add new APIs in ffi and bindings (python, kotlin, swift) [#131](https://github.com/snipsco/snips-nlu-rs/pull/131)
+
+### Changed
+- Leverage entity scopes of each intent in deterministic intent parser [#126](https://github.com/snipsco/snips-nlu-rs/pull/126)
+
 ## [0.64.1] - 2019-03-01
 ### Fixed
-- Fix bug with regex patterns containing duplicated slot names
+- Fix bug with regex patterns containing duplicated slot names [#124](https://github.com/snipsco/snips-nlu-rs/pull/124)
 
 ## [0.64.0] - 2019-02-28
 ### Changed
@@ -12,7 +23,7 @@ All notable changes to this project will be documented in this file.
 
 ## [0.63.1] - 2019-02-11
 ### Fixed
-- Fix an issue regarding the way builtin entities were handled by the `CRFSlotFiller`
+- Fix an issue regarding the way builtin entities were handled by the `CRFSlotFiller` [#116](https://github.com/snipsco/snips-nlu-rs/pull/116)
 
 ## [0.63.0] - 2019-02-04
 ### Added
@@ -178,6 +189,7 @@ being statically hardcoded, reducing the binary size by 31Mb.
 - Improve support for japanese
 - Rename python package to `snips_nlu_rust`
 
+[0.64.2]: https://github.com/snipsco/snips-nlu-rs/compare/0.64.1...0.64.2
 [0.64.1]: https://github.com/snipsco/snips-nlu-rs/compare/0.64.0...0.64.1
 [0.64.0]: https://github.com/snipsco/snips-nlu-rs/compare/0.63.1...0.64.0
 [0.63.1]: https://github.com/snipsco/snips-nlu-rs/compare/0.63.0...0.63.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-lib"
-version = "0.64.1"
+version = "0.64.2"
 authors = [
     "Adrien Ball <[email protected]>",
     "Clement Doumouro <[email protected]>",
@@ -19,8 +19,8 @@ members = [
 
 [dependencies]
 crfsuite = { git = "https://github.com/snipsco/crfsuite-rs", tag = "0.3.1" }
-snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.64.4" }
-snips-nlu-parsers = { git = "https://github.com/snipsco/snips-nlu-parsers", tag = "0.2.0" }
+snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.64.6" }
+snips-nlu-parsers = { git = "https://github.com/snipsco/snips-nlu-parsers", tag = "0.2.1" }
 snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.8.0" }
 failure = "0.1"
 base64 = "0.10"
@@ -40,6 +40,7 @@ zip = { version = "0.5", default-features = false, features = ["deflate"] }
 bencher = { git = "https://github.com/snipsco/bencher", rev = "63910ace" }
 clap = "2.32"
 dinghy-test = "0.4"
+env_logger = "0.6"
 maplit = "1.0"
 fs_extra = "1.1"
 

README.rst

@@ -67,15 +67,16 @@ the `Snips NLU python library <https://github.com/snipsco/snips-nlu>`_.
 Example and API Usage
 ---------------------
 
-The `interactive parsing CLI <snips-nlu-lib/examples/interactive_parsing_cli>`_  is a good example
+The `interactive parsing CLI <examples/interactive_parsing_cli>`_  is a good example
 of to how to use ``snips-nlu-rs``.
 
 Here is how you can run the CLI example:
 
 .. code-block:: bash
 
    $ git clone https://github.com/snipsco/snips-nlu-rs
-   $ cargo run -p snips-nlu-lib --example interactive_parsing_cli data/tests/models/nlu_engine
+   $ cd snips-nlu-rs
+   $ cargo run --example interactive_parsing_cli data/tests/models/nlu_engine
 
 Here we used a sample trained engine, which consists in two intents: ``MakeCoffee`` and ``MakeTea``.
 Thus, it will be able to parse queries like ``"Make me two cups of coffee please"`` or ``"I'd like a hot tea"``.

examples/interactive_parsing_cli.rs

@@ -1,4 +1,5 @@
 extern crate clap;
+extern crate env_logger;
 extern crate serde_json;
 extern crate snips_nlu_lib;
 
@@ -8,6 +9,10 @@ use std::io;
 use std::io::Write;
 
 fn main() {
+    env_logger::Builder::from_default_env()
+        .default_format_timestamp_nanos(true)
+        .init();
+
     let matches = App::new("snips-nlu-parse")
         .about("Snips NLU interactive CLI for parsing intents")
         .arg(

ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ffi"
-version = "0.64.1"
+version = "0.64.2"
 edition = "2018"
 authors = [
     "Adrien Ball <[email protected]>",
@@ -12,7 +12,7 @@ authors = [
 [dependencies]
 ffi-utils = { git = "https://github.com/snipsco/snips-utils-rs", rev = "4292ad9" }
 snips-nlu-lib = { path = ".." }
-snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.64.4" }
+snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.64.6" }
 failure = "0.1"
 lazy_static = "1.0"
 libc = "0.2"

ffi/cbindgen.toml

@@ -2,17 +2,22 @@ language = "c"
 
 include_guard = "LIBSNIPS_NLU_H_"
 
-header = "#define SNIPS_NLU_VERSION \"0.62.0-SNAPSHOT\""
+header = "#define SNIPS_NLU_VERSION \"0.64.2\""
 
 [parse]
-parse_deps=true
+parse_deps = true
 include = [
     "snips_nlu_ffi",
     "ffi_utils",
     "snips_nlu_ontology_ffi",
     "snips_nlu_ontology_ffi_macros",
 ]
 
+[parse.expand]
+crates = [
+    "snips-nlu-ffi",
+]
+
 [export]
 # These types are hidden behind a void pointer, let's include them
 include = [