Merge pull request #118 from eclipsevortex/release/3.1.0

Feature metagraph (#117)

Author: eclipsevortex

.github/scripts/generate_metadata.sh

@@ -2,13 +2,13 @@
 
 set -e
 
-echo "🔄 Updating metadata.json with correct versions"
+echo "🔄 Updating metadata.json and manifest.json with correct versions"
 
 # Define components and their services
 COMPONENTS=("miner" "validator")
 declare -A SERVICES
-SERVICES["miner"]="neuron"
-SERVICES["validator"]="neuron redis"
+SERVICES["miner"]="neuron metagraph redis"
+SERVICES["validator"]="neuron metagraph redis"
 
 # Function to extract version from a directory
 get_version() {
@@ -38,6 +38,33 @@ if [[ "$ROOT_VERSION" == "VERSION_NOT_FOUND" ]]; then
   exit 1
 fi
 
+# Helper to update a given JSON file (metadata.json or manifest.json)
+update_json_file() {
+  local file_path="$1"
+  local component="$2"
+  local service="$3"
+  local root_version="$4"
+  local component_version="$5"
+  local service_version="$6"
+
+  tmpfile=$(mktemp)
+  if [ -f "$file_path" ]; then
+    jq --arg root_version "$root_version" \
+       --arg comp_version "$component_version" \
+       --arg svc_version "$service_version" \
+       '.version = $root_version
+        | ."'"$component"'.version" = $comp_version
+        | ."'"$component"'.'"$service"'.version" = $svc_version' \
+       "$file_path" > "$tmpfile" && mv "$tmpfile" "$file_path"
+  else
+    echo "{
+  \"version\": \"$root_version\",
+  \"$component.version\": \"$component_version\",
+  \"$component.$service.version\": \"$service_version\"
+}" > "$file_path"
+  fi
+}
+
 # Iterate over all components
 for COMPONENT in "${COMPONENTS[@]}"; do
   echo "📦 Processing component: $COMPONENT"
@@ -66,31 +93,14 @@ for COMPONENT in "${COMPONENTS[@]}"; do
       continue
     fi
 
-    # Metadata file
-    metadata_path="$SERVICE_PATH/metadata.json"
-    tmpfile=$(mktemp)
-
-    # Build/update JSON
-    if [ -f "$metadata_path" ]; then
-      jq --arg root_version "$ROOT_VERSION" \
-         --arg comp_version "$COMPONENT_VERSION" \
-         --arg svc_version "$SERVICE_VERSION" \
-         '.version = $root_version
-          | ."'"$COMPONENT"'.version" = $comp_version
-          | ."'"$COMPONENT"'.'"$SERVICE"'.version" = $svc_version' \
-         "$metadata_path" > "$tmpfile" && mv "$tmpfile" "$metadata_path"
-    else
-      echo "{
-  \"version\": \"$ROOT_VERSION\",
-  \"$COMPONENT.version\": \"$COMPONENT_VERSION\",
-  \"$COMPONENT.$SERVICE.version\": \"$SERVICE_VERSION\"
-}" > "$metadata_path"
-    fi
-
-    echo "🏷️  Updated $metadata_path with:"
-    echo "    ➡️ version=$ROOT_VERSION"
-    echo "    ➡️ $COMPONENT.version=$COMPONENT_VERSION"
-    echo "    ➡️ $COMPONENT.$SERVICE.version=$SERVICE_VERSION"
+    for FILE in metadata.json manifest.json; do
+      FILE_PATH="$SERVICE_PATH/$FILE"
+      update_json_file "$FILE_PATH" "$COMPONENT" "$SERVICE" "$ROOT_VERSION" "$COMPONENT_VERSION" "$SERVICE_VERSION"
+      echo "📁 Updated $FILE_PATH:"
+      echo "    ➡️ version=$ROOT_VERSION"
+      echo "    ➡️ $COMPONENT.version=$COMPONENT_VERSION"
+      echo "    ➡️ $COMPONENT.$SERVICE.version=$SERVICE_VERSION"
+    done
   done
 done
 

.gitignore

@@ -174,7 +174,8 @@ firewall-events.json
 DS_Store
 *secrets
 *.txt
+!requirements*.txt
 ga-*.json
 .build
 redis.conf
-pyproject.toml
+/pyproject.toml

Makefile

@@ -12,8 +12,8 @@ ACTIONS_miner := bump-major bump-minor bump-patch bump-alpha bump-rc
 ACTIONS_validator := bump-major bump-minor bump-patch bump-alpha bump-rc
 
 # Services per component
-SERVICES_miner := neuron
-SERVICES_validator := neuron redis
+SERVICES_miner := neuron metagraph redis
+SERVICES_validator := neuron metagraph redis
 
 # All components
 COMPONENTS := miner validator
@@ -272,8 +272,8 @@ unprerelease:
 		[ -d "$$comp" ] || continue; \
 		comp_name=$$(basename "$$comp"); \
 		case $$comp_name in \
-			miner) services="neuron" ;; \
-			validator) services="neuron redis" ;; \
+			miner) services="$(SERVICES_miner)" ;; \
+			validator) services="$(SERVICES_validator)" ;; \
 			*) services="$$comp_name" ;; \
 		esac; \
 		for service in $$services; do \
