check for protected datasets

Author: mayofaulkner

ibllib/oneibl/registration.py

@@ -84,7 +84,7 @@ def register_dataset(file_list, one=None, exists=False, versions=None, **kwargs)
     # Account for cases where we are connected to cortex lab database
     if one.alyx.base_url == 'https://alyx.cortexlab.net':
         protected_status = IBLRegistrationClient(
-            ONE(base_url='https://alyx.internationalbrainlab.org')).check_protected_files(file_list)
+            ONE(base_url='https://alyx.internationalbrainlab.org', mode='remote')).check_protected_files(file_list)
     else:
         protected_status = client.check_protected_files(file_list)
 
@@ -95,8 +95,8 @@ def register_dataset(file_list, one=None, exists=False, versions=None, **kwargs)
 
     # If we find a protected dataset, and we don't have a force=True flag, raise an error
     if protected and not kwargs.pop('force', False):
-        raise (FileExistsError, 'Protected datasets were found in the file list. To force the registration of datasets '
-                                'add the force=True argument.')
+        raise FileExistsError('Protected datasets were found in the file list. To force the registration of datasets '
+                              'add the force=True argument.')
 
     # If the repository is specified then for the registration client we want server_only=True to
     # make sure we don't make any other repositories for the lab

ibllib/tests/test_oneibl.py

@@ -332,9 +332,14 @@ def test_registration_datasets(self):
             self.one.alyx.rest('datasets', 'partial_update',
                                id=d['url'][-36:], data={'tags': [self.tag['name']]})
 
+        # Check that we get an exception error unless force=True
+        flist = list(self.rev_path.glob('*.npy'))
+        with self.assertRaises(FileExistsError):
+            registration.register_dataset(file_list=flist, one=self.one)
+
         # Test registering with a revision already in the file path, should use this rather than create one with today's date
         flist = list(self.rev_path.glob('*.npy'))
-        r = registration.register_dataset(file_list=flist, one=self.one)
+        r = registration.register_dataset(file_list=flist, one=self.one, force=True)
         self.assertTrue(all(d['revision'] == self.revision for d in r))
         self.assertTrue(all(d['default'] for d in r))
         self.assertTrue(all(d['collection'] == 'alf' for d in r))
@@ -348,7 +353,7 @@ def test_registration_datasets(self):
         # Register again with revision in file path, it should register to self.revision + a
         flist = list(self.rev_path.glob('*.npy'))
 
-        r = registration.register_dataset(file_list=flist, one=self.one)
+        r = registration.register_dataset(file_list=flist, one=self.one, force=True)
         self.assertTrue(all(d['revision'] == f'{self.revision}a' for d in r))
         self.assertTrue(self.alf_path.joinpath(f'#{self.revision}a#', 'spikes.times.npy').exists())
         self.assertTrue(self.alf_path.joinpath(f'#{self.revision}a#', 'spikes.amps.npy').exists())
@@ -357,7 +362,7 @@ def test_registration_datasets(self):
 
         # When we re-register the original it should move them into revision with today's date
         flist = list(self.alf_path.glob('*.npy'))
-        r = registration.register_dataset(file_list=flist, one=self.one)
+        r = registration.register_dataset(file_list=flist, one=self.one, force=True)
         self.assertTrue(all(d['revision'] == self.today_revision for d in r))
         self.assertTrue(self.alf_path.joinpath(f'#{self.today_revision}#', 'spikes.times.npy').exists())
         self.assertTrue(self.alf_path.joinpath(f'#{self.today_revision}#', 'spikes.amps.npy').exists())
@@ -375,7 +380,7 @@ def test_registration_datasets(self):
         np.save(self.alf_path.joinpath('spikes.times.npy'), np.random.random(500))
         np.save(self.alf_path.joinpath('spikes.amps.npy'), np.random.random(500))
         flist = list(self.alf_path.glob('*.npy'))
-        r = registration.register_dataset(file_list=flist, one=self.one)
+        r = registration.register_dataset(file_list=flist, one=self.one, force=True)
         self.assertTrue(all(d['revision'] == self.today_revision + 'a' for d in r))
 
     def _write_settings_file(self):