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

Indirect File click types #1124

Merged
merged 1 commit into from
Apr 5, 2019
Merged

Indirect File click types #1124

merged 1 commit into from
Apr 5, 2019

Conversation

ttung
Copy link
Collaborator

@ttung ttung commented Apr 2, 2019

Add the ability to reference an imagestack or a codebook through a set of conversion recipes. Each conversion recipe can read the input given on the CLI and make an attempt to convert it to the desired type.

For instance, a primary image can be referred to by the json describing the slicedimage set, or @experiment.json[my_fov_name][primary].

@ttung
Copy link
Collaborator Author

ttung commented Apr 2, 2019

Here's an example of how this works:
931666e

@ttung ttung force-pushed the tonytung-alternative-suppress-warning branch from b4d4832 to a7fa8d1 Compare April 2, 2019 08:53
@ttung ttung force-pushed the tonytung-indirectfile branch from a0fe12f to 9a7ab47 Compare April 2, 2019 08:53
@codecov-io
Copy link

codecov-io commented Apr 2, 2019

Codecov Report

Merging #1124 into master will decrease coverage by 1.79%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #1124     +/-   ##
=========================================
- Coverage   90.41%   88.62%   -1.8%     
=========================================
  Files         125      130      +5     
  Lines        4550     4642     +92     
=========================================
  Hits         4114     4114             
- Misses        436      528     +92
Impacted Files Coverage Δ
starfish/util/indirectfile/_base.py 0% <0%> (ø)
starfish/util/click/indirectparams.py 0% <0%> (ø)
starfish/util/indirectfile/_codebook.py 0% <0%> (ø)
starfish/util/indirectfile/__init__.py 0% <0%> (ø)
starfish/util/indirectfile/_imagestack.py 0% <0%> (ø)

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 16bb36e...8c8c39a. Read the comment docs.

@ttung ttung force-pushed the tonytung-indirectfile branch from 9a7ab47 to 5f51faf Compare April 3, 2019 06:01
@ttung ttung changed the base branch from tonytung-alternative-suppress-warning to master April 3, 2019 06:02
@ttung ttung force-pushed the tonytung-indirectfile branch 3 times, most recently from 5fd821e to c582dd5 Compare April 3, 2019 18:40
@ttung ttung force-pushed the tonytung-indirectfile branch 3 times, most recently from 503d218 to 69153e2 Compare April 5, 2019 06:27
@ttung ttung changed the title RFC: Indirect File click types Indirect File click types Apr 5, 2019
Add the ability to reference an imagestack or a codebook through a set of conversion recipes.  Each conversion recipe can read the input given on the CLI and make an attempt to convert it to the desired type.

For instance, a primary image can be referred to by the json describing the slicedimage set, _or_ @experiment.json[my_fov_name][primary].
@ttung ttung force-pushed the tonytung-indirectfile branch from 69153e2 to 8c8c39a Compare April 5, 2019 06:57
@ttung
Copy link
Collaborator Author

ttung commented Apr 5, 2019

I refactored this a bit to separate out the conversion logic from the click logic. Rationale: I want to be able to use this in the pipeline recipes. However, the recipes will not be able to use the click params, because at the time we generate the click.command calls, we do not know the types! Only when we parse the recipe do we know what type they will be.

I will wait for this to be green before landing, but if you want to do a post-merge review, please do! :)

@ttung ttung merged commit 911f024 into master Apr 5, 2019
@ttung ttung deleted the tonytung-indirectfile branch April 6, 2019 04:41
ttung added a commit that referenced this pull request Apr 8, 2019
…#1137)

#1124 introduced new click param types that directly return an ImageStack or a Codebook.  This refactors the existing cli params to use those types.

Test plan: `make -j fast`
ttung pushed a commit that referenced this pull request Apr 8, 2019
#1124 ensures that blobs_stack is already an ImageStack, but #1143 still does the conversion.  Merging both created this conflict.

Test plan: `pytest starfish/test/full_pipelines/cli/test_iss.py`
ttung added a commit that referenced this pull request Apr 8, 2019
#1124 ensures that blobs_stack is already an ImageStack, but #1143 still does the conversion.  Merging both created this conflict.

Test plan: `pytest starfish/test/full_pipelines/cli/test_iss.py`
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.

4 participants