Merge pull request #2944 from alicevision/dev/simplifyStatus

[core] Simplify status file for chunks

Author: cbentejac

meshroom/core/__init__.py

@@ -76,7 +76,6 @@ def loadClasses(folder: str, packageName: str, classType: type) -> list[type]:
             package = importlib.import_module(packageName)
             packageName = package.packageName if hasattr(package, "packageName") \
                 else package.__name__
-            packageVersion = getattr(package, "__version__", None)
             packagePath = os.path.dirname(package.__file__)
         except Exception as exc:
             tb = traceback.extract_tb(exc.__traceback__)
@@ -109,7 +108,6 @@ def loadClasses(folder: str, packageName: str, classType: type) -> list[type]:
 
                 for p in plugins:
                     p.packageName = packageName
-                    p.packageVersion = packageVersion
                     p.packagePath = packagePath
                     if classType == desc.BaseNode:
                         nodePlugin = NodePlugin(p)

meshroom/core/desc/node.py

@@ -35,7 +35,6 @@ class BaseNode(object):
     gpu = Level.NONE
     ram = Level.NORMAL
     packageName = ""
-    packageVersion = ""
     internalInputs = [
         StringParam(
             name="invalidation",

meshroom/core/node.py

@@ -67,14 +67,13 @@ class StatusData(BaseObject):
     """
     dateTimeFormatting = '%Y-%m-%d %H:%M:%S.%f'
 
-    def __init__(self, nodeName='', nodeType='', packageName='', packageVersion='',
+    def __init__(self, nodeName='', nodeType='', packageName='',
                  mrNodeType: MrNodeType = MrNodeType.NONE, parent: BaseObject = None):
         super().__init__(parent)
 
         self.nodeName: str = nodeName
         self.nodeType: str = nodeType
         self.packageName: str = packageName
-        self.packageVersion: str = packageVersion
         self.mrNodeType = mrNodeType
 
         self.sessionUid: Optional[str] = None
@@ -96,7 +95,6 @@ def setNodeType(self, node):
         """
         self.nodeType = node.nodeType
         self.packageName = node.packageName
-        self.packageVersion = node.packageVersion
         self.mrNodeType = node.getMrNodeType()
 
     def merge(self, other):
@@ -108,16 +106,13 @@ def reset(self):
         self.nodeName: str = ""
         self.nodeType: str = ""
         self.packageName: str = ""
-        self.packageVersion: str = ""
         self.mrNodeType: MrNodeType = MrNodeType.NONE
         self.execMode: ExecMode = ExecMode.NONE
         self.resetDynamicValues()
 
     def resetDynamicValues(self):
         self.status: Status = Status.NONE
-        self.graph = ""
         self.commandLine: str = ""
-        self.env: str = ""
         self._startTime: Optional[datetime.datetime] = None
         self.startDateTime: str = ""
         self.endDateTime: str = ""
@@ -205,10 +200,7 @@ def fromDict(self, d):
         self.nodeName = d.get("nodeName", "")
         self.nodeType = d.get("nodeType", "")
         self.packageName = d.get("packageName", "")
-        self.packageVersion = d.get("packageVersion", "")
-        self.graph = d.get("graph", "")
         self.commandLine = d.get("commandLine", "")
-        self.env = d.get("env", "")
         self.startDateTime = d.get("startDateTime", "")
         self.endDateTime = d.get("endDateTime", "")
         self.elapsedTime = d.get("elapsedTime", 0)
@@ -342,7 +334,7 @@ def __init__(self, node, range, parent=None):
         self.range = range
         self._logManager = None
         self._status: StatusData = StatusData(node.name, node.nodeType, node.packageName,
-                                              node.packageVersion, node.getMrNodeType())
+                                              node.getMrNodeType())
         self.statistics: stats.Statistics = stats.Statistics()
         self.statusFileLastModTime = -1
         self.subprocess = None
@@ -670,7 +662,6 @@ def __init__(self, nodeType: str, position: Position = None, parent: BaseObject
             self.nodePlugin = meshroom.core.pluginManager.getRegisteredNodePlugin(nodeType)
 
         self.packageName: str = ""
-        self.packageVersion: str = ""
         self._internalFolder: str = ""
         self._sourceCodeFolder: str = self.nodeDesc.sourceCodeFolder if self.nodeDesc else ""
         self._internalFolderExp = "{cache}/{nodeType}/{uid}"
@@ -814,10 +805,6 @@ def getNodeInfo(self):
                 info[key] = value
         return [{"key": k, "value": v} for k, v in info.items()]
 
-    @property
-    def packageFullName(self):
-        return '-'.join([self.packageName, self.packageVersion])
-
     @Slot(str, result=Attribute)
     def attribute(self, name):
         att = None
@@ -1824,7 +1811,6 @@ def __init__(self, nodeType, position=None, parent=None, uid=None, **kwargs):
             raise UnknownNodeTypeError(nodeType)
 
         self.packageName = self.nodeDesc.packageName
-        self.packageVersion = self.nodeDesc.packageVersion
 
         for attrDesc in self.nodeDesc.inputs:
             self._attributes.add(attributeFactory(attrDesc, kwargs.get(attrDesc.name, None),