Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
payno
workflow_concepts
Commits
b12489b5
Commit
b12489b5
authored
Jun 12, 2021
by
Wout De Nolf
Browse files
esrftaskgraph rename "uhash_nonce" to "instance_nonce"
parent
edfddeac
Changes
4
Hide whitespace changes
Inline
Side-by-side
esrftaskgraph/esrftaskgraph/hashing.py
View file @
b12489b5
...
...
@@ -127,15 +127,15 @@ class UniversalHashable:
__VERSION
=
None
MISSING_DATA
=
MissingData
()
def
__init__
(
self
,
uhash
=
None
,
uhash
_nonce
=
None
):
def
__init__
(
self
,
uhash
=
None
,
instance
_nonce
=
None
):
"""
:param str, bytes, UniversalHash, UniversalHashable uhash:
:param
uhash
_nonce:
:param
instance
_nonce:
"""
self
.
__set_uhash
(
uhash
)
self
.
__original_uhash
=
self
.
__uhash
self
.
__instance_nonce
=
uhash
_nonce
self
.
__original__instance_nonce
=
uhash
_nonce
self
.
__instance_nonce
=
instance
_nonce
self
.
__original__instance_nonce
=
instance
_nonce
def
__init_subclass__
(
subcls
,
version
=
None
,
**
kwargs
):
super
().
__init_subclass__
(
**
kwargs
)
...
...
esrftaskgraph/esrftaskgraph/task.py
View file @
b12489b5
...
...
@@ -64,7 +64,7 @@ class Task(Registered, hashing.UniversalHashable, register=False):
self
.
_outputs
=
VariableContainer
(
value
=
ovars
,
uhash
=
self
.
_inputs
,
uhash
_nonce
=
self
.
class_nonce
(),
instance
_nonce
=
self
.
class_nonce
(),
varinfo
=
varinfo
,
)
...
...
@@ -140,7 +140,7 @@ class Task(Registered, hashing.UniversalHashable, register=False):
return
super
().
class_nonce_data
()
+
(
sorted
(
cls
.
input_names
()),
sorted
(
cls
.
output_names
()),
cls
.
_N_REQUIRED_POSITIONAL_INPUTS
cls
.
_N_REQUIRED_POSITIONAL_INPUTS
,
)
@
property
...
...
esrftaskgraph/esrftaskgraph/variable.py
View file @
b12489b5
...
...
@@ -264,11 +264,11 @@ class VariableContainer(Mapping, Variable):
varparams
=
dict
(
self
.
__varparams
)
if
isinstance
(
value
,
hashing
.
UniversalHash
):
varparams
[
"uhash"
]
=
value
varparams
[
"
uhash
_nonce"
]
=
None
varparams
[
"
instance
_nonce"
]
=
None
else
:
varparams
[
"value"
]
=
value
uhash
_nonce
=
varparams
.
pop
(
"
uhash
_nonce"
,
None
)
varparams
[
"
uhash
_nonce"
]
=
uhash
_nonce
,
key
instance
_nonce
=
varparams
.
pop
(
"
instance
_nonce"
,
None
)
varparams
[
"
instance
_nonce"
]
=
instance
_nonce
,
key
return
Variable
(
**
varparams
)
def
__iter__
(
self
):
...
...
@@ -291,7 +291,7 @@ class VariableContainer(Mapping, Variable):
def
_deserialize
(
self
,
value
):
adict
=
dict
()
varparams
=
dict
(
self
.
__varparams
)
varparams
[
"
uhash
_nonce"
]
=
None
varparams
[
"
instance
_nonce"
]
=
None
for
k
,
v
in
value
.
items
():
varparams
[
"uhash"
]
=
hashing
.
UniversalHash
(
v
)
adict
[
k
]
=
Variable
(
**
varparams
)
...
...
esrftaskgraph/tests/test_variable.py
View file @
b12489b5
...
...
@@ -48,15 +48,15 @@ def test_variable_uhash(varinfo):
def
test_variable_nonce
(
varinfo
):
v1
=
Variable
(
9999
,
varinfo
=
varinfo
)
v2
=
Variable
(
value
=
9999
,
uhash
_nonce
=
1
,
varinfo
=
varinfo
)
v2
=
Variable
(
value
=
9999
,
instance
_nonce
=
1
,
varinfo
=
varinfo
)
assert
v1
.
uhash
!=
v2
.
uhash
assert
v1
!=
v2
assert
v1
.
value
==
v2
.
value
v2
=
Variable
(
uhash
=
v1
,
uhash
_nonce
=
1
,
varinfo
=
varinfo
)
v2
=
Variable
(
uhash
=
v1
,
instance
_nonce
=
1
,
varinfo
=
varinfo
)
assert
v1
.
uhash
!=
v2
.
uhash
assert
v1
!=
v2
assert
v1
.
value
!=
v2
.
value
v2
=
Variable
(
uhash
=
v1
.
uhash
,
uhash
_nonce
=
1
,
varinfo
=
varinfo
)
v2
=
Variable
(
uhash
=
v1
.
uhash
,
instance
_nonce
=
1
,
varinfo
=
varinfo
)
assert
v1
.
uhash
!=
v2
.
uhash
assert
v1
!=
v2
assert
v1
.
value
!=
v2
.
value
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment