Skip to content

Commit 932f1c1

Browse files
committed
chore: rm fingerprints checks at load stage
1 parent 815ebbc commit 932f1c1

2 files changed

Lines changed: 20 additions & 26 deletions

File tree

rr_cache/config/config_rr2026.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
},
88
"file": {
99
"url": "",
10-
"name": "cid_strc.json.gz",
11-
"fingerprint": "04d9c2edaf86c3df1ccf74a37838ffdcfdf4b5f87ebc8ca70e797212856bae6a4fb07f549b0bff73fae66df66de0e1637c51039aa5b395ff70ca30d5f67d1a58"
10+
"name": "cid_strc.json.gz"
1211
}
1312
},
1413
"cid_xref": {
@@ -18,8 +17,7 @@
1817
},
1918
"file": {
2019
"url": "https://gitlab.com/breakthewall/rrCache-data/-/raw/master/cache/mnx_4.4/",
21-
"name": "cid_xref.json.gz",
22-
"fingerprint": "5f2b9dc3c1e5ff90ea907aae712e7f9354828e5d07eed97dce94e348315a72090ce22c53f54bb155dfd23fe8f8f89a20005f8e20cfc5d4cd0b1215e178b6f1b8"
20+
"name": "cid_xref.json.gz"
2321
}
2422
},
2523
"rr_reactions": {
@@ -28,8 +26,7 @@
2826
},
2927
"file": {
3028
"url": "",
31-
"name": "rr_reactions.json.gz",
32-
"fingerprint": "395fcc7f3fe6412889e4c622ba0bca582c344d8f1ec9cab94586bf553915ab3e1d54d2ca59d8f08c1d9f65d540a3bdfeaed0eff1819f69d12c8904211fa52863"
29+
"name": "rr_reactions.json.gz"
3330
}
3431
},
3532
"template_reactions": {
@@ -38,8 +35,7 @@
3835
},
3936
"file": {
4037
"url": "",
41-
"name": "template_reactions.json.gz",
42-
"fingerprint": "a888f9406c0e9b00719e007665a65962bdf24a9701cd6095c8678de2485f57ca14fff4a2ca7e33ccb8d120c7f11027dcce2cfa73abb3168d3aeb1e864b785f05"
38+
"name": "template_reactions.json.gz"
4339
}
4440
}
4541
},

rr_cache/rr_cache.py

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -228,21 +228,21 @@ def _check_or_download_cache_to_disk(
228228
full_filename = os_path.join(cache_dir, filename)
229229
# try:
230230
if os_path.exists(full_filename):
231-
fingerprint = rrCache.__cache[attr]["file"]["fingerprint"]
232-
if check_sha(full_filename, fingerprint):
233-
logger.debug(filename + " already downloaded")
234-
else: # sha not ok
235-
logger.warning(
236-
"\nfilename: "
237-
+ filename
238-
+ "\nlocation: "
239-
+ cache_dir
240-
+ "\nsha (computed): "
241-
+ sha512(Path(full_filename).read_bytes()).hexdigest()
242-
+ "\nsha (expected): "
243-
+ fingerprint
244-
)
245-
# raise FileNotFoundError
231+
# fingerprint = rrCache.__cache[attr]["file"]["fingerprint"]
232+
# if check_sha(full_filename, fingerprint):
233+
logger.debug(filename + " already downloaded")
234+
# else: # sha not ok
235+
# logger.warning(
236+
# "\nfilename: "
237+
# + filename
238+
# + "\nlocation: "
239+
# + cache_dir
240+
# + "\nsha (computed): "
241+
# + sha512(Path(full_filename).read_bytes()).hexdigest()
242+
# + "\nsha (expected): "
243+
# + fingerprint
244+
# )
245+
# # raise FileNotFoundError
246246
else:
247247
# raise FileNotFoundError
248248

@@ -479,9 +479,7 @@ def Build(self, interactive: bool = DEFAULTS["interactive"]) -> None:
479479
del cid_strc, cid_name
480480
try:
481481
cid_xref = rrCache._gen_cid_xref(
482-
self.__input__cache_dir,
483-
self.__cache_dir,
484-
logger=self.logger
482+
self.__input__cache_dir, self.__cache_dir, logger=self.logger
485483
)
486484
print_progress(self.logger)
487485
# rrCache._gen_chebi_cid(self.__input__cache_dir, self.__cache_dir, cid_xref)

0 commit comments

Comments
 (0)