Commit Graph
35719 Commits
Author SHA1 Message Date
Ahmed Awan 5eb268ae83 fix api and integration tests (for removed panel_labels) 2023-10-13 19:31:09 -05:00
Ahmed Awan 2ee780a9b9 remove panel_labels from api/tools return's section.tools
improve typing
2023-10-13 19:31:09 -05:00
Ahmed Awan 8809476a17 fix all tests to work with the new GET 'api/tools' structure 2023-10-13 19:29:18 -05:00
Ahmed Awan 185e388b18 add ToolSection.panel_labels to api return, to include any sub
sections within a ToolSection
2023-10-13 19:29:18 -05:00
Ahmed Awan 0d21b18d8e Refactor Tool Panel views into one Toolbox
Changed the structure of toolbox received from the backend
ToolBox is now an object of ToolSections (and Tools) by id

Also consolidated `ToolBox` and `ToolBoxWorkflow` into one `ToolBox`
that is contained within a `ToolPanel`. Removed Tool panel providers
and ProviderAware tool boxes
2023-10-13 19:29:15 -05:00
Nicola Soranzo 80cc5dd1bb Merge pull request #16851 from afuetterer/fix-typos
chore: fix typos
2023-10-13 19:00:23 +01:00
Dannon 57985f1b3c Merge pull request #16522 from ahmedhamidawan/reusable_filters_component
Create reusable `FilterMenu` with advanced options
2023-10-13 11:08:38 -04:00
Heinz-Alexander FuettererandNicola Soranzo 347e7b8301 chore: fix typos
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2023-10-13 16:29:27 +02:00
mvdbeek 88487589f1 Merge branch 'release_23.1' into dev 2023-10-13 16:05:28 +02:00
mvdbeek e9bc593ba0 Exclude on_opened and on_closed from watcher events
We're not interested in these. `on_opened` in particular was introduced
in https://github.com/gorakhargosh/watchdog/pull/941 and then partially
reverted in
https://github.com/gorakhargosh/watchdog/commit/25a2d1fec55fc32f97055ba827c8ce7b959acb34,
but that doesn't work for us.

