Merge pull request #298 from macrocosm-os/fix/miner-inactive

remove inactive uid filtering

Author: mccrindlebrian

folding/__init__.py

@@ -1,7 +1,7 @@
 from .protocol import JobSubmissionSynapse
 from .validators.protein import Protein
 
-__version__ = "1.3.3"
+__version__ = "1.3.4"
 version_split = __version__.split(".")
 __spec_version__ = (
     (10000 * int(version_split[0]))

folding/base/neuron.py

@@ -14,11 +14,10 @@
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
-
+import os
 import copy
 import bittensor as bt
 from abc import ABC, abstractmethod
-import os
 
 import openmm
 from tenacity import RetryError

folding/validators/forward.py

@@ -93,30 +93,16 @@ async def run_step(
 
     response_info = get_response_info(responses=responses)
 
-    # There are hotkeys that have decided to stop serving. We need to remove them from the store.
-    responses_serving = []
-    active_uids = []
-    for ii, state in enumerate(response_info["response_miners_serving"]):
-        if state:
-            responses_serving.append(responses[ii])
-            active_uids.append(uids[ii])
-
     event = {
         "block": self.block,
         "step_length": time.time() - start_time,
-        "uids": active_uids,
+        "uids": uids,
         "energies": [],
         **response_info,
     }
 
-    if len(responses_serving) == 0:
-        logger.warning(
-            f"❗ No miners serving pdb_id {synapse.pdb_id}... Making job inactive. ❗"
-        )
-        return event
-
     energies, energy_event = get_energies(
-        protein=protein, responses=responses_serving, uids=active_uids
+        protein=protein, responses=responses, uids=uids
     )
 
     # Log the step event.

neurons/validator.py

@@ -157,26 +157,27 @@ async def ping_all_miners(
     async def sample_random_uids(
         self,
         num_uids_to_sample: int,
-        exclude_uids: List[int],
+        exclude_uids: List[int] = None,
     ) -> List[int]:
         """Helper function to sample a batch of uids on the network, determine their serving status,
         and sample more until a desired number of uids is found.
 
         Args:
             num_uids_to_sample (int): The number of uids to sample.
-            exclude_uids (List[int]): A list of uids that should be excluded from sampling.
+            exclude_uids (List[int], optional): List of uids to exclude from the sampling. Defaults to None.
 
         Returns:
-            List[int]: A list of responding and free uids.
+            List[int]: A list of random uids.
         """
-        exclude_uids = []
-        active_uids = await self.ping_all_miners(exclude_uids=exclude_uids)
 
-        if len(active_uids) > num_uids_to_sample:
-            return random.sample(active_uids, num_uids_to_sample)
+        if exclude_uids is not None:
+            all_miner_uids = list(
+                set(self.all_miner_uids).difference(set(exclude_uids))
+            )
+        else:
+            all_miner_uids = self.all_miner_uids
 
-        elif len(active_uids) <= num_uids_to_sample:
-            return active_uids
+        return random.sample(all_miner_uids, num_uids_to_sample)
 
     async def get_valid_uids(self) -> List[int]:
         """get valid uids to work on a job by sampling random uids and excluding active jobs.
@@ -191,7 +192,7 @@ async def get_valid_uids(self) -> List[int]:
 
         valid_uids = await self.sample_random_uids(
             num_uids_to_sample=self.config.neuron.sample_size,
-            exclude_uids=exclude_uids,
+            exclude_uids = exclude_uids
         )
 
         return valid_uids

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "folding"
-version = "1.3.3"
+version = "1.3.4"
 description = "Macrocosmos Subnet 25: Folding"
 authors = ["Brian McCrindle <[email protected]>", "Sergio Champoux <[email protected]>", "Szymon Fonau <[email protected]>"]