From f8e460a7358e2773fcf40e52ac10cf9ebb33177c Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Mon, 2 Jul 2018 11:24:47 -0400
Subject: [PATCH 1/3] ENH: First pass at new workflow syntax

---
 nipype/pipeline/engine/workflows.py | 109 +++++++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 1 deletion(-)

diff --git a/nipype/pipeline/engine/workflows.py b/nipype/pipeline/engine/workflows.py
index a10dabef30..b8d20ffd0c 100644
--- a/nipype/pipeline/engine/workflows.py
+++ b/nipype/pipeline/engine/workflows.py
@@ -22,6 +22,7 @@
 import networkx as nx
 
 from ... import config, logging
+from ...exceptions import NodeError, WorkflowError, MappingError, JoinError
 from ...utils.misc import str2bool
 from ...utils.functions import (getsource, create_function_from_source)
 
@@ -33,7 +34,7 @@
                     get_print_name, merge_dict, format_node)
 
 from .base import EngineBase
-from .nodes import MapNode
+from .nodes import MapNode, Node
 
 # Py2 compat: http://python-future.org/compatible_idioms.html#collections-counter-and-ordereddict
 from future import standard_library
@@ -1043,3 +1044,109 @@ def _get_dot(self,
                                                   vname1.replace('.', '_')))
                     logger.debug('cross connection: %s', dotlist[-1])
         return ('\n' + prefix).join(dotlist)
+
+    def add(self, name, node_like):
+        if is_interface(node_like):
+            node = Node(node_like, name=name)
+        elif is_node(node_like):
+            node = node_like
+
+        self.add_nodes([node])
+
+
+class Map(Node):
+    pass
+
+
+class Join(Node):
+    pass
+
+
+class MapState(object):
+    pass
+
+class NewNode(EngineBase):
+    def __init__(self, inputs={}, map_on=None, join_by=None,
+                 *args, **kwargs):
+        self._mappers = {}
+        self._joiners = {}
+
+    def map(self, field, values=None):
+        if isinstance(field, list):
+            for field_
+            if values is not None:
+                if len(values != len(field)):
+        elif isinstance(field, tuple):
+            pass
+        if values is None:
+            values = getattr(self._inputs, field)
+            if values is None:
+                raise MappingError('Cannot map unassigned input field')
+        self._mappers[field] = values
+
+    def join(self, field):
+        pass
+
+
+class NewWorkflow(NewNode):
+    def __init__(self, inputs={}, *args, **kwargs):
+        super(NewWorkflow, self).__init__(*args, **kwargs)
+
+        self._nodes = {}
+
+        mro = self.__class__.mro()
+        wf_klasses = mro[:mro.index(NewWorkflow)][::-1]
+        items = {}
+        for klass in wf_klasses:
+            items.update(klass.__dict__)
+        for name, runnable in items.items():
+            if name in ('__module__', '__doc__'):
+                continue
+
+            self.add(name, value)
+
+    def add(self, name, runnable):
+        if is_function(runnable):
+            node = Node(Function(function=runnable), name=name)
+        elif is_interface(runnable):
+            node = Node(runnable, name=name)
+        elif is_node(runnable):
+            node = runnable if runnable.name == name else runnable.clone(name=name)
+        else:
+            raise ValueError("Unknown workflow element: {!r}".format(runnable))
+        setattr(self, name, node)
+        self._nodes[name] = node
+        self._last_added = name
+
+    def map(self, field, node=None, values=None):
+        if node is None:
+            if '.' in field:
+                node, field = field.rsplit('.', 1)
+            else:
+                node = self._last_added
+
+        if '.' in node:
+            subwf, node = node.split('.', 1)
+            self._nodes[subwf].map(field, node, values)
+            return
+
+        if node in self._mappers:
+            raise WorkflowError("Cannot assign two mappings to the same input")
+
+        self._mappers[node] = (field, values)
+
+    def join(self, field, node=None):
+        pass
+
+
+def is_function(obj):
+    return hasattr(obj, '__call__')
+
+
+def is_interface(obj):
+    return all(hasattr(obj, protocol)
+               for protocol in ('input_spec', 'output_spec', 'run'))
+
+
+def is_node(obj):
+    return hasattr(obj, itername)

From a646483de3993ae55678c3a9ef50677ef86409d6 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Mon, 2 Jul 2018 14:38:02 -0400
Subject: [PATCH 2/3] ENH: Add nipype exceptions

---
 nipype/exceptions.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 nipype/exceptions.py

diff --git a/nipype/exceptions.py b/nipype/exceptions.py
new file mode 100644
index 0000000000..19880a22ab
--- /dev/null
+++ b/nipype/exceptions.py
@@ -0,0 +1,26 @@
+class NipypeError(Exception):
+    pass
+
+
+class PipelineError(NipypeError):
+    pass
+
+
+class NodeError(EngineError):
+    pass
+
+
+class WorkflowError(NodeError):
+    pass
+
+
+class MappingError(NodeError):
+    pass
+
+
+class JoinError(NodeError):
+    pass
+
+
+class InterfaceError(NipypeError):
+    pass

From 33393375cf76f0c7ceba32575e16be07d3be943d Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Tue, 24 Jul 2018 09:02:13 -0400
Subject: [PATCH 3/3] FIX: Exception hierarchy

---
 nipype/exceptions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nipype/exceptions.py b/nipype/exceptions.py
index 19880a22ab..f6352c78f0 100644
--- a/nipype/exceptions.py
+++ b/nipype/exceptions.py
@@ -6,7 +6,7 @@ class PipelineError(NipypeError):
     pass
 
 
-class NodeError(EngineError):
+class NodeError(PipelineError):
     pass