ONE-api 2.10.1__tar.gz → 2.11.1__tar.gz

{one_api-2.10.1 → one_api-2.11.1/ONE_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ONE-api
-Version: 2.10.1
+Version: 2.11.1
 Summary: Open Neurophysiology Environment
 Home-page: https://github.com/int-brain-lab/ONE
 Author: IBL Staff

{one_api-2.10.1 → one_api-2.11.1}/ONE_api.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ one/alf/cache.py
 one/alf/exceptions.py
 one/alf/files.py
 one/alf/io.py
+one/alf/path.py
 one/alf/spec.py
 one/remote/__init__.py
 one/remote/aws.py

{one_api-2.10.1/ONE_api.egg-info → one_api-2.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ONE-api
-Version: 2.10.1
+Version: 2.11.1
 Summary: Open Neurophysiology Environment
 Home-page: https://github.com/int-brain-lab/ONE
 Author: IBL Staff

{one_api-2.10.1 → one_api-2.11.1}/one/__init__.py

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

{one_api-2.10.1 → one_api-2.11.1}/one/alf/cache.py

@@ -28,7 +28,7 @@ from iblutil.io import parquet
 from iblutil.io.hashfile import md5
 
 from one.alf.io import iter_sessions, iter_datasets
-from one.alf.files import session_path_parts, get_alf_path
+from one.alf.path import session_path_parts, get_alf_path
 from one.converters import session_record2path
 from one.util import QC_TYPE, patch_cache
 

one_api-2.11.1/one/alf/files.py

@@ -0,0 +1,11 @@
+"""
+(DEPRECATED) Module for identifying and parsing ALF file names.
+
+This module has moved to :mod:`one.alf.path`.
+"""
+import warnings
+
+from .path import *  # noqa
+
+warnings.warn(
+    '`one.alf.files` will be removed in version 3.0. Use `one.alf.path` instead.', FutureWarning)

{one_api-2.10.1 → one_api-2.11.1}/one/alf/io.py

@@ -26,7 +26,7 @@ from iblutil.util import Bunch
 from iblutil.io import parquet
 from iblutil.io import jsonable
 from .exceptions import ALFObjectNotFound
-from . import files, spec
+from . import spec, path as files
 from .spec import FILE_SPEC
 
 _logger = logging.getLogger(__name__)

{one_api-2.10.1 → one_api-2.11.1}/one/api.py

@@ -25,7 +25,7 @@ from iblutil.util import Bunch, flatten, ensure_list
 import one.params
 import one.webclient as wc
 import one.alf.io as alfio
-import one.alf.files as alfiles
+import one.alf.path as alfiles
 import one.alf.exceptions as alferr
 from .alf.cache import make_parquet_db, DATASETS_COLUMNS, SESSIONS_COLUMNS
 from .alf.spec import is_uuid_string, QC, to_alf
@@ -1855,8 +1855,10 @@ class OneAlyx(One):
             return self._cache['datasets'].iloc[0:0] if details else []  # Return empty
         assert set(datasets.index.unique('eid')) == {eid}
         del filters['default_revisions_only']
+        if not keep_eid_index and 'eid' in datasets.index.names:
+            datasets = datasets.droplevel('eid')
         datasets = util.filter_datasets(
-            datasets.droplevel('eid'), assert_unique=False, wildcards=self.wildcards, **filters)
+            datasets, assert_unique=False, wildcards=self.wildcards, **filters)
         # Return only the relative path
         return datasets if details else datasets['rel_path'].sort_values().values.tolist()
 

{one_api-2.10.1 → one_api-2.11.1}/one/converters.py

@@ -19,7 +19,7 @@ import pandas as pd
 from iblutil.util import Bunch
 
 from one.alf.spec import is_session_path, is_uuid_string
-from one.alf.files import get_session_path, add_uuid_string, session_path_parts, get_alf_path
+from one.alf.path import get_session_path, add_uuid_string, session_path_parts, get_alf_path
 from .util import Listable
 
 

{one_api-2.10.1 → one_api-2.11.1}/one/registration.py

@@ -26,7 +26,7 @@ from iblutil.io import hashfile
 from iblutil.util import Bunch, ensure_list
 
 import one.alf.io as alfio
-from one.alf.files import session_path_parts, get_session_path, folder_parts, filename_parts
+from one.alf.path import session_path_parts, get_session_path, folder_parts, filename_parts
 from one.alf.spec import is_valid
 import one.alf.exceptions as alferr
 from one.api import ONE

{one_api-2.10.1 → one_api-2.11.1}/one/remote/globus.py

@@ -100,7 +100,7 @@ from iblutil.io import params as iopar
 from iblutil.util import ensure_list
 
 from one.alf.spec import is_uuid
-from one.alf.files import remove_uuid_string
+from one.alf.path import remove_uuid_string
 import one.params
 from one.webclient import AlyxClient
 from .base import DownloadClient, load_client_params, save_client_params

{one_api-2.10.1 → one_api-2.11.1}/one/util.py

@@ -16,7 +16,7 @@ import numpy as np
 from packaging import version
 
 import one.alf.exceptions as alferr
-from one.alf.files import rel_path_parts, get_session_path, get_alf_path, remove_uuid_string
+from one.alf.path import rel_path_parts, get_session_path, get_alf_path, remove_uuid_string
 from one.alf.spec import QC, FILE_SPEC, regex as alf_regex
 
 logger = logging.getLogger(__name__)

{one_api-2.10.1 → one_api-2.11.1}/one/webclient.py

@@ -589,7 +589,7 @@ class AlyxClient:
         rest_query = rest_query.replace(self.base_url, '')
         if not rest_query.startswith('/'):
             rest_query = '/' + rest_query
-        _logger.debug(f"{self.base_url + rest_query}, headers: {self._headers}")
+        _logger.debug(f'{self.base_url + rest_query}, headers: {self._headers}')
         headers = self._headers.copy()
         if files is None:
             data = json.dumps(data) if isinstance(data, dict) or isinstance(data, list) else data
@@ -678,8 +678,8 @@ class AlyxClient:
             rep = requests.post(self.base_url + '/auth-token', data=credentials)
         except requests.exceptions.ConnectionError:
             raise ConnectionError(
-                f"Can't connect to {self.base_url}.\n" +
-                "Check your internet connections and Alyx database firewall"
+                f'Can\'t connect to {self.base_url}.\n' +
+                'Check your internet connections and Alyx database firewall'
             )
         # Assign token or raise exception on auth error
         if rep.ok:
@@ -839,6 +839,7 @@ class AlyxClient:
 
     def _validate_file_url(self, url):
         """Asserts that URL matches HTTP_DATA_SERVER parameter.
+
         Currently only one remote HTTP server is supported for a given AlyxClient instance.  If
         the URL contains only the relative path part, the full URL is returned.
 
@@ -1069,7 +1070,7 @@ class AlyxClient:
                 if 'django' in kwargs.keys():
                     kwargs['django'] = kwargs['django'] + ','
                 else:
-                    kwargs['django'] = ""
+                    kwargs['django'] = ''
                 kwargs['django'] = f"{kwargs['django']}pk,{id}"
             # otherwise, look for a dictionary of filter terms
             if kwargs:
@@ -1135,7 +1136,7 @@ class AlyxClient:
         # Prepare data to patch
         patch_dict = {field_name: data}
         # Upload new extended_qc to session
-        ret = self.rest(endpoint, "partial_update", id=uuid, data=patch_dict)
+        ret = self.rest(endpoint, 'partial_update', id=uuid, data=patch_dict)
         return ret[field_name]
 
     def json_field_update(
@@ -1181,7 +1182,7 @@ class AlyxClient:
 
         if not isinstance(current, dict):
             _logger.warning(
-                f'Current json field {field_name} does not contains a dict, aborting update'
+                f'Current json field "{field_name}" does not contains a dict, aborting update'
             )
             return current
 
@@ -1236,7 +1237,7 @@ class AlyxClient:
                 f'{key}: Key not found in endpoint {endpoint} field {field_name}'
             )
             return current
-        _logger.info(f"Removing key from dict: '{key}'")
+        _logger.info(f'Removing key from dict: "{key}"')
         current.pop(key)
         # Re-write contents without removed key
         written = self.json_field_write(