Commit Graph
69929 Commits
Author SHA1 Message Date
John Chilton e5d37d48d3 Merge pull request #17036 from jmchilton/tool_panel_fixes
[23.1] Fix duplicated tools in tool panel view section copying
2023-11-17 10:38:02 -05:00
mvdbeek 0e142414cd Exclude multiple_versions from test_global_filters_on_integrated_panel 2023-11-16 15:08:21 +01:00
mvdbeek ca5fce7566 Test tool shed version as well 2023-11-16 05:52:30 -05:00
mvdbeek c3dc92b463 Test that only latest version is loaded 2023-11-16 05:52:19 -05:00
John Chilton f36b8474a3 Comment about new bug discovered. Lower priority though right?
Come back and fix it in dev?
2023-11-16 05:51:03 -05:00
Marius van den Beek 427677a540 Merge pull request #16988 from mvdbeek/warning_for_duplicate_log_files
[23.1] Change log level for duplicate data table entries to warning
2023-11-16 11:17:10 +01:00
John Chilton 3e4089526e Fix duplicated tools in tool panel view section copying. 2023-11-15 14:21:38 -05:00
John Chilton edcc043b61 Make testing tool panel views a little easier. 2023-11-15 11:04:28 -05:00
mvdbeek d0c583ec0e Merge branch 'release_23.0' into release_23.1 2023-11-13 15:06:55 +01:00
Marius van den Beek 1b0c0bb353 Merge pull request #17013 from bernt-matthias/bump/conda
[23.0] Upgrade minimum conda to be compatible with latest conda-build
2023-11-13 15:04:29 +01:00
Matthias Bernt 0aafa22154 bump required conda version
potential solution for the build prblems in https://github.com/galaxyproject/planemo/pull/1388
2023-11-13 13:19:10 +01:00
Martin Cech 70d41851f4 Merge pull request #17009 from mvdbeek/update_tar_to_directory_dependency
[23.1] Update tar_to_directory dependency
2023-11-11 00:53:23 +01:00
Björn Grüning 643b0d4147 Merge pull request #17007 from mvdbeek/fix_copied_outputs_metadata
[23.1] Fix copying metadata to copied job outputs
2023-11-10 20:56:26 +01:00
mvdbeek 93d11dc04a Update tar_to_directory dependency
Should fix:
```
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/usr/local/lib/python3.7/site-packages/galaxy/util/compression_utils.py", line 114, in extract
    common_prefix_dir = self.common_prefix_dir
  File "/usr/local/lib/python3.7/site-packages/galaxy/util/compression_utils.py", line 103, in common_prefix_dir
    if len(common_prefix) >= 1 and not common_prefix.endswith(os.sep) and self.isdir(self.getmember(common_prefix)) \
  File "/usr/local/lib/python3.7/site-packages/galaxy/util/compression_utils.py", line 186, in isdir
    return getattr(self, 'isdir_%s' % self.type)(member)
  File "/usr/local/lib/python3.7/site-packages/galaxy/util/compression_utils.py", line 189, in isdir_tar
    return member.isdir()
AttributeError: 'NoneType' object has no attribute 'isdir'

```

seen on usegalaxy.eu with https://www.ncbi.nlm.nih.gov/geo/download/?acc=GSE176031&format=file
2023-11-10 18:37:34 +01:00
mvdbeek 2fc1b64742 Fix copying metadata to copied job outputs
Fixes https://github.com/galaxyproject/galaxy/issues/17003
2023-11-10 18:03:45 +01:00
Marius van den Beek f450dee29b Merge pull request #16965 from mvdbeek/dont_hold_on_to_job_object
[23.1] Don't store job in JobIO instance attributes
2023-11-09 09:43:47 +01:00
Martin Cech 02902198bf Merge pull request #16999 from dannon/client-publish-23.1
[23.1] Client publication
2023-11-09 00:20:02 +01:00
Dannon Baker 2e92765e1b Update cpy-cli utility. 2023-11-08 16:58:47 -05:00
Dannon Baker f0c5024fe9 Update installer package to 23.1.1 2023-11-08 16:53:28 -05:00
Dannon Baker 4a2dc9ebe0 Clean rebuild and publish 2023-11-08 16:51:06 -05:00
Dannon Baker dc6af21ed8 Link installer package to galaxy release version 2023-11-08 16:37:10 -05:00
Dannon Baker cb5d18ddf3 Drop unused, unintentionally added package from galaxy client installer 2023-11-08 16:34:27 -05:00
Dannon Baker 97d09ce397 Update Galaxy client installer package version for 23.1 2023-11-08 16:29:45 -05:00
Dannon Baker 2af38ac03e Update 23.1 client package version. 2023-11-08 16:29:24 -05:00
mvdbeek 5566be02ab Don't store job in JobIO instance attributes
and invalidate `_output_hdas_and_paths` when current session is not the
same session that was used to populate `_output_hdas_and_paths`.

