mirror of
https://github.com/alicevision/Meshroom.git
synced 2025-04-28 09:47:20 +02:00
[core] checkTemplateVersions
: Ensure nodes are not loaded several times
By performing a `initNodes()` every single time `checkTemplateVersions` was called without ever unregistering the nodes, warnings about nodes being already registered were raised when for example calling `checkAllTemplatesVersions`.
This commit is contained in:
parent
ee5e9401ce
commit
c3e8b8833f
1 changed files with 49 additions and 40 deletions
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# coding:utf-8
|
||||
|
||||
from meshroom.core import pipelineTemplates, Version
|
||||
from meshroom.core import unregisterNodeType, pipelineTemplates, Version
|
||||
from meshroom.core.node import CompatibilityIssue, CompatibilityNode
|
||||
from meshroom.core.graphIO import GraphIO
|
||||
|
||||
|
@ -9,60 +9,69 @@ import meshroom
|
|||
|
||||
import json
|
||||
|
||||
def checkTemplateVersions(path: str) -> bool:
|
||||
def checkTemplateVersions(path: str, nodesAlreadyLoaded: bool = False) -> bool:
|
||||
""" Check whether there is a compatibility issue with the nodes saved in the template provided with "path". """
|
||||
meshroom.core.initNodes()
|
||||
if not nodesAlreadyLoaded:
|
||||
meshroom.core.initNodes()
|
||||
|
||||
with open(path) as jsonFile:
|
||||
fileData = json.load(jsonFile)
|
||||
|
||||
graphData = fileData.get(GraphIO.Keys.Graph, fileData)
|
||||
if not isinstance(graphData, dict):
|
||||
return False
|
||||
|
||||
header = fileData.get(GraphIO.Keys.Header, {})
|
||||
if not header.get("template", False):
|
||||
return False
|
||||
nodesVersions = header.get(GraphIO.Keys.NodesVersions, {})
|
||||
|
||||
for _, nodeData in graphData.items():
|
||||
nodeType = nodeData["nodeType"]
|
||||
if not nodeType in meshroom.core.nodesDesc:
|
||||
try:
|
||||
graphData = fileData.get(GraphIO.Keys.Graph, fileData)
|
||||
if not isinstance(graphData, dict):
|
||||
return False
|
||||
|
||||
nodeDesc = meshroom.core.nodesDesc[nodeType]
|
||||
currentNodeVersion = meshroom.core.nodeVersion(nodeDesc)
|
||||
|
||||
inputs = nodeData.get("inputs", {})
|
||||
internalInputs = nodeData.get("internalInputs", {})
|
||||
version = nodesVersions.get(nodeType, None)
|
||||
|
||||
compatibilityIssue = None
|
||||
|
||||
if version and currentNodeVersion and Version(version).major != Version(currentNodeVersion).major:
|
||||
compatibilityIssue = CompatibilityIssue.VersionConflict
|
||||
else:
|
||||
for attrName, value in inputs.items():
|
||||
if not CompatibilityNode.attributeDescFromName(nodeDesc.inputs, attrName, value):
|
||||
compatibilityIssue = CompatibilityIssue.DescriptionConflict
|
||||
break
|
||||
for attrName, value in internalInputs.items():
|
||||
if not CompatibilityNode.attributeDescFromName(nodeDesc.internalInputs, attrName, value):
|
||||
compatibilityIssue = CompatibilityIssue.DescriptionConflict
|
||||
break
|
||||
|
||||
if compatibilityIssue is not None:
|
||||
print("{} in {} for node {}".format(compatibilityIssue, path, nodeType))
|
||||
header = fileData.get(GraphIO.Keys.Header, {})
|
||||
if not header.get("template", False):
|
||||
return False
|
||||
nodesVersions = header.get(GraphIO.Keys.NodesVersions, {})
|
||||
|
||||
return True
|
||||
for _, nodeData in graphData.items():
|
||||
nodeType = nodeData["nodeType"]
|
||||
if not nodeType in meshroom.core.nodesDesc:
|
||||
return False
|
||||
|
||||
nodeDesc = meshroom.core.nodesDesc[nodeType]
|
||||
currentNodeVersion = meshroom.core.nodeVersion(nodeDesc)
|
||||
|
||||
inputs = nodeData.get("inputs", {})
|
||||
internalInputs = nodeData.get("internalInputs", {})
|
||||
version = nodesVersions.get(nodeType, None)
|
||||
|
||||
compatibilityIssue = None
|
||||
|
||||
if version and currentNodeVersion and Version(version).major != Version(currentNodeVersion).major:
|
||||
compatibilityIssue = CompatibilityIssue.VersionConflict
|
||||
else:
|
||||
for attrName, value in inputs.items():
|
||||
if not CompatibilityNode.attributeDescFromName(nodeDesc.inputs, attrName, value):
|
||||
compatibilityIssue = CompatibilityIssue.DescriptionConflict
|
||||
break
|
||||
for attrName, value in internalInputs.items():
|
||||
if not CompatibilityNode.attributeDescFromName(nodeDesc.internalInputs, attrName, value):
|
||||
compatibilityIssue = CompatibilityIssue.DescriptionConflict
|
||||
break
|
||||
|
||||
if compatibilityIssue is not None:
|
||||
print("{} in {} for node {}".format(compatibilityIssue, path, nodeType))
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
finally:
|
||||
if not nodesAlreadyLoaded:
|
||||
nodeTypes = [nodeType for _, nodeType in meshroom.core.nodesDesc.items()]
|
||||
for nodeType in nodeTypes:
|
||||
unregisterNodeType(nodeType)
|
||||
|
||||
|
||||
def checkAllTemplatesVersions() -> bool:
|
||||
meshroom.core.initNodes()
|
||||
meshroom.core.initPipelines()
|
||||
|
||||
validVersions = []
|
||||
for _, path in pipelineTemplates.items():
|
||||
validVersions.append(checkTemplateVersions(path))
|
||||
validVersions.append(checkTemplateVersions(path, nodesAlreadyLoaded=True))
|
||||
|
||||
return all(validVersions)
|
||||
|
|
Loading…
Add table
Reference in a new issue