Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gga_load_data
Manage
Activity
Members
Labels
Plan
Issues
12
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
abims
e-infra
gga_load_data
Commits
2eed9230
Commit
2eed9230
authored
3 years ago
by
Arthur Le Bars
Browse files
Options
Downloads
Patches
Plain Diff
fix for chado ids
parent
3a5a747b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!9
Release 2.0 (merge dev to master)
,
!5
Workflow v2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
run_workflow_phaeoexplorer.py
+4
-4
4 additions, 4 deletions
run_workflow_phaeoexplorer.py
with
4 additions
and
4 deletions
run_workflow_phaeoexplorer.py
+
4
−
4
View file @
2eed9230
...
...
@@ -287,7 +287,7 @@ class RunWorkflow(speciesData.SpeciesData):
org_job_out_id
=
add_org_job
[
"
outputs
"
][
0
][
"
id
"
]
org_json_output
=
self
.
instance
.
datasets
.
download_dataset
(
dataset_id
=
org_job_out_id
)
org_output
=
json
.
loads
(
org_json_output
)
org_id
=
str
(
org
anism
_output
_dict
[
"
organism_id
"
])
# id needs to be a str to be recognized by chado tools
org_id
=
str
(
org_output
[
"
organism_id
"
])
# id needs to be a str to be recognized by chado tools
else
:
add_org_job
=
self
.
instance
.
tools
.
run_tool
(
tool_id
=
"
toolshed.g2.bx.psu.edu/repos/gga/chado_organism_add_organism/organism_add_organism/%s
"
%
tool_version
,
...
...
@@ -299,7 +299,7 @@ class RunWorkflow(speciesData.SpeciesData):
org_job_out_id
=
add_org_job
[
"
outputs
"
][
0
][
"
id
"
]
org_json_output
=
self
.
instance
.
datasets
.
download_dataset
(
dataset_id
=
org_job_out_id
)
org_output
=
json
.
loads
(
org_json_output
)
org_id
=
str
(
org
anism
_output
_dict
[
"
organism_id
"
])
# id needs to be a str to be recognized by chado tools
org_id
=
str
(
org_output
[
"
organism_id
"
])
# id needs to be a str to be recognized by chado tools
get_analyses
=
self
.
instance
.
tools
.
run_tool
(
...
...
@@ -338,7 +338,7 @@ class RunWorkflow(speciesData.SpeciesData):
analysis_json_output
=
self
.
instance
.
datasets
.
download_dataset
(
dataset_id
=
analysis_job_out_id
)
analysis_output
=
json
.
loads
(
analysis_json_output
)
ogs_analysis_id
=
analysis_output
[
"
analysis_id
"
]
ogs_analysis_id
=
str
(
analysis_
output_dict
[
"
analysis_id
"
])
ogs_analysis_id
=
str
(
ogs_
analysis_
id
[
"
analysis_id
"
])
if
genome_analysis_id
is
None
:
add_genome_analysis_job
=
self
.
instance
.
tools
.
run_tool
(
...
...
@@ -353,7 +353,7 @@ class RunWorkflow(speciesData.SpeciesData):
analysis_job_out_id
=
analysis_outputs
[
0
][
"
id
"
]
analysis_json_output
=
self
.
instance
.
datasets
.
download_dataset
(
dataset_id
=
analysis_job_out_id
)
analysis_output
=
json
.
loads
(
analysis_json_output
)
genome_analysis_id
=
str
(
analysis_output
_dict
[
"
analysis_id
"
])
genome_analysis_id
=
str
(
analysis_output
[
"
analysis_id
"
])
print
({
"
org_id
"
:
org_id
,
"
genome_analysis_id
"
:
genome_analysis_id
,
"
ogs_analysis_id
"
:
ogs_analysis_id
})
return
({
"
org_id
"
:
org_id
,
"
genome_analysis_id
"
:
genome_analysis_id
,
"
ogs_analysis_id
"
:
ogs_analysis_id
})
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment