Merge branch 'staging' into backmerge/release-7.4.0

Author: ibraheem-abe

bittensor/metagraph.py

@@ -468,6 +468,7 @@ def state_dict(self):
             "bonds": self.bonds,
             "uids": self.uids,
             "axons": self.axons,
+            "neurons": self.neurons,
         }
 
     def sync(
@@ -790,6 +791,7 @@ def save(self) -> "metagraph":  # type: ignore
             graph_filename = f"{save_directory}/block-{self.block.item()}.pt"
             state_dict = self.state_dict()
             state_dict["axons"] = self.axons
+            state_dict["neurons"] = self.neurons
             torch.save(state_dict, graph_filename)
             state_dict = torch.load(
                 graph_filename
@@ -1037,6 +1039,7 @@ def load_from_path(self, dir_path: str) -> "metagraph":  # type: ignore
         )
         self.uids = torch.nn.Parameter(state_dict["uids"], requires_grad=False)
         self.axons = state_dict["axons"]
+        self.neurons = state_dict["neurons"]
         if "weights" in state_dict:
             self.weights = torch.nn.Parameter(
                 state_dict["weights"], requires_grad=False
@@ -1181,6 +1184,7 @@ def load_from_path(self, dir_path: str) -> "metagraph":  # type: ignore
         self.last_update = state_dict["last_update"]
         self.validator_permit = state_dict["validator_permit"]
         self.axons = state_dict["axons"]
+        self.neurons = state_dict["neurons"]
         if "weights" in state_dict:
             self.weights = state_dict["weights"]
         if "bonds" in state_dict:

tests/e2e_tests/subcommands/subnet/test_metagraph.py

@@ -80,9 +80,8 @@ def test_metagraph_command(local_chain, capsys):
     captured = capsys.readouterr()
 
     # Assert the neuron is registered and displayed
-    assert (
-        "Metagraph: net: local:1" and "N: 1/1" in captured.out
-    ), "Neuron isn't displayed in metagraph"
+    assert "Metagraph: net: local:1" in captured.out
+    assert "N: 1/1" in captured.out, "Neuron isn't displayed in metagraph"
 
     # Register Dave as neuron to the subnet
     dave_keypair, dave_exec_command, dave_wallet = setup_wallet("//Dave")
@@ -117,6 +116,7 @@ def test_metagraph_command(local_chain, capsys):
     captured = capsys.readouterr()
 
     # Assert the neuron is registered and displayed
-    assert "Metagraph: net: local:1" and "N: 2/2" in captured.out
+    assert "Metagraph: net: local:1" in captured.out
+    assert "N: 2/2" in captured.out
 
     logging.info("Passed test_metagraph_command")