Skip to content

[core] Simplify status file for chunks #2944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 26, 2025
Merged

[core] Simplify status file for chunks #2944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cdd68c
[core] Remove `packageVersion` from the status file
cbentejac Nov 26, 2025
b5a7ad1
[core] Remove `graph` and `env` keys from the status file
cbentejac Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions meshroom/core/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion meshroom/core/desc/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class BaseNode(object):
gpu = Level.NONE
ram = Level.NORMAL
packageName = ""
packageVersion = ""
internalInputs = [
StringParam(
name="invalidation",
Expand Down
18 changes: 2 additions & 16 deletions meshroom/core/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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):
Expand All @@ -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 = ""
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down