refactor: revert changes to Model.__iadd__

Author: yt-ms

src/structurizr/model/container.py

@@ -154,7 +154,8 @@ def __iadd__(self, component: Component) -> "Container":
                 f"{component.parent}. Cannot add to {self}."
             )
         self._components.add(component)
-        self.model.add(component)
+        model = self.model
+        model += component
         return self
 
     def get_component_with_name(self, name: str) -> Component:

src/structurizr/model/model.py

@@ -199,11 +199,6 @@ def add_software_system(self, **kwargs) -> SoftwareSystem:
         return software_system
 
     def __iadd__(self, element: Element) -> "Model":
-        """Add a newly constructed element to the model."""
-        self.add(element)
-        return self
-
-    def add(self, element: Element):
         """Add a newly constructed element to the model."""
         if isinstance(element, Person):
             if any(element.name == p.name for p in self.people):
@@ -223,6 +218,7 @@ def add(self, element: Element):
                 f"you have added it to the parent element."
             )
         self._add_element(element)
+        return self
 
     def add_container_instance(
         self,

src/structurizr/model/software_system.py

@@ -109,7 +109,8 @@ def __iadd__(self, container: Container) -> "SoftwareSystem":
                 f"{container.parent}. Cannot add to {self}."
             )
         self._containers.add(container)
-        self.model.add(container)
+        model = self.model
+        model += container
         return self
 
     def get_container_with_name(self, name: str) -> Container:

tests/unit/model/test_container.py

@@ -27,11 +27,12 @@ def __init__(self):
         self.empty_container = Container(name="Container", description="Description")
         self.empty_container.set_model(self)
 
-    def add(self, component):
+    def __iadd__(self, component):
         """Simulate the model assigning IDs to new elements."""
         if not component.id:
             component.id = "id"
         component.set_model(self)
+        return self
 
 
 @pytest.fixture(scope="function")

tests/unit/model/test_software_system.py

@@ -30,11 +30,12 @@ def __init__(self):
         self.empty_system = SoftwareSystem(name="Sys")
         self.empty_system.set_model(self)
 
-    def add(self, container):
+    def __iadd__(self, container):
         """Simulate the model assigning IDs to new elements."""
         if not container.id:
             container.id = "id"
         container.set_model(self)
+        return self
 
 
 @pytest.fixture(scope="function")