added btminer get_model and improved return on the rest of the get_models

miners/bmminer.py

@@ -5,11 +5,22 @@ from miners import BaseMiner
 class BMMiner(BaseMiner):
     def __init__(self, ip: str) -> None:
         api = BMMinerAPI(ip)
+        self.model = None
         super().__init__(ip, api)
 
     def __repr__(self) -> str:
         return f"BMMiner: {str(self.ip)}"
 
+    async def get_model(self):
+        if self.model:
+            return self.model
+        version_data = await self.api.devdetails()
+        if version_data:
+            self.model = version_data["DEVDETAILS"][0]["Model"].replace("Antminer ", "")
+            return self.model
+        return None
+
+
     async def get_hostname(self) -> str:
         return "BMMiner Unknown"
 

miners/bosminer.py

@@ -9,6 +9,7 @@ class BOSminer(BaseMiner):
     def __init__(self, ip: str) -> None:
         api = BOSMinerAPI(ip)
         super().__init__(ip, api)
+        self.model = None
         self.config = None
         self.uname = 'root'
         self.pwd = 'admin'
@@ -87,9 +88,12 @@ class BOSminer(BaseMiner):
             return "BOSMiner Unknown"
 
     async def get_model(self):
+        if self.model:
+            return self.model
         version_data = await self.api.devdetails()
         if version_data:
-            return version_data["DEVDETAILS"][0]["Model"].replace("Antminer ", "")
+            self.model = version_data["DEVDETAILS"][0]["Model"].replace("Antminer ", "")
+            return self.model
         return None
 
     async def send_config(self, yaml_config) -> None:

miners/btminer.py

@@ -6,11 +6,21 @@ from API import APIError
 class BTMiner(BaseMiner):
     def __init__(self, ip: str) -> None:
         api = BTMinerAPI(ip)
+        self.model = None
         super().__init__(ip, api)
 
     def __repr__(self) -> str:
         return f"BTMiner: {str(self.ip)}"
 
+    async def get_model(self):
+        if self.model:
+            return self.model
+        version_data = await self.api.devdetails()
+        if version_data:
+            self.model = version_data["DEVDETAILS"][0]["Model"].split("V")[0]
+            return self.model
+        return None
+
     async def get_hostname(self) -> str:
         try:
             host_data = await self.api.get_miner_info()

miners/cgminer.py

@@ -7,6 +7,7 @@ class CGMiner(BaseMiner):
     def __init__(self, ip: str) -> None:
         api = CGMinerAPI(ip)
         super().__init__(ip, api)
+        self.model = None
         self.config = None
         self.uname = 'root'
         self.pwd = 'admin'
@@ -14,6 +15,15 @@ class CGMiner(BaseMiner):
     def __repr__(self) -> str:
         return f"CGMiner: {str(self.ip)}"
 
+    async def get_model(self):
+        if self.model:
+            return self.model
+        version_data = await self.api.devdetails()
+        if version_data:
+            self.model = version_data["DEVDETAILS"][0]["Model"].replace("Antminer ", "")
+            return self.model
+        return None
+
     async def get_hostname(self) -> str:
         try:
             async with (await self._get_ssh_connection()) as conn:

miners/whatsminer/M20.py

@@ -1,26 +1,9 @@
-from API.btminer import BTMinerAPI
+from miners.btminer import BTMiner
-from miners import BaseMiner
 
 
-class BTMinerM20(BaseMiner):
+class BTMinerM20(BTMiner):
     def __init__(self, ip: str) -> None:
-        api = BTMinerAPI(ip)
+        super().__init__(ip)
-        super().__init__(ip, api)
 
     def __repr__(self) -> str:
         return f"M20 - BTMiner: {str(self.ip)}"
-
-    async def get_hostname(self) -> str:
-        return "BTMiner Unknown"
-
-    async def send_config(self):
-        return None  # ignore for now
-
-    async def restart_backend(self) -> None:
-        return None
-
-    async def reboot(self) -> None:
-        return None
-
-    async def get_config(self) -> None:
-        return None

miners/whatsminer/M21.py

@@ -1,26 +1,9 @@
-from API.btminer import BTMinerAPI
+from miners.btminer import BTMiner
-from miners import BaseMiner
 
 
-class BTMinerM21(BaseMiner):
+class BTMinerM21(BTMiner):
     def __init__(self, ip: str) -> None:
-        api = BTMinerAPI(ip)
+        super().__init__(ip)
-        super().__init__(ip, api)
 
     def __repr__(self) -> str:
         return f"M21 - BTMiner: {str(self.ip)}"
-
-    async def get_hostname(self) -> str:
-        return "BTMiner Unknown"
-
-    async def send_config(self):
-        return None  # ignore for now
-
-    async def restart_backend(self) -> None:
-        return None
-
-    async def reboot(self) -> None:
-        return None
-
-    async def get_config(self) -> None:
-        return None

miners/whatsminer/M30.py

@@ -1,26 +1,9 @@
-from API.btminer import BTMinerAPI
+from miners.btminer import BTMiner
-from miners import BaseMiner
 
 
-class BTMinerM30(BaseMiner):
+class BTMinerM30(BTMiner):
     def __init__(self, ip: str) -> None:
-        api = BTMinerAPI(ip)
+        super().__init__(ip)
-        super().__init__(ip, api)
 
     def __repr__(self) -> str:
         return f"M30- BTMiner: {str(self.ip)}"
-
-    async def get_hostname(self) -> str:
-        return "BTMiner Unknown"
-
-    async def send_config(self):
-        return None  # ignore for now
-
-    async def restart_backend(self) -> None:
-        return None
-
-    async def reboot(self) -> None:
-        return None
-
-    async def get_config(self) -> None:
-        return None

miners/whatsminer/M31.py

@@ -1,26 +1,9 @@
-from API.btminer import BTMinerAPI
+from miners.btminer import BTMiner
-from miners import BaseMiner
 
 
-class BTMinerM31(BaseMiner):
+class BTMinerM31(BTMiner):
     def __init__(self, ip: str) -> None:
-        api = BTMinerAPI(ip)
+        super().__init__(ip)
-        super().__init__(ip, api)
 
     def __repr__(self) -> str:
         return f"M31 - BTMiner: {str(self.ip)}"
-
-    async def get_hostname(self) -> str:
-        return "BTMiner Unknown"
-
-    async def send_config(self):
-        return None  # ignore for now
-
-    async def restart_backend(self) -> None:
-        return None
-
-    async def reboot(self) -> None:
-        return None
-
-    async def get_config(self) -> None:
-        return None

miners/whatsminer/M32.py

@@ -1,26 +1,9 @@
-from API.btminer import BTMinerAPI
+from miners.btminer import BTMiner
-from miners import BaseMiner
 
 
-class BTMinerM32(BaseMiner):
+class BTMinerM32(BTMiner):
     def __init__(self, ip: str) -> None:
-        api = BTMinerAPI(ip)
+        super().__init__(ip)
-        super().__init__(ip, api)
 
     def __repr__(self) -> str:
         return f"M32 - BTMiner: {str(self.ip)}"
-
-    async def get_hostname(self) -> str:
-        return "BTMiner Unknown"
-
-    async def send_config(self):
-        return None  # ignore for now
-
-    async def restart_backend(self) -> None:
-        return None
-
-    async def reboot(self) -> None:
-        return None
-
-    async def get_config(self) -> None:
-        return None