Should fix https://github.com/galaxyproject/galaxy/issues/16840
2023-10-13 12:18:38 +02:00
mvdbeek 01fae97579 Merge branch 'release_23.1' into dev 2023-10-13 11:01:36 +02:00
Dannon 4a397b1358 Merge pull request #16836 from mvdbeek/fix_up_tool_version_handling
[23.1] Fix up local tool version handling
2023-10-12 15:25:11 -04:00
Ahmed Awan 1c37fa90f3 fix seleniums and minor bug fixes for FilterMenu 2023-10-12 13:30:28 -05:00
Ahmed Awan 619ad66d52 fix lint error for workflow advanced search selenium 2023-10-12 10:33:30 -05:00
Ahmed Awan f3969612c8 fix seleniums and adjust navigation.yml for FilterMenu changes 2023-10-12 10:33:29 -05:00
Ahmed Awan 3f19332bc5 add FilterMenu to PageList and fix some jests and seleniums 2023-10-12 10:33:29 -05:00
Dannon Baker 950823d109 Create alembic head merge for 987ce9839ecb, e93c5d0b47a9 2023-10-12 08:04:28 -04:00
Nicola Soranzo d14225d637 Merge branch 'release_23.1' into dev 2023-10-12 12:24:37 +01:00
Nicola Soranzo b34e378623 Merge branch 'release_23.0' into release_23.1 2023-10-12 10:52:59 +01:00
mvdbeek 2b1518387a Extend selenium test for downgrading a tool 2023-10-12 11:43:07 +02:00
mvdbeek 519066ab7c Fix tool version switching for local tools
They don't have the version in the tool id, so we need to explicitly
include tool_version.
2023-10-12 08:58:51 +01:00
mvdbeek 5f1471e1ca Get correct tool version in workflow preview
And remove the step.type is None condition, which I don't think can
happen and even if it can, would have already failed at the module
inection in module_factory.from_workflow_step.
2023-10-12 00:55:10 -04:00
Dannon c38dd5fa98 Merge pull request #16829 from mvdbeek/fix_workflow_displau
[23.1] Fix workflow preview display if tool state does not contain all parameter values
2023-10-11 09:22:57 -04:00
Nicola Soranzo 7fc41423d2 Fix create/install commands for conda 23.9.0
The `--experimental-solver` option was removed.
2023-10-11 13:09:12 +01:00
mvdbeek d989ec37cc Fix display of tools where parameter values have been added 2023-10-10 20:40:19 -04:00
John Chilton 2c8ecfde27 Merge pull request #16799 from jdavcs/dev_ts20_sa20_2
Another batch of SA2.0 edits in TS 2.0
2023-10-10 11:54:29 -04:00
davelopez 97356338b8 Update db revision tags for 23.1 2023-10-10 16:50:39 +02:00
davelopez 239fd39879 Add DB migration to increase external_user_id length 2023-10-10 16:50:28 +02:00
davelopez af7d63b60f Increase length of CustosAuthnzToken.external_user_id 2023-10-10 16:46:54 +02:00
Marius van den Beek 590948116f Merge pull request #16776 from jdavcs/dev_sa20_optimize_iter
Optimize iteration in DatasetInstance model + SA2.0 fix
2023-10-10 10:03:22 -04:00
Nicola Soranzo e074c92cb1 Merge pull request #16807 from galaxybot/dev_auto_update_dependencies
Update Python dependencies
2023-10-09 21:54:57 +02:00
Marius van den Beek fba260564d Merge pull request #16822 from martenson/231-tostring
[23.1] backport of pysam tostring
2023-10-09 15:08:08 -04:00
Martin Cech f3fdd8bb98 Merge pull request #16820 from martenson/231-purge-unampass
[23.1] move the email and username redacting from the role loop
2023-10-09 20:54:24 +02:00
Martin Cech f15c4c42f0 fix the call arguments
https://pysam.readthedocs.io/en/v0.21.0/api.html?highlight=AlignedSegment#pysam.AlignedSegment.tostring
2023-10-09 14:28:15 -04:00
Marius van den BeekandDannon 14fc85cc4e Update outdated comment
Co-authored-by: Dannon <dannon.baker@gmail.com>
2023-10-09 14:28:03 -04:00
mvdbeek a25f98d38a Use AlignedSegment.to_string 2023-10-09 14:27:52 -04:00
Martin Cech 455d9e6b47 remove the email and username redacting frmo the role loop
I guess this worked because user is guaranteed to have a role?
2023-10-09 12:09:43 -04:00
mvdbeek 4df49010b3 Fix parameter display for tools with sections
Fixes:

```
Message
Uncaught exception in exposed API method:
Stack Trace(most recent call first)

TypeError: Object of type method is not JSON serializable
  File "galaxy/util/json.py", line 74, in safe_dumps
    dumped = json.dumps(obj, allow_nan=False, **kwargs)
  File "__init__.py", line 234, in dumps
    return cls(
  File "json/encoder.py", line 199, in encode
    chunks = self.iterencode(o, _one_shot=True)
  File "json/encoder.py", line 257, in iterencode
    return _iterencode(o, 0)
  File "json/encoder.py", line 179, in default
    raise TypeError(f'Object of type {o.__class__.__name__} '
TypeError: Object of type method is not JSON serializable
  File "galaxy/web/framework/decorators.py", line 341, in decorator
    rval = format_return_as_json(rval, jsonp_callback, pretty=trans.debug)
  File "galaxy/web/framework/decorators.py", line 378, in format_return_as_json
    json = safe_dumps(rval, **dumps_kwargs)
  File "galaxy/util/json.py", line 77, in safe_dumps
    dumped = json.dumps(obj, allow_nan=False, **kwargs)
  File "__init__.py", line 234, in dumps
    return cls(
  File "json/encoder.py", line 199, in encode
    chunks = self.iterencode(o, _one_shot=True)
  File "json/encoder.py", line 257, in iterencode
    return _iterencode(o, 0)
  File "json/encoder.py", line 179, in default
    raise TypeError(f'Object of type {o.__class__.__name__} '
```

