Commit Graph
10827 Commits
Author SHA1 Message Date
Nicola Soranzo bd1349eb9b Merge pull request #1274 from jmchilton/workflow_fix_3
Fix tool shed tests for recent workflow changes.
2015-12-09 16:20:02 +00:00
John Chilton 37931505d4 Fix tool shed tests for recent workflow changes.
Thanks for bug report by @nsoranzo on https://github.com/galaxyproject/galaxy/pull/1263.
2015-12-09 10:26:57 +00:00
carlfeberhard a033d798de Remove: history_options and options.mako (history options as a page) 2015-12-08 16:02:49 -05:00
Martin Cech 864472870f Merge pull request #1267 from erasche/install-logging
Log command executed during package installation
2015-12-08 14:06:21 -05:00
Eric Rasche b273e3b0c5 Improve logging during package installation 2015-12-08 13:03:03 -06:00
Martin Cech 6d16549a46 Merge pull request #1262 from carlfeberhard/fix.js-app-mako
Managers, users: properly return a boolean from has_requests
2015-12-08 12:44:36 -05:00
Martin Cech fe1c9dd293 Merge pull request #1251 from jmchilton/workflow_labels_2
Workflow Editor UI for Step Labels
2015-12-08 12:04:26 -05:00
carlfeberhard 38a9aa6a5c Managers, users: update serialized key 'requests' to 'has_requests', update test 2015-12-08 11:43:15 -05:00
carlfeberhard 7f4c3fcfc8 Managers, users: properly return a boolean from has_requests 2015-12-08 11:20:16 -05:00
Nicola Soranzo bcf8ddfbd0 Merge branch 'master' into dev
Conflicts:
	lib/galaxy/jobs/runners/__init__.py
2015-12-07 15:23:04 +00:00
Martin Cech 01a919ce6a Merge pull request #1253 from nsoranzo/dev_verify_tools
Tool migration: do not mess with galaxy_config_file, if provided.
2015-12-07 08:56:14 -05:00
John Chilton 371125bc87 Merge pull request #1111 from erasche/user-search-name
Add search on username/any for API calls to user, use Select2 for sharing workflows/pages/histories
2015-12-06 16:17:34 -05:00
John Chilton 3a023f4cae Merge pull request #818 from mvdbeek/cross_toolshed_tool_fetching
Look up installed tools from different toolshed(s)
2015-12-06 15:56:31 -05:00
John Chilton 53354c7e36 Fix collection output for less flushing in tool action handle_output. 2015-12-06 14:32:05 +00:00
John Chilton c14c45be46 Further cache user roles across batched tool executions. 2015-12-06 14:32:05 +00:00
John Chilton 836b0dfc15 Fix location of timer generation for fairer comparison in next commit. 2015-12-06 14:32:05 +00:00
John Chilton 2c6819cd87 Tool optimization - eliminate repeated role generation.
For cat1 with 5 inputs - this shaves about 100 ms off of job execution time.

Before:

 galaxy.tools.execute DEBUG 2015-12-01 15:08:56,745 Tool [cat1] created job [171] (545.776 ms)
 galaxy.tools.execute DEBUG 2015-12-01 15:08:31,871 Tool [cat1] created job [170] (478.813 ms)

After :

 galaxy.tools.execute DEBUG 2015-12-01 15:07:11,401 Tool [cat1] created job [168] (371.722 ms)
 galaxy.tools.execute DEBUG 2015-12-01 15:07:42,060 Tool [cat1] created job [169] (333.296 ms)
2015-12-06 14:32:05 +00:00
John Chilton e72604be7c Instrument upload action for timing.
- Checked and cleanup datasets ~500ms
 - Create job ~200ms
 - Persisting ~20 ms
2015-12-06 14:32:05 +00:00
John Chilton 3bf466c8f5 Micro optimization in tool execute - eliminate repeated trans.app fetch. 2015-12-06 14:32:03 +00:00
John Chilton 59c3acfbf5 Tool execution optimization - remove another unneeded flush.
Flush the job and its output datasets all at the same time in one transaction.

Inuitively it makes sense that this should work and the timings seem to improve, triming another quater or third of the submission time per job.

