Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve workflows #3083

Merged
merged 18 commits into from
Mar 17, 2021
Merged

Improve workflows #3083

merged 18 commits into from
Mar 17, 2021

Conversation

antgonza
Copy link
Member

@antgonza antgonza commented Mar 9, 2021

First review/merge #3078.

These are improvements after the qiita-rc deployment.

@antgonza antgonza changed the title [WIP] Improve workflows Improve workflows Mar 13, 2021
@antgonza antgonza requested a review from ElDeveloper March 13, 2021 20:35
Copy link
Member

@ElDeveloper ElDeveloper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @antgonza. The default workflows UI looks great, thanks for deploying to qiita-rc. Do you think scrolling to zoom should be disabled by default in this page like in the main processing network UI?


Returns
-------
description : str
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description : str
str

qiita_db/software.py Show resolved Hide resolved

Returns
-------
description : str
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description : str
str

qiita_db/software.py Show resolved Hide resolved
@property
def data_type(self):
"""Retrieves all the data_types the workflow accepts
"""Retrieves all the data_types of the default workflow
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"""Retrieves all the data_types of the default workflow
"""Retrieves all the data_types accepted by the default workflow

main_nodes = dict()
for x, y in graph.edges:
connections = []
for a, b, c in graph[x][y]['connections'].connections:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for a, b, c in graph[x][y]['connections'].connections:
for a, _, c in graph[x][y]['connections'].connections:

@@ -6,7 +6,8 @@
</script>
<h3>Analyses that have used this study</h3>

Note that if an analysis doesn't have a link, it means that is a "User default analysis"; which means that the analysis belongs to that user but the user has only selected artifacts and hasn't created the actual analysis. Please contact the user and ask them to delete that artifact from their analysis creation page.
Note that if an analysis doesn't have a link, it means that it is a "User default analysis". This means that the analysis belongs to the indicated user but the user has only selected artifacts and the actual analysis has not been created. Please contact the user and ask them to delete that artifact from their analysis creation page.
page.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
page.

# output_type: output_node_name}, ...}
# for easy look up and merge of output_names
main_nodes = dict()
for x, y in graph.edges:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think I follow all that is going on in this loop. But my general comment would be to move this into a separate function that can be tested. Maybe as a class method or a function in the DefaultWorfklow module.

@@ -63,16 +64,26 @@
<h3>Recommended Workflows</h3>
~~ Click on the spheres to get more information ~~
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about this:

Screen Shot 2021-03-16 at 4 56 47 PM

Suggested change
~~ Click on the spheres to get more information ~~
<h5>Click on the circles to get more information</h5>

Copy link
Member

@ElDeveloper ElDeveloper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much @antgonza! Looks great.

@ElDeveloper ElDeveloper merged commit 8e6d250 into qiita-spots:dev Mar 17, 2021
antgonza added a commit that referenced this pull request Mar 19, 2021
* adding creation and modification timestamps to prep_templates (#3066)

* adding creation and modification timestamps to prep_templates

* Apply suggestions from code review [skip ci]

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>

* fix #3068 (#3069)

* minor improvements (#3067)

* minor improvements

* fix test

* adding @wasade suggestion

* minor fixes (#3073)

* fix #3072 (#3074)

* fix #3072

* flake8

* fix #3076 (#3077)

* fix #3076

* addressing @ElDeveloper comments

* fix #3070 (#3075)

* fix #3070

* Apply suggestions from code review

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>

* flake8

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>

* fix-3064 (#3080)

* Create qiita-ci.yml

* add passwd to psql

* nginx + redis

* redis via conda

* redis-server - -> redis-server --

* daemonize -> daemonize

* conda libevent

* apt-get libevent-dev

* adding multiple sections

* rm travis_retry

* add missing activagte

* onfig_test.cfg

* rm indent

* add 1 indent

* pgport

* add drop

* change db name

* redis version

* redis -> redbiom version

* split tests

* source .profile

* adding ssh command

* mkdir ~/.ssh/

* only ssh

* pushing to retrigger

* add run

* split ssh conf/run

* 60367309

* add bash

* fix ident

* rm ssh cmd

* strict=no

* localhost

* mod permissions

* user ssh

* rm keys

* echos

* start ssh service

* ssh -vvv

* split setup/test

* localhost -> 127

* localhost -> 127

* rm ssh setup

* -o StrictHostKeyChecking=no

* change key creation

* echo sshd_config

* readd ssh config

* cp sshd_config and then move

* rm echos

* extra qiita folder

* ls test_data

* rm qiita folder

* use key in .ssh

* more ssh params

* tee -> >

* chmod

* fullpath

* ls key

* rm localhost

* params

* rsa -> rsa-sha2-256

* rm root login

* readd -o StrictHostKeyChecking=no

* minimizing params

* permissions

* cleaning up

* comments => echo

* -o StrictHostKeyChecking=no

* export REDBIOM_HOST=http://127.0.0.1:7379

* localhost -> 127.0.0.1

* add runner

* cover package

* cleaning env vars

* renaming jobs

* redbiom host

* add env vars via export

* changing echo

* add env COVER_PACKAGE

* rm user sftp

* just qiita_db

* open_sftp -> SFTPClient

* +1 worker

* only SCPClient

* ssh.SCPClient -> SCPClient

* return sftp/ssh back

* just qiita_db

* rm sftp

* add all tests

* BASE_URL = https://127.0.0.1:8383

* bash -c

* start_biom

* start_biom 127

* populate QIITA_SERVER_CERT

* nginx 127

* adding ports to conf

* lowering ports

* service qiita

* 8383 postgres

* curl test

* mkdir nginx

* moving tests around

* moving curl up

* echos for curl

* sleep 10

* 127.0.0.1 -> localhost

* returning some localhost to 127...

* qiita_pet!

* final clean up

* kill qiita first

* addreesing @ElDeveloper comments

* checkout repo for flake8

* split cover_package

* Workflows GUI (#3078)

* fix #3076

* addressing @ElDeveloper comments

* adding workflows GUI

* improve HTML

* db changes and improvements

* comment out new db changes

* rm default_workflows from PluginHandler.get

* Apply suggestions from code review [skip ci]

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>

* fix #3081 (#3082)

* fix #3081

* generate_analysis_list_per_study to speed up retrival

* minor modifications

* split sql

* addressing @ElDeveloper comments

* add Command.processing_jobs (#3085)

* add Command.processing_jobs

* Update qiita_db/software.py [skip ci]

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>

* Improve workflows (#3083)

* fix #3076

* addressing @ElDeveloper comments

* adding workflows GUI

* improve HTML

* db changes and improvements

* comment out new db changes

* rm default_workflows from PluginHandler.get

* improving workflows after deployment

* fix error

* clean up

* minor fixes

* improving html

* comments from @justinshaffer

* addressing @ElDeveloper comments

* 2021.03 (#3084)

* 2021.03

* add Command.processing_jobs to changelog

* codecov

* codecov required

* codecov token

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants