Merge pull request #46 from snipsco/release/0.55.0

Release 0.55.0

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.55.0] - 2018-05-02
+
+### Changed
+- Updated ffi signatures
+
 ## [0.54.3] - 2018-04-20
 
 ### Changed
@@ -27,6 +32,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Updated Rustling ontology to `0.16.4`
 
+[0.55.0]: https://github.com/snipsco/snips-nlu-ontology/compare/0.54.3...0.55.0
 [0.54.3]: https://github.com/snipsco/snips-nlu-ontology/compare/0.54.2...0.54.3
 [0.54.2]: https://github.com/snipsco/snips-nlu-ontology/compare/0.54.1...0.54.2
 [0.54.1]: https://github.com/snipsco/snips-nlu-ontology/compare/0.54.0...0.54.1

platforms/snips-nlu-ontology-kotlin/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 }
 
-version = "0.54.3"
+version = "0.55.0"
 group = "ai.snips"
 
 

platforms/snips-nlu-ontology-python/snips-nlu-ontology-rs/Cargo.toml

@@ -1,13 +1,16 @@
 [package]
 name = "snips-nlu-ontology-rs"
-version = "0.54.3"
+version = "0.55.0"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 
 [dependencies]
+failure = "0.1"
+ffi-utils = { git = "https://github.com/snipsco/snips-utils-rs", rev = "b1f4af3" }
+lazy_static = "1.0"
 libc = "0.2"
-snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.54.3" }
-snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.54.3" }
-snips-nlu-ontology-parsers-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.54.3" }
+snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.55.0" }
+snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.55.0" }
+snips-nlu-ontology-parsers-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.55.0" }
 
 [lib]
 name = "snips_nlu_ontology_rs"

platforms/snips-nlu-ontology-python/snips-nlu-ontology-rs/src/lib.rs

@@ -1,9 +1,17 @@
+#[macro_use]
+extern crate failure;
+#[macro_use]
+extern crate lazy_static;
 extern crate libc;
 extern crate snips_nlu_ontology;
 #[macro_use]
 extern crate snips_nlu_ontology_ffi_macros;
 #[macro_use]
 extern crate snips_nlu_ontology_parsers_ffi_macros;
+#[macro_use]
+extern crate ffi_utils;
+
+generate_error_handling!(snips_nlu_ontology_get_last_error);
 
 export_nlu_ontology_c_symbols!();
 

platforms/snips-nlu-ontology-python/snips_nlu_ontology/__version__

@@ -1 +1 @@
-0.54.3
+0.55.0

platforms/snips-nlu-ontology-python/snips_nlu_ontology/builtin_entities.py

@@ -23,17 +23,17 @@ def get_ontology_version():
     """Get the version of the ontology"""
     global _ONTOLOGY_VERSION
     if _ONTOLOGY_VERSION is None:
-        lib.nlu_ontology_version.restype = c_char_p
-        _ONTOLOGY_VERSION = lib.nlu_ontology_version().decode("utf8")
+        lib.snips_nlu_ontology_version.restype = c_char_p
+        _ONTOLOGY_VERSION = lib.snips_nlu_ontology_version().decode("utf8")
     return _ONTOLOGY_VERSION
 
 
 def get_all_languages():
     """Lists all the supported languages"""
     global _ALL_LANGUAGES
     if _ALL_LANGUAGES is None:
-        lib.nlu_ontology_supported_languages.restype = CStringArray
-        array = lib.nlu_ontology_supported_languages()
+        lib.snips_nlu_ontology_supported_languages.restype = CStringArray
+        array = lib.snips_nlu_ontology_supported_languages()
         _ALL_LANGUAGES = set(
             array.data[i].decode("utf8") for i in range(array.size))
     return _ALL_LANGUAGES
