Refactor python progress callback (#266)

* refactor the compiler progress callback

* Update autwrap_workarounds.pyx

python/src/addons/CompletionDictionaryCompiler.pyx

@@ -20,9 +20,4 @@
 
         cdef void* callback = <void*> args[0]
         with nogil:
-            self.inst.get().Compile(callback_wrapper, callback)
-
-
-# definition for all compilers
-cdef void callback_wrapper(size_t a, size_t b, void* py_callback) with gil:
-    (<object>py_callback)(a, b)
+            self.inst.get().Compile(progress_compiler_callback, callback)

python/src/addons/FloatVectorDictionaryCompiler.pyx

@@ -20,5 +20,5 @@
 
         cdef void* callback = <void*> args[0]
         with nogil:
-            self.inst.get().Compile(callback_wrapper, callback)
+            self.inst.get().Compile(progress_compiler_callback, callback)
 

python/src/addons/IntDictionaryCompiler.pyx

@@ -20,5 +20,5 @@
 
         cdef void* callback = <void*> args[0]
         with nogil:
-            self.inst.get().Compile(callback_wrapper, callback)
+            self.inst.get().Compile(progress_compiler_callback, callback)
 

python/src/addons/IntDictionaryCompilerSmallData.pyx

@@ -20,5 +20,5 @@
 
         cdef void* callback = <void*> args[0]
         with nogil:
-            self.inst.get().Compile(callback_wrapper, callback)
+            self.inst.get().Compile(progress_compiler_callback, callback)
 

python/src/addons/JsonDictionaryCompiler.pyx

@@ -20,5 +20,5 @@
 
         cdef void* callback = <void*> args[0]
         with nogil:
-            self.inst.get().Compile(callback_wrapper, callback)
+            self.inst.get().Compile(progress_compiler_callback, callback)
 

python/src/addons/JsonDictionaryCompilerSmallData.pyx

@@ -35,5 +35,5 @@
 
         cdef void* callback = <void*> args[0]
         with nogil:
-            self.inst.get().Compile(callback_wrapper, callback)
+            self.inst.get().Compile(progress_compiler_callback, callback)
 

python/src/addons/KeyOnlyDictionaryCompiler.pyx

@@ -20,5 +20,5 @@
 
         cdef void* callback = <void*> args[0]
         with nogil:
-            self.inst.get().Compile(callback_wrapper, callback)
+            self.inst.get().Compile(progress_compiler_callback, callback)
 

python/src/addons/StringDictionaryCompiler.pyx

@@ -20,5 +20,5 @@
 
         cdef void* callback = <void*> args[0]
         with nogil:
-            self.inst.get().Compile(callback_wrapper, callback)
+            self.inst.get().Compile(progress_compiler_callback, callback)
 

python/src/addons/autwrap_workarounds.pyx

@@ -33,3 +33,8 @@ def get_interpreter_executable():
         executable = executable.encode('utf-8')
 
     return executable
+
+
+# definition for all compilers
+cdef void progress_compiler_callback(size_t a, size_t b, void* py_callback) noexcept with gil:
+    (<object>py_callback)(a, b)

python/src/pxds/match.pxd

@@ -17,7 +17,7 @@ cdef extern from "keyvi/dictionary/match.h" namespace "keyvi::dictionary":
         void SetScore(float score)
         libcpp_utf8_output_string GetMatchedString()
         void SetMatchedString (libcpp_utf8_string matched_string)
-        PyObject* GetAttributePy(libcpp_utf8_string) nogil except + # wrap-ignore
+        PyObject* GetAttributePy(libcpp_utf8_string) except + nogil # wrap-ignore
         libcpp_utf8_output_string GetValueAsString() except +
         libcpp_string GetRawValueAsString() except +
         libcpp_string GetMsgPackedValueAsString() except + # wrap-ignore