Integrate changes from finalfusion-rust.

Temporarily changes the finalfusion-rust dependency to the github
repo. Report missing words in failed analogy queries, rename the
similarity method to word_similarity.

Author: sebpuetz

Cargo.lock

@@ -19,8 +19,9 @@ version = "0.7"
 features = ["extension-module"]
 
 [dependencies]
+itertools = "0.8"
 failure = "0.1"
-finalfusion = "0.7"
+finalfusion = { git = "https://github.com/finalfusion/finalfusion-rust.git", rev = "8e360c6" }
 libc = "0.2"
 ndarray = "0.12"
 numpy = "0.6"

Cargo.toml

@@ -7,6 +7,7 @@ use failure::Error;
 use finalfusion::metadata::Metadata;
 use finalfusion::prelude::*;
 use finalfusion::similarity::*;
+use itertools::Itertools;
 use ndarray::Array2;
 use numpy::{IntoPyArray, PyArray1, PyArray2};
 use pyo3::class::iter::PyIterProtocol;
@@ -85,11 +86,17 @@ impl PyEmbeddings {
             }
         };
 
-        let results =
-            match embeddings.analogy_masked(word1, word2, word3, limit, [mask.0, mask.1, mask.2]) {
-                Some(results) => results,
-                None => return Err(exceptions::KeyError::py_err("Unknown word or n-grams")),
-            };
+        let results = embeddings
+            .analogy_masked([word1, word2, word3], [mask.0, mask.1, mask.2], limit)
+            .map_err(|lookup| {
+                let failed = [word1, word2, word3]
+                    .iter()
+                    .zip(lookup.iter())
+                    .filter(|(_, success)| !*success)
+                    .map(|(word, _)| word)
+                    .join(" ");
+                exceptions::KeyError::py_err(format!("Unknown word or n-grams: {}", failed))
+            })?;
 
         let mut r = Vec::with_capacity(results.len());
         for ws in results {
@@ -219,7 +226,7 @@ impl PyEmbeddings {
             }
         };
 
-        let results = match embeddings.similarity(word, limit) {
+        let results = match embeddings.word_similarity(word, limit) {
             Some(results) => results,
             None => return Err(exceptions::KeyError::py_err("Unknown word and n-grams")),
         };

src/embeddings.rs

@@ -88,3 +88,5 @@ def test_analogies(analogy_fifu):
     with pytest.raises(ValueError):
         analogy_fifu.analogy("Paris", "Frankreich", "Paris",
                              1, (True, True, True, True))
+    with pytest.raises(KeyError):
+        analogy_fifu.analogy("Paris", "OOV", "Paris", 1, (True, True, True))