Add relative paths to nodes as variables #2629
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cbentejac
force-pushed
the
dev/relativePaths
branch
2 times, most recently
from
53206f9 to
34e1495
Compare
Codecov ReportAttention: Patch coverage is
✅ All tests successful. No failed tests found. Additional details and impacted files@@ Coverage Diff @@
## develop #2629 +/- ##
===========================================
+ Coverage 73.26% 73.31% +0.05%
===========================================
Files 131 131
Lines 7873 7889 +16
===========================================
+ Hits 5768 5784 +16
Misses 2105 2105 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
cbentejac
force-pushed
the
dev/relativePaths
branch
8 times, most recently
from
8c37fd0 to
3042f94
Compare
fabiencastan
requested changes
Jan 6, 2025
cbentejac
force-pushed
the
dev/relativePaths
branch
from
3042f94 to
11d9b40
Compare
fabiencastan
requested changes
Jan 7, 2025
Member
fabiencastan
left a comment
fabiencastan
left a comment
There was a problem hiding this comment.
Sorry, I should have seen that in the first review...
cbentejac
added
the
invalidate:graph
cbentejac
force-pushed
the
dev/relativePaths
branch
2 times, most recently
from
e21fc38 to
0dd5c10
Compare
cbentejac
force-pushed
the
dev/relativePaths
branch
from
0dd5c10 to
8423fd5
Compare
cbentejac
force-pushed
the
dev/relativePaths
branch
from
8423fd5 to
dfebb50
Compare
cbentejac
force-pushed
the
dev/relativePaths
branch
from
dfebb50 to
31d0b71
Compare
This property stores the location of the source code for a given node and is not exposed to the QML side.
Add 2 default entries to the command line variables: - `nodeCacheFolder`, which contains the location of the cache folder - `nodeSourceCodeFolder`, which contains the location of the file describing the node
This is fully replaced with `{nodeCacheFolder}`.
By doing so, invalidation values will evaluate to the same UID independently from whether the attribute's value has been written with an extra "/" or not.
Otherwise, input attributes with variables (either environment ones or local ones) cannot be opened through "Open File", even though "Open Containing Folder" works fine.
cbentejac
force-pushed
the
dev/relativePaths
branch
from
31d0b71 to
2c06ea4
Compare
fabiencastan
approved these changes
Mar 7, 2025
Member
|
Need update to fix the CI. |
cbentejac
added a commit
to meshroomHub/mrDepthEstimation
that referenced
this pull request
Mar 10, 2025
This follows changes introduced in Meshroom: alicevision/Meshroom#2629
cbentejac
added a commit
that referenced
this pull request
Mar 10, 2025
For nodes that were added right before the merge of #2629, the replacement still needed to be done.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR will invalidate all pre-existing graphs.
Failures of the CI will be solved when the following PR will be merged: meshroomHub/mrSegmentation#12.
This PR adds new variables that can be used in the description of nodes to write relative paths. For each
Nodeobject, there are currently two variables that are available by default:{nodeCacheFolder}, which points towards the cache folder for this node (and is effectively the same asdesc.Node.internalFolder);{nodeSourceCodeFolder}, which points towards the folder containing the node's description.These variables are resolved with the
cmdVarsdictionary, which contains essentially the {"key": "value"} mapping for all the attributes in a node's command line.desc.Node.internalFolderis removed as its purpose is fully replaced by{nodeCacheFolder}, and{nodeSourceCodeFolder}replaces the absolute path for the Blender script in theScenePreviewnode.Features
{nodeCacheFolder}and{nodeSourceCodeFolder}to the list of command-line variablesImplementation remarks
For output attributes, we implement a change that will invalidate almost all pre-existing graphs: when computing an output attribute, we want "/path/to/something" to evaluate to the same thing as "/path/to/something/". "/" on the right are thus stripped from invalidation values when evaluating the UID for an output attribute. This causes all the nodes which had outputs finishing with a "/" to evaluate to a new UID, hence the invalidation of all pre-existing graphs.