Fix enhanced CLI explicit-donor handling and writeout tuple unpacking#541
Merged
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #541 +/- ##
==========================================
+ Coverage 40.26% 40.68% +0.41%
==========================================
Files 93 93
Lines 30325 30327 +2
==========================================
+ Hits 12211 12339 +128
+ Misses 18114 17988 -126
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
|
Everything looks good here! Thanks,
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
run_build_complex()importedpydentatebefore checking whether any ligand was actually missing coordinating atoms. That made commands with explicit--usercatomsfail in environments wherepydentatewas not installed, even though donor prediction was not needed for the run.After fixing that, the same enhanced CLI path hit a second bug: it overwrote
molwith the full return value ofenforce_metal_ligand_distances_and_optimize(...), which returns a tuple. The latermol.writexyz(...)call then failed with:This patch defers the
pydentateimport until it is actually needed, unpacks the return value ofenforce_metal_ligand_distances_and_optimize(...)before writeout, and adds a CLI regression test for the explicit--usercatomspath.Repro before
python -m molSimplify \ --ligand NCCCOCCN \ --usercatoms '[0,7]' \ --occupancy 3 \ --metal Fe \ --ox 2 \ --spin 1 \ --geometry octahedral \ --run-dir /tmp/molsimplify-cli-probe-reproIn an environment without
pydentate, this failed immediately with:After the lazy-import change, the same command progressed to the next bug in the same CLI path:
With both fixes in place, the command completes and writes the expected output files.
Test