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

Major Version Update- BTEP Presentations #121

Merged
merged 253 commits into from
Oct 15, 2024
Merged

Major Version Update- BTEP Presentations #121

merged 253 commits into from
Oct 15, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 29, 2024

  1. It wasn't forcing a key reset, it was just that I hadn't updated the …

    …plot chart key; now the reset button works as expected, but the chart still resets its zoom if anything such as selection or slider changing etc. modifies the selected region. If I pursue this as users probably want, it would require the original idea of toggling the plotly box selection between a zoom, i.e. manually setting it, and the actual histogram region selection functionality which is already implemented
    andrew-weisman committed May 29, 2024
    Configuration menu
    Copy the full SHA
    babb427 View commit details
    Browse the repository at this point in the history
  2. Add radio to select the function of the box selection, whether select…

    …ion of positive region of the histogram(s) or the x axis zoom
    andrew-weisman committed May 29, 2024
    Configuration menu
    Copy the full SHA
    3b017cc View commit details
    Browse the repository at this point in the history
  3. Initialize relevant histogram-zoom-related settings every time the co…

    …lumn for filtering is changed
    andrew-weisman committed May 29, 2024
    Configuration menu
    Copy the full SHA
    4b365ba View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    094e578 View commit details
    Browse the repository at this point in the history
  5. Add too-global fixes in comments to force MAWA to use just a single C…

    …PU when Squidpy is selected since it commandeers threads; in future we'll need to limit just the significance calculations to a single thread if Squidpy is selected
    andrew-weisman committed May 29, 2024
    Configuration menu
    Copy the full SHA
    bb3b7b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Add functionality for robust image filtering using new selectable dat…

    …aframes in Streamlit, to replace previous image filters such as in the multiaxial gater and probably in the plotter-based pages such as the scatter plotter and the draft radial profiles page
    andrew-weisman committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    6573c3b View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Configuration menu
    Copy the full SHA
    ea4e92f View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Configuration menu
    Copy the full SHA
    4aa18e0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ec9900d View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Configuration menu
    Copy the full SHA
    a6ccaa0 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Configuration menu
    Copy the full SHA
    ebd989e View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Configuration menu
    Copy the full SHA
    82bce06 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4e70281 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    144531a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    216ba81 View commit details
    Browse the repository at this point in the history
  5. Help notes for widgets

    abombin committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    050eac3 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e25b018 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    fa0f63e View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Configuration menu
    Copy the full SHA
    396c7d7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    975703a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    19a0153 View commit details
    Browse the repository at this point in the history
  4. adjust widget sizes

    abombin committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    6445a4c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bd3b829 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    845485a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e79d546 View commit details
    Browse the repository at this point in the history
  8. updated requirements.txt

    djsmith17 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    afa4ff6 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #120 from ncats/improvement_suggestions

    Removing Neighborhood Profiles checkpointing
    djsmith17 authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    bbc21d6 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    702fb1a View commit details
    Browse the repository at this point in the history
  11. Setting subset toggle to true

    Andrew intended to make the default condition for the umap subset to be true. The change in this commit will make the intention true
    djsmith17 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    59bfcf9 View commit details
    Browse the repository at this point in the history
  12. Weird Palantir bug

    Something weird is going on with palantir library. Taking this out for the time being
    djsmith17 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    000261f View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    a16022b View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    41e31cb View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Configuration menu
    Copy the full SHA
    7c640e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Configuration menu
    Copy the full SHA
    c9c6086 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Configuration menu
    Copy the full SHA
    0f134d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f53b4c4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1e90857 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0c4f591 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Small error found

    djsmith17 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    73ecc0f View commit details
    Browse the repository at this point in the history
  2. Fix error

    andrew-weisman committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    37af16a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ca65b40 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    25605c8 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #122 from ncats/improvement_suggestions

    QoL changes for MAWA/Neighborhood Profiles
    djsmith17 authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    99d5451 View commit details
    Browse the repository at this point in the history
  6. Testing clustering

    djsmith17 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    cf25a9d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    91a75e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Configuration menu
    Copy the full SHA
    f67a571 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3c5600a View commit details
    Browse the repository at this point in the history
  3. Merge pull request #125 from ncats/improvement_suggestions

    Hard setting cpu_pool_size = 3 for clustering
    djsmith17 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    3940e42 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Configuration menu
    Copy the full SHA
    95251c7 View commit details
    Browse the repository at this point in the history
  2. A bit of improved logic

    Only want this to run when its toggle_clust_diff and when its also a appro_feat
    djsmith17 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    dddca8d View commit details
    Browse the repository at this point in the history
  3. Adding a new callback

    This only solves half the problem. I think I can make the rest of it work too
    djsmith17 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    3e65058 View commit details
    Browse the repository at this point in the history
  4. Allow the user to specify the mean and std to be used for the thresho…

    …ld calculation for the box and whisker plots. This allows e.g. to use T=0 mean and std in the plots for the entire dataset
    andrew-weisman committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    02e4b87 View commit details
    Browse the repository at this point in the history
  5. Removing calls to callback function

    Didnt solve all my problems. Making a simple variable to check for the kind of clustering being completed
    djsmith17 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1e85f49 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    01dee0d View commit details
    Browse the repository at this point in the history
  7. Fixing some limit issues

    djsmith17 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    f8b913b View commit details
    Browse the repository at this point in the history
  8. Removing a word

    djsmith17 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    6305d0b View commit details
    Browse the repository at this point in the history
  9. Adding some split timing

    djsmith17 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1df6415 View commit details
    Browse the repository at this point in the history
  10. Moving the if statement over

    So that we can see feedback message
    djsmith17 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    983ed4a View commit details
    Browse the repository at this point in the history
  11. Merge pull request #127 from ncats/improvement_suggestions

    Adding mp_start_method to match utils.execute_data_parallelism_potentially
    djsmith17 authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    ef1d2d2 View commit details
    Browse the repository at this point in the history
  12. Trying a direct call of the utils function

    I think this is what Andrew wanted. Lets give this a go
    djsmith17 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    2bdb6c2 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #128 from ncats/improvement_suggestions

    Trying a direct call of the utils function
    djsmith17 authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    10239fc View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    a39e2b5 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    50bed2f View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. About to try to debug why going to the next image scrolls page back u…

    …p to the plot in the radial profiles app but not in the scatter plotter
    andrew-weisman committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    9168d0a View commit details
    Browse the repository at this point in the history
  2. Fix issue with page automatically scrolling back to the top when some…

    …thing updates a plotly figure by rendering some output (st.toggle() works too) after the plotly figure is rendered
    andrew-weisman committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    1c474f5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2c4268f View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Configuration menu
    Copy the full SHA
    0c7e548 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Configuration menu
    Copy the full SHA
    54bb136 View commit details
    Browse the repository at this point in the history
  2. Unify the unit coordinates by temporarily converting the coordinates …

    …since we currently did not perform the conversion in the unifier
    andrew-weisman committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    762b3c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. Pin Streamlit to v1.35 due to st_pages breaking in v1.36

    Automatically calculate the midpoint of each image
    
    Calculate evenly spaced radii from the midpoint to at most include the largest possible radius
    
    Plot the radii on the image
    
    In the scatter plotter, exit cleanly if the input dataset does not exist
    andrew-weisman committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    59563ff View commit details
    Browse the repository at this point in the history
  2. Delete newline

    andrew-weisman committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    68976e3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0560257 View commit details
    Browse the repository at this point in the history
  4. Update version

    andrew-weisman committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    7e8a93a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    32d8ff5 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Configuration menu
    Copy the full SHA
    4286bae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    33d3604 View commit details
    Browse the repository at this point in the history
  3. Fixing an issue with slider val and plotting

    Too many calls to a function and things got lost along the way
    djsmith17 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    9a0b706 View commit details
    Browse the repository at this point in the history
  4. whoops. Missed this

    djsmith17 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    13b9797 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Put analysis inside its own function and cleaned up code, all still s…

    …eems to be good, 6M cells take 20 sec to run
    andrew-weisman committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    f3d6d70 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b000a6f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b072ddd View commit details
    Browse the repository at this point in the history
  4. Start to intelligently and in a user friendly way calculate the means…

    … and CIs of a selected set of images; basically just have to do plotting now, no more calculations
    andrew-weisman committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    44052f7 View commit details
    Browse the repository at this point in the history
  5. Add heatmap

    andrew-weisman committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    46b8655 View commit details
    Browse the repository at this point in the history
  6. Use annuli out to the rectangle corners instead of the edges and crea…

    …te a single function that detects the radial bin for each cell
    andrew-weisman committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    fcc1c8a View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Feature values checking -NP

    Improved method for checking the values within a column and determining if we can split it before clustering
    djsmith17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    14708f0 View commit details
    Browse the repository at this point in the history
  2. Refactor a few things

    andrew-weisman committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    774c9ea View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8aed27b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    445538a View commit details
    Browse the repository at this point in the history
  5. adding back in subheader

    djsmith17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    95fdf55 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #130 from ncats/improvement_suggestions

    Adding Feature separation for difference clustering
    djsmith17 authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    ae95133 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Configuration menu
    Copy the full SHA
    4c39d2d View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Configuration menu
    Copy the full SHA
    a0dc2cb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    61f159c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9380057 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #131 from ncats/improvement_suggestions

    Fixing a bug related to drawing 0 values on log scale
    djsmith17 authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    049531d View commit details
    Browse the repository at this point in the history
  5. Don't throw red error box if no file has been opened if the user imme…

    …diately tries to use the scatter plotter
    andrew-weisman committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    2ea8aca View commit details
    Browse the repository at this point in the history
  6. Delete streamlit=1.35.0 in pip section of environment.yml, should hav…

    …e been == anyway I believe
    andrew-weisman committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    3eb9245 View commit details
    Browse the repository at this point in the history
  7. Also delete pinned Streamlit version in .hooks/startup.sh, note there…

    …'s no longer a red error though you have to hit 'r' to reload the page and then the sidebar loads correctly
    andrew-weisman committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    6a3eda2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0b485ca View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Address bug where if you set a custom phenotype name to unassigned in…

    … order to ignore it, the phenotyping in the spatial interaction tool won't die on an assertion error
    andrew-weisman committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    1c47833 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1614b42 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    559ba0a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    70125cc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b857a14 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Configuration menu
    Copy the full SHA
    c624d06 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    29d6a91 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Configuration menu
    Copy the full SHA
    d578c06 View commit details
    Browse the repository at this point in the history
  2. Fix minor issues

    andrew-weisman committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    1e1b6da View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6925651 View commit details
    Browse the repository at this point in the history
  4. Refactor and clean up the code, didn't implement parallelization but …

    …doesn't seem to be needed when applying the thresholds to each individual group as likely makes the most sense
    andrew-weisman committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    247c18c View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Configuration menu
    Copy the full SHA
    970af7d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7faf1c5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    27dd4fc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    50b2bbf View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9a276d1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a0e8da7 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    18fb0a5 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ca18dbf View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. updated fast methods and de

    abombin committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    b9fbb77 View commit details
    Browse the repository at this point in the history
  2. Try porting to Streamlit's new multipage functionality since we have …

    …to significantly change the .toml file anyway
    andrew-weisman committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    f535d31 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8020db6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    38c33f4 View commit details
    Browse the repository at this point in the history
  5. Remove reference to pages directory, which the new Streamlit multipag…

    …e functionality says to not use or else issues might crop up, hence the rename to pages2
    andrew-weisman committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    e98e944 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8c3bfb2 View commit details
    Browse the repository at this point in the history
  7. Move code from radial_bins_plots.py to the new pages adaptive_phenoty…

    …ping.py and preprocessing.py
    andrew-weisman committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    52a8840 View commit details
    Browse the repository at this point in the history
  8. Rename main app file

    andrew-weisman committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    8c2ef1d View commit details
    Browse the repository at this point in the history
  9. Minor updates

    andrew-weisman committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    bf31d50 View commit details
    Browse the repository at this point in the history
  10. Minor deletion

    andrew-weisman committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    304187a View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Use lambda functions in callbacks to simplify key deletion from sessi…

    …on state
    
    Remove any dependence of adaptive phenotyping on radial bins analysis... it's completely general
    
    Make categorical column determination a function in utils.py
    andrew-weisman committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    82bcf79 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Configuration menu
    Copy the full SHA
    b4370f6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6339d83 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3bf5d6a View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Configuration menu
    Copy the full SHA
    6b6fc0e View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. typos

    abombin committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    70a5544 View commit details
    Browse the repository at this point in the history
  2. Disabled unsupervised phenotyping workflow so app works while Andrei …

    …sees if he can fix it
    
    Saved edits back to main dataframe in session state in adaptive phenotyper
    
    Add warning that preprocessing may have already been done so exit preprocessing function cleanly
    
    Broaden ImageJ preprocessing to accommodate newest dataset
    andrew-weisman committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    0e7c41b View commit details
    Browse the repository at this point in the history
  3. Allow user to select confidence level for determination of significan…

    …ce difference in the means
    andrew-weisman committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    0d9cd44 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. removed utag git

    abombin committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    d36075c View commit details
    Browse the repository at this point in the history
  2. updated dependencies in yml

    abombin committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    7d4e2fa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    837c289 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. dummies +/-

    abombin committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    228ed8c View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Configuration menu
    Copy the full SHA
    c0d1c3a View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Configuration menu
    Copy the full SHA
    13d41b6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    993f719 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9dbc6aa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2e82304 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    059fad6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1a608d5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6a60134 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Configuration menu
    Copy the full SHA
    46051f6 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Configuration menu
    Copy the full SHA
    cf79f8a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cad0c4e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c5d9cc0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c4263d3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2008358 View commit details
    Browse the repository at this point in the history
  6. swapping these values

    No idea they were in this order. I think these changes came after we had finished working with Will and group.
    djsmith17 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    141e00d View commit details
    Browse the repository at this point in the history
  7. Linting

    djsmith17 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    2cc941e View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Configuration menu
    Copy the full SHA
    f4cbf2f View commit details
    Browse the repository at this point in the history
  2. Updated instructions

    djsmith17 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    3085210 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #132 from ncats/improvement_suggestions

    Improvement suggestions
    djsmith17 authored Aug 2, 2024
    Configuration menu
    Copy the full SHA
    3598a53 View commit details
    Browse the repository at this point in the history
  4. heatmaps and umaps

    abombin committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    21634c7 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. added dependencies

    abombin committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    7654a34 View commit details
    Browse the repository at this point in the history
  2. adjusted umap

    abombin committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    bf68b01 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f4afdc8 View commit details
    Browse the repository at this point in the history
  4. added New Rank Plots

    abombin committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ca84de1 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Don't stop rest of Unifier from running until ROI definition button h…

    …as been pressed
    
    Don't let robust scatter plotter die if the dataframe of interest contains lists in a column (unhashable error)
    
    Fix Squidpy from dying with cryptic error 'TypeError: No matching definition for argument type(s) readonly array(uint32, 1d, C), array(uint32, 1d, C), array(uint32, 1d, C)' by basically removing n_jobs=1
    andrew-weisman committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    d17db87 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Configuration menu
    Copy the full SHA
    ebc70bf View commit details
    Browse the repository at this point in the history
  2. Merge pull request #134 from ncats/updates_merge

    Updates merge
    andrew-weisman authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    76949b5 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Clear datafile unifier data when new files are combined

    Implement taking the intersection of columns instead of forcing the user to use datafiles with all the same columns
    
    Detect null values in the data
    
    Turn off plotting once min/max settings are changed
    andrew-weisman committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    6dafe64 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dcafd00 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    032e440 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2db5ea5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    187933c View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Configuration menu
    Copy the full SHA
    1ec9bd9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1aea01c View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Configuration menu
    Copy the full SHA
    aefe5f7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #135 from ncats/improvement_suggestions

    Fixing an issue with feature separation
    djsmith17 authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    cd80bab View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Configuration menu
    Copy the full SHA
    1a927d3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9783733 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Configuration menu
    Copy the full SHA
    a48d522 View commit details
    Browse the repository at this point in the history
  2. In null row detection in the unifier, display only the rows with null…

    … values; also, if basic_phenotyper_lib.init_pheno_cols() null rows are found, delete them automatically and render a warning to the user
    andrew-weisman committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    7fdc2bf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    93ec13f View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. fast phenograph and parc

    abombin committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    f849233 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f0d1320 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Configuration menu
    Copy the full SHA
    a0fa2e8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3c571de View commit details
    Browse the repository at this point in the history
  3. Get kdtree working to match the previous cdist implementation in the …

    …SIT, although it may suffer from: (1) generating many trees, and (2) not taking memory issues into consideration as is done using kdtree in neighborhood profiles
    andrew-weisman committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    3d50646 View commit details
    Browse the repository at this point in the history
  4. Reverting to cdist method accounting for OOM. Refactoring the SIT to …

    …use kdtree efficiently involves the following considerations: (1) many trees are generated in the version just implemented so it'd be tempting to generate one per center phenotype and neighbor phenotype where there are fewer possible centers than neighbors due to edge effects, (2) the metrics calculation includes the number of neighbors in lambda, (3) using utils.fast_neighbors_counts_for_block2() would be tempting which suggests to use one df per ROI but don't forget edge effects, (4) it could also be best to just take into account memory considerations in the new kdtree counts method implemented today, (5) there could be more considerations. Basically, we'd need to balance the considerations in utils.fast_neighbors_counts_for_block2() with many nuances most of which are touched upon in this commit message, so refactoring to use kdtree efficiently for the SIT is far from trivial and probably not worth it at this time
    andrew-weisman committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    05fe741 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Configuration menu
    Copy the full SHA
    969bcb5 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Merge pull request #136 from ncats/andrei_develop

    Andrei develop
    andrew-weisman authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    8d83160 View commit details
    Browse the repository at this point in the history
  2. Update NIDAP template

    andrew-weisman committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5b18baa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9ba7058 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Configuration menu
    Copy the full SHA
    71684b5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #137 from ncats/andrei_develop

    normalization methods and variable features selection
    andrew-weisman authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    5881756 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Configuration menu
    Copy the full SHA
    b74d3b9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    23924be View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Configuration menu
    Copy the full SHA
    e36fc8d View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. spatial plot aspect ratio

    abombin committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    0d9a53b View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. removed : from checkboxes

    abombin committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    1e554f9 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #145 from ncats/andrei_develop

    Andrei develop
    andrew-weisman authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    8ffe8b7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d1e88c3 View commit details
    Browse the repository at this point in the history
  4. Allow for .zip files to be loaded in which the user has potentially a…

    …dded a bunch more periods than expected
    andrew-weisman committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    3b2e0f2 View commit details
    Browse the repository at this point in the history
  5. Add instructions imploring user to always delete null rows in the Dat…

    …afile Unifier. This is in response to a user running the SIT when using a unified datafile where null values weren't deleted, so the SIT crashed with df[marker_cols] = df[marker_cols].map(lambda x: {'+': 1, '-': 0}[x[-1]])
    andrew-weisman committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    131c77f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    75e571c View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Update missing ROI heatmap data message

    Account for missing average slide heatmap data in the plots
    andrew-weisman committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    564ec10 View commit details
    Browse the repository at this point in the history
  2. Remove unit conversion in the file opener since the conversion should…

    … always be done in the unifier
    andrew-weisman committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7907598 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b98da0e View commit details
    Browse the repository at this point in the history
  4. Merge pull request #146 from ncats/andrew-dev

    Bunch of changes mainly to address issues with user's dataset and settings
    andrew-weisman authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    110cb77 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. corrected typo in sklearn-ann

    abombin committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    bac5694 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1e3882a View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. rewrote forking_test.py

    abombin committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    b8df4e2 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Fix occassional 'Stopping...' error by forcing the forkserver start m…

    …ethod to get set since it never was since it was being set in the name==main block, which is never called by Multiplex_Analysis_Web_Apps.py
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    cf7227a View commit details
    Browse the repository at this point in the history
  2. Pare down Multiplex_Analysis_Web_Apps.py keeping only 'st.set_page_co…

    …nfig(layout=wide)'; the problem still occurs: 2024-09-23 13:38:45.780 WARNING streamlit.runtime.scriptrunner_utils.script_run_context: Thread 'MainThread': missing ScriptRunContext! This warning can be ignored when running in bare mode.
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    99ef673 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e7a5445 View commit details
    Browse the repository at this point in the history
  4. Putting back in 'st.set_page_config(layout=wide)' to find this is wha…

    …t causes the problem to occur, at least in the MAWA code stack
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    9ef1e03 View commit details
    Browse the repository at this point in the history
  5. Fix the problem by moving the wide layout command to inside the main(…

    …) function. It was previously outside it above the import statements because at least one of those scripts contained calls to streamlit (well, to st) outside functions, which can't be called before the layout command
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    3ba0110 View commit details
    Browse the repository at this point in the history
  6. Put back in all the imports... no conflicts with the layout function …

    …are detected so there must be no more streamlit calls before layout is called in the main() function in Multiplex_Analysis_Web_Apps.py. However, running the forking test still executes slowly with seconds of overhead.
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    7f850da View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    acae75a View commit details
    Browse the repository at this point in the history
  8. Switch back to my original forking test which is more representative …

    …of how parallel calls are made in MAWA. The slow imports still occur the same way, we probably just need to fix those scripts
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    cd510d5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    93a5180 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0cc4c83 View commit details
    Browse the repository at this point in the history
  11. Show that only if both nidap_dashboard_lib.py and basic_phenotyper_li…

    …b.py are commented out that speed goes back to normal (note in my last commit I still had one of those mistakenly commented out)
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    f676185 View commit details
    Browse the repository at this point in the history
  12. It's fast again having commented out the import of the thresholded ph…

    …enotyper, will address that later
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    4b98210 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    d4e4753 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    d846bac View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    1c59448 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    43e1e1f View commit details
    Browse the repository at this point in the history
  17. Find that not only is umap slow, but also something in 'from neighbor…

    …hood_profiles import NeighborhoodProfiles, UMAPDensityProcessing' in nidap_dashboard_lib.py is slow
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    287e3fe View commit details
    Browse the repository at this point in the history
  18. The culprit seems to be the import of umap in neighborhood_profiles.p…

    …y... so it seems that umap is what makes anything in nidap_dashboard_lib.py and basic_phenotyper_lib.py slow
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    fe4b68c View commit details
    Browse the repository at this point in the history
  19. The culprit seems to be the import of umap in neighborhood_profiles.p…

    …y... so it seems that umap is what makes anything in nidap_dashboard_lib.py and basic_phenotyper_lib.py slow
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    a0b89d4 View commit details
    Browse the repository at this point in the history
  20. Start uncommenting things out, carefully ensuring the threading issue…

    … still doesn't pop up due to setting the wide layout in the main() function now
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    b654356 View commit details
    Browse the repository at this point in the history
  21. Finish fixing threading problem by moving wide layout and assessing s…

    …peed of module imports and their effects on the forking testing
    andrew-weisman committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    89056e0 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    40dfe5d View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    77d0571 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Merge pull request #147 from ncats/check_ubuntu_installation

    Check ubuntu installation + Andrew's additions
    abombin authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    5255580 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. This seems to be working for both published and unpublished dashboard…

    …s, though I'm a bit nervous about the consistency of the installation of 'annoy'. But the last two times it worked. This adds Python-based installation of packages after environment.yml/startup.sh have been used to set up the environments.
    andrew-weisman committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    c0414a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge pull request #148 from ncats/package_setup_using_old_methods

    Update live installation of packages so that both unpublished workspaces and published dashboards work
    andrew-weisman authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    89d97e2 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Don't resample without replacement if the requested sample size is sm…

    …aller than the dataframe size; if so, then essentially just return the whole dataframe
    andrew-weisman committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    01a7138 View commit details
    Browse the repository at this point in the history
  2. Allow the user to manually re-extract the columns from the dataset of…

    … interest in case they have changed and haven't updated through the app
    andrew-weisman committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    e01ddac View commit details
    Browse the repository at this point in the history
  3. Even if ROI name have spaces in them, ensure ALL images generated by …

    …SIT replace them with underscores; until now, just some of them did, like those in single_roi_outlines_on_whole_slides
    andrew-weisman committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    64bac4e View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Merge pull request #149 from ncats/andrew-dev

    Three bug fixes
    andrew-weisman authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    9e71bf5 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Configuration menu
    Copy the full SHA
    95f4232 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2dc4b6c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d4ceedb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    75d703b View commit details
    Browse the repository at this point in the history
  5. Parsing image names is proving really hard to generalize; trying a mu…

    …ch cleaner way, basically undoing most of the changes from the last commit; compare to the commit before that
    andrew-weisman committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    1197186 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c3bf2df View commit details
    Browse the repository at this point in the history
  7. Since we are maintaining that images get generated without the spaces…

    …, in order to not change many things at once, then make sure we respect that when getting the correct paths for the ROIs
    andrew-weisman committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    a14dce5 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. Configuration menu
    Copy the full SHA
    2ef7cdb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6ebb017 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Configuration menu
    Copy the full SHA
    78c8c50 View commit details
    Browse the repository at this point in the history