Commit Graph
47693 Commits
Author SHA1 Message Date
Kaivan Kamali d88e955e8a Fixed a typo 2020-08-27 09:48:43 -04:00
Kaivan Kamali fcf5a997bf Revised help message (added list of packages to install, needed to run the script). 2020-08-26 13:02:33 -04:00
Kaivan Kamali 64dec6390f Minor revision to documentation 2020-08-26 10:54:27 -04:00
Kaivan Kamali 220c97850e Cleaned up script, added documentation to help. 2020-08-26 10:47:12 -04:00
Kaivan Kamali 7f811424ae Removing redundant script. Minor change in copy script 2020-08-26 09:07:16 -04:00
Kaivan Kamali 35d4e77015 Merged both scripts into one. The same script does the copy or checksum/delete depending on a new input parmater. Will delete the second script later. 2020-08-25 16:42:33 -04:00
Kaivan Kamali 08b9ea521c Fixed a bug 2020-08-25 15:40:15 -04:00
Kaivan Kamali 43a3cadb80 Now comparing the checksum with irods checksum for all files in extra folder 2020-08-25 14:39:25 -04:00
Kaivan Kamali aced6baee3 Broke the script into two scripts: One script copies files from disk to irods, and another script verifies the checksum, then updated the object store id in dataset table and deletes the file on disk. 2020-08-25 09:17:59 -04:00
Kaivan Kamali 063588a997 Irods calculates checksum now when a file is added to it. Also, calculating the checksum locally, so can comapre to irods checksum after getting the file. 2020-08-24 15:31:06 -04:00
Kaivan Kamali 2e267ef55b Formatted the json file 2020-08-21 16:32:52 -04:00
Kaivan Kamali d96fe5db10 Revised script so that it now updates dataset table's object_store_id after file is copied to irods. Added script input json files. 2020-08-21 16:31:38 -04:00
Kaivan Kamali 0e00d24c1d Added function to display the required input parameters, incase caller does not provide all of them. 2020-08-21 14:20:58 -04:00
Kaivan Kamali 2b8aad8ccf irods and DB connection info passed in as json files 2020-08-21 14:06:13 -04:00
Kaivan Kamali 2cc093e938 object store info pased in as a json file 2020-08-21 13:42:54 -04:00
Kaivan Kamali 4ec2c98a1c iput works now 2020-08-20 18:54:19 -04:00
Kaivan Kamali b77e75d79c iputalmost works -- debugging 2020-08-20 16:41:43 -04:00
Kaivan Kamali 9fe92f8388 Updated dynamic sql per code review feedback. 2020-08-20 11:54:19 -04:00
Kaivan Kamali 1dec4af804 python irods client successfully puts filer in irods. Added partial capability to parse input parameters. 2020-08-20 11:16:23 -04:00
Kaivan Kamali 672eafad4d Using a single SQL statement to get all data instead of multiple SQL statements to get data one row at a time. 2020-08-19 14:28:49 -04:00
Kaivan Kamali 3193b51065 Applied some of the code review changes. 2020-08-19 13:26:43 -04:00
Kaivan Kamali a3699d05c2 Added wrapper method to call the method that adds file to irods in a loop for a range of object IDs. Also pulled out the DB connection object into the wrapper to no create/destroy it for every call. 2020-08-18 16:11:56 -04:00
Kaivan Kamali ed2d7633a5 Made revision based on self review. 2020-08-18 14:46:01 -04:00
Kaivan Kamali 72f52a7652 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev 2020-08-18 09:57:45 -04:00
Kaivan Kamali d5f26a72d3 More revision to script copying files to irods 2020-08-18 09:57:30 -04:00
Dannon 10bd31d5c7 Merge pull request #10104 from OlegZharkov/lib-folder-pagination
Lib Folder pagination (backend)
2020-08-17 11:33:29 -04:00
John Chilton 3540b3fc2d Merge pull request #10116 from mvdbeek/change_datatype_fix
Fix change_datatype
2020-08-17 09:23:53 -04:00
Björn Grüning f612007a1e Merge pull request #10110 from OlegZharkov/test-lib-subfolder
Selenium Library Subfolder
2020-08-17 15:21:02 +02:00
mvdbeek 69810ce0d6 Fix change_datatype
Broken in https://github.com/galaxyproject/galaxy/pull/10087.

If the dataset is new we can't copy Metadata, it fails with
```
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/Users/mvandenb/src/galaxy/lib/galaxy/model/metadata.py", line 145, in make_dict_copy
    rval[key] = self.spec[key].param.make_copy(value, target_context=self, source_context=to_copy)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/model/metadata.py", line 265, in make_copy
    return copy.deepcopy(value)
  File "/Users/mvandenb/src/galaxy/.venv/lib/python3.8/copy.py", line 153, in deepcopy
    y = copier(memo)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/model/custom_types.py", line 232, in __deepcopy__
    return MutationList(MutationObj.coerce(self._key, copy.deepcopy(self[:])))
AttributeError: 'MutationList' object has no attribute '_key'
```