Before:

 - galaxy.tools.execute DEBUG 2015-12-01 12:58:51,154 Tool [cat1] created job [21] (261.932 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 12:59:11,354 Tool [cat1] created job [22] (278.699 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 12:59:43,105 Tool [cat1] created job [23] (296.438 ms)

After:

 - galaxy.tools.execute DEBUG 2015-12-01 13:22:00,649 Tool [cat1] created job [39] (265.547 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 13:22:27,720 Tool [cat1] created job [40] (214.905 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 13:21:40,225 Tool [cat1] created job [38] (198.936 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 13:22:44,076 Tool [cat1] created job [41] (213.096 ms)
2015-12-06 14:30:09 +00:00
John Chilton bd6a34e279 Tool optimization comments for future reference.
Including replacing a log statement with a comment.
2015-12-06 14:30:09 +00:00
John Chilton 81799bd3a7 Micro-optimizations for adding many datasets to history...
... during tool execution. Build method once instead of in each function call, use imap instead of map since we don't need a list, remove some duplicated checks. Frankly this is all stuff Python is probably doing anyway - but in case it doesn't and just so the eye doesn't jump to these optimizations again.

Timings before and after for a section of tool action execute that includes this additon show that this might have a small effect.

Before:

 - galaxy.tools.actions INFO 2015-12-01 13:11:39,446 Add outputs to history (127.379 ms)
 - galaxy.tools.actions INFO 2015-12-01 13:12:06,598 Add outputs to history (137.029 ms)
 - galaxy.tools.actions INFO 2015-12-01 13:12:23,931 Add outputs to history (118.489 ms)

After:

 - galaxy.tools.actions INFO 2015-12-01 13:13:09,999 Add outputs to history (99.456 ms)
 - galaxy.tools.actions INFO 2015-12-01 13:13:38,573 Add outputs to history (126.131 ms)
 - galaxy.tools.actions INFO 2015-12-01 13:13:54,538 Add outputs to history (137.643 ms)
 - galaxy.tools.actions INFO 2015-12-01 13:14:12,516 Add outputs to history (101.451 ms)
2015-12-06 14:30:09 +00:00
John Chilton 2b8a1423f7 Tool optimization - remove another seemingly needless flush.
Saves around a teenth of a second per job.

Before:

 - galaxy.tools.execute DEBUG 2015-12-01 13:00:56,984 Tool [cat1] created job [24] (435.468 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 13:01:17,296 Tool [cat1] created job [25] (341.687 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 13:01:32,896 Tool [cat1] created job [26] (354.138 ms)

After -

 - galaxy.tools.execute DEBUG 2015-12-01 12:58:51,154 Tool [cat1] created job [21] (261.932 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 12:59:11,354 Tool [cat1] created job [22] (278.699 ms)
 - galaxy.tools.execute DEBUG 2015-12-01 12:59:43,105 Tool [cat1] created job [23] (296.438 ms)
2015-12-06 14:30:09 +00:00
John Chilton 0ac7c33522 Tool optimization and comment improvement. 2015-12-06 14:30:08 +00:00
John Chilton 563e363478 Tool optimization - don't set state to queued twice.
Just keep the dataset in the correct NEW state until it has actually been queued. Addresses FIXME comment added by James 7 years ago in https://github.com/galaxyproject/galaxy/commit/4c3db1af95fb0520960046ae549462aebd78b326.

This behavior feels correct to me, but it does have ramifications in the GUI. I had previously never actually seen a dataset in the "NEW" state.

Saves an extra flush per dataset, on sqlite this translates to 50ms per dataset for me.
2015-12-06 14:30:08 +00:00
carlfeberhard b55635f71b Client, upload: fix passing of nginx_upload_path and ftp_upload_site to upload-view, fix default nginx_upload_path in configuration serializer 2015-12-06 12:10:31 -05:00
John Chilton e3161b4671 Add support for workflow step labels in editor.
- If a step has a label, display it in the step editor side panel title.
 - Allow clicking the title to change the label.
 - Display the label (if set) as the workflow node box title.
 - Add icon to workflow node since the title might not be related to type anymore.
 - Enforce unique labels accross the workflow in the editor.
 - Qunit test cases for some of this behavior and other recent changes.
2015-12-06 12:27:13 +00:00
John Chilton f92220a74f Allow workflow outputs on non-tool steps. 2015-12-06 10:43:09 +00:00
John Chilton 73bfbf0163 Refactor some workflow API code into workflows manager.
This allows for reuse outside of the API controller, such as loading subworkflows downstream.
2015-12-06 10:43:09 +00:00
John Chilton f6d26c9ee6 Small refactor making workflow views and modules tad more generic.
- Reduce duplication between initializing generic modules and tool modules.
 - Switch tool_id to content_id as variable names throughout the client.
 - Rename get_tool_id to get_content_id on workflow modules.
 - Add some minimal documentation to the workflow module about get_content_id.

Downstream in the subworkflow commit I switch the over-the-wire communication to use content_id instead of tool_id also and use content_ids to refer to workflow ids in subworkflow moduls.
2015-12-06 10:43:09 +00:00
John Chilton f17a6c996a Synchronize decoding ids across base controller and manager base.
To ensure we have the same kind of exception thrown in both cases.
2015-12-06 10:43:09 +00:00
John Chilton 98249058e8 Cleanup error message.
Thanks @bgruening.
2015-12-06 09:50:55 +00:00
Martin Cech e12179b016 Merge pull request #1211 from gregvonkuster/dev
Enhance the VTK datatypes to support cell data in addition to point
2015-12-05 19:19:03 -05:00
Björn Grüning 4d252119fd Merge pull request #1216 from jmchilton/workflow_tweaks_1
More small workflow tweaks.
2015-12-05 21:38:34 +01:00
Björn Grüning 6126bd0e93 Merge pull request #1214 from jmchilton/format_2_1
Small enhancements in workflow inputs and outputs
2015-12-05 21:37:50 +01:00
Greg Von Kuster 3069e12ca7 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev 2015-12-05 15:04:08 -05:00
Marius van den Beek 77f034019b Fix failing api test 2015-12-05 14:23:56 +01:00
Marius van den Beek 4f1359a0a6 Merge branch 'dev' of github.com:galaxyproject/galaxy into cross_toolshed_tool_fetching 2015-12-05 12:34:37 +01:00
Marius van den Beek 1be4f85404 Add messages inform users of changes in the tool_id. 2015-12-05 12:28:46 +01:00
mvdbeek 2d168a2c07 Remove whitespaces in blank line. 2015-12-05 12:28:25 +01:00
mvdbeek c040a18b4b Modify get_tool() directly instead of using decorator. 2015-12-05 12:28:16 +01:00
mvdbeek d0a0116753 Enable lookup of tools from other tool sheds. 2015-12-05 12:28:02 +01:00
John Chilton 9f8eb465e7 Merge pull request #1144 from carlfeberhard/webpack
Webpack
2015-12-04 20:21:36 -05:00
Daniel Blankenberg e186b6a0cf Fix for getting shed_config_dict when an old/invalid shed_config_filename has been stored. Fixes issue updating repositories that have had shed_tool_conf.xml changed since installation. 2015-12-04 17:42:33 -05:00
Martin Cech f34d701019 Merge pull request #1242 from jmchilton/sync_path
[15.10] Use fixed path to sync like in dev.
2015-12-04 16:06:47 -05:00
John Chilton 62a26516cd Fix PR #805 for changes in PR #1153. 2015-12-04 20:41:22 +00:00
John Chilton c91a2eb339 Multi data parameter improvements.
Allow multiple collections to be fed to a multi data parameter in one reduction step. Fixes #750 and will really simplify certain classes of tools.

Rebased original with fixes for rerun of such reductions.

Manually tested workflow execution and everything seems fine. The workflow editor already thought this was possible, so that is another bug corrected by this enhancement.

To run the associated API test, execute the following command:

./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_reduce_multiple_lists_on_multi_data

Conflicts:
	static/maps/mvc/dataset/dataset-choice.js.map
	static/maps/mvc/form/form-select-content.js.map
	static/scripts/mvc/form/form-select-content.js
2015-12-04 20:41:21 +00:00
John Chilton 7b3fa824b6 Update worklfow editor representation of workflow outputs.
Modified this for the workflow export representation but this needed to be updated for the workflow editor because they shared some code in the manager. This was going to be needed downstream when I add labels and uuids to workflow outputs anyway.
2015-12-04 20:36:18 +00:00
John Chilton a597e0e834 Implement workflow outputs for format 2 workflow definitions.
Copy CWL style of specifying a outputs specification block at the top-level of the workflow specification and within that use the "source" attribute to specify the output. Reuse the specification used by "$link"s to describe this output - namely <label_or_order_index>[#<output_name=output>].
2015-12-04 20:34:57 +00:00
carlfeberhard 9e8068f367 (merge dev) 2015-12-04 13:17:29 -05:00