Commit Graph
71616 Commits
Author SHA1 Message Date
John Davis fbcabb2aff Fix SA2.0 usage in managers.users 2023-11-09 15:33:46 -05:00
John Davis 7c5f60095d Fix SA2.0 usage in managers.library_datasets 2023-11-09 15:33:46 -05:00
John Davis c4ecdf57cf Fix SA2.0 usage in managers.datasets 2023-11-09 15:33:46 -05:00
John Davis b1ee6b98d1 Fix SA2.0 in managers.workflows (5) 2023-11-09 15:33:46 -05:00
John Davis 9ce277919d Fix SA2.0 usage in managers.workflows (4) 2023-11-09 15:33:46 -05:00
John Davis c907cfca72 Fix SA2.0 usage in managers.workflows (3) 2023-11-09 15:33:46 -05:00
John Davis b799811b3a Fix SA2.0 usage in managers.workflows, refactor (2) 2023-11-09 15:33:46 -05:00
John Davis b94cbff4a0 Fix SA2.0 usage in managers.workflows, refactor (1) 2023-11-09 15:33:46 -05:00
John Davis ec36ea7e57 Fix SA2.0 usage in managers.interactivetool, refactor 2023-11-09 15:33:46 -05:00
John Davis fc69968a9d Fix SA2.0 usage in managers.pages (2) 2023-11-09 15:33:46 -05:00
John Davis 564eab73e9 Fix SA2.0 usage in managers.pages (1) 2023-11-09 15:33:46 -05:00
John Davis cc56de6442 Fix SA2.0 usage in managers.jobs (1) 2023-11-09 15:33:46 -05:00
John Davis eadc457949 Fix SA2.0 usage in managers.collections 2023-11-09 15:33:46 -05:00
John Davis fa46d0ab90 Fix SA2.0 usage in managers.libraries (2); refactor
Factor out SA statement building logic into 2 separate helpers (I think
the filtering criteria for admin and nonadmin users is sufficiently
different, so 2 methods make for cleaner code here).
2023-11-09 15:33:46 -05:00
John Davis 5b906eedec Fix SA2.0 usage in managers.libraries (1) 2023-11-09 15:33:46 -05:00
John Davis 311fe028da Fix SA2.0 usage in managers.folders 2023-11-09 15:33:46 -05:00
Dannon a1b548556d Merge pull request #17000 from mvdbeek/dev
Merge 23.1 into dev
2023-11-09 11:04:11 -05:00
John Chilton ff45b6341c Merge pull request #16994 from jmchilton/job_metrics_fix
Fixes for job metrics Galaxy markdown component.
2023-11-09 10:43:13 -05:00
mvdbeek 8d80308bb8 Merge branch 'release_23.1' into dev 2023-11-09 12:53:32 +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
John Davis f91693dc6e Merge pull request #16783 from SergeyYakubov/get-rid-of-filename-property
Replace file_name property with get_file_name function
2023-11-08 17:19:40 -05:00
Yakubov, Sergey c30a4c06c2 Replace file_name property with get_file_name function 2023-11-08 17:17:14 -05: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
Martin Cech 930e6fdd96 Merge pull request #16938 from ahmedhamidawan/remove_create_wf_form
Remove "Create Workflow" form and allow workflow creation in editor
2023-11-08 22:43:49 +01: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
Dannon 307938e46d Merge pull request #16657 from ElectronicBlueberry/workflow-embed
Workflow Embed
2023-11-08 14:16:36 -05:00
Marius van den Beek 9741c3bf02 Merge pull request #16993 from dannon/peekpeak-typo
Minor clarification/typo fix in datatypes.data
2023-11-08 19:42:12 +01: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
Dannon Baker bc470c694f Extra typos. 2023-11-08 11:54:51 -05:00
John Chilton 200d03a9ed Fixes for job metrics Galaxy markdown component.
So https://github.com/galaxyproject/galaxy/pull/10121 added back in the title header to the component which is only designed for the dataset details page for an individual dataset - the original implementation striped out the title for that reason.

The target might an interesting step of a workflow, a problematic tool, a complex resulting dataset - so trying to come up with a title automically is a little challenging. My thought was therefore to keep the component rendered as simply as possible - since the page or report writer will be the one that has the context for how the component should be titled. It needs a prefix and so the big h2 "Job Metrics" is not useful or wanted I think.

https://github.com/galaxyproject/galaxy/pull/10121 did correctly preserve the removal of the title for the job parameters component - so I think this getting added back in was just an oversight.
2023-11-08 11:48:10 -05:00
Dannon Baker c2432d0cfc Minor clarification/typo fix in datatypes.data 2023-11-08 11:16:29 -05: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
John Davis 7404ed0578 Merge pull request #16675 from jmchilton/report_urls
Implement instance URLs in Galaxy markdown.
2023-11-08 09:25:12 -05:00
Marius van den Beek a57b08ab6b Merge pull request #16985 from dannon/empty-page-render-fix
Fix rendering of an empty page
2023-11-08 11:30:49 +01:00
Lucille Delisle 4e15e6929e Fix maf_thread_for_species.py 2023-11-08 10:45:11 +01:00
Marius van den Beek 2f56125915 Merge pull request #16971 from lldelisle/patch-3
Fix maf_thread_for_species.py
2023-11-08 10:44:00 +01:00
Ahmed Awan 901e3bb01f scopePointerStore always checks for existing scope 2023-11-07 16:55:40 -06:00
Ahmed Awan bbd004d74e use create endpoint for name, ann & tags, else use save as endpoint
Also, use `scopePointerStore` for actual Save As operation as well
2023-11-07 14:45:11 -06:00
Dannon Baker 6ca550c3dd Fixes rendering of an empty page by ensuring default content, even if empty. 2023-11-07 10:46:45 -05:00
Dannon b7fc2e33a1 Merge pull request #16760 from assuntad23/16556/include-wf-version
WF Report Enhancement: Exposing Workflow Version as Workflow Checkpoint
2023-11-07 10:24:44 -05:00
Laila Los 857af57bf2 hide attributes panel while loading 2023-11-07 15:49:22 +01:00
Laila Los 3422161478 wait for workflow to load before closing loading indicator 2023-11-07 15:38:17 +01:00