Automatically wrap multilinks too.

Author: dnwpark

gel/_internal/_qbmodel/_abstract/_link_set.py

@@ -954,6 +954,7 @@ def __gel_extend__(self, values: Iterable[_PT_co | _BMT_co]) -> None:
 
         self._ensure_snapshot()
 
+        linked_type = type(self).type
         proxy_type = type(self).proxytype
 
         assert self._tracking_index is not None
@@ -963,14 +964,29 @@ def __gel_extend__(self, values: Iterable[_PT_co | _BMT_co]) -> None:
         # of slow iterative appends.
         empty_items = not self._items
 
-        for v in values:
-            existing = self._find_proxy(v)
+        for val in values:
+            proxy_val: _PT_co | _BMT_co
+            if (
+                isinstance(val, linked_type)
+                and not isinstance(val, proxy_type)
+            ):
+                # The value is the correct target, but has not yet been wrapped
+                # in a proxy model.
+                proxy_val = proxy_type.__gel_proxy_construct__(
+                    val,
+                    dict.fromkeys(proxy_type.__linkprops__.__gel_reflection__.pointers.keys())
+                )
+
+            else:
+                proxy_val = val
+
+            existing = self._find_proxy(proxy_val)
 
             proxy = cast(
                 "_PT_co",
                 proxy_link(
                     existing=existing,
-                    new=v,
+                    new=proxy_val,
                     proxy_type=proxy_type,
                 ),
             )

tests/test_model_sync.py

@@ -2978,13 +2978,17 @@ def test_model_sync_multi_link_01(self):
         def _testcase(
             model_type: typing.Type[GelModel],
             initial_targets: typing.Collection[typing.Any],
+            expected_targets: typing.Collection[typing.Any] | None = None,
         ) -> None:
+            if expected_targets is None:
+                expected_targets = initial_targets
+
             with_targets = model_type(targets=initial_targets)
             without_targets = model_type()
 
             self.client.sync(with_targets, without_targets)
 
-            self._check_multilinks_equal(with_targets.targets, initial_targets)
+            self._check_multilinks_equal(with_targets.targets, expected_targets)
             self._check_multilinks_equal(without_targets.targets, [])
 
             # cleanup
@@ -2996,6 +3000,15 @@ def _testcase(
 
         # With linkprops
         _testcase(default.SourceWithProp, [])
+        _testcase(
+            default.SourceWithProp,
+            [target_a, target_b, target_c],
+            [
+                default.SourceWithProp.targets.link(target_a),
+                default.SourceWithProp.targets.link(target_b),
+                default.SourceWithProp.targets.link(target_c),
+            ],
+        )
         _testcase(
             default.SourceWithProp,
             [
@@ -3026,12 +3039,16 @@ def _testcase_assign(
         model_type: typing.Type[GelModel],
         initial_targets: typing.Collection[typing.Any],
         changed_targets: typing.Collection[typing.Any],
+        expected_targets: typing.Collection[typing.Any] | None = None,
     ) -> None:
+        if expected_targets is None:
+            expected_targets = changed_targets
+
         self._base_testcase(
             model_type,
             initial_targets,
             self._get_assign_targets_func(changed_targets),
-            changed_targets,
+            expected_targets,
         )
 
     def test_model_sync_multi_link_02(self):
@@ -3089,6 +3106,16 @@ def test_model_sync_multi_link_02(self):
 
         # With linkprops
         self._testcase_assign(default.SourceWithProp, [], [])
+        self._testcase_assign(
+            default.SourceWithProp,
+            [],
+            [target_a, target_b, target_c],
+            [
+                default.SourceWithProp.targets.link(target_a),
+                default.SourceWithProp.targets.link(target_b),
+                default.SourceWithProp.targets.link(target_c),
+            ],
+        )
         self._testcase_assign(
             default.SourceWithProp,
             [],
@@ -3117,6 +3144,20 @@ def test_model_sync_multi_link_02(self):
             ],
             [],
         )
+        self._testcase_assign(
+            default.SourceWithProp,
+            [
+                default.SourceWithProp.targets.link(target_a),
+                default.SourceWithProp.targets.link(target_b),
+                default.SourceWithProp.targets.link(target_c),
+            ],
+            [target_a, target_b, target_c],
+            [
+                default.SourceWithProp.targets.link(target_a),
+                default.SourceWithProp.targets.link(target_b),
+                default.SourceWithProp.targets.link(target_c),
+            ],
+        )
         self._testcase_assign(
             default.SourceWithProp,
             [
@@ -3194,6 +3235,18 @@ def test_model_sync_multi_link_02(self):
             ],
         )
 
+        self._testcase_assign(
+            default.SourceWithProp,
+            [
+                default.SourceWithProp.targets.link(target_a),
+                default.SourceWithProp.targets.link(target_b),
+            ],
+            [target_c, target_d],
+            [
+                default.SourceWithProp.targets.link(target_c),
+                default.SourceWithProp.targets.link(target_d),
+            ],
+        )
         self._testcase_assign(
             default.SourceWithProp,
             [