Skip to content
Snippets Groups Projects
Commit 5176195a authored by Loraine Gueguen's avatar Loraine Gueguen
Browse files

Merge remote-tracking branch 'origin/workflow_v2' into dev 

# Conflicts:
#	README.md
#	run_workflow_phaeoexplorer.py
parents 8a311f6f 4d4554c4
No related branches found
No related tags found
1 merge request!9Release 2.0 (merge dev to master)
Expand all Hide whitespace changes
Inline Side-by-side
README.md
+ 2
− 2
View file @ 5176195a
......@@ -73,8 +73,8 @@ $ python3 /path/to/repo/gga_load_data.py input_file.yml -c/--config config_file.
- Run a workflow in galaxy:
```bash
$ python3 /path/to/repo/run_workflow_phaeoexplorer.py input_file.yml -c/--config config_file.yml --workflow /path/to/workflow.ga [-v/--verbose] [OPTIONS]
--workflow $WORKFLOW (Path to the workflow to run in galaxy. A couple of preset workflows are available in the "workflows_phaeoexplorer" folder)
$ python3 /path/to/repo/run_workflow_phaeoexplorer.py input_file.yml -c/--config config_file --workflow workflow_type [-v/--verbose] [OPTIONS]
--workflow (Valid options: "chado_load_fasta_gff_jbrowse", "blast", "interpro", preset workflows are available in the "workflows_phaeoexplorer" directory)
--main-directory $PATH (Path where to access stacks; default=current directory)
```
......
run_workflow_phaeoexplorer.py
+ 752
− 572
View file @ 5176195a
This diff is collapsed.
workflows_phaeoexplorer/Galaxy-Workflow-load_blast_results_1org_v1.ga 0 → 100644
+ 271
− 0
View file @ 5176195a
{
"a_galaxy_workflow": "true",
"annotation": "",
"format-version": "0.1",
"name": "load_blast_results_1org_v1",
"steps": {
"0": {
"annotation": "",
"content_id": null,
"errors": null,
"id": 0,
"input_connections": {},
"inputs": [
{
"description": "",
"name": "blast file xml org1"
}
],
"label": "blast file xml org1",
"name": "Input dataset",
"outputs": [],
"position": {
"bottom": 416.1999969482422,
"height": 82.19999694824219,
"left": 410,
"right": 610,
"top": 334,
"width": 200,
"x": 410,
"y": 334
},
"tool_id": null,
"tool_state": "{\"optional\": false}",
"tool_version": null,
"type": "data_input",
"uuid": "b1c63d94-61a7-4bf1-8b5d-e08fb34c0357",
"workflow_outputs": [
{
"label": null,
"output_name": "output",
"uuid": "f602d234-8cea-4db9-ab77-678cdc0d2101"
}
]
},
"1": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/chado_load_blast/load_blast/2.3.4+galaxy0",
"errors": null,
"id": 1,
"input_connections": {
"input": {
"id": 0,
"output_name": "output"
}
},
"inputs": [
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "analysis_id"
},
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "input"
},
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "organism_id"
},
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "wait_for"
}
],
"label": "load blast results org1",
"name": "Chado load Blast results",
"outputs": [
{
"name": "results",
"type": "json"
}
],
"position": {
"bottom": 457.3999938964844,
"height": 164.39999389648438,
"left": 711,
"right": 911,
"top": 293,
"width": 200,
"x": 711,
"y": 293
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/chado_load_blast/load_blast/2.3.4+galaxy0",
"tool_shed_repository": {
"changeset_revision": "08ae8b27b193",
"name": "chado_load_blast",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"analysis_id\": {\"__class__\": \"RuntimeValue\"}, \"blastdb_id\": \"21\", \"input\": {\"__class__\": \"RuntimeValue\"}, \"match_on_name\": \"false\", \"organism_id\": {\"__class__\": \"RuntimeValue\"}, \"psql_target\": {\"method\": \"remote\", \"__current_case__\": 0}, \"query_type\": \"polypeptide\", \"re_name\": \"\", \"skip_missing\": \"false\", \"wait_for\": {\"__class__\": \"RuntimeValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "2.3.4+galaxy0",
"type": "tool",
"uuid": "10144cf8-f121-45f3-ba64-9f4d66bf1e56",
"workflow_outputs": [
{
"label": null,
"output_name": "results",
"uuid": "95708895-8439-4257-bff6-96e4c51a0725"
}
]
},
"2": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_analysis_sync/analysis_sync/3.2.1.0",
"errors": null,
"id": 2,
"input_connections": {
"wait_for": {
"id": 1,
"output_name": "results"
}
},
"inputs": [
{
"description": "runtime parameter for tool Synchronize an analysis",
"name": "analysis_id"
}
],
"label": "sync blast analysis org1",
"name": "Synchronize an analysis",
"outputs": [
{
"name": "results",
"type": "json"
}
],
"position": {
"bottom": 451.3999938964844,
"height": 154.39999389648438,
"left": 1010,
"right": 1210,
"top": 297,
"width": 200,
"x": 1010,
"y": 297
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_analysis_sync/analysis_sync/3.2.1.0",
"tool_shed_repository": {
"changeset_revision": "f487ff676088",
"name": "tripal_analysis_sync",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"analysis_id\": {\"__class__\": \"RuntimeValue\"}, \"wait_for\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "3.2.1.0",
"type": "tool",
"uuid": "99e7496d-ac32-467d-8c09-2efd48d0231a",
"workflow_outputs": [
{
"label": "Synchronize Analysis into Tripal",
"output_name": "results",
"uuid": "1fb6db92-90a2-4e33-beec-f2f974e369e9"
}
]
},
"3": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_db_populate_mviews/db_populate_mviews/3.2.1.0",
"errors": null,
"id": 3,
"input_connections": {
"wait_for": {
"id": 2,
"output_name": "results"
}
},
"inputs": [],
"label": "populate mat views",
"name": "Populate materialized views",
"outputs": [
{
"name": "results",
"type": "txt"
}
],
"position": {
"bottom": 452.3999938964844,
"height": 154.39999389648438,
"left": 1295,
"right": 1495,
"top": 298,
"width": 200,
"x": 1295,
"y": 298
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_db_populate_mviews/db_populate_mviews/3.2.1.0",
"tool_shed_repository": {
"changeset_revision": "3c08f32a3dc1",
"name": "tripal_db_populate_mviews",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"mview\": \"\", \"wait_for\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "3.2.1.0",
"type": "tool",
"uuid": "5c947dd5-89df-4146-9ab8-9e1d6de42360",
"workflow_outputs": [
{
"label": "Populate Tripal materialized view(s)",
"output_name": "results",
"uuid": "0a0c9fa7-3a3c-459d-b5c7-b7a5a11459f3"
}
]
},
"4": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_db_index/db_index/3.2.1.1",
"errors": null,
"id": 4,
"input_connections": {
"wait_for": {
"id": 3,
"output_name": "results"
}
},
"inputs": [],
"label": "index tripal data",
"name": "Index Tripal data",
"outputs": [
{
"name": "results",
"type": "txt"
}
],
"position": {
"bottom": 433.6000061035156,
"height": 113.60000610351562,
"left": 1570,
"right": 1770,
"top": 320,
"width": 200,
"x": 1570,
"y": 320
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_db_index/db_index/3.2.1.1",
"tool_shed_repository": {
"changeset_revision": "d55a39f12dda",
"name": "tripal_db_index",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"expose\": {\"do_expose\": \"no\", \"__current_case__\": 0}, \"queues\": \"10\", \"table\": {\"mode\": \"website\", \"__current_case__\": 0}, \"tokenizer\": \"standard\", \"wait_for\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "3.2.1.1",
"type": "tool",
"uuid": "5ecc30b0-07ab-4f9b-81f0-31310358c221",
"workflow_outputs": [
{
"label": "Index Tripal data",
"output_name": "results",
"uuid": "5c0f0431-acb0-4e40-a7e4-8a562933fd97"
}
]
}
},
"tags": [],
"uuid": "80e32784-e39e-48ce-a6e3-7627de734ca6",
"version": 4
}
\ No newline at end of file
workflows_phaeoexplorer/Galaxy-Workflow-load_blast_results_2org_v1.ga 0 → 100644
+ 439
− 0
View file @ 5176195a
{
"a_galaxy_workflow": "true",
"annotation": "",
"format-version": "0.1",
"name": "load_blast_results_2org_v1",
"steps": {
"0": {
"annotation": "",
"content_id": null,
"errors": null,
"id": 0,
"input_connections": {},
"inputs": [
{
"description": "",
"name": "blast file xml org1"
}
],
"label": "blast file xml org1",
"name": "Input dataset",
"outputs": [],
"position": {
"bottom": 230.39999389648438,
"height": 61.19999694824219,
"left": 97.5,
"right": 297.5,
"top": 169.1999969482422,
"width": 200,
"x": 97.5,
"y": 169.1999969482422
},
"tool_id": null,
"tool_state": "{\"optional\": false}",
"tool_version": null,
"type": "data_input",
"uuid": "b1c63d94-61a7-4bf1-8b5d-e08fb34c0357",
"workflow_outputs": [
{
"label": null,
"output_name": "output",
"uuid": "72006174-6297-4777-95bd-ca427b9ea729"
}
]
},
"1": {
"annotation": "",
"content_id": null,
"errors": null,
"id": 1,
"input_connections": {},
"inputs": [
{
"description": "",
"name": "blast file xml org2"
}
],
"label": "blast file xml org2",
"name": "Input dataset",
"outputs": [],
"position": {
"bottom": 341.40000915527344,
"height": 61.19999694824219,
"left": 129.5,
"right": 329.5,
"top": 280.20001220703125,
"width": 200,
"x": 129.5,
"y": 280.20001220703125
},
"tool_id": null,
"tool_state": "{\"optional\": false}",
"tool_version": null,
"type": "data_input",
"uuid": "9de2716c-eecd-48fc-8a71-b3d1f5daef85",
"workflow_outputs": [
{
"label": null,
"output_name": "output",
"uuid": "45971e82-4e85-4993-a9cb-9a4608e9def7"
}
]
},
"2": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/chado_load_blast/load_blast/2.3.4+galaxy0",
"errors": null,
"id": 2,
"input_connections": {
"input": {
"id": 0,
"output_name": "output"
}
},
"inputs": [
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "analysis_id"
},
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "organism_id"
},
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "wait_for"
}
],
"label": "load blast results org1",
"name": "Chado load Blast results",
"outputs": [
{
"name": "results",
"type": "json"
}
],
"position": {
"bottom": 255.8000030517578,
"height": 163.60000610351562,
"left": 457.5,
"right": 657.5,
"top": 92.19999694824219,
"width": 200,
"x": 457.5,
"y": 92.19999694824219
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/chado_load_blast/load_blast/2.3.4+galaxy0",
"tool_shed_repository": {
"changeset_revision": "08ae8b27b193",
"name": "chado_load_blast",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"analysis_id\": {\"__class__\": \"RuntimeValue\"}, \"blastdb_id\": \"21\", \"input\": {\"__class__\": \"ConnectedValue\"}, \"match_on_name\": \"false\", \"organism_id\": {\"__class__\": \"RuntimeValue\"}, \"psql_target\": {\"method\": \"remote\", \"__current_case__\": 0}, \"query_type\": \"polypeptide\", \"re_name\": \"\", \"skip_missing\": \"false\", \"wait_for\": {\"__class__\": \"RuntimeValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "2.3.4+galaxy0",
"type": "tool",
"uuid": "595f6e1f-955a-42be-b03b-1269d1f7d189",
"workflow_outputs": [
{
"label": null,
"output_name": "results",
"uuid": "cb238779-29f4-4f22-b6f3-6a8cc84857d1"
}
]
},
"3": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_analysis_sync/analysis_sync/3.2.1.0",
"errors": null,
"id": 3,
"input_connections": {
"wait_for": {
"id": 2,
"output_name": "results"
}
},
"inputs": [
{
"description": "runtime parameter for tool Synchronize an analysis",
"name": "analysis_id"
},
{
"description": "runtime parameter for tool Synchronize an analysis",
"name": "wait_for"
}
],
"label": "sync blast analysis org1",
"name": "Synchronize an analysis",
"outputs": [
{
"name": "results",
"type": "json"
}
],
"position": {
"bottom": 254.8000030517578,
"height": 153.60000610351562,
"left": 787.5,
"right": 987.5,
"top": 101.19999694824219,
"width": 200,
"x": 787.5,
"y": 101.19999694824219
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_analysis_sync/analysis_sync/3.2.1.0",
"tool_shed_repository": {
"changeset_revision": "f487ff676088",
"name": "tripal_analysis_sync",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"analysis_id\": {\"__class__\": \"RuntimeValue\"}, \"wait_for\": {\"__class__\": \"RuntimeValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "3.2.1.0",
"type": "tool",
"uuid": "c98dedf6-8857-4d23-be94-fe6630f245d7",
"workflow_outputs": [
{
"label": "Synchronize Analysis into Tripal",
"output_name": "results",
"uuid": "1ff4b1db-b6bf-4c48-a0ab-0a8513683999"
}
]
},
"4": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/chado_load_blast/load_blast/2.3.4+galaxy0",
"errors": null,
"id": 4,
"input_connections": {
"input": {
"id": 1,
"output_name": "output"
},
"wait_for": {
"id": 3,
"output_name": "results"
}
},
"inputs": [
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "analysis_id"
},
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "input"
},
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "organism_id"
},
{
"description": "runtime parameter for tool Chado load Blast results",
"name": "wait_for"
}
],
"label": "load blast results org2",
"name": "Chado load Blast results",
"outputs": [
{
"name": "results",
"type": "json"
}
],
"position": {
"bottom": 439.8000183105469,
"height": 163.60000610351562,
"left": 520.5,
"right": 720.5,
"top": 276.20001220703125,
"width": 200,
"x": 520.5,
"y": 276.20001220703125
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/chado_load_blast/load_blast/2.3.4+galaxy0",
"tool_shed_repository": {
"changeset_revision": "08ae8b27b193",
"name": "chado_load_blast",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"analysis_id\": {\"__class__\": \"RuntimeValue\"}, \"blastdb_id\": \"21\", \"input\": {\"__class__\": \"RuntimeValue\"}, \"match_on_name\": \"false\", \"organism_id\": {\"__class__\": \"RuntimeValue\"}, \"psql_target\": {\"method\": \"remote\", \"__current_case__\": 0}, \"query_type\": \"polypeptide\", \"re_name\": \"\", \"skip_missing\": \"false\", \"wait_for\": {\"__class__\": \"RuntimeValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "2.3.4+galaxy0",
"type": "tool",
"uuid": "a7ec5c91-7cef-4b9f-95a0-ed5542b8e142",
"workflow_outputs": [
{
"label": null,
"output_name": "results",
"uuid": "119f219e-3d80-4b42-bb38-d07d4583048c"
}
]
},
"5": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_analysis_sync/analysis_sync/3.2.1.0",
"errors": null,
"id": 5,
"input_connections": {
"wait_for": {
"id": 4,
"output_name": "results"
}
},
"inputs": [
{
"description": "runtime parameter for tool Synchronize an analysis",
"name": "analysis_id"
},
{
"description": "runtime parameter for tool Synchronize an analysis",
"name": "wait_for"
}
],
"label": "sync blast analysis org2",
"name": "Synchronize an analysis",
"outputs": [
{
"name": "results",
"type": "json"
}
],
"position": {
"bottom": 440.8000183105469,
"height": 153.60000610351562,
"left": 828.5,
"right": 1028.5,
"top": 287.20001220703125,
"width": 200,
"x": 828.5,
"y": 287.20001220703125
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_analysis_sync/analysis_sync/3.2.1.0",
"tool_shed_repository": {
"changeset_revision": "f487ff676088",
"name": "tripal_analysis_sync",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"analysis_id\": {\"__class__\": \"RuntimeValue\"}, \"wait_for\": {\"__class__\": \"RuntimeValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "3.2.1.0",
"type": "tool",
"uuid": "2fff7637-7904-46ff-87e1-ce2721727e75",
"workflow_outputs": [
{
"label": "Synchronize Analysis into Tripal",
"output_name": "results",
"uuid": "924991f3-6dd4-4752-9ce2-3832d72dff57"
}
]
},
"6": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_db_populate_mviews/db_populate_mviews/3.2.1.0",
"errors": null,
"id": 6,
"input_connections": {
"wait_for": {
"id": 5,
"output_name": "results"
}
},
"inputs": [],
"label": "populate mat views",
"name": "Populate materialized views",
"outputs": [
{
"name": "results",
"type": "txt"
}
],
"position": {
"bottom": 368.8000030517578,
"height": 153.60000610351562,
"left": 1103.5,
"right": 1303.5,
"top": 215.1999969482422,
"width": 200,
"x": 1103.5,
"y": 215.1999969482422
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_db_populate_mviews/db_populate_mviews/3.2.1.0",
"tool_shed_repository": {
"changeset_revision": "3c08f32a3dc1",
"name": "tripal_db_populate_mviews",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"mview\": \"\", \"wait_for\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "3.2.1.0",
"type": "tool",
"uuid": "5c947dd5-89df-4146-9ab8-9e1d6de42360",
"workflow_outputs": [
{
"label": "Populate Tripal materialized view(s)",
"output_name": "results",
"uuid": "dc519305-8c27-4c53-9150-7dd37b5090cd"
}
]
},
"7": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_db_index/db_index/3.2.1.1",
"errors": null,
"id": 7,
"input_connections": {
"wait_for": {
"id": 6,
"output_name": "results"
}
},
"inputs": [],
"label": "index tripal data",
"name": "Index Tripal data",
"outputs": [
{
"name": "results",
"type": "txt"
}
],
"position": {
"bottom": 349,
"height": 112.80000305175781,
"left": 1373.5,
"right": 1573.5,
"top": 236.1999969482422,
"width": 200,
"x": 1373.5,
"y": 236.1999969482422
},
"post_job_actions": {},
"tool_id": "toolshed.g2.bx.psu.edu/repos/gga/tripal_db_index/db_index/3.2.1.1",
"tool_shed_repository": {
"changeset_revision": "d55a39f12dda",
"name": "tripal_db_index",
"owner": "gga",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"expose\": {\"do_expose\": \"no\", \"__current_case__\": 0}, \"queues\": \"10\", \"table\": {\"mode\": \"website\", \"__current_case__\": 0}, \"tokenizer\": \"standard\", \"wait_for\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "3.2.1.1",
"type": "tool",
"uuid": "5ecc30b0-07ab-4f9b-81f0-31310358c221",
"workflow_outputs": [
{
"label": "Index Tripal data",
"output_name": "results",
"uuid": "e2911922-2412-4618-97fe-bcc783bb0865"
}
]
}
},
"tags": [],
"uuid": "ffae97b5-698a-41a5-8561-470300594544",
"version": 6
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment