Skip to content

Commit 90d6d55

Browse files
feat: update references to use unified stores configuration
- Update hash_registry.py to use get_store_spec() instead of get_object_store_spec() - Update staged_insert.py to use get_store_spec() for default store - Update error messages to reference new stores configuration - Remove references to object_storage.default_store (now stores.default)
1 parent 9bf4848 commit 90d6d55

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

src/datajoint/hash_registry.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,20 +138,15 @@ def get_store_backend(store_name: str | None = None) -> StorageBackend:
138138
Parameters
139139
----------
140140
store_name : str, optional
141-
Name of the store to use. If None, uses the default object storage
142-
configuration or the configured default_store.
141+
Name of the store to use. If None, uses stores.default.
143142
144143
Returns
145144
-------
146145
StorageBackend
147146
StorageBackend instance.
148147
"""
149-
# If store_name is None, check for configured default_store
150-
if store_name is None and config.object_storage.default_store:
151-
store_name = config.object_storage.default_store
152-
153-
# get_object_store_spec handles None by returning default object_storage config
154-
spec = config.get_object_store_spec(store_name)
148+
# get_store_spec handles None by using stores.default
149+
spec = config.get_store_spec(store_name)
155150
return StorageBackend(spec)
156151

157152

@@ -162,14 +157,14 @@ def get_store_subfolding(store_name: str | None = None) -> tuple[int, ...] | Non
162157
Parameters
163158
----------
164159
store_name : str, optional
165-
Name of the store. If None, uses default store.
160+
Name of the store. If None, uses stores.default.
166161
167162
Returns
168163
-------
169164
tuple[int, ...] | None
170165
Subfolding pattern (e.g., (2, 2)) or None for flat storage.
171166
"""
172-
spec = config.get_object_store_spec(store_name)
167+
spec = config.get_store_spec(store_name)
173168
subfolding = spec.get("subfolding")
174169
if subfolding is not None:
175170
return tuple(subfolding)

src/datajoint/staged_insert.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,11 @@ def _ensure_backend(self):
6969
"""Ensure storage backend is initialized."""
7070
if self._backend is None:
7171
try:
72-
spec = config.get_object_storage_spec()
72+
spec = config.get_store_spec() # Uses stores.default
7373
self._backend = StorageBackend(spec)
7474
except DataJointError:
7575
raise DataJointError(
76-
"Object storage is not configured. Set object_storage settings in datajoint.json "
77-
"or DJ_OBJECT_STORAGE_* environment variables."
76+
"Storage is not configured. Set stores.default and stores.<name> settings in datajoint.json."
7877
)
7978

8079
def _get_storage_path(self, field: str, ext: str = "") -> str:
@@ -110,8 +109,8 @@ def _get_storage_path(self, field: str, ext: str = "") -> str:
110109
f"Missing: {set(self._table.primary_key) - set(primary_key)}"
111110
)
112111

113-
# Get storage spec
114-
spec = config.get_object_storage_spec()
112+
# Get storage spec (uses stores.default)
113+
spec = config.get_store_spec()
115114
partition_pattern = spec.get("partition_pattern")
116115
token_length = spec.get("token_length", 8)
117116

0 commit comments

Comments
 (0)