Merge branch 'dynamic_filters'

Merge branch for supporting dynamic loaded filters

Author: martaiborra

blosc2/blosc2_ext.pyx

@@ -409,6 +409,7 @@ cdef extern from "blosc2.h":
 
     ctypedef struct blosc2_filter:
         uint8_t id
+        char* name
         blosc2_filter_forward_cb forward
         blosc2_filter_backward_cb backward
 
@@ -1786,11 +1787,11 @@ def register_codec(codec_name, id, encoder=None, decoder=None, version=1):
     if encoder is None:
         codec.encoder = NULL
     else:
-        codec.encoder = general_encoder
+        codec.encoder = <blosc2_codec_encoder_cb> general_encoder
     if decoder is None:
         codec.decoder = NULL
     else:
-        codec.decoder = general_decoder
+        codec.decoder = <blosc2_codec_decoder_cb> general_decoder
 
     rc = blosc2_register_codec(&codec)
     if rc < 0:
@@ -1835,20 +1836,35 @@ cdef int general_backward(const uint8_t* input_buffer, uint8_t* output_buffer, i
     return BLOSC2_ERROR_SUCCESS
 
 
-def register_filter(id, forward, backward):
+def register_filter(id, forward, backward, filter_name):
     if id < BLOSC2_USER_REGISTERED_FILTERS_START or id > BLOSC2_USER_REGISTERED_FILTERS_STOP:
         raise ValueError("`id` must be between ", BLOSC2_USER_REGISTERED_FILTERS_START,
                          " and ", BLOSC2_USER_REGISTERED_FILTERS_STOP)
+    if (forward is None and backward is not None) or (forward is not None and backward is None):
+        raise ValueError("both encoder and decoder must be given, or none")
 
     cdef blosc2_filter filter
     filter.id = id
-    filter.forward = general_forward
-    filter.backward = general_backward
+    if forward is None:
+        filter.forward = NULL
+    else:
+        filter.forward = <blosc2_filter_forward_cb> general_forward
+    if backward is None:
+        filter.backward = NULL
+    else:
+        filter.backward = <blosc2_filter_backward_cb> general_backward
+    if filter_name is None and not forward and not backward:
+        raise ValueError("You need to pass the filter name or the forward and backward functions")
+    if filter_name:
+        filter_name_ = filter_name.encode() if isinstance(filter_name, str) else filter_name
+        filter.name = <char *> malloc(strlen(filter_name_) + 1)
+        strcpy(filter.name, filter_name_)
+
     rc = blosc2_register_filter(&filter)
     if rc < 0:
         raise RuntimeError("Error while registering filter")
-
-    blosc2.ufilters_registry[id] = (forward, backward)
+    if forward and backward:
+        blosc2.ufilters_registry[id] = (forward, backward)
 
 def _check_rc(rc, message):
     if rc < 0:

blosc2/c-blosc2

@@ -1472,7 +1472,7 @@ def decoder1(input, output, meta, schunk):
     blosc2_ext.register_codec(codec_name, id, encoder, decoder, version)
 
 
-def register_filter(id, forward, backward):
+def register_filter(id, forward=None, backward=None, name=None):
     """Register an user defined filter.
 
     Parameters
@@ -1482,10 +1482,15 @@ def register_filter(id, forward, backward):
     forward: Python function
         This will receive an input to apply the filter as a ndarray of dtype uint8, an output to fill
         as a ndarray of dtype uint8, the filter meta and the corresponding `SChunk` instance.
+        If None then the filter name indicates a dynamic plugin which must be installed.
     backward: Python function
         This will receive an input as a ndarray of dtype uint8, an output to fill
         as a ndarray of dtype uint8, the filter meta and the `SChunk` instance.
-
+        If None then the filter name indicates a dynamic plugin which must be installed.
+    name: str
+        The filter name.
+        If both `forward`and `backward` are None, this parameter must be passed to correctly
+        load the dynamic filter.
     Returns
     -------
     out: None
@@ -1525,4 +1530,4 @@ def backward(input, output, meta, schunk):
     """
     if id in blosc2.ufilters_registry.keys():
         raise ValueError("Id already in use")
-    blosc2_ext.register_filter(id, forward, backward)
+    blosc2_ext.register_filter(id, forward, backward, name)