command line exit node. pip install dev scripts

Author: IlgarLunin

PyFlow/Core/GraphManager.py

@@ -32,6 +32,7 @@ class GraphManager(object):
     """
     def __init__(self):
         super(GraphManager, self).__init__()
+        self.terminationRequested = False  #: used by cli only
         self.graphChanged = Signal(object)
         self._graphs = {}
         self._activeGraph = None

PyFlow/Core/NodeBase.py

@@ -713,7 +713,6 @@ def initializeFromFunction(foo):
         """
         retAnyOpts = None
         retConstraint = None
-        foo = foo
         meta = foo.__annotations__['meta']
         returnType = returnDefaultValue = None
         returnPinOptionsToEnable = None

PyFlow/Packages/PyFlowBase/Nodes/cliexit.py

@@ -0,0 +1,49 @@
+## Copyright 2015-2019 Ilgar Lunin, Pedro Cabrera
+
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+
+##     http://www.apache.org/licenses/LICENSE-2.0
+
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
+
+from PyFlow.Core import NodeBase
+from PyFlow.Core.Common import *
+from PyFlow.Core.GraphManager import GraphManagerSingleton
+from PyFlow.Core.NodeBase import NodePinsSuggestionsHelper
+from PyFlow.Packages.PyFlowBase.Nodes import FLOW_CONTROL_COLOR
+
+
+class cliexit(NodeBase):
+    def __init__(self, name):
+        super(cliexit, self).__init__(name)
+        self.inp0 = self.createInputPin(DEFAULT_IN_EXEC_NAME, 'ExecPin', None, self.compute)
+
+    @staticmethod
+    def pinTypeHints():
+        helper = NodePinsSuggestionsHelper()
+        helper.addInputDataType('ExecPin')
+        helper.addInputStruct(PinStructure.Single)
+        return helper
+
+    @staticmethod
+    def category():
+        return 'CLI'
+
+    @staticmethod
+    def keywords():
+        return []
+
+    @staticmethod
+    def description():
+        return 'Stops cli program loop'
+
+    def compute(self, *args, **kwargs):
+        man = GraphManagerSingleton().get()
+        man.terminationRequested = True

PyFlow/Packages/PyFlowBase/__init__.py

@@ -54,6 +54,7 @@
 from PyFlow.Packages.PyFlowBase.Nodes.floatRamp import floatRamp
 from PyFlow.Packages.PyFlowBase.Nodes.colorRamp import colorRamp
 from PyFlow.Packages.PyFlowBase.Nodes.stringToArray import stringToArray
+from PyFlow.Packages.PyFlowBase.Nodes.cliexit import cliexit
 
 
 from PyFlow.Packages.PyFlowBase.Nodes.consoleOutput import consoleOutput
@@ -148,7 +149,8 @@
     floatRamp.__name__: floatRamp,
     colorRamp.__name__: colorRamp,
     stringToArray.__name__: stringToArray,
-    imageDisplay.__name__: imageDisplay
+    imageDisplay.__name__: imageDisplay,
+    cliexit.__name__: cliexit
 }
 
 _PINS = {

PyFlow/Scripts/__init__.py

@@ -17,13 +17,16 @@
 import sys
 import os
 import json
+import threading
+import time
+
 from PyFlow.App import PyFlow
 from PyFlow import graphUiParser
 from Qt.QtWidgets import QApplication
 from PyFlow import INITIALIZE
 from PyFlow.Core.Common import *
 from PyFlow.Core.version import currentVersion
-from PyFlow.Core.GraphManager import GraphManager
+from PyFlow.Core.GraphManager import GraphManagerSingleton
 
 
 def getGraphArguments(data, parser):
@@ -76,6 +79,7 @@ def main():
                 with open(filePath, 'r') as f:
                     data = json.load(f)
                     instance.loadFromData(data)
+                    instance.currentFileName = filePath
 
             try:
                 sys.exit(app.exec_())
@@ -91,9 +95,17 @@ def main():
 
         # load updated data
         INITIALIZE()
-        GM = GraphManager()
+        GM = GraphManagerSingleton().get()
         GM.deserialize(data)
 
+        # fake main loop
+        def programLoop():
+            while True:
+                GM.Tick(deltaTime=0.02)
+                time.sleep(0.02)
+                if GM.terminationRequested:
+                    break
+
         # call graph inputs nodes
         root = GM.findRootGraph()
         graphInputNodes = root.getNodesList(classNameFilters=["graphInputs"])
@@ -111,5 +123,9 @@ def main():
         for foo in evalFunctions:
             foo()
 
+        loopThread = threading.Thread(target=programLoop)
+        loopThread.start()
+        loopThread.join()
+
     if parsedArguments.mode == "runui":
         graphUiParser.run(filePath)

PyFlow/__init__.py

@@ -162,7 +162,7 @@ def recursePackagePaths(inPath):
         additionalPackageLocations[packagePathId] = packagePath
 
     packagePaths.extend(additionalPackageLocations)
-    
+
     for importer, modname, ispkg in pkgutil.iter_modules(packagePaths):
         try:
             if ispkg:

PyFlow/graphUiParser.py

@@ -68,21 +68,21 @@ def run(filePath):
 
                 # fake main loop
                 stopEvent = threading.Event()
+
                 def programLoop(stopEvent):
                     while not stopEvent.is_set():
                         man.Tick(deltaTime=0.02)
                         time.sleep(0.02)
                 t = threading.Thread(target=programLoop, args=(stopEvent,))
                 t.start()
+
                 def quitEvent():
                     stopEvent.set()
                     t.join()
                 app.aboutToQuit.connect(quitEvent)
             else:
-
                 msg.setInformativeText(filePath)
-                msg.setDetailedText(
-                    "The file doesn't containt graphInputs nodes")
+                msg.setDetailedText("The file doesn't containt graphInputs nodes")
                 msg.setWindowTitle("PyFlow Ui Graph Parser")
                 msg.setStandardButtons(QMessageBox.Ok)
                 msg.show()

pip_install.bat

@@ -0,0 +1 @@
+pip install . -U

pip_uninstall.bat

@@ -0,0 +1 @@
+pip uninstall pyflow