Merge branch 'staging' into feat/thewhaleking/add-timestamp

Author: thewhaleking

bittensor/core/dendrite.py

@@ -877,7 +877,14 @@ def __del__(self):
             # ... some operations ...
             del dendrite  # This will implicitly invoke the __del__ method and close the session.
         """
-        self.close_session()
+        try:
+            self.close_session()
+        except RuntimeError:
+            if self._session:
+                logging.debug(
+                    "A Dendrite session was unable to be closed during garbage-collection of the Dendrite object. This "
+                    "usually indicates that you were not using the async context manager."
+                )
 
 
 # For back-compatibility with torch

tests/e2e_tests/test_commit_weights.py

@@ -267,7 +267,7 @@ async def test_commit_weights_uses_next_nonce(local_chain, subtensor, alice_wall
     assert success is True
 
     # Wait a few blocks
-    await asyncio.sleep(2)  # Wait for the txs to be included in the chain
+    await asyncio.sleep(10)  # Wait for the txs to be included in the chain
 
     # Query the WeightCommits storage map for all three salts
     weight_commits = subtensor.query_module(

tests/e2e_tests/utils/chain_interactions.py

@@ -81,7 +81,7 @@ async def wait_epoch(subtensor: "Subtensor", netuid: int = 1):
     q_tempo = [v for (k, v) in subtensor.query_map_subtensor("Tempo") if k == netuid]
     if len(q_tempo) == 0:
         raise Exception("could not determine tempo")
-    tempo = q_tempo[0]
+    tempo = q_tempo[0].value
     logging.info(f"tempo = {tempo}")
     await wait_interval(tempo, subtensor, netuid)
 

tests/e2e_tests/utils/e2e_test_utils.py

@@ -78,12 +78,7 @@ def clone_or_update_templates(specific_commit=None):
     return install_dir + templates_repo
 
 
-def install_templates(install_dir):
-    subprocess.check_call([sys.executable, "-m", "pip", "install", "-e", "."])
-
-
 def uninstall_templates(install_dir):
-    subprocess.check_call([sys.executable, "-m", "pip", "uninstall", "bittensor", "-y"])
     # Delete everything in directory
     shutil.rmtree(install_dir)
 
@@ -93,7 +88,6 @@ def __init__(self):
         self.dir = clone_or_update_templates()
 
     def __enter__(self):
-        install_templates(self.dir)
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):

tests/unit_tests/test_dendrite.py

@@ -83,6 +83,17 @@ def test_close(setup_dendrite, setup_axon):
     assert setup_dendrite._session is None
 
 
+def test_garbage_collection(setup_dendrite):
+    del setup_dendrite  # should not raise an error
+
+
+@pytest.mark.asyncio
+async def test_async_garbage_collection(setup_dendrite, setup_axon):
+    async with setup_dendrite as dendrite:
+        assert (await dendrite.session) is not None
+    del setup_dendrite  # should not raise error
+
+
 @pytest.mark.asyncio
 async def test_aclose(setup_dendrite, setup_axon):
     axon = setup_axon