@@ -44,8 +44,8 @@ def get_all_builtin_entities():
     language"""
     global _ALL_BUILTIN_ENTITIES
     if _ALL_BUILTIN_ENTITIES is None:
-        lib.nlu_ontology_all_builtin_entities.restype = CStringArray
-        array = lib.nlu_ontology_all_builtin_entities()
+        lib.snips_nlu_ontology_all_builtin_entities.restype = CStringArray
+        array = lib.snips_nlu_ontology_all_builtin_entities()
         _ALL_BUILTIN_ENTITIES = set(
             array.data[i].decode("utf8") for i in range(array.size))
     return _ALL_BUILTIN_ENTITIES
@@ -65,7 +65,7 @@ def get_supported_entities(language):
 
     if language not in _SUPPORTED_ENTITIES:
         with string_array_pointer(pointer(CStringArray())) as ptr:
-            exit_code = lib.nlu_ontology_supported_builtin_entities(
+            exit_code = lib.snips_nlu_ontology_supported_builtin_entities(
                 language.encode("utf8"), byref(ptr))
             if exit_code:
                 raise ValueError("Something wrong happened while retrieving "
@@ -93,7 +93,7 @@ def get_builtin_entity_examples(builtin_entity_kind, language):
 
     if language not in _ENTITIES_EXAMPLES[builtin_entity_kind]:
         with string_array_pointer(pointer(CStringArray())) as ptr:
-            exit_code = lib.nlu_ontology_builtin_entity_examples(
+            exit_code = lib.snips_nlu_ontology_builtin_entity_examples(
                 builtin_entity_kind.encode("utf8"),
                 language.encode("utf8"), byref(ptr))
             if exit_code:
@@ -118,15 +118,15 @@ def __init__(self, language):
                             " %s" % type(language))
         self.language = language
         self._parser = pointer(c_void_p())
-        exit_code = lib.nlu_ontology_create_builtin_entity_parser(
+        exit_code = lib.snips_nlu_ontology_create_builtin_entity_parser(
             byref(self._parser), language.encode("utf8"))
         if exit_code:
             raise ImportError("Something wrong happened while creating the "
                               "intent parser. See stderr.")
 
     def __del__(self):
         if hasattr(self, '_parser'):
-            lib.nlu_ontology_destroy_builtin_entity_parser(self._parser)
+            lib.snips_nlu_ontology_destroy_builtin_entity_parser(self._parser)
 
     def parse(self, text, scope=None):
         """Extract builtin entities from *text*
@@ -155,7 +155,7 @@ def parse(self, text, scope=None):
             scope = byref(arr)
 
         with string_pointer(c_char_p()) as ptr:
