👌 IMPROVE: Move default user caching to StorageBackend
#5460
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged
|
Same as for #5461 if you add a quick test, we should merge this for the release since it is a known bug of the new profile switching |
Currently it is cached on the `UserCollection`, but this means that, on profile switching, it would return a user associated with the wrong backend instance.
chrisjsewell
force-pushed
the
default-user
branch
from
f2cc261 to
d0b5e06
Compare
|
@sphuber this is good to go |
sphuber
requested changes
Apr 25, 2022
aiida/orm/groups.py
Outdated
| @@ -155,7 +155,7 @@ def __init__( | |||
| raise ValueError('Group label must be provided') | |||
|
|
|||
| backend = backend or get_manager().get_profile_storage() | |||
| user = user or users.User.collection(backend).get_default() | |||
| user = user if user else backend.default_user | |||
There was a problem hiding this comment.
Is the change from user or to user if user else necessary? Does that change anything? I think the or notation is clearer and is also used in the line before.
Comment on lines
176
to
178
| results = query.all(flat=True) | ||
| if results: | ||
| self._default_user = results[0] |
There was a problem hiding this comment.
Was line 178 being tested? Shouldn't all(flat=True) just return the User or None? So line 178 indexing [0] would except no? Anyway, I think we should just use first here.
Suggested change
| results = query.all(flat=True) | |
| if results: | |
| self._default_user = results[0] | |
| self._default_user = query.first(flat=True) |
| @@ -31,7 +31,6 @@ def _entity_base_cls() -> Type['User']: | |||
|
|
|||
| def __init__(self, entity_class: Type['User'], backend: Optional['StorageBackend'] = None) -> None: | |||
| super().__init__(entity_class=entity_class, backend=backend) | |||
| self._default_user: Optional[User] = None | |||
There was a problem hiding this comment.
The overridden constructor is now pointless, might as well get rid of it entirely
sphuber
approved these changes
Apr 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently it is cached on the
UserCollection,but this means that, on profile switching,
it would return a user associated with the wrong backend instance.