Merge remote-tracking branch 'origin/feat/roman/selective-metagraph' into feat/roman/selective-metagraph

Author: thewhaleking

bittensor/core/async_subtensor.py

@@ -1471,7 +1471,7 @@ async def get_minimum_required_stake(self):
     async def get_metagraph_info(
         self,
         netuid: int,
-        field_indices: Optional[list["SelectiveMetagraphIndex"]] = None,
+        field_indexes: Optional[list["SelectiveMetagraphIndex"]] = None,
         block: Optional[int] = None,
         block_hash: Optional[str] = None,
         reuse_block: bool = False,
@@ -1481,7 +1481,7 @@ async def get_metagraph_info(
 
         Arguments:
             netuid (int): The NetUID of the subnet to query.
-            field_indices (Optional[list[SelectiveMetagraphIndex]]): An optional list of SelectiveMetagraphIndex values
+            field_indexes (Optional[list[SelectiveMetagraphIndex]]): An optional list of SelectiveMetagraphIndex values
                 specifying which fields to retrieve. If not provided, all available fields will be returned.
             block: the block number at which to retrieve the hyperparameter. Do not specify if using block_hash or
                 reuse_block
@@ -1498,19 +1498,19 @@ async def get_metagraph_info(
 
             partial_meta_info = await subtensor.get_metagraph_info(
                 netuid=2,
-                field_indices=[SelectiveMetagraphIndex.Name, SelectiveMetagraphIndex.OwnerHotkeys]
+                field_indexes=[SelectiveMetagraphIndex.Name, SelectiveMetagraphIndex.OwnerHotkeys]
             )
         """
         indexes = SelectiveMetagraphIndex.all_indices()
 
-        if field_indices:
-            if isinstance(field_indices, list) and all(
-                isinstance(f, SelectiveMetagraphIndex) for f in field_indices
+        if field_indexes:
+            if isinstance(field_indexes, list) and all(
+                isinstance(f, SelectiveMetagraphIndex) for f in field_indexes
             ):
-                indexes = [f.value for f in field_indices]
+                indexes = [f.value for f in field_indexes]
             else:
                 raise ValueError(
-                    "`field_indices` must be a list of SelectiveMetagraphIndex items."
+                    "`field_indexes` must be a list of SelectiveMetagraphIndex items."
                 )
 
         block_hash = await self.determine_block_hash(block, block_hash, reuse_block)

bittensor/core/subtensor.py

@@ -1133,15 +1133,15 @@ def get_minimum_required_stake(self) -> Balance:
     def get_metagraph_info(
         self,
         netuid: int,
-        field_indices: Optional[list["SelectiveMetagraphIndex"]] = None,
+        field_indexes: Optional[list["SelectiveMetagraphIndex"]] = None,
         block: Optional[int] = None,
     ) -> Optional[MetagraphInfo]:
         """
         Retrieves full or partial metagraph information for the specified subnet (netuid).
 
         Arguments:
             netuid (int): The NetUID of the subnet to query.
-            field_indices (Optional[list[SelectiveMetagraphIndex]]): An optional list of SelectiveMetagraphIndex values
+            field_indexes (Optional[list[SelectiveMetagraphIndex]]): An optional list of SelectiveMetagraphIndex values
                 specifying which fields to retrieve. If not provided, all available fields will be returned.
             block (Optional[int]):The block number at which to query the data. If not specified, the current block or
                 one determined via reuse_block or block_hash will be used.
@@ -1155,19 +1155,19 @@ def get_metagraph_info(
 
             partial_meta_info = subtensor.get_metagraph_info(
                 netuid=2,
-                field_indices=[SelectiveMetagraphIndex.Name, SelectiveMetagraphIndex.OwnerHotkeys]
+                field_indexes=[SelectiveMetagraphIndex.Name, SelectiveMetagraphIndex.OwnerHotkeys]
             )
         """
         indexes = SelectiveMetagraphIndex.all_indices()
 
-        if field_indices:
-            if isinstance(field_indices, list) and all(
-                isinstance(f, SelectiveMetagraphIndex) for f in field_indices
+        if field_indexes:
+            if isinstance(field_indexes, list) and all(
+                isinstance(f, SelectiveMetagraphIndex) for f in field_indexes
             ):
-                indexes = [f.value for f in field_indices]
+                indexes = [f.value for f in field_indexes]
             else:
                 raise ValueError(
-                    "`field_indices` must be a list of SelectiveMetagraphIndex items."
+                    "`field_indexes` must be a list of SelectiveMetagraphIndex items."
                 )
 
         block_hash = self.determine_block_hash(block)

tests/e2e_tests/test_metagraph.py

@@ -456,7 +456,7 @@ def test_metagraph_info_with_indexes(subtensor, alice_wallet, bob_wallet):
     ]
 
     metagraph_info = subtensor.get_metagraph_info(
-        netuid=alice_subnet_netuid, field_indices=field_indices
+        netuid=alice_subnet_netuid, field_indexes=field_indices
     )
 
     assert metagraph_info == MetagraphInfo(
@@ -563,7 +563,7 @@ def test_metagraph_info_with_indexes(subtensor, alice_wallet, bob_wallet):
     ]
 
     metagraph_info = subtensor.get_metagraph_info(
-        netuid=alice_subnet_netuid, field_indices=fields
+        netuid=alice_subnet_netuid, field_indexes=fields
     )
 
     assert metagraph_info == MetagraphInfo(

tests/unit_tests/test_async_subtensor.py

@@ -3112,7 +3112,7 @@ async def test_get_metagraph_info_specific_fields(subtensor, mocker):
     )
 
     # Call
-    result = await subtensor.get_metagraph_info(netuid=netuid, field_indices=fields)
+    result = await subtensor.get_metagraph_info(netuid=netuid, field_indexes=fields)
 
     # Asserts
     assert result == "parsed_metagraph"
@@ -3137,12 +3137,12 @@ async def test_get_metagraph_info_specific_fields(subtensor, mocker):
 )
 @pytest.mark.asyncio
 async def test_get_metagraph_info_invalid_field_indices(subtensor, wrong_fields):
-    """Test get_metagraph_info raises ValueError on invalid field_indices."""
+    """Test get_metagraph_info raises ValueError on invalid field_indexes."""
     with pytest.raises(
         ValueError,
-        match="`field_indices` must be a list of SelectiveMetagraphIndex items.",
+        match="`field_indexes` must be a list of SelectiveMetagraphIndex items.",
     ):
-        await subtensor.get_metagraph_info(netuid=1, field_indices=wrong_fields)
+        await subtensor.get_metagraph_info(netuid=1, field_indexes=wrong_fields)
 
 
 @pytest.mark.asyncio

tests/unit_tests/test_subtensor.py

@@ -3440,7 +3440,7 @@ def test_get_metagraph_info_specific_fields(subtensor, mocker):
     )
 
     # Call
-    result = subtensor.get_metagraph_info(netuid=netuid, field_indices=fields)
+    result = subtensor.get_metagraph_info(netuid=netuid, field_indexes=fields)
 
     # Asserts
     assert result == "parsed_metagraph"
@@ -3464,12 +3464,12 @@ def test_get_metagraph_info_specific_fields(subtensor, mocker):
     ],
 )
 def test_get_metagraph_info_invalid_field_indices(subtensor, wrong_fields):
-    """Test get_metagraph_info raises ValueError on invalid field_indices."""
+    """Test get_metagraph_info raises ValueError on invalid field_indexes."""
     with pytest.raises(
         ValueError,
-        match="`field_indices` must be a list of SelectiveMetagraphIndex items.",
+        match="`field_indexes` must be a list of SelectiveMetagraphIndex items.",
     ):
-        subtensor.get_metagraph_info(netuid=1, field_indices=wrong_fields)
+        subtensor.get_metagraph_info(netuid=1, field_indexes=wrong_fields)
 
 
 def test_get_metagraph_info_subnet_not_exist(subtensor, mocker):