@@ -318,8 +318,8 @@ unrelease:
 		[ -d "$$comp" ] || continue; \
 		comp_name=$$(basename "$$comp"); \
 		case $$comp_name in \
-			miner) services="neuron" ;; \
-			validator) services="neuron redis" ;; \
+			miner) services="$(SERVICES_miner)" ;; \
+			validator) services="$(SERVICES_validator)" ;; \
 			*) services="$$comp_name" ;; \
 		esac; \
 		for service in $$services; do \
@@ -344,6 +344,44 @@ release:
  		$(DIST_DIR)/*.tar.gz \
  		$(DIST_DIR)/*.whl || true
 
+# =========
+# 🧪 Tests
+# =========
+TARGETS += test
+
+test:
+	@echo "🧪 Running tests in all components/services..."
+	@PYTHONPATH=. ; \
+	for comp in $(COMPONENTS); do \
+		case "$$comp" in \
+			miner) SERVICES="$(SERVICES_miner)";; \
+			validator) SERVICES="$(SERVICES_validator)";; \
+			*) echo "Unknown component: $$comp"; exit 1;; \
+		esac; \
+		for svc in $$SERVICES; do \
+			svc_path=subvortex/$$comp/$$svc; \
+			if [ -d "$$svc_path" ]; then \
+				echo "🔍 Testing $$svc_path..."; \
+				PYTHONPATH=. pytest "$$svc_path"|| test $$? -eq 5 || exit $$?; \
+			else \
+				echo "⚠️ Warning: Path $$svc_path not found, skipping..."; \
+			fi \
+		done \
+	done; \
+	if [ -d "subvortex/core" ]; then \
+		echo "🔍 Testing subvortex/core..."; \
+		PYTHONPATH=. pytest subvortex/core || test $$? -eq 5 || exit $$?; \
+	else \
+		echo "⚠️ Warning: subvortex/core not found, skipping..."; \
+	fi
+
+
+# ==========
+# 📜 Scripts 
+# ==========
+generate:
+	python3 tools/generate_scripts/src/main.py
+
 # =====================
 # Add the last target
 # =====================
@@ -385,6 +423,7 @@ help:
 	@echo ""
 	@echo "  build                         – Build all components"
 	@echo "  clean                         – Clean all components"
+	@echo "  test                          – Run pytest in all service folders"
 	@echo ""
 	@echo "🏷️ Tag/Untag:"
 	@echo ""

VERSION

@@ -1 +1 @@
-3.0.1
+3.1.0

min_compute.yml

@@ -14,7 +14,7 @@ compute_spec:
   miner:
 
     cpu:
-      min_cores: 4            # Minimum number of CPU cores
+      min_cores: 8            # Minimum number of CPU cores
       min_speed: 2.5          # Minimum speed per core (GHz)
       recommended_cores: 8    # Recommended number of CPU cores
       recommended_speed: 3.5  # Recommended speed per core (GHz)
@@ -43,7 +43,7 @@ compute_spec:
   validator:
 
     cpu:
-      min_cores: 4            # Minimum number of CPU cores
+      min_cores: 8            # Minimum number of CPU cores
       min_speed: 2.5          # Minimum speed per core (GHz)
       recommended_cores: 8    # Recommended number of CPU cores
       recommended_speed: 3.5  # Recommended speed per core (GHz)

pyproject-miner.toml

@@ -38,13 +38,15 @@ include-package-data = true
 [tool.setuptools.packages.find]
 where = ["."]
 include = [
+    "scripts",
     "subvortex",
     "subvortex.core",
     "subvortex.miner",
     "subvortex.scripts",
 ]
 
 [tool.setuptools.package-data]
+"scripts" = ["**/utils/*.sh"]
 "subvortex" = ["pyproject.toml"]
 "subvortex.miner" = [
     "**/*.py",
@@ -56,6 +58,7 @@ include = [
     "**/env.template",
     "**/docker-compose.yml",
     "**/metadata.json",
+    "**/manifest.json",
 ]
 "subvortex.core" = ["**/*.py"]
 "subvortex.scripts" = ["**/*.sh", "wss/**/*"]

pyproject-validator.toml

@@ -58,6 +58,7 @@ include = [
     "**/env.template",
     "**/docker-compose.yml",
     "**/metadata.json",
+    "**/manifest.json",
 ]
 "subvortex.core" = ["**/*.py"]
 "subvortex.scripts" = ["**/*.sh"]

subvortex/core/Makefile

@@ -0,0 +1,25 @@
+# =========
+# 🧪 Tests
+# =========
+TARGETS += test
+
+test:
+	PYTHONPATH=../.. pytest . $(ARGS)
+
+# =====================
+# Add the last target
+# =====================
+.PHONY: $(TARGETS) help
+
+# =====================
+# Optional: help target
+# =====================
+help:
+	@echo "📦 CI/CD Targets:"
+	@echo ""
+	@echo "  test                          – Run pytest in all service folders"
+
+targets:
+	@echo "📋 Available Dynamic Targets:"
+	@echo ""
+	@printf "  %s\n" $(sort $(TARGETS))

subvortex/core/core_bittensor/axon.py

@@ -19,7 +19,6 @@
 import uvicorn
 import bittensor.core.config as btcc
 import bittensor.core.axon as btca
-import bittensor.core.settings as btcs
 import bittensor.core.threadpool as btct
 import bittensor.utils.networking as btun
 import bittensor.utils.btlogging as btul