Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
2af7cc0
draft for Konnektor integration
RiesBen Sep 3, 2024
3c5c8a0
draft for Konnektor integration
RiesBen Sep 3, 2024
2eb3c84
changing back to mappers iterable as parameter
RiesBen Sep 4, 2024
0e9440d
consistently using Konnektor also in loading fep or orion net
RiesBen Sep 4, 2024
a55cfb8
adding handles for Konnektor functionality.
RiesBen Sep 4, 2024
bc9eb89
used black for formatting.
RiesBen Sep 4, 2024
9a0a85b
used black for formatting.
RiesBen Sep 4, 2024
e626408
Update test_network_planning.py
RiesBen Oct 17, 2024
e1c1170
fixes for unittests:
RiesBen Oct 22, 2024
730718a
Update test_network_planning.py
RiesBen Oct 29, 2024
a338d17
updating docstrings
atravitz Nov 6, 2024
b334007
adjusting n_processes docstring language
atravitz Nov 6, 2024
1de0809
fixing central_ligand default
atravitz Nov 6, 2024
b85b4f3
rename mappers to mapper to avoid api break
atravitz Nov 6, 2024
16781f8
Revert "rename mappers to mapper to avoid api break"
atravitz Nov 6, 2024
28e70e2
fixing mapper/s to avoid api break
atravitz Nov 6, 2024
c94de80
switching arg names from 'ligands' to new 'components' keyword to mat…
atravitz Nov 6, 2024
b8ca43c
reverting ordering change
atravitz Jan 8, 2025
68c1ff1
fixing docstring
atravitz Jan 8, 2025
ef9fde2
pull konnektor from main for development only
atravitz May 14, 2025
915e71a
mapper back to mappers to avoid api break
atravitz May 15, 2025
a3e4f18
clean up
atravitz May 15, 2025
c800bea
formatting
atravitz May 15, 2025
8d2b88b
mapper->mappers
atravitz May 15, 2025
0cc0c24
fixing call to network_from_indices
atravitz May 15, 2025
3368bd4
update radial network test scorer to return between 0 and 1
atravitz May 20, 2025
1e97692
organizing tests into classes
atravitz May 20, 2025
d6526c6
expect only one mapping per edge for maximal networks
atravitz May 20, 2025
a044a71
adding TODOs
atravitz May 20, 2025
92fbffb
adding TODOs for later
atravitz May 21, 2025
7655a1f
update index error string to match konnektor's clarity improvement
atravitz May 21, 2025
14a191b
updating pytest.raises to look for RuntimeError instead of ValueError
atravitz May 21, 2025
9dcfa4f
adding TODO
atravitz May 23, 2025
649845d
making unreachable test clearer
atravitz May 23, 2025
f3200f7
fixing regex AGAIN
atravitz May 23, 2025
aeb5f8d
some light formatting
atravitz May 27, 2025
4a3bfe3
Merge branch 'main' of github.com:OpenFreeEnergy/openfe into Konnekto…
atravitz May 27, 2025
b7478bf
cleaning up diff
atravitz May 27, 2025
b4d9717
central_ligand -> central component for msg regex
atravitz May 29, 2025
e4f5548
Merge branch 'main' of github.com:OpenFreeEnergy/openfe into Konnekto…
atravitz May 29, 2025
39fe159
regex
atravitz May 29, 2025
a167e83
Merge branch 'main' of github.com:OpenFreeEnergy/openfe into Konnekto…
atravitz Jun 3, 2025
5030386
updating regexes to match new konnektor behavior
atravitz Jun 3, 2025
107b15b
formatting :(
atravitz Jun 3, 2025
93f0459
formatting :(
atravitz Jun 3, 2025
924467f
Merge branch 'main' of github.com:OpenFreeEnergy/openfe into Konnekto…
atravitz Jun 3, 2025
43cbc1d
add connectedness check
atravitz Jun 3, 2025
385dbf1
updating TODO
atravitz Jun 3, 2025
890da29
fix comment
atravitz Jun 5, 2025
1648e0b
Merge branch 'main' of github.com:OpenFreeEnergy/openfe into Konnekto…
atravitz Jun 10, 2025
9d58bba
update progress bar docstring
atravitz Jun 10, 2025
14619e5
fix ambiguous var name
atravitz Jun 10, 2025
ea5c868
remove unused imports
atravitz Jun 10, 2025
8d37c6e
fix mypy checks
atravitz Jun 10, 2025
311f133
remove unused testing code
atravitz Jun 11, 2025
8102f7c
Merge branch 'main' into KonnektorIntegration
atravitz Jun 12, 2025
807fb4d
Merge branch 'main' into KonnektorIntegration
IAlibay Jun 13, 2025
cef8fc7
Merge branch 'main' into KonnektorIntegration
atravitz Jun 13, 2025
8aba9b3
pin konnektor to 0.2
atravitz Jun 17, 2025
b9fefa8
remove completed TODOs
atravitz Jun 17, 2025
f298c0f
add konnektor to docs env
atravitz Jun 17, 2025
71c1669
remove completed TODO
atravitz Jun 17, 2025
062bcb4
updating news
atravitz Jun 17, 2025
a3a5888
clarifying process and progress additions in news
atravitz Jun 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies:
- autodoc-pydantic <2.0
- gitpython
- kartograf >=1.0.0
- konnektor >=0.2.0
- libsass
- lomap2 >=3.0.0
- myst-parser
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dependencies:
- coverage
- duecredit<0.10
- kartograf>=1.0.0
- konnektor~=0.2.0
- lomap2>=3.2.1
- networkx
- numpy<2.0.0
Expand Down
25 changes: 25 additions & 0 deletions news/konnektor_changes.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
**Added:**

* Added optional ``n_processes`` (number of parallel processes to use when generating the network) arguments for network planners.
* Added optional ``progress`` (whether to show progress bar) for ``openfe.setup.ligand_network_planning.generate_radial_network`` (default=``False``, such that there is no default behavior change).

**Changed:**

* `konnektor <https://konnektor.openfree.energy/en/latest/>_` is now used as the backend for all network generation.
* ``openfe.setup.ligand_network_planning.generate_maximal_network`` now returns the *best* mapping for each edge, rather than *all possible* mappings for each edge. If multiple mappers are passed but no scorer, the first mapper passed will be used, and a warning will be raised.

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>
Loading