Skip to content

Conversation

@charles-cowart
Copy link
Contributor

analysis.build_files will now run an arbitrary number of post-processes defined
in qiita.software_command.post_processing_cmd column. It's assumed that each
post-process is a python script, with a defined Conda environment. It's also
currently assumed that each post-process overwrites the merged BIOM file. A
step removed from calling plugins, but getting closer.

analysis.build_files will now run an arbitrary number of post-processes defined
in qiita.software_command.post_processing_cmd column. It's assumed that each
post-process is a python script, with a defined Conda environment. It's also
currently assumed that each post-process overwrites the merged BIOM file. A
step removed from calling plugins, but getting closer.
@codecov-io
Copy link

codecov-io commented Oct 10, 2018

Codecov Report

Merging #2698 into dev will increase coverage by <.01%.
The diff coverage is 98.59%.

Impacted file tree graph

@@            Coverage Diff             @@
##              dev    #2698      +/-   ##
==========================================
+ Coverage   94.33%   94.34%   +<.01%     
==========================================
  Files         166      166              
  Lines       19840    19888      +48     
==========================================
+ Hits        18717    18764      +47     
- Misses       1123     1124       +1
Impacted Files Coverage Δ
qiita_db/test/test_analysis.py 98.61% <100%> (+0.06%) ⬆️
qiita_db/test/test_software.py 99.82% <100%> (ø) ⬆️
qiita_db/software.py 98.06% <100%> (+0.01%) ⬆️
qiita_db/analysis.py 96.68% <96.66%> (-0.09%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1f1ca91...d65103e. Read the comment docs.

Copy link
Member

@antgonza antgonza left a comment

Choose a reason for hiding this comment

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

Thanks for the rename: addtl_processing_cmd -> post_processing_cmd. Note that the change of location of the worker.py file will mean some changes in the code too.

Copy link
Member

@antgonza antgonza left a comment

Choose a reason for hiding this comment

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

Looking good, one minor comment but that might impact also the PR in qp-deblur.

cmd['script_params'].items()])

# append fragments file and output dir parameters
params = "%s --fp_fragments=%s --output_dir=%s" %\
Copy link
Member

Choose a reason for hiding this comment

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

Can you change the name of the parameter from --fp_fragments= to --fp_archive so it's more generic; at the end of the day this can be fragments or anything else the plugin stores in the database/archive

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No problem - changes already made to qiita and qp_deblur. One thing though, the command line util that strips fragments from the biom that aren't in the tree takes --fp_phylogeny and --fp_biom as options; do you think they might be too specific as well?

Originally, I thought a chain of commands would each in turn iterate over the same biom file, but since the second command will need a tree and a biom file as input, the database entry will need to be updated with the fp_s to the data, or the second command will need to assume the name and location of the inputs.

Copy link
Member

Choose a reason for hiding this comment

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

I think those names internally in deblur are fine but you are right about those here. Also all the comments that mention phylogeny vs. extra file for analysis ...

fragments-named variables renamed to archives, to be more general.
--fp_fragments option also renamed to fp_archives, where appropriate.
# suitable for other files as well.
output_dir = base_fp

fp_archive = '%s/archive.json' % output_dir
Copy link
Member

Choose a reason for hiding this comment

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

sorry for not catching this before: you should use join to create this path and also use the analysis id to be safe something like: fp_archive = join(output_dir, 'archive_%d.json' % self.id)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah gotcha, platform independence path creation.

@antgonza antgonza merged commit 5a0677e into qiita-spots:dev Nov 1, 2018
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.

3 participants