Skip to content

Conversation

@atravitz
Copy link
Contributor

@atravitz atravitz commented Dec 2, 2025

in response to #1710 (comment)

Checklist

  • All new code is appropriately documented (user-facing code must have complete docstrings).
  • Added a news entry, or the changes are not user-facing.
  • Ran pre-commit by making a comment with pre-commit.ci autofix before requesting review.

Manual Tests: these are slow so don't need to be run every commit, only before merging and when relevant changes are made (generally at reviewer-discretion).

Developers certificate of origin

@github-actions
Copy link

github-actions bot commented Dec 2, 2025

No API break detected ✅

@atravitz atravitz changed the base branch from main to feat/cli-gather-improvements December 2, 2025 01:07
@atravitz atravitz changed the title Cli/fix gather repeat headers make gather septop/abfe output headers accurately reflect error type Dec 2, 2025
@atravitz atravitz requested review from IAlibay and removed request for IAlibay December 2, 2025 01:08
@codecov
Copy link

codecov bot commented Dec 2, 2025

Codecov Report

❌ Patch coverage is 91.66667% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 93.09%. Comparing base (9c04915) to head (2b7f1b4).
⚠️ Report is 1 commits behind head on feat/cli-gather-improvements.

Files with missing lines Patch % Lines
openfecli/commands/gather_septop.py 86.66% 2 Missing ⚠️
Additional details and impacted files
@@                       Coverage Diff                        @@
##           feat/cli-gather-improvements    #1712      +/-   ##
================================================================
- Coverage                         93.10%   93.09%   -0.01%     
================================================================
  Files                               189      189              
  Lines                             16526    16539      +13     
================================================================
+ Hits                              15386    15397      +11     
- Misses                             1140     1142       +2     
Flag Coverage Δ
fast-tests 93.09% <91.66%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment on lines 169 to 170
error_name = "MBAR uncertainty (kcal/mol)"
else:
error_func = _error_std
error_name = "uncertainty (kcal/mol)"
Copy link
Member

Choose a reason for hiding this comment

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

Thoughts on being more explicit here? Maybe "STDEV uncertainty" or something like that?

@atravitz atravitz force-pushed the cli/fix_gather_repeat_headers branch from a835400 to b7c456c Compare December 2, 2025 16:09
@atravitz atravitz force-pushed the cli/fix_gather_repeat_headers branch from 2cd85f4 to e86ee4f Compare December 2, 2025 17:08
unc_col_name = "MBAR uncertainty (kcal/mol)"
else:
error_func = _error_std
unc_col_name = "std dev uncertainty (kcal/mol)"
Copy link
Member

Choose a reason for hiding this comment

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

I didn't see any of the test files update with this, are we not testing this code path?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

they're updated! I think you just saw this between commit pushes.

@atravitz atravitz marked this pull request as ready for review December 2, 2025 17:40
@atravitz
Copy link
Contributor Author

atravitz commented Dec 2, 2025

I think there's a more robust way to do this, but this is at least better than not having mbar/stdev labels.

@atravitz atravitz merged commit 6315c97 into feat/cli-gather-improvements Dec 3, 2025
10 of 11 checks passed
@atravitz atravitz deleted the cli/fix_gather_repeat_headers branch December 3, 2025 15:42
atravitz added a commit that referenced this pull request Dec 4, 2025
…ort (#1710)

* feat: support `openfe gather` for septop (#1638)

* copy septop analysis notebook over

* add todos

* add plan and test

* format

* add failing tests

* comment out secondary tests

* add cli tmp

* clean up imports

* fix type hints in gather.py

* test passes for gather raw

* test passes for ddg

* tests pass for dg

* pull more error handling into septop

* condense code a bit

* MBAR uncertainty

* remove planning stub

* Revert "MBAR uncertainty"

This reverts commit bf32aa3.

* format

* test with tolerances

* precommit format

* remove accidentally committed file

* Apply suggestions from code review

Co-authored-by: Hannah Baumann <43765638+hannahbaumann@users.noreply.github.com>

---------

Co-authored-by: Hannah Baumann <43765638+hannahbaumann@users.noreply.github.com>

* feat: add abfe gathering support first draft (#1686)

* add abfe MVP with tests

* Apply suggestions from code review

Co-authored-by: Hannah Baumann <43765638+hannahbaumann@users.noreply.github.com>

* fix incorrect var name

* fix abfe legs extraction

* fix merge bug

* remove unused import

---------

Co-authored-by: Hannah Baumann <43765638+hannahbaumann@users.noreply.github.com>

* gather: fix septop rounding (#1696)

* only apply precision rounding at the end

* clean up code

* gather: update names parsing (septop and abfe) (#1698)

* update abfe names parsing

* update septop names parsing

* add todo

* get names from alchemical_components

* remove todo

* gather: refactor/unify rounding behavior (#1697)

* format septop outputs with format_df_with_precision

* only apply precision rounding at the end

* update gather abfe formatting to use format_df_with_precision

* remove unused import

* switch back to checking final outputs for abfes

* clean up code

* add rounding for dg mle

* simplify code

* gather: unify code structure between rbfe, septop, & abfe (#1700)

* format septop outputs with format_df_with_precision

* only apply precision rounding at the end

* update gather abfe formatting to use format_df_with_precision

* remove unused import

* switch back to checking final outputs for abfes

* clean up code

* add rounding for dg mle

* simplify code

* make gather_septop.py code more similar to gather.py

* make gather_abfe.py code more similar to gather.py

* remove unused function

* add stdout message for experimental gathering support (#1703)

* add warnings for experimental gathering

* use click to make output look nicer, not a true warning

* add warning text

* make yellow

* add tests

* remove unused code

* add news item

* speed up names gathering

* names should always return str

* add single repeat tests for abfe and septop

* remove unused imports

* make `gather septop/abfe` output headers accurately reflect error type (#1712)

* gather septop/abfe output headers accurately reflect error type

* split into func

* label all uncertainty columns more specifically

* add docstring

* update test data

* update error calculation

---------

Co-authored-by: Hannah Baumann <43765638+hannahbaumann@users.noreply.github.com>
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