ONE-api 3.4.0__tar.gz → 3.4.2__tar.gz

{one_api-3.4.0 → one_api-3.4.2/ONE_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ONE-api
-Version: 3.4.0
+Version: 3.4.2
 Summary: Open Neurophysiology Environment
 Author: IBL Staff
 License: MIT
@@ -13,8 +13,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ruff
-Requires-Dist: numpy>=1.18
-Requires-Dist: pandas>=1.5.0
+Requires-Dist: numpy<2.4,>=1.18
+Requires-Dist: pandas<3.0.0,>=1.5.0
 Requires-Dist: tqdm>=4.32.1
 Requires-Dist: requests>=2.22.0
 Requires-Dist: iblutil>=1.14.0
@@ -46,7 +46,7 @@ pip install ONE-api
 For using ONE with a local cache directory:
 ```python
 from one.api import One
-one = One(cache_dir='/home/user/downlaods/ONE/behavior_paper')
+one = One(cache_dir='/home/user/downloads/ONE/behavior_paper')
 ```
 
 To use the default setup settings that connect you to the [IBL public database](https://openalyx.internationalbrainlab.org):

{one_api-3.4.0 → one_api-3.4.2}/ONE_api.egg-info/requires.txt

@@ -1,6 +1,6 @@
 ruff
-numpy>=1.18
-pandas>=1.5.0
+numpy<2.4,>=1.18
+pandas<3.0.0,>=1.5.0
 tqdm>=4.32.1
 requests>=2.22.0
 iblutil>=1.14.0

{one_api-3.4.0/ONE_api.egg-info → one_api-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ONE-api
-Version: 3.4.0
+Version: 3.4.2
 Summary: Open Neurophysiology Environment
 Author: IBL Staff
 License: MIT
@@ -13,8 +13,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ruff
-Requires-Dist: numpy>=1.18
-Requires-Dist: pandas>=1.5.0
+Requires-Dist: numpy<2.4,>=1.18
+Requires-Dist: pandas<3.0.0,>=1.5.0
 Requires-Dist: tqdm>=4.32.1
 Requires-Dist: requests>=2.22.0
 Requires-Dist: iblutil>=1.14.0
@@ -46,7 +46,7 @@ pip install ONE-api
 For using ONE with a local cache directory:
 ```python
 from one.api import One
-one = One(cache_dir='/home/user/downlaods/ONE/behavior_paper')
+one = One(cache_dir='/home/user/downloads/ONE/behavior_paper')
 ```
 
 To use the default setup settings that connect you to the [IBL public database](https://openalyx.internationalbrainlab.org):

{one_api-3.4.0 → one_api-3.4.2}/README.md

@@ -21,7 +21,7 @@ pip install ONE-api
 For using ONE with a local cache directory:
 ```python
 from one.api import One
-one = One(cache_dir='/home/user/downlaods/ONE/behavior_paper')
+one = One(cache_dir='/home/user/downloads/ONE/behavior_paper')
 ```
 
 To use the default setup settings that connect you to the [IBL public database](https://openalyx.internationalbrainlab.org):

{one_api-3.4.0 → one_api-3.4.2}/one/__init__.py

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

{one_api-3.4.0 → one_api-3.4.2}/one/alf/cache.py

@@ -538,13 +538,18 @@ def merge_tables(cache, strict=False, origin=None, **kwargs):
         cache[table] = pd.concat(frames).sort_index()
         updated = datetime.datetime.now()
         # Update the table metadata with the origin
+        table_meta = cache['_meta']['raw'].get(table, {})
         if origin is not None:
-            table_meta = cache['_meta']['raw'].get(table, {})
             if 'origin' not in table_meta:
-                table_meta['origin'] = set(origin)
+                table_meta['origin'] = set(ensure_list(origin))
             else:
                 table_meta['origin'].add(origin)
             cache['_meta']['raw'][table] = table_meta
+        # Makes sure that the `date_created` field exists for a new table
+        if 'date_created' not in table_meta.keys():
+            table_meta['date_created'] = datetime.datetime.now().isoformat(
+                sep=' ', timespec='minutes')
+            cache['_meta']['raw'][table] = table_meta
     cache['_meta']['modified_time'] = updated
     return updated
 

{one_api-3.4.0 → one_api-3.4.2}/one/webclient.py

@@ -134,12 +134,16 @@ def _cache_response(method):
         # Reversible but length may exceed 255 chars
         # name = base64.urlsafe_b64encode(args[2].encode('UTF-8')).decode('UTF-8')
         files = list(rest_cache.glob(name))
-        cached = None
+        cached, when = None, None
         if len(files) == 1 and not clobber:
             _logger.debug('loading REST response from cache')
-            with open(files[0], 'r') as f:
-                cached, when = json.load(f)
-            if datetime.fromisoformat(when) > datetime.now():
+            try:
+                with open(files[0], 'r') as f:
+                    cached, when = json.load(f)
+            except json.JSONDecodeError as e:
+                _logger.debug(f'corrupted cache file {name}: {e}')
+                files[0].unlink()  # delete corrupted cache file
+            if cached and datetime.fromisoformat(when) > datetime.now():
                 return cached
         try:
             response = method(alyx_client, *args, **kwargs)
@@ -409,7 +413,7 @@ def http_download_file(full_link_to_file, chunks=None, *, clobber=False, silent=
         Directory in which files are downloaded; defaults to user's Download directory
     return_md5 : bool
         If True an MD5 hash of the file is additionally returned
-    headers : list of dicts
+    headers : dict
         Additional headers to add to the request (auth tokens etc.)
 
     Returns
@@ -1502,7 +1506,9 @@ class AlyxClient:
                 if len(set(kwargs.keys()) - set(self.rest_schemes.field_names(endpoint, action))):
                     missing = set(kwargs.keys()) - set(
                         self.rest_schemes.field_names(endpoint, action))
-                    raise ValueError(f"Error: Unsupported fields '{missing}' in query parameters.")
+                    warnings.warn(
+                        f"Error: Unsupported fields '{missing}' in query parameters"
+                        f" for endpoint {endpoint}.")
                 query_params = {k: ','.join(map(str, ensure_list(v))) for k, v in kwargs.items()}
                 url = update_url_params(url, query_params)
             return self.get('/' + url, **cache_args)

one_api-3.4.2/requirements.txt

@@ -0,0 +1,9 @@
+ruff
+numpy>=1.18, <2.4  # waiting for numba to support 2.4
+pandas>=1.5.0, <3.0.0 # pandas 3 regex on strings issue <one.tests.test_one.TestONECache testMethod=test_filter>
+tqdm>=4.32.1
+requests>=2.22.0
+iblutil>=1.14.0
+packaging
+boto3
+pyyaml

one_api-3.4.0/requirements.txt

@@ -1,9 +0,0 @@
-ruff
-numpy>=1.18
-pandas>=1.5.0
-tqdm>=4.32.1
-requests>=2.22.0
-iblutil>=1.14.0
-packaging
-boto3
-pyyaml