The Job instance may originate from a session that is associated to
another thread, and when that thread closes the session the instance
(along with other instances retrieved through loading relationships)
becomes detached.

I am not sure at all if this will fix
```
DetachedInstanceError: Instance <HistoryDatasetAssociation at 0x7fe68bbf14f0> is not bound to a Session; attribute refresh operation cannot proceed (Background on this error at: https://sqlalche.me/e/14/bhk3)
  File "galaxy/jobs/runners/__init__.py", line 291, in prepare_job
    job_wrapper.prepare()
  File "galaxy/jobs/__init__.py", line 1248, in prepare
    tool_evaluator.set_compute_environment(compute_environment, get_special=get_special)
  File "galaxy/tools/evaluation.py", line 162, in set_compute_environment
    self.param_dict = self.build_param_dict(
  File "galaxy/tools/evaluation.py", line 204, in build_param_dict
    self.__populate_output_dataset_wrappers(param_dict, output_datasets, job_working_directory)
  File "galaxy/tools/evaluation.py", line 447, in __populate_output_dataset_wrappers
    param_dict[name] = DatasetFilenameWrapper(
  File "galaxy/tools/wrappers.py", line 403, in __init__
    path_rewrite = compute_environment and compute_environment.output_path_rewrite(dataset_instance)
  File "galaxy/job_execution/compute_environment.py", line 132, in output_path_rewrite
    return str(self.job_io.get_output_path(dataset))
  File "galaxy/job_execution/setup.py", line 226, in get_output_path
    if hda.id == dataset.id:
  File "sqlalchemy/orm/attributes.py", line 487, in __get__
    return self.impl.get(state, dict_)
  File "sqlalchemy/orm/attributes.py", line 959, in get
    value = self._fire_loader_callables(state, key, passive)
  File "sqlalchemy/orm/attributes.py", line 990, in _fire_loader_callables
    return state._load_expired(state, passive)
  File "sqlalchemy/orm/state.py", line 712, in _load_expired
    self.manager.expired_attribute_loader(self, toload, passive)
  File "sqlalchemy/orm/loading.py", line 1369, in load_scalar_attributes
    raise orm_exc.DetachedInstanceError(
```
but it seems to make some sense. JobIO crosses thread boundaries as part
of the job wrapper getting put into threading queues.

Ideally we'd make sure that no ORM instance crosses the thread boundary
(or we systematically re-associated with a session).

I also tried flagging these patterns automatically using something like:

```

    @event.listens_for(session, "persistent_to_detached")
    def on_detach(sess, instance):
        if not getattr(instance, "allow_detatch", False):
            raise Exception(f"{instance} detached. This ain't good for how we do things ?")
```

but it seems tricky to figure out when this is fine and when it is not.
2023-11-08 19:25:15 +01:00
Marius van den Beek 977a9ac95f Merge pull request #16992 from dannon/empty-page-render-fix-backport
[23.1] Empty page render fix - backport
2023-11-08 16:54:15 +01:00
Dannon Baker 496ecc22b2 Fixes rendering of an empty page by ensuring default content, even if empty. 2023-11-08 10:21:43 -05:00
Nicola Soranzo df9c9b58c1 Merge pull request #16989 from mvdbeek/backport_maf_fix
[23.1] Backport Fix maf_thread_for_species.py
2023-11-08 14:26:53 +00:00
Lucille Delisle 4e15e6929e Fix maf_thread_for_species.py 2023-11-08 10:45:11 +01:00
mvdbeek ec32669cf5 Change log level for duplicate data table entries to warning
Fixes https://github.com/galaxyproject/galaxy/issues/16987,
though there's probably something to be done for loc files
being loaded from tools. At the minimum this is a versioning
issue, if a new version of featureCounts comes with a new
built-in reference then an old version shouldn't use it,
and vice-versa. Seems like a hard problem to solve.
2023-11-08 10:38:47 +01:00
Marius van den Beek d6cc9f0fa4 Merge pull request #16981 from nsoranzo/release_23.1_routes_bug
[23.1] Workaround issue in Routes
2023-11-07 11:44:39 +01:00
Nicola Soranzo d8f490ff4a Workaround issue in routes
Fix the following traceback:
```
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: uvicorn.access INFO 2023-06-30 10:28:03,573 [pN:main.1,p:3528860,tN:MainThread] 193.156.42.8:0 - "HEAD /root/login HTTP/1.0" 500
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: Exception in supplement:
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: Traceback (most recent call last):
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: File "/cluster/galaxy-test/srv/galaxy/server/lib/galaxy/web/framework/middleware/error.py", line 165, in __call__
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: app_iter = self.application(environ, sr_checker)
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: File "/cluster/galaxy-test/srv/galaxy/venv/lib64/python3.11/site-packages/paste/recursive.py", line 85, in __call__
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: return self.application(environ, start_response)
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: File "/cluster/galaxy-test/srv/galaxy/venv/lib64/python3.11/site-packages/paste/httpexceptions.py", line 640, in __call__
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: return self.application(environ, start_response)
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: File "/cluster/galaxy-test/srv/galaxy/server/lib/galaxy/web/framework/base.py", line 167, in __call__
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: return self.handle_request(environ, start_response)
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: File "/cluster/galaxy-test/srv/galaxy/server/lib/galaxy/web/framework/base.py", line 221, in handle_request
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: rc.environ = environ
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: ^^^^^^^^^^
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: File "/cluster/galaxy-test/srv/galaxy/venv/lib64/python3.11/site-packages/routes/__init__.py", line 23, in __setattr__
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: self.load_wsgi_environ(value)
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: File "/cluster/galaxy-test/srv/galaxy/venv/lib64/python3.11/site-packages/routes/__init__.py", line 73, in load_wsgi_environ
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: self.__shared_state.host += ':' + environ['SERVER_PORT']
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: ~~~~^~~~~~~~~~~~~~~~~~~~~~~~
Jun 30 10:28:03 galaxy01-test.educloud.no galaxyctl[3528286]: TypeError: can only concatenate str (not "int") to str
```

