add ssh remote connection & validator installation for sn12

app/src/auto_validator/core/admin.py

@@ -13,7 +13,7 @@
     UploadedFile,
     ValidatorInstance,
 )
-from auto_validator.core.utils.utils import fetch_and_compare_subnets, install_validator_on_remote_server
+from auto_validator.core.utils.utils import fetch_and_compare_subnets
 
 admin.site.site_header = "auto_validator Administration"
 admin.site.site_title = "auto_validator"
@@ -32,10 +32,9 @@ class UploadedFileAdmin(admin.ModelAdmin):
 @admin.register(Subnet)
 class SubnetAdmin(admin.ModelAdmin):
     list_display = (
-        "name",
-        "description",
-        "mainnet_id",
-        "testnet_id",
+        "codename",
+        "mainnet_netuid",
+        "testnet_netuid",
         "owner_nick",
         "registered_networks",
     )
@@ -107,31 +106,6 @@ def get_queryset(self, request):
     is_registered.admin_order_field = "is_registered_sort"
     is_registered.short_description = "Is Registered"
 
-    def install_validator(self, request, queryset):
-        if queryset.count() > 1:
-            self.message_user(request, "Please select only one subnet slot.", level="ERROR")
-            return
-        subnet_slot = queryset.first()
-        # change the path to the actual path of the private key
-        # change the hotkey to the actual hotkey of the validator
-        # change the IP address to the actual IP address of the server
-        # change the username to the actual username of the server
-        # change the path to the actual path of the private key
-        # change the passphrase to the actual passphrase of the private key
-        install_validator_on_remote_server(
-            subnet_slot.subnet.codename,
-            subnet_slot.blockchain,
-            subnet_slot.netuid,
-            "/root/.bittensor/wallets/validator",
-            "validator-hotkey",
-            "219.15.67.27",
-            "root",
-            "/root/.ssh/id_rsa",
-            "1234567890",
-        )
-
-    actions = [install_validator]
-
 
 @admin.register(ValidatorInstance)
 class ValidatorInstanceAdmin(admin.ModelAdmin):

app/src/auto_validator/core/api.py

@@ -1,4 +1,6 @@
-import yaml
+import logging
+import pathlib
+
 from django.conf import settings
 from rest_framework import mixins, parsers, routers, status, viewsets
 from rest_framework.exceptions import AuthenticationFailed
@@ -11,8 +13,12 @@
 
 from .authentication import HotkeyAuthentication
 from .utils.bot import trigger_bot_send_message
+from .utils.utils import get_dumper_commands
+
+SUBNETS_CONFIG_PATH = pathlib.Path(settings.LOCAL_SUBNETS_SCRIPTS_PATH) / "subnets.yaml"
 
-YAML_FILE_PATH = settings.LOCAL_SUBNETS_SCRIPTS_PATH + "/subnets.yaml"
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
 
 
 class FilesViewSet(mixins.CreateModelMixin, mixins.ListModelMixin, viewsets.GenericViewSet):
@@ -62,20 +68,15 @@ class DumperCommandsViewSet(viewsets.ViewSet):
     def list(self, request):
         subnet_identifier = request.headers.get("SubnetID")
         if not subnet_identifier:
-            return Response({"error": "subnet_identifier is required"}, status=status.HTTP_400_BAD_REQUEST)
-
-        try:
-            with open(YAML_FILE_PATH) as file:
-                data = yaml.safe_load(file)
-                codename_lower = subnet_identifier.lower()
-                for normalized_codename, sn_config in data.items():
-                    codenames = sn_config.get("codename_list", [])
-                    if codename_lower in map(str.lower, codenames):
-                        return Response((normalized_codename, sn_config.get("dumper_commands", [])))
-                else:
-                    return Response({"error": "subnet_identifier not found"}, status=status.HTTP_404_NOT_FOUND)
-        except Exception as e:
-            return Response({"error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            return Response({"error": "SubnetID is required"}, status=status.HTTP_400_BAD_REQUEST)
+
+        dumper_commands = get_dumper_commands(subnet_identifier, SUBNETS_CONFIG_PATH)
+        if dumper_commands is not None:
+            logger.info(f"SubnetID: {subnet_identifier}, dumper_commands: {dumper_commands}")
+            return Response(dumper_commands)
+        else:
+            logger.error(f"SubnetID: {subnet_identifier} not found")
+            return Response({"error": "SubnetID not found"}, status=status.HTTP_404_NOT_FOUND)
 
 
 class APIRootView(routers.DefaultRouter.APIRootView):

app/src/auto_validator/core/migrations/0012_rename_hw_requirements_subnet_hardware_description_and_more.py

@@ -0,0 +1,58 @@
+# Generated by Django 4.2.16 on 2024-10-08 01:54
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0011_alter_subnet_hw_requirements"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="subnet",
+            old_name="hw_requirements",
+            new_name="hardware_description",
+        ),
+        migrations.RenameField(
+            model_name="subnet",
+            old_name="mainnet_id",
+            new_name="mainnet_netuid",
+        ),
+        migrations.RenameField(
+            model_name="subnet",
+            old_name="maintainers_ids",
+            new_name="maintainer_discord_ids",
+        ),
+        migrations.RenameField(
+            model_name="subnet",
+            old_name="owner_id",
+            new_name="owner_discord_id",
+        ),
+        migrations.RenameField(
+            model_name="subnet",
+            old_name="testnet_id",
+            new_name="testnet_netuid",
+        ),
+        migrations.AddField(
+            model_name="subnet",
+            name="allowed_secrets",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                null=True,
+                size=None,
+            ),
+        ),
+        migrations.AddField(
+            model_name="subnet",
+            name="dumper_commands",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                null=True,
+                size=None,
+            ),
+        ),
+    ]

