Skip to content

Commit 0760835

Browse files
committed
fix: add chem_xref
1 parent 11801b2 commit 0760835

2 files changed

Lines changed: 22 additions & 13 deletions

File tree

rr_cache/config/config_rr2026.json

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,23 @@
33
"cache": {
44
"cid_strc": {
55
"deps": {
6-
"file_deps": ["chemicals.tsv.gz", "chem_prop.tsv"]
6+
"file_deps": ["chemicals.tsv.gz", "chem_prop.tsv.gz"]
77
},
88
"file": {
99
"url": "",
1010
"name": "cid_strc.json.gz",
11-
"fingerprint": "4d51044442db3a103b0540df3dd24bf946bc0f13ef0f561f5baaaaa19fd57fd450885971c7b1661f3fa410250dd86c186c899c36891ef3f86eeef51181620386"
11+
"fingerprint": "cb330b718fc9dfd17772c16eb01134a811cae1c2fb1d44718bfa18db17abfef698a058ed4d290a5160b39786b9cf9cd1b9794f7de1f1ab05875a02c5a9d7f9d4"
12+
}
13+
},
14+
"cid_xref": {
15+
"deps": {
16+
"attr_deps": [],
17+
"file_deps": ["chem_xref.tsv.gz"]
18+
},
19+
"file": {
20+
"url": "https://gitlab.com/breakthewall/rrCache-data/-/raw/master/cache/mnx_4.4/",
21+
"name": "cid_xref.json.gz",
22+
"fingerprint": "f8a6e6ceb529abcb0223f89a92692a5031e31e2a7b35fa3f5e0b741b822544caa74b7cdc1ea137239fa6d5af81ad1d2794283157996185a20a23eed8a921b66a"
1223
}
1324
},
1425
"rr_reactions": {
@@ -18,7 +29,7 @@
1829
"file": {
1930
"url": "",
2031
"name": "rr_reactions.json.gz",
21-
"fingerprint": "b6e2dbc7033bafd21e6567cef8f75de06cf7e7bd365e361d8aff346df159aeaae3ba56c6d1d543cd985587c81e3a11d3931b1d1896214d8485cc44bbf54266d1"
32+
"fingerprint": "0486138cb224575c0bb1278ad31edc10cd5add44404d355aa7ab15c46fefb7fe4aff45a830c35de44e781c6aa86c762e773828a57a2146cc1ffb9e5ab398f46f"
2233
}
2334
},
2435
"template_reactions": {
@@ -28,21 +39,21 @@
2839
"file": {
2940
"url": "",
3041
"name": "template_reactions.json.gz",
31-
"fingerprint": "78946fd50963c1587e43caf190a3853936b3ed18bd2e649447b7e9c936f530e52bcc2d91ae6c97cae5fb58bde47891f2e1cc85cc7fe8e82d40a03fa6e0624d50"
42+
"fingerprint": "26bd612214d2744ba579ad2a57973bdde94ca847c3cac17c6e912bd65aba32831a7aa6ffbc440a5941221121b3d3af2ceaa1ad7642c2ef2a11a84a192abf1b90"
3243
}
3344
}
3445
},
3546
"sources": {
3647
"rr2": {
3748
"url": "",
3849
"files": {
39-
"templates.tsv.gz": "ede287e7e2b08f5620d26af0d7e68e25be70fb54eb5a8657b92314d4250a869073fa6022608fb00b9147a531a81f32c31923613a9b2b0c4321da45a7d8f56a1b"
50+
"templates.tsv.gz": "2974bff42eacb4beeae1c160f2b687ef8ee42b4e4dd762fbd103300636dfa0b8252e2f50a920f4199c5a4ec7e9df1b4a5e4c05167cab90bbefbcb18fde69f3f9"
4051
}
4152
},
4253
"rr2more": {
4354
"url": "",
4455
"files": {
45-
"chemicals.tsv.gz": "af060a170e43e55b0ee70567d7f14ef9ae21534c7c5c2e6a58ec19f8adec82a6c05080204c1d6d43f1556cabf91b711ba85d58dc5a6b1b5cb5e892fde4d7e001"
56+
"chemicals.tsv.gz": "ed9e91d63c34d963e313b7ca180e9285d2f1814dbf5bcee43f254a8db8ab385671dda20c88e71eaca50f52cd2a28d76adbfdb0bfd880c74293849650900a25e8"
4657
}
4758
}
4859
}

rr_cache/rr_cache.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -633,10 +633,8 @@ def _gen_cid_xref(
633633
# logger.debug(" Loading input data from file...")
634634
# deprecatedCID_cid['attr'] = rrCache._load_json(deprecatedCID_cid['file'])
635635
logger.debug(" Generating data...")
636-
cid_xref = rrCache._m_mnxm_xref(
637-
os_path.join(input_dir, 'chem_xref.tsv'),
638-
# deprecatedCID_cid['attr']
639-
)
636+
dep_files = [os_path.join(input_dir, f) for f in rrCache.__cache[attribute]['deps']['file_deps']]
637+
cid_xref = rrCache._m_mnxm_xref(dep_files[0])
640638
logger.debug(" Writing data to file...")
641639
rrCache._store_cache_to_file(cid_xref, f_cid_xref, logger=logger)
642640

@@ -1128,7 +1126,7 @@ def _m_mnxm_strc(
11281126

11291127
if chem_prop_path:
11301128
# Parse the chem_prop.tsv file from MetanetX
1131-
with open(chem_prop_path, 'rt') as f:
1129+
with gzip_open(chem_prop_path, 'rt', encoding='utf-8-sig') as f:
11321130
tmp = {}
11331131
# read CSV with both tab and space as delimiters
11341132
c = csv_reader(f, delimiter='\t')
@@ -1259,7 +1257,7 @@ def _m_mnxm_xref(
12591257
logger: Logger = getLogger(__name__)
12601258
) -> Dict:
12611259
cid_xref = {}
1262-
with open(chem_xref_path, 'rt') as f:
1260+
with gzip_open(chem_xref_path, 'rt', encoding='utf-8-sig') as f:
12631261
c = csv_reader(f, delimiter='\t')
12641262
for row in c:
12651263
if not row[0][0] == '#':
@@ -1309,7 +1307,7 @@ def _m_mnxc_xref(
13091307
logger.error('Could not read the file {filename}'.format(filename=comp_xref_path))
13101308
return None
13111309

1312-
with open(comp_xref_path, 'rt') as f:
1310+
with gzip_open(comp_xref_path, 'rt', encoding='utf-8-sig') as f:
13131311
c = csv_reader(f, delimiter='\t')
13141312
# not_recognised = []
13151313
for row in c:

0 commit comments

Comments
 (0)