Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/easyscience/base_classes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from .based_base import BasedBase
from .collection_base import CollectionBase
from .easy_list import EasyList
from .model_base import ModelBase
from .new_base import NewBase
from .obj_base import ObjBase
Expand All @@ -10,4 +11,5 @@
ObjBase,
ModelBase,
NewBase,
EasyList
]
289 changes: 289 additions & 0 deletions src/easyscience/base_classes/easy_list.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,289 @@
# SPDX-FileCopyrightText: 2025 EasyScience contributors <core@easyscience.software>
# SPDX-License-Identifier: BSD-3-Clause
# © 2021-2025 Contributors to the EasyScience project <https://github.com/easyScience/EasyScience

from __future__ import annotations

import warnings
from collections.abc import MutableSequence
from typing import TYPE_CHECKING
from typing import Any
from typing import Callable
from typing import Iterable
from typing import List
from typing import Optional
from typing import Type
from typing import TypeVar
from typing import overload

from pyparsing import Dict
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why pyparsing not just the standard typing.Dict??


from easyscience.io.serializer_base import SerializerBase

from .new_base import NewBase

if TYPE_CHECKING:
pass
Comment on lines +25 to +26
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove


ProtectedType_ = TypeVar('ProtectedType', bound=NewBase)


class EasyList(NewBase, MutableSequence[ProtectedType_]):
def __init__(
self,
*args: ProtectedType_ | list[ProtectedType_],
protected_types: list[Type[NewBase]] | Type[NewBase] | None = None,
unique_name: Optional[str] = None,
display_name: Optional[str] = None,
**kwargs: Any,
):
"""
Initialize the EasyList.
:param args: Initial items to add to the list
:param protected_types: Types that are allowed in the list. Can be a single NewBase subclass or a list of them.
If None, defaults to [NewBase].
:param unique_name: Optional unique name for the list
:param display_name: Optional display name for the list
"""
super().__init__(unique_name=unique_name, display_name=display_name)
if protected_types is None:
self._protected_types = [NewBase]
elif isinstance(protected_types, type) and issubclass(protected_types, NewBase):
self._protected_types = [protected_types]
elif isinstance(protected_types, Iterable) and all(issubclass(t, NewBase) for t in protected_types):
self._protected_types = list(protected_types)
else:
raise TypeError('protected_types must be a NewBase subclass or an iterable of NewBase subclasses')
self._data: List[ProtectedType_] = []

# Add initial items
for item in args:
if isinstance(item, list):
for sub_item in item:
self.append(sub_item)
else:
self.append(item)

# For deserialization, the dict can't contain an *args, so we check for 'data' in kwargs
if 'data' in kwargs:
data = kwargs.pop('data')
for item in data:
self.append(item)

# MutableSequence abstract methods

# Use @overload to provide precise type hints for different __getitem__ argument types
@overload
def __getitem__(self, idx: int) -> ProtectedType_: ...
@overload
def __getitem__(self, idx: slice) -> 'EasyList[ProtectedType_]': ...
@overload
def __getitem__(self, idx: str) -> ProtectedType_: ...
def __getitem__(self, idx: int | slice | str) -> ProtectedType_ | 'EasyList[ProtectedType_]':
"""
Get an item by index, slice, or unique_name.

:param idx: Index, slice, or unique_name of the item
:return: The item or a new EasyList for slices
"""
if isinstance(idx, int):
return self._data[idx]
elif isinstance(idx, slice):
return self.__class__(self._data[idx], protected_types=self._protected_types)
elif isinstance(idx, str):
element = next((r for r in self._data if self._get_key(r) == idx), None)
if element is not None:
return element
raise KeyError(f'No item with unique name "{idx}" found')
else:
raise TypeError('Index must be an int, slice, or str')

@overload
def __setitem__(self, idx: int, value: ProtectedType_) -> None: ...
@overload
def __setitem__(self, idx: slice, value: Iterable[ProtectedType_]) -> None: ...

def __setitem__(self, idx: int | slice, value: ProtectedType_ | Iterable[ProtectedType_]) -> None:
"""
Set an item at an index.

:param idx: Index to set
:param value: New value
"""
if isinstance(idx, int):
if not isinstance(value, tuple(self._protected_types)):
raise TypeError(f'Items must be one of {self._protected_types}, got {type(value)}')
if value in self:
warnings.warn(f'Item with unique name "{self._get_key(value)}" already in EasyList, it will be ignored')
return
self._data[idx] = value
Comment on lines +118 to +119
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in-place replacement will fail.

>>> from easyscience.base_classes import NewBase, EasyList
>>> a1 = NewBase()
>>> a2 = NewBase()
>>> e = EasyList([a1, a2])
>>> e[0] = e[0]
C:\projects\easy\ERA\corelib\src\easyscience\base_classes\easy_list.py:117: UserWarning: Item with unique name "NewBase_0" already in EasyList, it will be ignored
  warnings.warn(f'Item with unique name "{self._get_key(value)}" already in EasyList, it will be ignored')
