Skip to content

Commit 2878e7d

Browse files
committed
fix CTS unavailability
1 parent f137483 commit 2878e7d

2 files changed

Lines changed: 18 additions & 4 deletions

File tree

galaxy/generate_options.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,31 @@
44
# this add to path the home dir, so it can be called from anywhere
55
sys.path.append(os.path.split(sys.path[0])[0])
66

7+
from MSMetaEnhancer.libs.converters.web import CTS, CIR, IDSM, PubChem, BridgeDb
8+
from MSMetaEnhancer.libs.converters.compute import RDKit
79
from MSMetaEnhancer.libs.utils.ConverterBuilder import ConverterBuilder
10+
811
from MSMetaEnhancer.libs.converters.web import __all__ as web_converters
912
from MSMetaEnhancer.libs.converters.compute import __all__ as compute_converters
1013

1114

1215
def generate_options():
16+
ConverterBuilder.register([CTS, CIR, IDSM, PubChem, BridgeDb, RDKit])
17+
1318
jobs = []
1419
converters = web_converters + compute_converters
15-
built_converters, built_web_converters = ConverterBuilder().build_converters(
20+
21+
builder = ConverterBuilder()
22+
builder.validate_converters(converters)
23+
built_compute_converters, built_web_converters = builder.build_converters(
1624
None, converters
1725
)
1826

19-
for converter in built_converters:
20-
jobs += built_converters[converter].get_conversion_functions()
27+
for converter in built_compute_converters.values():
28+
jobs += converter.get_conversion_functions()
29+
30+
for converter in built_web_converters.values():
31+
jobs += converter.get_conversion_functions()
2132

2233
for job in jobs:
2334
print(

tests/test_CTS.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88

99
@pytest.mark.dependency()
1010
def test_service_available():
11-
asyncio.run(wrap_with_session(CTS, "casno_to_inchikey", ["7783-89-3"]))
11+
try:
12+
asyncio.run(wrap_with_session(CTS, "casno_to_inchikey", ["7783-89-3"]))
13+
except:
14+
assert False
1215

1316

1417
@pytest.mark.dependency(depends=["test_service_available"])

0 commit comments

Comments
 (0)