I guess that's also not necessary, since `copy_from` in handle_outputs
would take care of this (and this restores the logic from https://github.com/galaxyproject/galaxy/pull/10087)
2020-08-17 11:03:16 +02:00
Dannon 246603a7f0 Merge pull request #9151 from jmchilton/simplified_run
Simplified Workflow Run Form
2020-08-14 14:25:19 -04:00
Oleg Zharkov 79164f82cb lib-sub-folder functionality test 2020-08-14 19:01:12 +02:00
Oleg Zharkov 8988617317 remove unnecessary int cast 2020-08-14 15:51:36 +02:00
Oleg Zharkov e80fb543c7 add example 2020-08-14 15:51:36 +02:00
Oleg Zharkov b0fd51952f python lint 2020-08-14 15:51:36 +02:00
Oleg Zharkov b9364591ee folder contents pagination 2020-08-14 15:51:36 +02:00
John Chilton 3cab834085 Merge pull request #9963 from kxk302/documentation
Added doc explaining what happens when you upload a file to Galaxy.
2020-08-13 16:59:43 -04:00
Kaivan Kamali 3810a3f381 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev 2020-08-13 15:46:23 -04:00
John Chilton 4626f714bb Simplified workflow run form.
Builds on refactoring the workflow run form landing and orchestration into Vue (#9147).

Implements #9111 - part of https://github.com/galaxyproject/galaxy/projects/15 and outlined in http://bit.ly/simplified-workflow-ui.

What is in the PR:

- Add new Galaxy configuration option - ``simplified_workflow_run_ui`` set to ``off`` by default.
- If instead the admin has set this parameter to ``prefer``, on the workflow run page scan the workflow run request and if three conditions are met show a simplfied tool form. These conditions are:
  - No workflow "resource parameters" - pretty niche, not documented, I don't think anyone outside of Canada is using them and even them I'm not sure if they ever got to production.
  - No "open" tools (i.e. tools with disconnected runtime inputs).
  - No "replacement parameters" defined outside PJAs. I'm calling #{} inside PJA and ${} inside tool steps both "replacement parameters" because the user populates them the same way in the GUI. The API only handles them inside the context of the PJA - it seems the GUI is responsible for replacing them at runtime in the traditional form.
- The simplified workflow form:
   - Drops tool and subworkflow steps from rendering all together and instead just renders the inputs. These are not rendered as separate "steps" or forms - but as just different inputs the same clean, simple form (more the like tool GUI). Labels (or step indexes as a fallback) are used at the input name, step annotations are used as the input help text.
   - Simplify the workflow request made by the client - send only replacement parameters and inputs - do not serialize tool state for each module. I think this makes what we are tracking more structured and should be more performant as well. Prevents storing HDA IDs in unstructured JSON blobs in the database as well.
   - Drops history target option to simplify the UI - simplified_workflow_run_ui_target_history can be set to either 'current' or 'new' to adjust this parameter Galaxy-wide for the simplified form.
   - Drops job caching option to simplify the UI - simplified_workflow_run_ui_cache can be set to 'off' or 'on' to change this parameter Galaxy-wide for the simplified form.
   - Drops resource parameters - we've already verified there are none for simplified workflows.
2020-08-13 15:43:03 -04:00
Björn Grüning 3ff92f5d2e Merge pull request #10102 from OlegZharkov/test_import_dataset_from_path
Test import dataset from path
2020-08-13 20:17:43 +02:00
Dannon ba717eb575 Merge pull request #10103 from anuprulez/fix_name_wf_editor
Fix name wf editor
2020-08-13 12:20:59 -04:00
Anup Kumar 0f4d9771aa Fix name 2020-08-13 11:55:34 -04:00
Dannon d3ec2981d3 Merge pull request #10090 from OlegZharkov/delete-dataset-dataset-test
Selenium Delete Dataset from library folder
2020-08-13 10:53:57 -04:00
Kaivan Kamali 00c63d2d20 Added comment for iROds object store in sample configuration file 2020-08-13 10:29:42 -04:00
Oleg Zharkov 0022333651 uncomment 2020-08-13 15:56:57 +02:00
Dannon 8595b62428 Merge pull request #10094 from anuprulez/remove_tr_duplicates
Remove duplicates from tool recommendations
2020-08-13 09:22:49 -04:00
Oleg Zharkov df0837a101 remove disambiguity from comment 2020-08-13 14:23:37 +02:00
Oleg Zharkov ddf5d2561e python linting 2020-08-13 14:22:02 +02:00
Oleg Zharkov 5e3642c1c9 implement delete dataset from lib folder 2020-08-13 14:22:02 +02:00
Oleg Zharkov e8eb3b0d58 revert forgotten headless flag 2020-08-13 14:22:02 +02:00
Oleg Zharkov 1773f24a58 implement check download .zip selenium 2020-08-13 14:22:02 +02:00