Merge pull request #485 from int-brain-lab/one_globus

One globus

Author: juhuntenburg

ibllib/oneibl/data_handlers.py

@@ -123,15 +123,15 @@ def __init__(self, session_path, signatures, one=None):
         :param signature: input and output file signatures
         :param one: ONE instance
         """
-        from one.globus import Globus, get_lab_from_endpoint_id  # noqa
+        from one.remote.globus import Globus, get_lab_from_endpoint_id  # noqa
         super().__init__(session_path, signatures, one=one)
         self.globus = Globus(client_name='server')
 
         # on local servers set up the local root path manually as some have different globus config paths
         self.globus.endpoints['local']['root_path'] = '/mnt/s0/Data/Subjects'
 
         # Find the lab
-        labs = get_lab_from_endpoint_id(one=self.one)
+        labs = get_lab_from_endpoint_id(alyx=self.one.alyx)
 
         if len(labs) == 2:
             # for flofer lab
@@ -142,9 +142,9 @@ def __init__(self, session_path, signatures, one=None):
 
         # For cortex lab we need to get the endpoint from the ibl alyx
         if self.lab == 'cortexlab':
-            self.globus.add_endpoint(f'flatiron_{self.lab}', one=ONE(base_url='https://alyx.internationalbrainlab.org'))
+            self.globus.add_endpoint(f'flatiron_{self.lab}', alyx=ONE(base_url='https://alyx.internationalbrainlab.org').alyx)
         else:
-            self.globus.add_endpoint(f'flatiron_{self.lab}')
+            self.globus.add_endpoint(f'flatiron_{self.lab}', alyx=self.one.alyx)
 
     def setUp(self):
         """
@@ -257,13 +257,16 @@ def __init__(self, task, session_path, signature, one=None):
         :param signature: input and output file signatures
         :param one: ONE instance
         """
-        from one.globus import Globus # noqa
+        from one.remote.globus import Globus # noqa
         super().__init__(session_path, signature, one=one)
         self.task = task
         self.aws = AWS(one=self.one)
         self.globus = Globus(client_name='server')
         self.lab = session_path_parts(self.session_path, as_dict=True)['lab']
-        self.globus.add_endpoint(f'flatiron_{self.lab}')
+        if self.lab == 'cortexlab':
+            self.globus.add_endpoint(f'flatiron_{self.lab}', alyx=ONE(base_url='https://alyx.internationalbrainlab.org').alyx)
+        else:
+            self.globus.add_endpoint(f'flatiron_{self.lab}', alyx=self.one.alyx)
 
     def setUp(self):
         """