Skip to content

#3640 Escaped characters in SGroup labels in CXSMILES not properly handled #3675

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.

Sign up for GitHub

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

Open
even1024 wants to merge 17 commits into
base: master
Choose a base branch
from
Open

#3640 Escaped characters in SGroup labels in CXSMILES not properly handled #3675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5423894
escape sgroups
even1024 May 20, 2026
f65ce5b
Fix daylight AP smiles
even1024 May 25, 2026
01c3596
Adjust escaped SGroup tests
even1024 May 28, 2026
73f204c
Fix terminal AP CXSMILES roundtrip
even1024 May 28, 2026
02d3ac9
Fix terminal AP CXSMILES roundtrip
even1024 May 28, 2026
36fd668
Limit AP star roundtrip
even1024 May 29, 2026
0dd7bd2
Escape dollar in SGroup fields
even1024 May 30, 2026
ef9b397
Split SGroup KET tests
even1024 May 30, 2026
5516349
Fix Jython KET test order
even1024 May 31, 2026
8226815
Format KET test
even1024 May 31, 2026
6bcd377
Write AP closure in Daylight SMILES
even1024 Jun 3, 2026
c9d8934
Add SGroup AP roundtrip test
even1024 Jun 4, 2026
10c0ebc
Fix CXSMILES AP star roundtrip
even1024 Jun 8, 2026
093457e
Revert "Fix CXSMILES AP star roundtrip"
even1024 Jun 9, 2026
e86817c
Merge branch 'master' into 3640-escape-bm
AliaksandrDziarkach Jun 15, 2026
451e7b8
Fix UT
AliaksandrDziarkach Jun 15, 2026
50cf560
Change all AP, fix UT
AliaksandrDziarkach Jun 16, 2026
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
32 changes: 16 additions & 16 deletions api/tests/integration/ref/basic/attachment_points.py.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ IC1CCCCC1I
M END

Molecule: CC1C(O)=C(C)C(CF)C(CO)C=1 |ha:0,1,2,3,4,6,7,9,10,12,hb:0,1,2,3,5,6,8,9,11,12|
decomposed molecule: CC1C(O)=C%91C(C%92)C(C%93)C=1.[*:2]%93.[*:3]%92.[*:4]%91 |$;;;;;;;;;;_R2;_R3;_R4$,RG:_R2={O%91.[*:1]%91 |$;_AP1$|},_R3={F%91.[*:1]%91 |$;_AP1$|},_R4={C%91.[*:1]%91 |$;_AP1$|}|
decomposed molecule: CC1C(O)=C%91C(C%92)C(C%93)C=1.[*:2]%93.[*:3]%92.[*:4]%91 |$;;;;;;;;;;_R2;_R3;_R4$,RG:_R2={O* |$;_AP1$|},_R3={F* |$;_AP1$|},_R4={C* |$;_AP1$|}|
mapped scaffold: CC1=CC(C)C(C)C=C1O
RGROUP #2
fragment #0: O%91.[*:1]%91 |$;_AP1$|
fragment #0: O* |$;_AP1$|
Number of attachment points: 1
Index: 0. Order 1
Number of attachment points: 1
Expand All @@ -58,7 +58,7 @@ OI
M END

RGROUP #3
fragment #0: F%91.[*:1]%91 |$;_AP1$|
fragment #0: F* |$;_AP1$|
Number of attachment points: 1
Index: 0. Order 1
Number of attachment points: 1
Expand All @@ -76,7 +76,7 @@ FI
M END

RGROUP #4
fragment #0: C%91.[*:1]%91 |$;_AP1$|
fragment #0: C* |$;_AP1$|
Number of attachment points: 1
Index: 0. Order 1
Number of attachment points: 1
Expand All @@ -94,10 +94,10 @@ CI
M END

Molecule: CC1C(O)=C(C)C2C(COC2)C=1 |ha:0,1,2,3,4,6,7,8,10,11,hb:0,1,2,3,5,6,7,10,11,12|
decomposed molecule: CC1C(O)=C%91C(C(C%92)C=1)C%93.[*:1]%92%93.[*:4]%91 |$;;;;;;;;;;_R1;_R4$,RG:_R1={O%91%92.[*:1]%91.[*:2]%92 |$;_AP1;_AP2$|},_R4={C%91.[*:1]%91 |$;_AP1$|}|
decomposed molecule: CC1C(O)=C%91C(C(C%92)C=1)C%93.[*:1]%92%93.[*:4]%91 |$;;;;;;;;;;_R1;_R4$,RG:_R1={O** |$;_AP1;_AP2$|},_R4={C* |$;_AP1$|}|
mapped scaffold: CC1=CC(C)C(C)C=C1O
RGROUP #1
fragment #0: O%91%92.[*:1]%91.[*:2]%92 |$;_AP1;_AP2$|
fragment #0: O** |$;_AP1;_AP2$|
Number of attachment points: 2
Index: 0. Order 1
Index: 0. Order 2
Expand All @@ -119,7 +119,7 @@ IOI
M END

