Added generic python __call__ method for process objects.

Bumped version to 4.17.2

Author: smistad

CMakeLists.txt

@@ -7,7 +7,7 @@ project(FAST)
 
 set(VERSION_MAJOR 4)
 set(VERSION_MINOR 17)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 set(VERSION_SO 4)   # SO version, should be incremented by 1 every time the existing API changes
 set(FAST_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 

source/FAST/Python/Core.i.in

@@ -649,10 +649,55 @@ static float* _intToFloatPointer(std::size_t intPointer) {
 
 %extend fast::ProcessObject {
     %pythoncode %{
-       def getDataStream(self):
-           return DataStream(self)
+        def getDataStream(self):
+            return DataStream(self)
+
+        def __call__(self, *args: Tuple[Union[DataObject, 'ProcessObject', Tuple[Union[DataObject, 'ProcessObject', int], ...]], ...]) -> Union[DataObject, List[DataObject]]:
+            """
+            Connect input data to this process object, run, and return all output data.
+            Input data must be a list of data or process objects. Input and output ports can be provided using a tuple.
+            For example
+            PO = SomeProcessObject()
+            output = PO(inputData1, inputPO2) # Only provide data sources, input ports are assumed to be 0, 1, ...
+            output = PO((inputPO, 1), (inputPO, 0)) # Specify output ports to connect
+            output = PO((1, inputPO, 1), (0, inputPO, 0)) # Specify both output ports and input ports
+            output = PO((1, inputPO), (0, inputPO)) # Specify input ports
+            """
+            for index, arg in enumerate(args):
+                if isinstance(arg, tuple):
+                    if len(arg) == 2:
+                        if isinstance(arg[0], int):
+                            inputPort = arg[0]
+                            source = arg[1]
+                            outputPort = 0
+                        else:
+                            inputPort = 0
+                            source = arg[0]
+                            outputPort = arg[1]
+                    elif len(arg) == 3:
+                        inputPort, source, outputPort = arg
+                    else:
+                        raise ValueError('Input data tuple given to __call__() must have 2 or 3 items.')
+                else:
+                    inputPort = index
+                    outputPort = 0
+                    source = arg
+                # Type check
+                if isinstance(source, ProcessObject):
+                    self.connect(inputPort, source, outputPort)
+                elif isinstance(source, DataObject):
+                    self.connect(inputPort, source)
+                else:
+                    raise ValueError('Data source given to __call__() must be a ProcessObject or a DataObject')
+            self.run()
+            outputData = []
+            for i in range(self.getNrOfOutputPorts()):
+                outputData.append(self.getOutput(i))
+            if len(outputData) == 1:
+                return outputData[0]
+            else:
+                return outputData
     %}
-
 }
 
 /*
@@ -667,4 +712,4 @@ static float* _intToFloatPointer(std::size_t intPointer) {
 }
 */
 
-%include "ProcessObjects.i"
+%include "ProcessObjects.i"

source/FAST/Python/Tests/test_core.py

@@ -0,0 +1,42 @@
+import fast
+import pytest
+
+
+def test_callable_process_object():
+    image = fast.Image.create(512, 512, fast.TYPE_UINT8, 1)
+    image2 = fast.ImageResizer.create(256, 256)(image)
+    assert image2.getWidth() == 256
+    assert image2.getHeight() == 256
+
+    image2 = fast.ImageResizer.create(256, 256)((0, image))
+    assert image2.getWidth() == 256
+    assert image2.getHeight() == 256
+
+    resize = fast.ImageResizer.create(256, 256).connect(image)
+    image2 = fast.GrayscaleToColor.create()(resize)
+    assert image2.getWidth() == 256
+    assert image2.getHeight() == 256
+    assert image2.getNrOfChannels() == 3
+
+    image2 = fast.GrayscaleToColor.create()((0, resize, 0))
+    assert image2.getWidth() == 256
+    assert image2.getHeight() == 256
+    assert image2.getNrOfChannels() == 3
+
+
+def test_callable_process_object_exceptions():
+    with pytest.raises(ValueError):
+        image2 = fast.ImageResizer.create(256, 256)(32)
+    with pytest.raises(RuntimeError):
+        image2 = fast.ImageResizer.create(256, 256)()
+    image = fast.Image.create(512, 512, fast.TYPE_UINT8, 1)
+    with pytest.raises(RuntimeError):
+        image2 = fast.ImageResizer.create(256, 256)(image, image)
+    with pytest.raises(RuntimeError):
+        image2 = fast.ImageResizer.create(256, 256)((1, image))
+
+    resize = fast.ImageResizer.create(256, 256).connect(image)
+    with pytest.raises(RuntimeError):
+        image2 = fast.GrayscaleToColor.create()((0, resize, 3))
+    with pytest.raises(ValueError):
+        image2 = fast.GrayscaleToColor.create()((0, resize, 3, 2))