ONE-api 3.1.0__tar.gz → 3.1.1__tar.gz

{one_api-3.1.0 → one_api-3.1.1/ONE_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ONE-api
-Version: 3.1.0
+Version: 3.1.1
 Summary: Open Neurophysiology Environment
 Author: IBL Staff
 License: MIT

{one_api-3.1.0/ONE_api.egg-info → one_api-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ONE-api
-Version: 3.1.0
+Version: 3.1.1
 Summary: Open Neurophysiology Environment
 Author: IBL Staff
 License: MIT

{one_api-3.1.0 → one_api-3.1.1}/one/__init__.py

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

{one_api-3.1.0 → one_api-3.1.1}/one/alf/cache.py

@@ -22,6 +22,7 @@ from functools import partial
 from pathlib import Path
 import warnings
 import logging
+from copy import deepcopy
 
 import pandas as pd
 import numpy as np
@@ -275,6 +276,9 @@ def default_cache(origin=''):
 
     """
     table_meta = _metadata(origin)
+    # The origin is now a set, however we leave _metadata as Alyx relies on this and sets
+    # can't be serialized to JSON
+    table_meta['origin'] = set(filter(None, [origin]))
     return Bunch({
             'datasets': EMPTY_DATASETS_FRAME.copy(),
             'sessions': EMPTY_SESSIONS_FRAME.copy(),
@@ -283,7 +287,7 @@ def default_cache(origin=''):
                 'loaded_time': None,
                 'modified_time': None,
                 'saved_time': None,
-                'raw': {k: table_meta.copy() for k in ('datasets', 'sessions')}}
+                'raw': {k: deepcopy(table_meta) for k in ('datasets', 'sessions')}}
         })
 
 
@@ -435,6 +439,10 @@ def load_tables(tables_dir, glob_pattern='*.pqt'):
         if not cache.index.is_monotonic_increasing:
             cache.sort_index(inplace=True)
 
+        # Ensure origin is a set (supports multiple origins)
+        meta['raw'][table]['origin'] = set(
+            filter(None, ensure_list(meta['raw'][table].get('origin', 'unknown'))))
+
         caches[table] = cache
 
     created = [datetime.datetime.fromisoformat(x['date_created'])
@@ -532,10 +540,10 @@ def merge_tables(cache, strict=False, origin=None, **kwargs):
         # Update the table metadata with the origin
         if origin is not None:
             table_meta = cache['_meta']['raw'].get(table, {})
-            if not table_meta.get('origin'):
-                table_meta['origin'] = origin
+            if 'origin' not in table_meta:
+                table_meta['origin'] = set(origin)
             else:
-                table_meta['origin'] = set((*ensure_list(table_meta['origin']), origin))
+                table_meta['origin'].add(origin)
             cache['_meta']['raw'][table] = table_meta
     cache['_meta']['modified_time'] = updated
     return updated

{one_api-3.1.0 → one_api-3.1.1}/one/api.py

@@ -6,7 +6,6 @@ import logging
 from weakref import WeakMethod
 from datetime import datetime, timedelta
 from functools import lru_cache, partial
-from itertools import chain
 from inspect import unwrap
 from pathlib import Path, PurePosixPath
 from typing import Any, Union, Optional, List
@@ -135,20 +134,25 @@ class One(ConversionMixin):
         tables = tables or filter(lambda x: x[0] != '_', self._cache)
         return remove_table_files(self._tables_dir, tables)
 
-    def load_cache(self, tables_dir=None, **kwargs):
+    def load_cache(self, tables_dir=None, clobber=True, **kwargs):
         """Load parquet cache files from a local directory.
 
         Parameters
         ----------
         tables_dir : str, pathlib.Path
             An optional directory location of the parquet files, defaults to One._tables_dir.
+        clobber : bool
+            If true, the cache is loaded without merging with existing table files.
 
         Returns
         -------
         datetime.datetime
             A timestamp of when the cache was loaded.
         """
-        self._reset_cache()
+        if clobber:
+            self._reset_cache()
+        else:
+            raise NotImplementedError('clobber=False not implemented yet')
         self._tables_dir = Path(tables_dir or self._tables_dir or self.cache_dir)
         self._cache = load_tables(self._tables_dir)
 
@@ -161,7 +165,7 @@ class One(ConversionMixin):
         # prompt the user to delete them to improve load times
         raw_meta = self._cache['_meta'].get('raw', {}).values() or [{}]
         tagged = any(filter(None, flatten(x.get('database_tags') for x in raw_meta)))
-        origin = set(x['origin'] for x in raw_meta if 'origin' in x)
+        origin = set(filter(None, flatten(ensure_list(x.get('origin', [])) for x in raw_meta)))
         older = (self._cache['_meta']['created_time'] or datetime.now()) < datetime(2025, 2, 13)
         remote = not self.offline and self.mode == 'remote'
         if remote and origin == {'alyx'} and older and not self._web_client.silent and not tagged:
@@ -221,6 +225,8 @@ class One(ConversionMixin):
             _logger.info('Saving cache tables...')
             for table in filter(lambda x: not x[0] == '_', caches.keys()):
                 metadata = meta['raw'].get(table, {})
+                if isinstance(metadata.get('origin'), set):
+                    metadata['origin'] = list(metadata['origin'])
                 metadata['date_modified'] = modified.isoformat(sep=' ', timespec='minutes')
                 filename = save_dir.joinpath(f'{table}.pqt')
                 # Cast indices to str before saving
@@ -1696,7 +1702,8 @@ class OneAlyx(One):
         tag = tag or current_tags[0]  # For refreshes take the current tag as default
         different_tag = any(x != tag for x in current_tags)
         if not (clobber or different_tag):
-            super(OneAlyx, self).load_cache(tables_dir)  # Load any present cache
+            # Load any present cache
+            super(OneAlyx, self).load_cache(tables_dir, clobber=True)
             cache_meta = self._cache.get('_meta', {})
             raw_meta = cache_meta.get('raw', {}).values() or [{}]
 
@@ -1719,7 +1726,7 @@ class OneAlyx(One):
             # contain the same tag or origin, we need to download the remote one.
             origin = cache_info.get('origin', 'unknown')
             local_origin = (x.get('origin', []) for x in raw_meta)
-            local_origin = set(chain.from_iterable(map(ensure_list, local_origin)))
+            local_origin = set(flatten(map(ensure_list, local_origin)))
             different_origin = origin not in local_origin
             if fresh and not (different_tag or different_origin):
                 _logger.info('No newer cache available')