RGROUP #4
fragment #0: C%91.[*:1]%91 |$;_AP1$|
fragment #0: C* |$;_AP1$|
Number of attachment points: 1
Index: 0. Order 1
Number of attachment points: 1
Expand All @@ -137,10 +137,10 @@ CI
M END

Molecule: CC1C2C(COC2)C(O)=C2C=1OCC2 |ha:1,2,3,4,6,7,9,10,11,13,hb:1,2,3,6,7,9,10,11,12,15|
decomposed molecule: C1%91C(C(C%92)C%93=C(C=1O%94)C%95)C%96.[*:5]%94%95.[*:4]%93.[*:1]%92%96.[*:6]%91 |$;;;;;;;;;;_R5;_R4;_R1;_R6$,RG:_R1={O%91%92.[*:1]%91.[*:2]%92 |$;_AP1;_AP2$|},_R4={O%91.[*:1]%91 |$;_AP1$|},_R5={C%91%92.[*:1]%91.[*:2]%92 |$;_AP1;_AP2$|},_R6={C%91.[*:1]%91 |$;_AP1$|}|
decomposed molecule: C1%91C(C(C%92)C%93=C(C=1O%94)C%95)C%96.[*:5]%94%95.[*:4]%93.[*:1]%92%96.[*:6]%91 |$;;;;;;;;;;_R5;_R4;_R1;_R6$,RG:_R1={O** |$;_AP1;_AP2$|},_R4={O* |$;_AP1$|},_R5={C** |$;_AP1;_AP2$|},_R6={C* |$;_AP1$|}|
mapped scaffold: CC1=CC(C)C(C)C=C1O
RGROUP #1
fragment #0: O%91%92.[*:1]%91.[*:2]%92 |$;_AP1;_AP2$|
fragment #0: O** |$;_AP1;_AP2$|
Number of attachment points: 2
Index: 0. Order 1
Index: 0. Order 2
Expand All @@ -162,7 +162,7 @@ IOI
M END

RGROUP #4
fragment #0: O%91.[*:1]%91 |$;_AP1$|
fragment #0: O* |$;_AP1$|
Number of attachment points: 1
Index: 0. Order 1
Number of attachment points: 1
Expand All @@ -180,7 +180,7 @@ OI
M END

RGROUP #5
fragment #0: C%91%92.[*:1]%91.[*:2]%92 |$;_AP1;_AP2$|
fragment #0: C** |$;_AP1;_AP2$|
Number of attachment points: 2
Index: 0. Order 1
Index: 0. Order 2
Expand All @@ -202,7 +202,7 @@ ICI
M END

RGROUP #6
fragment #0: C%91.[*:1]%91 |$;_AP1$|
fragment #0: C* |$;_AP1$|
Number of attachment points: 1
Index: 0. Order 1
Number of attachment points: 1
Expand Down Expand Up @@ -337,7 +337,7 @@ $END CTAB
$END RGP
$END MOL

CC(CC%91)CC%92.[*:1]%92%91 |$;;;;;;_R1$,RG:_R1={C%91%92.[*:1]%91.[*:2]%92 |$;_AP1;_AP2$|}|
CC(CC%91)CC%92.[*:1]%92%91 |$;;;;;;_R1$,RG:_R1={C** |$;_AP1;_AP2$|}|
Format: 2000
$MDL REV 1 0100000000
$MOL
Expand Down Expand Up @@ -458,7 +458,7 @@ $END MOL
*** Testing deco ***
C1C2CC3CC1C23
C1CCCCC1
C1C%91CC%92CC%931.[*:1]%91%93%92 |$;;;;;;_R1$,RG:_R1={C%91%92%93.[*:1]%91.[*:2]%92.[*:3]%93 |$;_AP1;_AP2;_AP3$|}|
C1C%91CC%92CC%931.[*:1]%91%93%92 |$;;;;;;_R1$,RG:_R1={C*** |$;_AP1;_AP2;_AP3$|}|
Format: 2000
$MDL REV 1 0100000000
$MOL
Expand Down Expand Up @@ -861,7 +861,7 @@ M END
*** Testing deco ***
C1C2CC3CC1C1C2C31
C1C2CC3CC1C23
C%91C1C%92C%93C%94C%95C1.[*:1]%91%93%95.[*:2]%94%92 |$;;;;;;;_R1;_R2$,RG:_R1={C%91C%92%93.[*:3]%91.[*:1]%92.[*:2]%93 |$;;_AP3;_AP1;_AP2$|},|
C%91C1C%92C%93C%94C%95C1.[*:1]%91%93%95.[*:2]%94%92 |$;;;;;;;_R1;_R2$,RG:_R1={C%91C**.[*:3]%91 |$;;_AP3;_AP1;_AP2$|},|
Format: 2000
$MDL REV 1 0100000000
$MOL
Expand Down Expand Up @@ -1338,7 +1338,7 @@ $END CTAB
$END RGP
$END MOL