Reported by @vazovn : https://matrix.to/#/!rfLDbcWEWZapZrujix:gitter.im/$McOyd5Kmp-w-Z-bYbRUV42K30YhVvwRJtrCaxru-yf4?via=gitter.im&via=matrix.org
2023-11-06 14:52:35 +00:00
Dannon 8768f3a900 Merge pull request #16961 from ahmedhamidawan/redirect_if_fixed_delegated_auth
[23.1] Prevent Singular external auth users from disconnecting identity
2023-11-02 21:19:45 -04:00
Dannon Baker c169add894 Update mocked app config for custos tests 2023-11-02 14:59:32 -04:00
Ahmed Awan e23b3f8687 generate fixed_delegated_auth in core config, instead of serializer 2023-11-02 13:35:21 -05:00
Ahmed Awan bc5aca07a6 [23.1] Prevent Singular external auth users from disconnecting identity
Added a `fixed_delegated_path` variable to the `ConfigSerializer` that
lets us reroute users to home if we have a Galaxy set up with:
```
	config.enable_oidc
	and len(config.oidc) == 1
	and len(auth_manager.authenticators) == 0
```

as in; we only have 1 external auth and no local authenticator,
hence, we don't want users to be disconnecting the external
provider.
2023-11-01 17:54:52 -05:00
Nicola Soranzo 8143b11921 Merge pull request #16952 from kostrykin/release_23.1
adds `biii` as supported xref reference type
2023-11-01 15:33:42 +01:00
Leonid Kostrykin 055afb6b37 fixes example for xref references 2023-11-01 12:01:31 +01:00
Leonid Kostrykin 00a3d036e3 adds biii as supported xref reference type 2023-11-01 11:34:06 +01:00
Dannon f6741e63ed Merge pull request #16943 from mvdbeek/backport_select_param_name_fallback
[23.1] Backport Fix select parameter doesn't show parameter name in UI
2023-10-30 16:46:26 -04:00
Laila Los 82c96257c1 fallback to test_param.name 2023-10-30 20:11:38 +01:00
Martin Cech 12b20c69d4 Merge pull request #16929 from davelopez/23.1_fix_discarded_dataset_ordering
[23.1] Fix discarded dataset ordering in Storage Dashboard
2023-10-27 22:45:34 +02:00
Marius van den Beek a2e3972ed2 Merge pull request #16930 from dannon/workflow-annotation-export
[23.1] Include owner's annotation when exporting workflow
2023-10-27 12:56:34 +02:00
Marius van den Beek 6df3182305 Merge pull request #16934 from dannon/run-published-workflow-23.1
[23.1] Add execute back to published workflows list
2023-10-27 12:40:26 +02:00
Marius van den Beek d93095af2e Merge pull request #16937 from mvdbeek/fix_merge_collection_input_state_handling
[23.1] Skip state filtering in ``__MERGE_COLLECTION__`` tool
2023-10-27 12:39:31 +02:00
mvdbeek 21fb9be7fd Add regression test for #16931 2023-10-27 10:56:14 +02:00
mvdbeek 69ca24f67d Skip state filering in __MERGE_COLLECTION__ tool
Fixes inputs getting skipped that are NEW, QUEUED, etc.

If you're after filtering out errored you should use the
`__FILTER_FAILED_DATASETS__` tool.
2023-10-27 10:02:46 +02:00
Dannon Baker 6372253e88 Add execute back to published workflows list 2023-10-26 15:04:17 -04:00
Dannon Baker e48e490b3a Also get owner annotations for individual steps, unless trans.user has one. It's still unclear how one would, so I'm being cautious here. 2023-10-26 14:39:59 -04:00
Dannon Baker ffed1573ff When exporting a workflow, include owner's annotation if the exporting user doesn't have an overriding one. 2023-10-26 14:39:59 -04:00