Bugfix: Fix adding data subject not working if there is no member

packages/syft/src/syft/node/node.py

@@ -17,6 +17,7 @@
 from typing import Any
 
 # third party
+from loguru import logger
 from nacl.signing import SigningKey
 from result import Err
 from result import Result
@@ -1564,6 +1565,12 @@ def create_default_worker_pool(node: Node) -> SyftError | None:
         role=ServiceRole.ADMIN,
     )
 
+    if isinstance(default_worker_pool, SyftError):
+        logger.error(
+            f"Failed to get default worker pool {default_pool_name}. Error: {default_worker_pool.message}"
+        )
+        return default_worker_pool
+
     print(f"Creating default worker image with tag='{default_worker_tag}'")
     # Get/Create a default worker SyftWorkerImage
     default_image = create_default_image(

packages/syft/src/syft/service/data_subject/data_subject_service.py

@@ -74,20 +74,28 @@ def add(
             DataSubjectMemberService.add
         )
 
-        member_relationships = data_subject.member_relationships
-        for member_relationship in member_relationships:
-            parent_ds, child_ds = member_relationship
-            for ds in [parent_ds, child_ds]:
-                result = self.stash.set(
-                    context.credentials,
-                    ds.to(DataSubject, context=context),
-                    ignore_duplicates=True,
-                )
-                if result.is_err():
-                    return SyftError(message=str(result.err()))
-            result = member_relationship_add(context, parent_ds.name, child_ds.name)
-            if isinstance(result, SyftError):
-                return result
+        member_relationships: set[tuple[str, str]] = data_subject.member_relationships
+        if len(member_relationships) == 0:
+            result = self.stash.set(
+                context.credentials,
+                data_subject.to(DataSubject, context=context),
+            )
+            if result.is_err():
+                return SyftError(message=str(result.err()))
+        else:
+            for member_relationship in member_relationships:
+                parent_ds, child_ds = member_relationship
+                for ds in [parent_ds, child_ds]:
+                    result = self.stash.set(
+                        context.credentials,
+                        ds.to(DataSubject, context=context),
+                        ignore_duplicates=True,
+                    )
+                    if result.is_err():
+                        return SyftError(message=str(result.err()))
+                result = member_relationship_add(context, parent_ds.name, child_ds.name)
+                if isinstance(result, SyftError):
+                    return result
 
         return SyftSuccess(
             message=f"{len(member_relationships)+1} Data Subjects Registered"

packages/syft/tests/syft/action_graph/action_graph_test.py

@@ -269,6 +269,7 @@ def test_networkx_backing_store_edge_related_methods(
     sys.platform == "win32",
     reason="Fails on Windows. capnp\lib\capnp.pyx:3323: KjException Message did not contain a root pointer.",
 )
+@pytest.mark.flaky(reruns=3, reruns_delay=3)
 def test_networkx_backing_store_save_load_default(
     networkx_store_with_nodes: NetworkXBackingStore, verify_key: SyftVerifyKey
 ) -> None: