Commit Graph
69871 Commits
Author SHA1 Message Date
Lucille Delisle 4e15e6929e Fix maf_thread_for_species.py 2023-11-08 10:45:11 +01:00
Marius van den Beek cd93598b87 Merge pull request #16917 from mvdbeek/improve_invocation_error_reporting
[23.1] Improve invocation error reporting
2023-10-25 16:59:50 +02:00
mvdbeek ce38206990 Extend tests for new invocation failure messages 2023-10-25 13:26:31 +02:00
mvdbeek c351301602 Include failing step for unexpected failures, turn more exceptions into MessageExceptions 2023-10-25 11:53:29 +02:00
mvdbeek 285db62fd3 Improve invocation error reporting when step requires datasets in ok state 2023-10-25 10:39:41 +02:00
Nicola Soranzo 2bf06010ea Merge pull request #16910 from mvdbeek/sort1_fix
[23.1] Fix missing grep input in sort1 tool
2023-10-24 18:20:22 +01:00
Matthias Bernt 856930eef6 Fix missing grep input in sort1 tool 2023-10-24 15:14:50 +02:00
Dannon 575e05aff5 Merge pull request #16905 from mvdbeek/no_500_history
[23.1] Provide error message instead of internal server error
2023-10-24 08:20:19 -04:00
Marius van den Beek 7d9c230c73 Merge pull request #16906 from mvdbeek/fix_unbound_runner
[23.1] Fix unbound ``runner`` variable when there is an error in the job config
2023-10-24 13:16:43 +02:00
mvdbeek 81e9d52b4a Fix unbound runner variable when there is an error in the job config
Fixes
```
UnboundLocalError: local variable 'runner' referenced before assignment
  File "galaxy/jobs/handler.py", line 541, in __handle_waiting_jobs
    self.dispatcher.put(self.job_wrappers.pop(job.id))
  File "galaxy/jobs/handler.py", line 1224, in put
    runner = self.get_job_runner(job_wrapper, get_task_runner=True)
  File "galaxy/jobs/handler.py", line 1221, in get_job_runner
    return runner
```
from https://sentry.galaxyproject.org/share/issue/a0a0049feb53487f9c84ede3784624b0/
which followed `(53095435) Invalid job runner: bridges`.
2023-10-24 11:40:40 +02:00
mvdbeek 424695763b Provide error message instead of internal server error 2023-10-24 11:03:17 +02:00
Dannon bdbcd7297b Merge pull request #16889 from ahmedhamidawan/history_items_invisible_delete_bug
[23.1] Fix History item deletion/undeletion reactivity with filter and `ToolForm` input field
2023-10-23 21:38:49 -04:00
mvdbeek 3dd88a4357 Start work on 23.1.2.dev0 2023-10-23 21:35:28 +02:00
mvdbeek e77b17df06 Create version 23.1.1 v23.1.1 2023-10-23 21:35:24 +02:00
Ahmed Awan 6e2b77111c turn itemsLoaded back to computed to fix selenium 2023-10-23 11:21:16 -05:00
mvdbeek 5aeff97113 Merge branch 'release_23.0' into release_23.1
# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg
2023-10-23 18:01:52 +02:00
mvdbeek e88541e645 Start work on 23.0.7.dev0 2023-10-23 18:01:40 +02:00
mvdbeek bce8be24fe Create version 23.0.6 v23.0.6 2023-10-23 18:01:36 +02:00
Marius van den Beek 41e06d0060 Merge pull request #16879 from davelopez/23.1_fix_delete_collection
[23.1] Fix delete collection + elements
2023-10-23 17:27:46 +02:00
davelopez 905a85cc11 Remove unnecessary update if the element was already deleted in bulk 2023-10-23 16:02:46 +02:00
David LópezandMarius van den Beek b7eea2fc8a Fix typo
Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
2023-10-23 15:48:18 +02:00
davelopez 672518c815 Unify bulk delete/purge behavior on collections
Use the same default behavior as "bulk purge" and mark also elements as deleted.
2023-10-20 10:37:18 +02:00
Ahmed Awan 38e50499db content items wait until latest payload to show input/output highlight 2023-10-19 18:17:04 -05:00
Ahmed Awan d44934f1c5 fix deletetion/undeletion reactivity with FormDisplay data input 2023-10-19 17:27:28 -05:00
Ahmed Awan cf782d2630 Fix HistoryPanel filter reactivity with deletions/undeletions 2023-10-19 15:41:50 -05:00
davelopez 4656698fb5 Add asserts on history contents in tests 2023-10-19 17:48:07 +02:00
davelopez 74cbf8353d Refactor API tests 2023-10-19 14:23:25 +02:00
davelopez 1ea7ee0605 Exclude from usage DCEs contained in deleted collections 2023-10-19 14:23:07 +02:00
davelopez 3cfad7ef74 Add API tests for deleting collections in bulk 2023-10-19 13:43:00 +02:00
davelopez 5173906f63 Delete orphaned and hidden datasets in collection
When deleting the collection via history bulk delete
2023-10-19 13:42:29 +02:00
Björn Grüning e4c467794f Merge pull request #16880 from mvdbeek/fix_nested_collection_query
[23.1] Fix join condition for nested collection query
2023-10-18 22:35:42 +02:00
mvdbeek e617099feb Fix join condition for nested collection query
For a list:list:list collection this brings the query from 12.5 seconds
(after the database cache is already hot ...) to 11 ms
2023-10-18 18:17:56 +02:00
Marius van den Beek cdbbbbe268 Merge pull request #16877 from mvdbeek/fix_tag_ownership_check
[23.1] Fix tag ownership check
2023-10-18 17:23:08 +02:00
Marius van den Beek b116321913 Merge pull request #16875 from mvdbeek/eliminate_more_flushes
[23.1] Remove more flushes in database operation tools
2023-10-18 17:20:06 +02:00
davelopez eed12c4a9a Display menu when deleting a collection
- Allow to delete only the top collection or also the items contained
2023-10-18 17:03:59 +02:00
mvdbeek f979572501 Remove more flushes in database operation tools
We sort of rely on the dataset not being flushed yet in order to bypass
the security check for tagging post job actions, so this fixes:

```
ItemOwnershipException: User does not own item.
  File "galaxy/workflow/run.py", line 233, in invoke
    incomplete_or_none = self._invoke_step(workflow_invocation_step)
  File "galaxy/workflow/run.py", line 309, in _invoke_step
    incomplete_or_none = invocation_step.workflow_step.module.execute(
  File "galaxy/workflow/modules.py", line 2274, in execute
    workflow_invocation_uuid=invocation.uuid.hex,
  File "galaxy/tools/execute.py", line 169, in execute
    execute_single_job(execution_slice, completed_jobs[i], skip=skip)
  File "galaxy/tools/execute.py", line 116, in execute_single_job
    job, result = tool.handle_single_execution(
  File "galaxy/tools/__init__.py", line 1957, in handle_single_execution
    execution_cache=execution_cache,
  File "galaxy/tools/__init__.py", line 1937, in handle_single_execution
    execution_slice,
  File "galaxy/tools/__init__.py", line 2034, in execute
    args[key] = model.User.expand_user_properties(trans.user, param.value)
  File "galaxy/tools/actions/model_operations.py", line 102, in execute
    job_callback(job)
  File "galaxy/workflow/modules.py", line 2284, in <lambda>
    complete = True
  File "galaxy/workflow/modules.py", line 2351, in _handle_post_job_actions
    self.trans.sa_session.add(pjaa)
  File "galaxy/job_execution/actions/post.py", line 575, in execute
    ActionBox.actions[pja.action_type].execute(
  File "galaxy/job_execution/actions/post.py", line 473, in execute
    cls._execute(tag_handler, job.user, dataset_assoc.dataset, tags)
  File "galaxy/job_execution/actions/post.py", line 481, in _execute
    tag_handler.add_tags_from_list(user, output, tags, flush=False)
  File "galaxy/model/tags.py", line 74, in add_tags_from_list
    return self.set_tags_from_list(user, item, new_tags_set, flush=flush)
  File "galaxy/model/tags.py", line 92, in set_tags_from_list
    self.delete_item_tags(user, item)
  File "galaxy/model/tags.py", line 165, in delete_item_tags
    self._ensure_user_owns_item(user, item)
  File "galaxy/model/tags.py", line 193, in _ensure_user_owns_item
    raise ItemOwnershipException("User does not own item.")
```
(once again).

From https://sentry.galaxyproject.org/share/issue/5b44d1ec20094a2ebe8331b1ef6e58a8/
2023-10-18 13:47:25 +02:00
mvdbeek cd9d132ee1 Fix tag ownership check
I think that in the tool evaluation context we don't actually need the
cached_id performance tweak: we batch flushes now on map over creation
... which in fact breaks the assumption that we're setting the user id
here.
2023-10-18 13:42:39 +02:00
mvdbeek 53f372aeee Add test for PJA that tags output collection
... from database operation tool.
2023-10-18 13:42:39 +02:00
Marius van den Beek 634d04f673 Merge pull request #16861 from mvdbeek/label_only_markdown_report
[23.1] Allow referring to steps by label only in markdown editor
2023-10-17 19:06:13 +02:00
John Davis bf1df292e0 Merge pull request #16869 from mvdbeek/fix_step_copy
[23.1] Fix workflow import losing tool_version
2023-10-17 12:42:11 -04:00
Nicola Soranzo fef87ab3bb Merge pull request #16865 from mvdbeek/add_filter1_bump_to_workflow_safe_update_versions
[23.1] Fix safe update version handling in run form
2023-10-17 16:23:16 +01:00
mvdbeek 94a12eee30 Copy `tool_version` on workflow steps when copying workflows
This is a problem when importing a shared workflow.
2023-10-17 17:01:28 +02:00
Marius van den BeekandNicola Soranzo 13b0696ee9 Drop unnecessary checks
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2023-10-17 14:34:33 +02:00
mvdbeek a2b7c864ba Skip run form warning if we know upgrade is safe
Should fix warning for built-in tools in run form.
Also makes the check more strict by checking that the version requested
in the module is actually in the safe range.
2023-10-17 14:34:33 +02:00
mvdbeek 2e502a7d53 Add test for version handling in run form 2023-10-17 14:34:33 +02:00
mvdbeek 5fb9ac4d1d Fail gracefully if step reference not found 2023-10-17 11:15:43 +02:00
mvdbeek 6d8cbeecb5 Allow referring to steps by label only in markdown editor 2023-10-17 10:38:25 +02:00
Marius van den Beek d01a21a9bd Merge pull request #16855 from mvdbeek/file_size_debug
[23.1] Fix and prevent persisting null file_size
2023-10-16 15:53:31 +02:00
mvdbeek 7e41cce56d Set size for null datasets 2023-10-15 23:25:24 +02:00
mvdbeek 23d938f7f9 Fix dataset collection unit tests 2023-10-15 22:10:44 +02:00