Merge pull request #127 from eclipsevortex/release/3.1.4

eclipsevortex · web-flow · commit 9d45b70c4b8c · 2025-05-30T09:39:45.000+02:00
fix reset moving score on condition (#126)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.3
+3.1.4
diff --git a/subvortex/core/version.py b/subvortex/core/version.py
@@ -1,3 +1,5 @@
+import tomli  # Upgrade to python 3.11 and use tomllib which is integrated
+from pathlib import Path
 from pip._vendor.packaging.version import Version
 
 
@@ -9,3 +11,10 @@ def to_spec_version(version: str):
 def to_release_version(version: str):
     version: Version = Version(version)
     return f"{version.major}.{version.minor}.{version.micro}"
+
+
+def get_version() -> str:
+    pyproject_path = Path(__file__).parent.parent / "pyproject.toml"
+    with pyproject_path.open("rb") as f:
+        data = tomli.load(f)
+    return data["project"]["version"]
diff --git a/subvortex/miner/metagraph/manifest.json b/subvortex/miner/metagraph/manifest.json
@@ -2,9 +2,9 @@
   "id": "miner-metagraph",
   "name": "subvortex-miner-metagraph",
   "description": "SubVortex Miner Metagraph",
-  "version": "3.1.3",
-  "miner.version": "3.1.3",
-  "miner.metagraph.version": "3.1.3",
+  "version": "3.1.4",
+  "miner.version": "3.1.4",
+  "miner.metagraph.version": "3.1.4",
   "type": "python",
   "neuron": "miner",
   "component": "metagraph",
diff --git a/subvortex/miner/metagraph/metadata.json b/subvortex/miner/metagraph/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "miner-metagraph",
   "name": "subvortex-miner-metagraph",
-  "version": "3.1.3",
-  "miner.version": "3.1.3",
-  "miner.metagraph.version": "3.1.3",
+  "version": "3.1.4",
+  "miner.version": "3.1.4",
+  "miner.metagraph.version": "3.1.4",
   "depends_on": [
     "miner-redis"
   ]
diff --git a/subvortex/miner/metagraph/pyproject.toml b/subvortex/miner/metagraph/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-miner-metagraph"
-version = "3.1.3"
+version = "3.1.4"
 description = "SubVortex Miner Metagraph"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/miner/metagraph/requirements.txt b/subvortex/miner/metagraph/requirements.txt
@@ -6,4 +6,4 @@ pydantic==2.8.2
 python-dotenv==1.0.1
 setuptools==70.0.0
 redis==5.0.1
-
+tomli==2.2.1
diff --git a/subvortex/miner/metagraph/src/main.py b/subvortex/miner/metagraph/src/main.py
@@ -11,6 +11,7 @@
 import subvortex.core.core_bittensor.config.config_utils as scccu
 import subvortex.core.metagraph.metagraph as scmm
 import subvortex.core.metagraph.database as scmms
+import subvortex.core.version as scv
 
 import subvortex.miner.metagraph.src.settings as smme
 
@@ -57,6 +58,13 @@ async def main():
     btul.logging.set_trace(config.logging.trace)
     btul.logging._stream_formatter.set_trace(config.logging.trace)
 
+    # Display the settings
+    btul.logging.info(f"Settings: {settings}")
+
+    # Show miner version
+    version = scv.get_version()
+    btul.logging.debug(f"Version: {version}")
+
     metagraph_observer = None
     subtensor = None
     try:
diff --git a/subvortex/miner/neuron/manifest.json b/subvortex/miner/neuron/manifest.json
@@ -2,9 +2,9 @@
   "id": "miner-neuron",
   "name": "subvortex-miner-neuron",
   "description": "SubVortex Miner Neuron",
-  "version": "3.1.3",
-  "miner.version": "3.1.3",
-  "miner.neuron.version": "3.1.3",
+  "version": "3.1.4",
+  "miner.version": "3.1.4",
+  "miner.neuron.version": "3.1.4",
   "type": "python",
   "neuron": "miner",
   "component": "neuron",
diff --git a/subvortex/miner/neuron/metadata.json b/subvortex/miner/neuron/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "miner-neuron",
   "name": "subvortex-miner-neuron",
-  "version": "3.1.3",
-  "miner.version": "3.1.3",
-  "miner.neuron.version": "3.1.3",
+  "version": "3.1.4",
+  "miner.version": "3.1.4",
+  "miner.neuron.version": "3.1.4",
   "depends_on": [
     "miner-redis",
     "miner-metagraph"
diff --git a/subvortex/miner/neuron/pyproject.toml b/subvortex/miner/neuron/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-miner-neuron"
-version = "3.1.3"
+version = "3.1.4"
 description = "SubVortex Miner Neuron"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/miner/neuron/requirements.txt b/subvortex/miner/neuron/requirements.txt
@@ -7,4 +7,5 @@ pydantic==2.8.2
 python-dotenv==1.0.1
 redis==5.0.1
 setuptools==70.0.0
-substrate_interface==1.7.9
+substrate_interface==1.7.9
+tomli==2.2.1
diff --git a/subvortex/miner/neuron/src/main.py b/subvortex/miner/neuron/src/main.py
@@ -32,6 +32,7 @@
 from subvortex.core.shared.neuron import wait_until_registered
 from subvortex.core.shared.substrate import get_weights_min_stake_async
 from subvortex.core.shared.mock import MockSubtensor, MockAxon
+from subvortex.core.version import get_version
 
 from subvortex.core.core_bittensor.config.config_utils import update_config
 from subvortex.core.core_bittensor.metagraph import SubVortexMetagraph
@@ -46,7 +47,6 @@
     create_firewall_tool,
     create_firewall_observer,
 )
-from subvortex.miner.version import __version__ as THIS_VERSION
 from subvortex.miner.neuron.src.firewall import Firewall
 from subvortex.miner.neuron.src.config import (
     config,
@@ -147,7 +147,8 @@ async def run(self):
             btul.logging.info(f"Settings: {self.settings}")
 
             # Show miner version
-            btul.logging.debug(f"Version: {THIS_VERSION}")
+            self.version = get_version()
+            btul.logging.debug(f"Version: {self.version}")
 
             await self._initialize()
             await self._serve()
@@ -186,9 +187,9 @@ async def _initialize(self):
         # Get the miner
         self.neuron = self.neurons[self.wallet.hotkey.ss58_address]
         btul.logging.info(
-            f"Local miner neuron: {self.neuron.hotkey} (UID: {self.neuron.uid}, IP: {self.neuron.ip})"
+            f"Neuron details — Hotkey: {self.neuron.hotkey}, UID: {self.neuron.uid}, IP: {self.neuron.ip}"
         )
-
+        
         btul.logging.success("Initialization complete.")
 
     async def _serve(self):
@@ -432,7 +433,7 @@ def _score(self, synapse: Score) -> Score:
         )
         btul.logging.success(f"[{validator_uid}] Score {synapse.score}")
 
-        synapse.version = THIS_VERSION
+        synapse.version = self.version
 
         return synapse
 
diff --git a/subvortex/miner/redis/manifest.json b/subvortex/miner/redis/manifest.json
@@ -2,9 +2,9 @@
   "id": "miner-redis",
   "name": "subvortex-miner-redis",
   "description": "SubVortex Miner Redis",
-  "version": "3.1.3",
-  "miner.version": "3.1.3",
-  "miner.redis.version": "3.1.3",
+  "version": "3.1.4",
+  "miner.version": "3.1.4",
+  "miner.redis.version": "3.1.4",
   "type": "package",
   "neuron": "miner",
   "component": "redis",
diff --git a/subvortex/miner/redis/metadata.json b/subvortex/miner/redis/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "miner-redis",
   "name": "subvortex-miner-redis",
-  "version": "3.1.3",
-  "miner.version": "3.1.3",
-  "miner.redis.version": "3.1.3",
+  "version": "3.1.4",
+  "miner.version": "3.1.4",
+  "miner.redis.version": "3.1.4",
   "migration_type": "redis",
   "migration": "./migrations/versions",
   "depends_on": []
diff --git a/subvortex/miner/redis/version.py b/subvortex/miner/redis/version.py
@@ -1 +1 @@
-__version__ = "3.1.3"
+__version__ = "3.1.4"
diff --git a/subvortex/miner/version.py b/subvortex/miner/version.py
@@ -1 +1 @@
-__version__ = "3.1.3"
+__version__ = "3.1.4"
diff --git a/subvortex/pyproject.toml b/subvortex/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex"
-version = "3.1.3"
+version = "3.1.4"
 description = "SubVortex"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/validator/metagraph/manifest.json b/subvortex/validator/metagraph/manifest.json
@@ -2,9 +2,9 @@
   "id": "validator-metagraph",
   "name": "subvortex-validator-metagraph",
   "description": "SubVortex Validator Metagraph",
-  "version": "3.1.3",
-  "validator.version": "3.1.3",
-  "validator.metagraph.version": "3.1.3",
+  "version": "3.1.4",
+  "validator.version": "3.1.4",
+  "validator.metagraph.version": "3.1.4",
   "type": "python",
   "neuron": "validator",
   "component": "metagraph",
diff --git a/subvortex/validator/metagraph/metadata.json b/subvortex/validator/metagraph/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "validator-metagraph",
   "name": "subvortex-validator-metagraph",
-  "version": "3.1.3",
-  "validator.version": "3.1.3",
-  "validator.metagraph.version": "3.1.3",
+  "version": "3.1.4",
+  "validator.version": "3.1.4",
+  "validator.metagraph.version": "3.1.4",
   "depends_on": [
     "validator-redis"
   ]
diff --git a/subvortex/validator/metagraph/pyproject.toml b/subvortex/validator/metagraph/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-validator-metagraph"
-version = "3.1.3"
+version = "3.1.4"
 description = "SubVortex Validator Metagraph"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/validator/metagraph/requirements.txt b/subvortex/validator/metagraph/requirements.txt
@@ -4,6 +4,7 @@ loguru==0.7.0
 numpy==2.0.1
 pydantic==2.8.2
 python-dotenv==1.0.1
-setuptools==70.0.0
 redis==5.0.1
+setuptools==70.0.0
+tomli==2.2.1
 
diff --git a/subvortex/validator/metagraph/src/main.py b/subvortex/validator/metagraph/src/main.py
@@ -11,10 +11,10 @@
 import subvortex.core.core_bittensor.config.config_utils as scccu
 import subvortex.core.metagraph.metagraph as scmm
 import subvortex.core.metagraph.database as scmms
+import subvortex.core.version as scv
 
 import subvortex.validator.metagraph.src.settings as svme
 
-
 # Load the environment variables for the whole process
 load_dotenv(override=True)
 
@@ -57,7 +57,11 @@ async def main():
     btul.logging.debug(str(config))
 
     # Display the settings
-    btul.logging.info(f"metagraph settings: {settings}")
+    btul.logging.info(f"Settings: {settings}")
+
+    # Show miner version
+    version = scv.get_version()
+    btul.logging.debug(f"Version: {version}")
 
     database = None
     metagraph_observer = None
diff --git a/subvortex/validator/neuron/manifest.json b/subvortex/validator/neuron/manifest.json
@@ -2,9 +2,9 @@
   "id": "validator-neuron",
   "name": "subvortex-validator-neuron",
   "description": "SubVortex Validator Neuron",
-  "version": "3.1.3",
-  "validator.version": "3.1.3",
-  "validator.neuron.version": "3.1.3",
+  "version": "3.1.4",
+  "validator.version": "3.1.4",
+  "validator.neuron.version": "3.1.4",
   "type": "python",
   "neuron": "validator",
   "component": "neuron",
diff --git a/subvortex/validator/neuron/metadata.json b/subvortex/validator/neuron/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "validator-neuron",
   "name": "subvortex-validator-neuron",
-  "version": "3.1.3",
-  "validator.version": "3.1.3",
-  "validator.neuron.version": "3.1.3",
+  "version": "3.1.4",
+  "validator.version": "3.1.4",
+  "validator.neuron.version": "3.1.4",
   "depends_on": [
     "validator-redis",
     "validator-metagraph"
diff --git a/subvortex/validator/neuron/pyproject.toml b/subvortex/validator/neuron/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-validator-neuron"
-version = "3.1.3"
+version = "3.1.4"
 description = "SubVortex Validator Neuron"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/validator/neuron/requirements.txt b/subvortex/validator/neuron/requirements.txt
@@ -8,4 +8,5 @@ python-dotenv==1.0.1
 redis==5.0.1
 setuptools==70.0.0
 substrate_interface==1.7.9
+tomli==2.2.1
 wandb==0.18.7
diff --git a/subvortex/validator/neuron/src/main.py b/subvortex/validator/neuron/src/main.py
@@ -39,9 +39,7 @@
     get_number_of_neurons,
     get_next_block,
 )
-from subvortex.core.version import to_spec_version
-
-from subvortex.validator.version import __version__ as THIS_VERSION
+from subvortex.core.version import to_spec_version, get_version
 
 from subvortex.validator.neuron.src.config import config, check_config, add_args
 from subvortex.validator.neuron.src.checks import check_redis_connection
@@ -135,7 +133,8 @@ async def run(self):
         btul.logging.info(f"Settings: {self.settings}")
 
         # Show miner version
-        btul.logging.debug(f"Version: {THIS_VERSION}")
+        version = get_version()
+        btul.logging.debug(f"Version: {version}")
 
         # Init validator wallet.
         btul.logging.debug(f"loading wallet")
@@ -175,7 +174,7 @@ async def run(self):
             self.dendrite = MockDendrite(wallet=self.wallet)
         else:
             self.dendrite = SubVortexDendrite(
-                version=to_spec_version(THIS_VERSION), wallet=self.wallet
+                version=to_spec_version(version), wallet=self.wallet
             )
         btul.logging.debug(str(self.dendrite))
 
@@ -201,7 +200,9 @@ async def run(self):
 
         # Get the neuron
         self.neuron = await self.database.get_neuron(self.wallet.hotkey.ss58_address)
-        btul.logging.debug(f"Validator based in {self.neuron.country}")
+        btul.logging.info(
+            f"Neuron details — Hotkey: {self.neuron.hotkey}, UID: {self.neuron.uid}, IP: {self.neuron.ip}"
+        )
 
         # Init wandb.
         if not self.config.wandb.off:
@@ -264,7 +265,7 @@ async def run(self):
                     btul.logging.debug(f"Locations loaded {len(locations)}")
 
                     # Sync the miners
-                    self.miners = await sync_miners(
+                    self.miners, reset_miners = await sync_miners(
                         database=self.database,
                         neurons=neurons,
                         miners=self.miners,
@@ -280,6 +281,7 @@ async def run(self):
                     self.moving_averaged_scores = reset_scores_for_not_serving_miners(
                         miners=self.miners,
                         moving_averaged_scores=self.moving_averaged_scores,
+                        reset_miners=reset_miners,
                     )
 
                 # Wait until next step epoch.
@@ -312,6 +314,7 @@ async def run(self):
                         wallet=self.wallet,
                         uid=self.neuron.uid,
                         moving_scores=self.moving_averaged_scores,
+                        version=version
                     )
                     save_state(self)
 
diff --git a/subvortex/validator/neuron/src/miner.py b/subvortex/validator/neuron/src/miner.py
diff --git a/subvortex/validator/neuron/src/weights.py b/subvortex/validator/neuron/src/weights.py
diff --git a/subvortex/validator/neuron/tests/src/test_miner.py b/subvortex/validator/neuron/tests/src/test_miner.py
diff --git a/subvortex/validator/neuron/tests/src/test_weights.py b/subvortex/validator/neuron/tests/src/test_weights.py
diff --git a/subvortex/validator/redis/manifest.json b/subvortex/validator/redis/manifest.json
diff --git a/subvortex/validator/redis/metadata.json b/subvortex/validator/redis/metadata.json
diff --git a/subvortex/validator/redis/version.py b/subvortex/validator/redis/version.py
diff --git a/subvortex/validator/version.py b/subvortex/validator/version.py

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "miner-metagraph",`
`3`	`3`	`"name": "subvortex-miner-metagraph",`
`4`		`- "version": "3.1.3",`
`5`		`- "miner.version": "3.1.3",`
`6`		`- "miner.metagraph.version": "3.1.3",`
	`4`	`+ "version": "3.1.4",`
	`5`	`+ "miner.version": "3.1.4",`
	`6`	`+ "miner.metagraph.version": "3.1.4",`
`7`	`7`	`"depends_on": [`
`8`	`8`	`"miner-redis"`
`9`	`9`	`]`