from https://sentry.galaxyproject.org/share/issue/665556bc240f4a04978f7c81c2be629c/
2023-10-09 12:07:41 -04:00
Marius van den Beek 985c1810de Merge pull request #16805 from martenson/purge-unampass
move the email and username redacting from the role loop
2023-10-09 10:52:02 -04:00
galaxybot 7e0e06825b Update Python dependencies 2023-10-09 15:25:32 +01:00
Martin Cech 4f92d010f5 Merge pull request #16811 from mvdbeek/shed_unit_test_fix
Fix shed unit test
2023-10-09 16:04:15 +02:00
mvdbeek 44903311b5 Avoid AttributeError when accessing toolbox
Fixes:

```
Traceback (most recent call last):
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/webapps/galaxy/buildapp.py", line 59, in app_pair
    app = galaxy.app.UniverseApplication(global_conf=global_conf, is_webapp=True, **kwargs)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/app.py", line 691, in __init__
    self._configure_toolbox()
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/app.py", line 309, in _configure_toolbox
    self._toolbox = tools.ToolBox(self.config.tool_configs, self.config.tool_path, self)
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tools/__init__.py", line 420, in __init__
    super().__init__(
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/toolbox/base.py", line 237, in __init__
    self._load_tool_panel_views()
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/toolbox/base.py", line 600, in _load_tool_panel_views
    self._tool_panel_view_rendered[key] = view.apply_view(self._integrated_tool_panel, registry)
                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/toolbox/views/static.py", line 195, in apply_view
    return definition_with_items_to_panel(root_defintion, items=root_items)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/toolbox/views/static.py", line 87, in definition_with_items_to_panel
    panel = definition_with_items_to_panel(section_def, allow_sections=False)
            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/toolbox/views/static.py", line 142, in definition_with_items_to_panel
    tool = toolbox_registry.get_tool(tool_id)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/toolbox/base.py", line 107, in get_tool
    return self.__toolbox.get_tool(tool_id)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/toolbox/base.py", line 719, in get_tool
    tool_lineage = self._lineage_map.get(tool_id)
                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/toolbox/lineages/factory.py", line 47, in get
    tool = self.app.toolbox._tools_by_id.get(tool_id)
           ^^^^^^^^^^^^^^^^
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/app.py", line 351, in toolbox
    return self._toolbox
           ^^^^^^^^^^^^^
AttributeError: 'UniverseApplication' object has no attribute '_toolbox'
```

when attempting to apply a panel view that contains tools that aren't
installed on a server.
2023-10-08 09:37:07 -04:00
Martin Cech d4b25fbcee Merge pull request #16803 from mvdbeek/pysam_to_string_fix
Use AlignedSegment.to_string
2023-10-07 22:57:19 +02:00
mvdbeek 3bb5db7410 Fix shed unit test 2023-10-07 16:29:16 -04:00
mvdbeek 612f1d6b82 Fix tool panel views for versionless tool ids 2023-10-07 16:06:22 -04:00
Martin Cech 48dcf862c9 fix the call arguments
https://pysam.readthedocs.io/en/v0.21.0/api.html?highlight=AlignedSegment#pysam.AlignedSegment.tostring
2023-10-07 21:49:17 +02:00
mvdbeek 0bb93e562e Merge branch 'release_23.1' into dev 2023-10-06 16:17:22 -04:00
Martin Cech ed519e650a remove the email and username redacting frmo the role loop
I guess this worked because user is guaranteed to have a role?
2023-10-06 14:44:00 -04:00
Marius van den BeekandDannon a058eeb3de Update outdated comment
Co-authored-by: Dannon <dannon.baker@gmail.com>
2023-10-06 14:06:56 -04:00
mvdbeek 6281b46ea8 Use AlignedSegment.to_string 2023-10-06 13:57:39 -04:00