>>> e[0] = e[1]
C:\projects\easy\ERA\corelib\src\easyscience\base_classes\easy_list.py:117: UserWarning: Item with unique name "NewBase_1" already in EasyList, it will be ignored
  warnings.warn(f'Item with unique name "{self._get_key(value)}" already in EasyList, it will be ignored')

elif isinstance(idx, slice):
if not isinstance(value, Iterable):
raise TypeError('Value must be an iterable for slice assignment')
for v in value:
if not isinstance(v, tuple(self._protected_types)):
raise TypeError(f'Items must be one of {self._protected_types}, got {type(v)}')

Check warning on line 125 in src/easyscience/base_classes/easy_list.py

View check run for this annotation

Codecov / codecov/patch

src/easyscience/base_classes/easy_list.py#L125

Added line #L125 was not covered by tests
if v in self:
warnings.warn(f'Item with unique name "{self._get_key(v)}" already in EasyList, it will be ignored')
return
Comment on lines +126 to +128
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad.

reverse() in MutableSequence swaps elements via __setitem__:

# MutableSequence.reverse() effectively does:
for i in range(n // 2):
    self[i], self[n-i-1] = self[n-i-1], self[i]

But your setitem uniqueness guard rejects items that are already in the list. So reverse() will just warn and return.

Look:

>>> from easyscience.base_classes import NewBase, EasyList
>>> b1 = NewBase()
>>> b2 = NewBase()
>>> a = EasyList([b1, b2])
>>> list(a.reverse())
C:\projects\easy\ERA\corelib\src\easyscience\base_classes\easy_list.py:117: UserWarning: Item with unique name "NewBase_1" already in EasyList, it will be ignored
  warnings.warn(f'Item with unique name "{self._get_key(value)}" already in EasyList, it will be ignored')
C:\projects\easy\ERA\corelib\src\easyscience\base_classes\easy_list.py:117: UserWarning: Item with unique name "NewBase_0" already in EasyList, it will be ignored
  warnings.warn(f'Item with unique name "{self._get_key(value)}" already in EasyList, it will be ignored')
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
TypeError: 'NoneType' object is not iterable

This potentially affects other methods which use direct assignment with __setitem__

Comment on lines +126 to +128
Copy link
Member

@rozyczko rozyczko Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also,

    warnings.warn(f'Item with unique name "{self._get_key(v)}" already in EasyList, it will be ignored')
    return

return should be changed to continue, otherwise you will return without actually setting any item.

self._data[idx] = list(value) # type: ignore[arg-type]
else:
raise TypeError('Index must be an int or slice')

def __delitem__(self, idx: int | slice | str) -> None:
"""
Delete an item by index, slice, or name.

:param idx: Index, slice, or name of item to delete
"""
if isinstance(idx, (int, slice)):
del self._data[idx]
elif isinstance(idx, str):
for i, item in enumerate(self._data):
if self._get_key(item) == idx:
del self._data[i]
return
raise KeyError(f'No item with unique name "{idx}" found')
else:
raise TypeError('Index must be an int, slice, or str')

def __len__(self) -> int:
"""Return the number of items in the collection."""
return len(self._data)

def insert(self, index: int, value: ProtectedType_) -> None:
"""
Insert an item at an index.

:param index: Index to insert at
:param value: Item to insert
"""
if not isinstance(index, int):
raise TypeError('Index must be an integer')
elif not isinstance(value, tuple(self._protected_types)):
raise TypeError(f'Items must be one of {self._protected_types}, got {type(value)}')
if value in self:
warnings.warn(f'Item with unique name "{self._get_key(value)}" already in EasyList, it will be ignored')
return
self._data.insert(index, value)

def _get_key(self, object) -> str:
"""
Comment on lines +170 to +171
Copy link
Member

@rozyczko rozyczko Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't want to shadow the builtin object... rename it to something like obj

Get the unique name of an object.
Can be overridden to use a different attribute as the key.
:param object: Object to get the key for
:return: The key of the object
:rtype: str
"""
return object.unique_name

# Overwriting methods

def sort(self, mapping: Callable[[ProtectedType_], Any], reverse: bool = False) -> None:
"""
Comment on lines +182 to +183
Copy link
Member

@rozyczko rozyczko Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very non-standard signature. list.sort() uses key, not maping.

items = [3, 1, 2]
items.sort(key=lambda x: x)  # this is what I would expect with EasyList

# EasyList:
el = EasyList(a3, a1, a2)
el.sort(key=lambda x: x.unique_name) 
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
TypeError: EasyList.sort() got an unexpected keyword argument 'key'

What works is an unintuitive

el.sort(mapping=lambda x: x.unique_name) 

Sort the collection according to the given mapping.

:param mapping: Mapping function to sort by
:param reverse: Whether to reverse the sort
"""
self._data.sort(key=mapping, reverse=reverse) # type: ignore[arg-type]

def __repr__(self) -> str:
return f'{self.__class__.__name__} of length {len(self)} of type(s) {self._protected_types}'

def __iter__(self) -> Any:
return iter(self._data)
Comment on lines +194 to +195
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MutableSequence provides a default that iterates via getitem(i) for i = 0, 1, 2, .... Your override (iter(self._data)) is functionally identical — just a micro-optimization skipping the index dispatch.


def __contains__(self, item: ProtectedType_ | str) -> bool:
if isinstance(item, str):
return any(self._get_key(r) == item for r in self._data)
return item in self._data

def index(self, value: ProtectedType_ | str, start: int = 0, stop: int = ...) -> int:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will throw TypeError in min(stop...) if stop is left as ... (ellipsis can't be compared to int)

You might need to change it to stop: int | None = None instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was a little fast here with the Copilot auto-complete. I'm surprised it suggested the Ellipsis as the default though. I guess it must be used extensively in Numpy and Scipy which is where Copilot got it from :/

if isinstance(value, str):
for i in range(start, min(stop, len(self._data))):
if self._get_key(self._data[i]) == value:
return i
raise ValueError(f'{value} is not in EasyList')
return self._data.index(value, start, stop)

def append(self, value: ProtectedType_) -> None:
"""
Append an item to the end of the collection.

:param value: Item to append
"""
if not isinstance(value, tuple(self._protected_types)):
raise TypeError(f'Items must be one of {self._protected_types}, got {type(value)}')
if value in self:
warnings.warn(f'Item with unique name "{self._get_key(value)}" already in EasyList, it will be ignored')
return
self._data.append(value)
Comment on lines +216 to +221
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MutableSequence append is calling insert. No need to override this method at all.
You are already doing all the relevant tests in insert.


def pop(self, index: int | str = -1) -> ProtectedType_:
"""
Remove and return an item at the given index or unique_name.

:param index: Index or unique_name of the item to remove
:return: The removed item
"""
if isinstance(index, int):
return self._data.pop(index)
elif isinstance(index, str):
for i, item in enumerate(self._data):
if self._get_key(item) == index:
return self._data.pop(i)
raise KeyError(f'No item with unique name "{index}" found')
else:
raise TypeError('Index must be an int or str')

# Serialization support

def to_dict(self) -> dict:
"""
Convert the EasyList to a dictionary for serialization.

:return: Dictionary representation of the EasyList
"""
dict_repr = super().to_dict()
if self._protected_types != [NewBase]:
dict_repr['protected_types'] = [
{'@module': cls_.__module__, '@class': cls_.__name__} for cls_ in self._protected_types
] # noqa: E501
dict_repr['data'] = [item.to_dict() for item in self._data]
return dict_repr

@classmethod
def from_dict(cls, obj_dict: Dict[str, Any]) -> NewBase:
"""
Re-create an EasyScience object from a full encoded dictionary.

:param obj_dict: dictionary containing the serialized contents (from `SerializerDict`) of an EasyScience object
:return: Reformed EasyScience object
"""
if not SerializerBase._is_serialized_easyscience_object(obj_dict):
raise ValueError('Input must be a dictionary representing an EasyScience EasyList object.')

Check warning on line 265 in src/easyscience/base_classes/easy_list.py

View check run for this annotation

Codecov / codecov/patch

src/easyscience/base_classes/easy_list.py#L265

Added line #L265 was not covered by tests
if obj_dict['@class'] == cls.__name__:
if 'protected_types' in obj_dict:
protected_types = obj_dict.pop('protected_types')
for i, type_dict in enumerate(protected_types):
Comment on lines +268 to +269
Copy link
Member

@rozyczko rozyczko Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are mutating the input obj_dict here. This is BAD.
Use obj_dict.get(...) or create a copy

if '@module' in type_dict and '@class' in type_dict:
modname = type_dict['@module']
classname = type_dict['@class']
mod = __import__(modname, globals(), locals(), [classname], 0)
if hasattr(mod, classname):
cls_ = getattr(mod, classname)
protected_types[i] = cls_
else:
raise ImportError(f'Could not import class {classname} from module {modname}')

Check warning on line 278 in src/easyscience/base_classes/easy_list.py

View check run for this annotation

Codecov / codecov/patch

src/easyscience/base_classes/easy_list.py#L278

Added line #L278 was not covered by tests
else:
raise ValueError(

Check warning on line 280 in src/easyscience/base_classes/easy_list.py

View check run for this annotation

Codecov / codecov/patch

src/easyscience/base_classes/easy_list.py#L280

Added line #L280 was not covered by tests
'Each protected type must be a serialized EasyScience class with @module and @class keys'
) # noqa: E501
else:
protected_types = None

Check warning on line 284 in src/easyscience/base_classes/easy_list.py

View check run for this annotation

Codecov / codecov/patch

src/easyscience/base_classes/easy_list.py#L284

Added line #L284 was not covered by tests
kwargs = SerializerBase.deserialize_dict(obj_dict)
data = kwargs.pop('data', [])
return cls(data, protected_types=protected_types, **kwargs)
else:
raise ValueError(f'Class name in dictionary does not match the expected class: {cls.__name__}.')

Check warning on line 289 in src/easyscience/base_classes/easy_list.py

View check run for this annotation

Codecov / codecov/patch

src/easyscience/base_classes/easy_list.py#L289

Added line #L289 was not covered by tests
Loading
Loading