moved plugin logic to nodeDesc instead of class

added build badge

Author: Matthieu Hog

meshroom/core/__init__.py

@@ -19,7 +19,7 @@
     pass
 
 from meshroom.core.submitter import BaseSubmitter
-from . import desc
+from meshroom.core import desc
 
 # Setup logging
 logging.basicConfig(format='[%(asctime)s][%(levelname)s] %(message)s', level=logging.INFO)

meshroom/core/desc.py

@@ -717,9 +717,53 @@ class Node(object):
     documentation = ''
     category = 'Other'
 
+    _isPlugin = True
+
     def __init__(self):
         super(Node, self).__init__()
         self.hasDynamicOutputAttribute = any(output.isDynamicValue for output in self.outputs)
+        try:
+            self.envFile 
+            self.envType
+        except:
+            self._isPlugin=False
+
+    @property
+    def envType(cls):
+        from core.plugin import EnvType #lazy import for plugin to avoid circular dependency
+        return EnvType.NONE
+
+    @property
+    def envFile(cls):
+        """
+        Env file used to build the environement, you may overwrite this to custom the behaviour
+        """
+        raise NotImplementedError("You must specify an env file")
+
+    @property
+    def _envName(cls):
+        """
+        Get the env name by hashing the env files, overwrite this to use a custom pre-build env 
+        """
+        with open(cls.envFile, 'r') as file:
+            envContent = file.read()
+        from meshroom.core.plugin import getEnvName  #lazy import as to avoid circular dep
+        return getEnvName(envContent)
+
+    @property
+    def isPlugin(self):
+        """
+        Tests if the node is a valid plugin node
+        """
+        return self._isPlugin
+
+    @property
+    def isBuilt(self):
+        """
+        Tests if the environnement is built
+        """
+        from meshroom.core.plugin import isBuilt
+        return self._isPlugin and isBuilt(self)
 
     def upgradeAttributeValues(self, attrValues, fromVersion):
         return attrValues
@@ -790,7 +834,17 @@ def buildCommandLine(self, chunk):
         if chunk.node.isParallelized and chunk.node.size > 1:
             cmdSuffix = ' ' + self.commandLineRange.format(**chunk.range.toDict())
 
-        return cmdPrefix + chunk.node.nodeDesc.commandLine.format(**chunk.node._cmdVars) + cmdSuffix
+        cmd=cmdPrefix + chunk.node.nodeDesc.commandLine.format(**chunk.node._cmdVars) + cmdSuffix
+
+        #the process in Popen does not seem to use the right python, even if meshroom_compute is called within the env
+        #so in the case of command line using python, we have to make sure it is using the correct python
+        from meshroom.core.plugin import EnvType, getVenvPath, getVenvExe  #lazy import to prevent circular dep
+        if self.isPlugin and self.envType == EnvType.VENV:
+            envPath = getVenvPath(self._envName)
+            envExe = getVenvExe(envPath)
+            cmd=cmd.replace("python", envExe)
+
+        return cmd
 
     def stopProcess(self, chunk):
         # The same node could exists several times in the graph and

meshroom/core/node.py

@@ -21,7 +21,6 @@
 from meshroom.core.attribute import attributeFactory, ListAttribute, GroupAttribute, Attribute
 from meshroom.core.exception import NodeUpgradeError, UnknownNodeTypeError
 
-
 def getWritingFilepath(filepath):
     return filepath + '.writing.' + str(uuid.uuid4())
 
@@ -406,13 +405,14 @@ def process(self, forceCompute=False):
 
 	    #if plugin node and if first call call meshroom_compute inside the env on 'host' so that the processchunk 
         # of the node will be ran into the env
-        if hasattr(self.node.nodeDesc, 'envFile') and self._status.status!=Status.FIRST_RUN:
+        if self.node.nodeDesc.isPlugin and self._status.status!=Status.FIRST_RUN:
             try:
-                if not self.node.nodeDesc.isBuild():
+                from meshroom.core.plugin import isBuilt, build, getCommandLine #lazy import to avoid circular dep
+                if not isBuilt(self.node.nodeDesc):
                     self.upgradeStatusTo(Status.BUILD)
-                    self.node.nodeDesc.build()
+                    build(self.node.nodeDesc)
                 self.upgradeStatusTo(Status.FIRST_RUN)
-                command = self.node.nodeDesc.getCommandLine(self)
+                command = getCommandLine(self)
                 #NOTE: docker returns 0 even if mount fail (it fails on the deamon side)
                 logging.info("Running plugin node with "+command)
                 status = os.system(command) 
@@ -482,6 +482,7 @@ def isExtern(self):
     statusNodeName = Property(str, lambda self: self._status.nodeName, constant=True)
 
     elapsedTime = Property(float, lambda self: self._status.elapsedTime, notify=statusChanged)
+    
 
 
 # Simple structure for storing node position
@@ -1413,6 +1414,8 @@ def has3DOutputAttribute(self):
     hasSequenceOutput = Property(bool, hasSequenceOutputAttribute, notify=outputAttrEnabledChanged)
     has3DOutput = Property(bool, has3DOutputAttribute, notify=outputAttrEnabledChanged)
 
+    isPlugin = Property(bool, lambda self: self.nodeDesc.isPlugin, constant=True)
+    isBuilt  = Property(bool, lambda self: self.nodeDesc.isBuilt,  constant=True)
 
 class Node(BaseNode):
     """