add review corrections

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 ## [Latest](https://github.com/int-brain-lab/ONE/commits/main) [2.6.0]
-## [Latest](https://github.com/int-brain-lab/ONE/commits/main) [2.5.5]
+
+### Modified
+- `one.load_dataset`
+  - add an option to skip computing hash for existing files when loading datasets `check_hash=False`
+  - check filesize before computing hash for performance
+
+
+## [2.5.5]
 
 ### Modified
 

one/__init__.py

@@ -1,2 +1,2 @@
 """The Open Neurophysiology Environment (ONE) API."""
-__version__ = '2.5.5'
+__version__ = '2.6.0'

one/tests/test_one.py

@@ -68,6 +68,16 @@ def setUp(self) -> None:
         self.one = ONE(mode='local', cache_dir=self.tempdir.name)
         # Create dset files from cache
         util.create_file_tree(self.one)
+        # here we create some variations to get coverage over more case
+        # the 10 first records will have the right file size (0) but the wrong hash
+        # the next 10 records will have the right file size (0) but the correct empty file md5
+        # all remaining records have NaN in file_size and None in hash (default cache table)
+        cols = self.one._cache['datasets'].columns
+        self.one._cache['datasets'].iloc[:20, cols.get_loc('file_size')] = 0
+        self.one._cache['datasets'].iloc[:20, cols.get_loc('hash')]\
+            = 'd41d8cd98f00b204e9800998ecf8427e'  # empty hash correct
+        self.one._cache['datasets'].iloc[:10, cols.get_loc('hash')]\
+            = 'd41d8cda454aaaa4e9800998ecf8497e'  # wrong hash
 
     def tearDown(self) -> None:
         while Path(self.one.cache_dir).joinpath('.cache.lock').exists():

one/webclient.py

@@ -610,12 +610,12 @@ def _generic_request(self, reqfunction, rest_query, data=None, files=None):
             self.authenticate(username=username, force=True)
             return self._generic_request(reqfunction, rest_query, data=data, files=files)
         else:
-            _logger.debug('Response text: ' + r.text)
+            _logger.debug('Response text raw: ' + r.text)
             try:
                 message = json.loads(r.text)
                 message.pop('status_code', None)  # Get status code from response object instead
                 message = message.get('detail') or message  # Get details if available
-                _logger.error(message)
+                _logger.debug(message)
             except json.decoder.JSONDecodeError:
                 message = r.text
             raise requests.HTTPError(r.status_code, rest_query, message, response=r)