Added pythonic wrappers for Topology and BlockRegistry

guruofquality · guruofquality · commit 3d530fedfe41 · 2016-06-04T19:21:19.000-07:00
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,10 @@
 This this the changelog file for the Pothos Python toolkit.
 
+Release 0.2.0 (pending)
+==========================
+
+- Added pythonic wrappers for Topology and BlockRegistry
+
 Release 0.1.3 (2016-03-06)
 ==========================
 
diff --git a/Pothos/Block.py b/Pothos/Block.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2014-2014 Josh Blum
+# Copyright (c) 2014-2016 Josh Blum
 # SPDX-License-Identifier: BSL-1.0
 
 from . PothosModule import *
 from . InputPort import InputPort
 from . OutputPort import OutputPort
 from . Label import Label, LabelIteratorRange
+from . BlockRegistry import BlockRegistry
 import weakref
 
 class Block(object):
     def __init__(self):
-        env = ProxyEnvironment("managed")
-        reg = env.findProxy("Pothos/BlockRegistry")
-        self._block = reg.callProxy("/blocks/python_block")
+        self._block = BlockRegistry("/blocks/python_block")
         self._block._setPyBlock(weakref.proxy(self))
 
     def __getattr__(self, name):
diff --git a/Pothos/BlockRegistry.py b/Pothos/BlockRegistry.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2016-2016 Josh Blum
+# SPDX-License-Identifier: BSL-1.0
+
+from . PothosModule import *
+
+def BlockRegistry(path, *args):
+    env = ProxyEnvironment("managed")
+    reg = env.findProxy("Pothos/BlockRegistry")
+    return reg.callProxy(path, *args)
diff --git a/Pothos/CMakeLists.txt b/Pothos/CMakeLists.txt
@@ -40,4 +40,6 @@ install(FILES
     InputPort.py
     OutputPort.py
     TestPothos.py
+    Topology.py
+    BlockRegistry.py
     DESTINATION ${POTHOS_PYTHON_DIR}/Pothos)
diff --git a/Pothos/TestTopology.py b/Pothos/TestTopology.py
@@ -23,26 +23,23 @@ def work(self):
     env = Pothos.ProxyEnvironment("managed")
 
     #make a topology to connect and process
-    topology = env.findProxy('Pothos/Topology').make()
-
-    #get the block registry
-    reg = env.findProxy("Pothos/BlockRegistry")
+    topology = Pothos.Topology()
 
     #create feeder block and give it a message
-    feeder = reg.callProxy("/blocks/feeder_source", "int")
+    feeder = Pothos.BlockRegistry("/blocks/feeder_source", "int")
     feeder.feedMessage("hello")
     feeder.feedMessage("world")
     feeder.feedMessage(123)
 
     #create a collector block to house the result
-    collector = reg.callProxy("/blocks/collector_sink", "int")
+    collector = Pothos.BlockRegistry("/blocks/collector_sink", "int")
 
     #use an all in-python block thats not even in the block registry
     fwd = MessageForwarder()
 
     #connect and run it
-    topology.connect(feeder, "0", fwd, "0")
-    topology.connect(fwd, "0", collector, "0")
+    topology.connect(feeder, 0, fwd, 0)
+    topology.connect(fwd, 0, collector, 0)
     topology.commit()
     topology.waitInactive()
 
diff --git a/Pothos/Topology.py b/Pothos/Topology.py
@@ -0,0 +1,25 @@
+# Copyright (c) 2016-2016 Josh Blum
+# SPDX-License-Identifier: BSL-1.0
+
+from . PothosModule import *
+
+class Topology(object):
+    def __init__(self):
+        env = ProxyEnvironment("managed")
+        self._topology = env.findProxy('Pothos/Topology').make()
+
+    def connect(self, src, srcPort, dst, dstPort):
+        return self._topology.connect(src, str(srcPort), dst, str(dstPort))
+
+    def disconnect(self, src, srcPort, dst, dstPort):
+        return self._topology.disconnect(src, str(srcPort), dst, str(dstPort))
+
+    def __getattr__(self, name):
+        return lambda *args: self._topology.call(name, *args)
+
+    def getInternalBlock(self):
+        """
+        Get access to the underlying Pothos::Block handle.
+        Topology uses this call to speak directly to the block.
+        """
+        return self.self._topology
diff --git a/Pothos/__init__.py b/Pothos/__init__.py
@@ -1,8 +1,10 @@
-# Copyright (c) 2014-2014 Josh Blum
+# Copyright (c) 2014-2016 Josh Blum
 # SPDX-License-Identifier: BSL-1.0
 
 from . PothosModule import *
 from . Block import Block
 from . Label import Label, LabelIteratorRange
 from . InputPort import InputPort
 from . OutputPort import OutputPort
+from . Topology import Topology
+from . BlockRegistry import BlockRegistry