-            exit_code = lib.nlu_ontology_extract_entities_json(
+            exit_code = lib.snips_nlu_ontology_extract_entities_json(
                 self._parser, text.encode("utf8"), scope, byref(ptr))
             if exit_code:
                 raise ValueError("Something wrong happened while extracting "

platforms/snips-nlu-ontology-python/snips_nlu_ontology/utils.py

@@ -14,15 +14,15 @@ def string_array_pointer(ptr):
     try:
         yield ptr
     finally:
-        lib.nlu_ontology_destroy_string_array(ptr)
+        lib.snips_nlu_ontology_destroy_string_array(ptr)
 
 
 @contextmanager
 def string_pointer(ptr):
     try:
         yield ptr
     finally:
-        lib.nlu_ontology_destroy_string(ptr)
+        lib.snips_nlu_ontology_destroy_string(ptr)
 
 
 class CStringArray(Structure):

snips-nlu-ontology-doc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-doc"
-version = "0.54.3"
+version = "0.55.0"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 
 [build-dependencies]

snips-nlu-ontology-ffi-macros/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "snips-nlu-ontology-ffi-macros"
-version = "0.54.3"
+version = "0.55.0"
 authors = [
     "Kevin Lefevre <kevin.lefevre@snips.ai>",
     "Thibaut Lorrain <thibaut.lorrain@snips.ai>",
 ]
 
 [dependencies]
 snips-nlu-ontology = { path = "../snips-nlu-ontology" }
-failure = "0.1"
+ffi-utils = { git = "https://github.com/snipsco/snips-utils-rs", rev = "b1f4af3" }
 lazy_static = "1.0"
 libc = "0.2"
 serde = "1.0"

snips-nlu-ontology-ffi-macros/src/builtin_entity.rs

@@ -8,7 +8,7 @@ use std::str::FromStr;
 use libc;
 
 use errors::*;
-use ffi_utils::CStringArray;
+use ffi_utils::{CStringArray, CReprOf, RawPointerConverter};
 use snips_nlu_ontology::{BuiltinEntityKind, Language};
 
 #[repr(C)]
@@ -22,11 +22,11 @@ pub struct CBuiltinEntity {
 }
 
 impl From<::BuiltinEntity> for CBuiltinEntity {
-    fn from(e: ::BuiltinEntity) -> CBuiltinEntity {
+    fn from(e: ::BuiltinEntity) -> Self {
         Self {
             entity: ::CSlotValue::from(e.entity),
             entity_kind: CString::new(e.entity_kind.identifier()).unwrap().into_raw(),
-            value: CString::new(e.value).unwrap().into_raw(), // String can not contains 0
+            value: CString::new(e.value).unwrap().into_raw(),
             range_start: e.range.start as libc::int32_t,
             range_end: e.range.end as libc::int32_t,
         }
@@ -35,8 +35,8 @@ impl From<::BuiltinEntity> for CBuiltinEntity {
 
 impl Drop for CBuiltinEntity {
     fn drop(&mut self) {
-        let _ = unsafe { CString::from_raw(self.value as *mut libc::c_char) };
-        let _ = unsafe { CString::from_raw(self.entity_kind as *mut libc::c_char) };
+        take_back_c_string!(self.value);
+        take_back_c_string!(self.entity_kind);
     }
 }
 
@@ -47,8 +47,8 @@ pub struct CBuiltinEntityArray {
     pub size: libc::int32_t, // Note: we can't use `libc::size_t` because it's not supported by JNA
 }
 
-impl CBuiltinEntityArray {
-    pub fn from(input: Vec<CBuiltinEntity>) -> Self {
+impl From<Vec<CBuiltinEntity>> for CBuiltinEntityArray {
+    fn from(input: Vec<CBuiltinEntity>) -> Self {
         Self {
             size: input.len() as libc::int32_t,
             data: Box::into_raw(input.into_boxed_slice()) as *const CBuiltinEntity,
@@ -81,7 +81,7 @@ pub fn all_builtin_entities() -> CStringArray {
                     .iter()
                     .map(|l| l.identifier().to_string())
                     .map(|l| CString::new(l).unwrap().into_raw() as *const libc::c_char)
-                    .collect::<Vec<*const libc::c_char>>()
+                    .collect::<Vec<_>>()
                     .into_boxed_slice()
             )
         };
@@ -103,10 +103,10 @@ pub fn get_supported_builtin_entities(
         .iter()
         .filter(|e| e.supported_languages().contains(&language))
         .map(|e| e.identifier().to_string())
-        .collect::<Vec<String>>();
-    let c_entities = CStringArray::from(entities);
+        .collect::<Vec<_>>();
+    let c_entities = CStringArray::c_repr_of(entities)?.into_raw_pointer();
     unsafe {
-        *results = Box::into_raw(Box::new(c_entities));
+        *results = c_entities;
     }
     Ok(())
 }
@@ -121,12 +121,12 @@ pub fn get_builtin_entity_examples(
     let language_str = unsafe { CStr::from_ptr(language) }.to_str()?;
     let language = Language::from_str(&*language_str.to_uppercase())?;
     let examples = entity_kind.examples(language)
-        .iter()
+        .into_iter()
         .map(|example| example.to_string())
-        .collect::<Vec<String>>();
-    let c_examples = CStringArray::from(examples);
+        .collect::<Vec<_>>();
+    let c_examples = CStringArray::c_repr_of(examples)?.into_raw_pointer();
     unsafe {
-        *results = Box::into_raw(Box::new(c_examples));
+        *results = c_examples;
     }
     Ok(())
 }