Skip to content

Fix OrderedNamespaceSet.__setitem__ slice assigns exhausted iterator #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zrgt wants to merge 1 commit into
base: develop
Choose a base branch
from
+30 −1
Open

Fix OrderedNamespaceSet.__setitem__ slice assigns exhausted iterator #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion sdk/basyx/aas/model/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2248,7 +2248,7 @@ def __setitem__(self, s, o) -> None:
for i in successful_new_items:
super().remove(i)
raise
self._order[s] = new_items
self._order[s] = successful_new_items
for i in deleted_items:
super().remove(i)

Expand Down
29 changes: 29 additions & 0 deletions sdk/test/model/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,35 @@ def test_OrderedNamespace(self) -> None:
f"{self._namespace_class.__name__}[{self.namespace.id}]'", # type: ignore[has-type]
str(cm2.exception))

def test_ordered_namespaceset_slice_setitem_preserves_order(self) -> None:
# Replace a slice of items; the new items must appear in the correct positions after replacement
ns = ExampleOrderedNamespace()
sid1 = model.ExternalReference((model.Key(model.KeyTypes.GLOBAL_REFERENCE, "http://example.org/sid1"),))
sid2 = model.ExternalReference((model.Key(model.KeyTypes.GLOBAL_REFERENCE, "http://example.org/sid2"),))
sid3 = model.ExternalReference((model.Key(model.KeyTypes.GLOBAL_REFERENCE, "http://example.org/sid3"),))
sid4 = model.ExternalReference((model.Key(model.KeyTypes.GLOBAL_REFERENCE, "http://example.org/sid4"),))
sid5 = model.ExternalReference((model.Key(model.KeyTypes.GLOBAL_REFERENCE, "http://example.org/sid5"),))
p1 = model.Property("PA", model.datatypes.Int, semantic_id=sid1)
p2 = model.Property("PB", model.datatypes.Int, semantic_id=sid2)
p3 = model.Property("PC", model.datatypes.Int, semantic_id=sid3)
ns.set1.add(p1)
ns.set1.add(p2)
ns.set1.add(p3)
self.assertEqual([p1, p2, p3], list(ns.set1))

# Replace slice [0:2] (p1, p2) with two new items
new1 = model.Property("PX", model.datatypes.Int, semantic_id=sid4)
new2 = model.Property("PY", model.datatypes.Int, semantic_id=sid5)
ns.set1[0:2] = [new1, new2]

# After replacement: [new1, new2, p3]
result = list(ns.set1)
self.assertEqual([new1, new2, p3], result)
self.assertIsNone(p1.parent)
self.assertIsNone(p2.parent)
self.assertIs(ns, new1.parent)
self.assertIs(ns, new2.parent)


class ExternalReferenceTest(unittest.TestCase):
def test_constraints(self):
Expand Down
Loading