C1C%91CC%92CC%931.[*:1]%91%93%92 |$;;;;;;_R1$,RG:_R1={C%91%92%93.[*:1]%91.[*:2]%92.[*:3]%93 |$;_AP1;_AP2;_AP3$|}|
C1C%91CC%92CC%931.[*:1]%91%93%92 |$;;;;;;_R1$,RG:_R1={C*** |$;_AP1;_AP2;_AP3$|}|
Format: 2000
$MDL REV 1 0100000000
$MOL
Expand Down
2 changes: 1 addition & 1 deletion api/tests/integration/ref/basic/rsite.py.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ $END MOL

C%91O%92.[*:2]%92CO%92.[*:1]%92%91 |$;;_R2;;;_R1$,RG:_R1={C},{N},_R2={C},{N}|
[*:1]C1C%91CCCC1.[*:2]%91 |$_R1;;;;;;;_R2$,RG:_R1={CCC},_R2={N},LOG={_R1:;;._R2:_R1;H;0,1}|
Cl%91.[*]%91(I)Br |RG:_R1={CCCC(CC%91)C%92.[*:1]%91.[*:2]%92 |$;;;;;;;_AP1;_AP2$|},{CCCN(CC%91)C%92.[*:1]%91.[*:2]%92 |$;;;;;;;_AP1;_AP2$|},LOG={_R1:;;1}|
Cl%91.[*]%91(I)Br |RG:_R1={CCCC(CC%91)C*.[*:1]%91 |$;;;;;;;_AP1;_AP2$|},{CCCN(CC%91)C*.[*:1]%91 |$;;;;;;;_AP1;_AP2$|},LOG={_R1:;;1}|
$MDL REV 1 0100000000
$MOL
$HDR
Expand Down
6 changes: 3 additions & 3 deletions api/tests/integration/ref/deco/deco_matches.py.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ should add correct disconnected match to the full scaffold**********************
MATCH # 1
highlighted structure: CCCCOCCCCCNCCC |ha:0,1,2,3,4,7,8,9,10,11,hb:0,1,2,3,7,8,9,10|
molecule with rgroups:
Smiles: CCCCO%91.C%92CCNC%93.[*:1]%92%91.[*:2]%93 |$;;;;;;;;;;_R1;_R2$,RG:_R1={C%91C%92.[*:2]%91.[*:1]%92 |$;;_AP2;_AP1$|},_R2={C%91C.[*:1]%91 |$;;_AP1$|}|
Smiles: CCCCO%91.C%92CCNC%93.[*:1]%92%91.[*:2]%93 |$;;;;;;;;;;_R1;_R2$,RG:_R1={C%91C*.[*:2]%91 |$;;_AP2;_AP1$|},_R2={C%91C.[*:1]%91 |$;;_AP1$|}|
Format: auto
$MDL REV 1 0100000000
$MOL
Expand Down Expand Up @@ -92,7 +92,7 @@ M END
MATCH # 2
highlighted structure: CCCCOCCCCCNCCC |ha:0,1,2,3,4,9,10,11,12,13,hb:0,1,2,3,9,10,11,12|
molecule with rgroups:
Smiles: CCCCO%91.C%92NCCC.[*:1]%92%91 |$;;;;;;;;;;_R1$,RG:_R1={C%91CCC%92.[*:2]%91.[*:1]%92 |$;;;;_AP2;_AP1$|}|
Smiles: CCCCO%91.C%92NCCC.[*:1]%92%91 |$;;;;;;;;;;_R1$,RG:_R1={C%91CCC*.[*:2]%91 |$;;;;_AP2;_AP1$|}|
Format: auto
$MDL REV 1 0100000000
$MOL
Expand Down Expand Up @@ -165,7 +165,7 @@ M END
MATCH # 3
highlighted structure: CCCCOCCCCCNCCC |ha:4,5,6,7,8,9,10,11,12,13,hb:4,5,6,7,9,10,11,12|
molecule with rgroups:
Smiles: O%91CCCC%92.C%93NCCC.[*:1]%91.[*:2]%93%92 |$;;;;;;;;;;_R1;_R2$,RG:_R1={CCCC%91.[*:1]%91 |$;;;;_AP1$|},|
Smiles: O%91CCCC%92.C%93NCCC.[*:1]%91.[*:2]%93%92 |$;;;;;;;;;;_R1;_R2$,RG:_R1={CCCC* |$;;;;_AP1$|},|
Format: auto
$MDL REV 1 0100000000
$MOL
Expand Down
Loading
Loading