app/src/auto_validator/core/models.py

@@ -49,13 +49,15 @@ class Subnet(models.Model):
     description = models.TextField(null=True, blank=True)
     operators = models.ManyToManyField("Operator", related_name="subnets", blank=True)
     codename = models.CharField(max_length=255, null=True, blank=True)
-    mainnet_id = models.IntegerField(null=True, blank=True)
-    testnet_id = models.IntegerField(null=True, blank=True)
+    mainnet_netuid = models.IntegerField(null=True, blank=True)
+    testnet_netuid = models.IntegerField(null=True, blank=True)
     owner_nick = models.CharField(max_length=255, null=True, blank=True)
-    owner_id = models.CharField(max_length=255, null=True, blank=True)
-    maintainers_ids = ArrayField(models.CharField(max_length=255), null=True, blank=True)
+    owner_discord_id = models.CharField(max_length=255, null=True, blank=True)
+    maintainer_discord_ids = ArrayField(models.CharField(max_length=255), null=True, blank=True)
     github_repo = models.CharField(max_length=255, null=True, blank=True)
-    hw_requirements = models.TextField(max_length=4095, null=True, blank=True)
+    hardware_description = models.TextField(max_length=4095, null=True, blank=True)
+    allowed_secrets = ArrayField(models.CharField(max_length=255), null=True, blank=True)
+    dumper_commands = ArrayField(models.CharField(max_length=255), null=True, blank=True)
 
     def registered_networks(self):
         mainnet_slots = self.slots.filter(

app/src/auto_validator/core/tests/conftest.py

@@ -1,7 +1,6 @@
 from collections.abc import Generator
 
 import bittensor as bt
-import pexpect
 import pytest
 from rest_framework.authtoken.models import Token
 from rest_framework.test import APIClient
@@ -86,42 +85,11 @@ def __eq__(self, other):
 def wallet():
     coldkey_name = "auto-validator7"
     hotkey_name = "testhotkey7"
-    command1 = f"btcli wallet new_coldkey --wallet.name {coldkey_name}"
-    command2 = f"btcli wallet new_hotkey --wallet.name {coldkey_name} --wallet.hotkey {hotkey_name}"
-    has_coldkey = False
-    has_hotkey = False
-    password = "your_password_here"
-
-    try:
-        wallet = bt.wallet(name=coldkey_name, hotkey=hotkey_name)
-        wallet.coldkeypub  # make sure wallet has coldkey file, if not, it will raise an exception
-        has_coldkey = True
-        wallet.hotkey  # make sure wallet has hotkey file, if not, it will raise an exception
-        has_hotkey = True
-    except bt.KeyFileError:
-        if not has_coldkey:
-            process = pexpect.spawn(command1, timeout=30)
-            try:
-                process.expect("Specify password for key encryption:")
-                process.sendline(password)
-
-                process.expect("Retype your password:")
-                process.sendline(password)
-
-                process.expect(pexpect.EOF)
-            except pexpect.TIMEOUT:
-                print("Timeout occurred while creating coldkey.")
-            finally:
-                process.close()
-
-        if not has_hotkey:
-            process = pexpect.spawn(command2, timeout=30)
-            try:
-                process.expect(pexpect.EOF)
-            except pexpect.TIMEOUT:
-                print("Timeout occurred while creating hotkey.")
-            finally:
-                process.close()
-        wallet = bt.wallet(name=coldkey_name, hotkey=hotkey_name)
+
+    wallet = bt.Wallet(name=coldkey_name, hotkey=hotkey_name, path=".bittensor/wallets")
+    if not wallet.coldkey_file.exists_on_device():
+        wallet.create_new_coldkey(overwrite=True, use_password=False)
+    if not wallet.hotkey_file.exists_on_device():
+        wallet.create_new_hotkey(overwrite=True, use_password=False)
 
     return wallet