8000 Working on adding entity_message by rcali21 · Pull Request #593 · nipype/pydra · GitHub
[go: up one dir, main page]

Skip to content

Working on adding entity_message #593

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.

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 39 commits into from
Nov 27, 2022
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5b05be5
Working on adding entity_message
Nov 2, 2022
1f236f9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 2, 2022
162b03b
Added GeneratedBy to entity using a path grabber
Nov 2, 2022
5a60569
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 2, 2022
1cc91ef
GeneratedBy populated with path grabber
Nov 2, 2022
ca9d0ea
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 2, 2022
d0770b4
Implemented AtLocation field, tested with input_spec
Nov 3, 2022
3462466
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 3, 2022
096cbb4
Updated tests
Nov 4, 2022
ae543ae
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 4, 2022
ef25055
Removed unused import
Nov 4, 2022
70f15ee
flake8
Nov 4, 2022
7ab3ddf
Updated tests, accounting for duplicate key names
Nov 7, 2022
c4f21af
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 7, 2022
fd625a9
Updated tests, accounting for duplicate key names
Nov 7, 2022
4d447d1
Fixed test
Nov 7, 2022
58e4767
Fixed tests
Nov 7, 2022
e355f21
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 7, 2022
a8c3a37
Added atlocation in tests to meet coverage
Nov 7, 2022
175662f
Added file test, atlocation test, hash test
Nov 18, 2022
0759ab1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 18, 2022
6c3cded
Updated ent. uuid, input_file checks
Nov 18, 2022
7895319
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 18, 2022
8a0d63c
Refactored, cleaned up old comments
Nov 20, 2022
1a5822c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 20, 2022
704d52e
Refactored, cleaned up old comments
Nov 20, 2022
2912ee6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 20, 2022
dfecb8a
Added dict for atlocation, digest tracking, added tests
Nov 22, 2022
9be04d2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 22, 2022
7d3845e
Updated entity_message to be collected per input
Nov 23, 2022
230d0ef
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 23, 2022
d1e3c58
Addressed all issues in audit
Nov 24, 2022
9d037df
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 24, 2022
e73b15b
Addressed all issues in audit
Nov 24, 2022
bf593de
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 24, 2022
118b7cd
Fixed tests
Nov 26, 2022
15a7542
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 26, 2022
662ade1
Added two file test back
Nov 27, 2022
19beeba
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 27, 2022
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
Prev Previous commit
Next Next commit
Implemented AtLocation field, tested with input_spec
  • Loading branch information
Ryan Cali authored and Ryan Cali committed Nov 3, 2022
commit d0770b41ff7ef4be009e4f116e7d45c073dd2015
19 changes: 8 additions & 11 deletions pydra/engine/audit.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,6 @@ def audit_check(self, flag):
def audit_task(self, task):
import subprocess as sp

args_list = [item for item in task.inputs.args if os.path.isfile(item)]
at_location = args_list[0]

label = task.name
entity_label = type(label)

Expand All @@ -184,12 +181,12 @@ def audit_task(self, task):
else:
command = None

# if hasattr(task.inputs, "in_file"):
# input_file = task.in_file
# at_location = os.path.abspath(input_file)
# else:
# at_location = None
# input_file = None
if hasattr(task.inputs, "in_file"):
input_file = task.inputs.in_file
at_location = os.path.abspath(input_file)
else:
at_location = None
input_file = None

# Next question for Dorota...Should we check if
# an output is generated by the task, and if so,
Expand Down Expand Up @@ -227,9 +224,9 @@ def audit_task(self, task):
"@id": self.aid,
"Label": print(entity_label),
"AtLocation": at_location,
"GeneratedBy": "test",
"GeneratedBy": "test", # if not part of workflow, this will be none
"Type": "Task",
"digest": "checksum",
"digest": "checksum" # hash value under helpers.py
}

# new code to be added here for i/o tracking - WIP
Expand Down
0