version: bump version number.

# Conflicts:
#	pyproject.toml

.pre-commit-config.yaml

@@ -9,6 +9,12 @@ repos:
     rev: 22.6.0
     hooks:
     -   id: black
+-   repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+    -   id: isort
+        name: isort (python)
+
 -   repo: local
     hooks:
     -   id: unittest

README.md

@@ -18,6 +18,10 @@ You can install pyasic directly from pip with the command `pip install pyasic`.
 For those of you who aren't comfortable with code and developer tools, there are windows builds of GUI applications that use this library [here](https://drive.google.com/drive/folders/1DjR8UOS_g0ehfiJcgmrV0FFoqFvE9akW?usp=sharing).
 
 ## Developer Setup
+It is highly reccommended that you contribute to this project through [`pyasic-super`](https://github.com/UpstreamData/pyasic-super) using its submodules.  This allows testing in conjunction with other `pyasic` related programs.
+
+<br>
+
 This repo uses poetry for dependencies, which can be installed by following the guide on their website [here](https://python-poetry.org/docs/#installation).
 
 After you have poetry installed, run `poetry install --with dev`, or `poetry install --with dev,docs` if you want to include packages required for documentation.
@@ -34,7 +38,6 @@ There are 2 main ways to get a miner (and the functions attached to it), via sca
 #### Scanning for miners
 ```python
 import asyncio
-import sys
 
 from pyasic.network import MinerNetwork
 
@@ -68,9 +71,8 @@ if __name__ == "__main__":
 #### Getting a miner if you know the IP
 ```python
 import asyncio
-import sys
 
-from pyasic.miners import get_miner
+from pyasic import get_miner
 
 
 # define asynchronous function to get miner and data
@@ -94,9 +96,8 @@ If needed, this library exposes a wrapper for the miner API that can be used for
 #### List available API commands
 ```python
 import asyncio
-import sys
 
-from pyasic.miners import get_miner
+from pyasic import get_miner
 
 
 async def get_api_commands(miner_ip: str):
@@ -117,9 +118,8 @@ The miner API commands will raise an `APIError` if they fail with a bad status c
 
 ```python
 import asyncio
-import sys
 
-from pyasic.miners import get_miner
+from pyasic import get_miner
 
 
 async def get_api_commands(miner_ip: str):

docs/index.md

@@ -117,10 +117,11 @@ These functions are
 [`get_hostname`](#get-hostname),
 [`get_model`](#get-model),
 [`reboot`](#reboot),
-[`restart_backend`](#restart-backend), and
-[`stop_mining`](#stop-mining), and
-[`resume_mining`](#resume-mining), and
-[`send_config`](#send-config).
+[`restart_backend`](#restart-backend),
+[`stop_mining`](#stop-mining),
+[`resume_mining`](#resume-mining),
+[`send_config`](#send-config), and
+[`set_power_limit`](#set-power-limit).
 
 <br>
 
@@ -228,6 +229,14 @@ These functions are
 
 <br>
 
+### Set Power Limit
+::: pyasic.miners.BaseMiner.set_power_limit
+    handler: python
+    options:
+        heading_level: 4
+
+<br>
+
 ## [`MinerConfig`][pyasic.config.MinerConfig] and [`MinerData`][pyasic.data.MinerData]
 
 Pyasic implements a few dataclasses as helpers to make data return types consistent across different miners and miner APIs.  The different fields of these dataclasses can all be viewed with the classmethod `cls.fields()`.

docs/miners/supported_types.md

@@ -90,6 +90,7 @@ details {
                 </details>
                 <details>
                     <summary><a href="../whatsminer/M3X/#m31s">M31S</a></summary>
+                    <summary><a href="../whatsminer/M3X/#m31sv70">M31SV70</a></summary>
                 </details>
                 <details>
                     <summary><a href="../whatsminer/M3X/#m31s_1">M31S+</a></summary>

docs/miners/whatsminer/M3X.md

@@ -108,6 +108,14 @@
 
 ## M31S
 
+::: pyasic.miners.whatsminer.btminer.M3X.M31S.BTMinerM31S
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M31SV70
+
 ::: pyasic.miners.whatsminer.btminer.M3X.M31S.BTMinerM31S
     handler: python
     options:

pyasic/API/__init__.py

@@ -13,12 +13,12 @@
 #  limitations under the License.
 
 import asyncio
-import json
 import ipaddress
-import warnings
+import json
 import logging
-from typing import Union
 import re
+import warnings
+from typing import Union
 
 from pyasic.errors import APIError, APIWarning
 
@@ -35,6 +35,81 @@ class BaseMinerAPI:
             raise TypeError(f"Only children of '{cls.__name__}' may be instantiated")
         return object.__new__(cls)
 
+    def __repr__(self):
+        return f"{self.__class__.__name__}: {str(self.ip)}"
+
+    async def send_command(
+        self,
+        command: Union[str, bytes],
+        parameters: Union[str, int, bool] = None,
+        ignore_errors: bool = False,
+        allow_warning: bool = True,
+    ) -> dict:
+        """Send an API command to the miner and return the result.
+
+        Parameters:
+            command: The command to sent to the miner.
+            parameters: Any additional parameters to be sent with the command.
+            ignore_errors: Whether to raise APIError when the command returns an error.
+            allow_warning: Whether to warn if the command fails.
+
+        Returns:
+            The return data from the API command parsed from JSON into a dict.
+        """
+        logging.debug(f"{self} - (Send Privileged Command) - {command} " +  f'with args {parameters}' if parameters else '')
+        # create the command
+        cmd = {"command": command}
+        if parameters:
+            cmd["parameter"] = parameters
+
+        # send the command
+        data = await self._send_bytes(json.dumps(cmd).encode("utf-8"))
+
+        data = self._load_api_data(data)
+
+        # check for if the user wants to allow errors to return
+        if not ignore_errors:
+            # validate the command succeeded
+            validation = self._validate_command_output(data)
+            if not validation[0]:
+                if allow_warning:
+                    logging.warning(
+                        f"{self.ip}: API Command Error: {command}: {validation[1]}"
+                    )
+                raise APIError(validation[1])
+
+        logging.debug(f"{self} - (Send Command) - Received data.")
+        return data
+
+
+    # Privileged command handler, only used by whatsminers, defined here for consistency.
+    async def send_privileged_command(self, *args, **kwargs) -> dict:
+        return await self.send_command(*args, **kwargs)
+
+
+    async def multicommand(self, *commands: str, allow_warning: bool = True) -> dict:
+        """Creates and sends multiple commands as one command to the miner.
+
+        Parameters:
+            *commands: The commands to send as a multicommand to the miner.
+            allow_warning: A boolean to supress APIWarnings.
+        """
+        # make sure we can actually run each command, otherwise they will fail
+        commands = self._check_commands(*commands)
+        # standard multicommand format is "command1+command2"
+        # standard format doesn't work for X19
+        command = "+".join(commands)
+        try:
+            data = await self.send_command(command, allow_warning=allow_warning)
+        except APIError:
+            return {}
+        logging.debug(f"{self} - (Multicommand) - Received data")
+        return data
+
+    @property
+    def commands(self) -> list:
+        return self.get_commands()
+
     def get_commands(self) -> list:
         """Get a list of command accessible to a specific type of API on the miner.
 
@@ -46,6 +121,7 @@ class BaseMinerAPI:
             for func in
             # each function in self
             dir(self)
+            if not func == "commands"
             if callable(getattr(self, func)) and
             # no __ or _ methods
             not func.startswith("__") and not func.startswith("_") and
@@ -72,34 +148,14 @@ If you are sure you want to use this command please use API.send_command("{comma
                 )
         return return_commands
 
-    async def multicommand(self, *commands: str, allow_warning: bool = True) -> dict:
-        """Creates and sends multiple commands as one command to the miner.
-
-        Parameters:
-            *commands: The commands to send as a multicommand to the miner.
-            allow_warning: A boolean to supress APIWarnings.
-        """
-        logging.debug(f"{self.ip}: Sending multicommand: {[*commands]}")
-        # make sure we can actually run each command, otherwise they will fail
-        commands = self._check_commands(*commands)
-        # standard multicommand format is "command1+command2"
-        # doesn't work for S19 which uses the backup _x19_multicommand
-        command = "+".join(commands)
-        try:
-            data = await self.send_command(command, allow_warning=allow_warning)
-        except APIError:
-            return {}
-        logging.debug(f"{self.ip}: Received multicommand data.")
-        return data
-
     async def _send_bytes(self, data: bytes) -> bytes:
         try:
             # get reader and writer streams
             reader, writer = await asyncio.open_connection(str(self.ip), self.port)
         # handle OSError 121
         except OSError as e:
-            if e.winerror == "121":
-                logging.warning("Semaphore Timeout has Expired.")
+            if getattr(e, "winerror") == "121":
+                logging.warning(f"{self} - ([Hidden] Send Bytes) - Semaphore timeout expired.")
             return b"{}"
 
         # send the command
@@ -117,7 +173,7 @@ If you are sure you want to use this command please use API.send_command("{comma
                     break
                 ret_data += d
         except Exception as e:
-            logging.warning(f"{self.ip}: API Command Error: - {e}")
+            logging.warning(f"{self} - ([Hidden] Send Bytes) - API Command Error {e}")
 
         # close the connection
         writer.close()
@@ -125,50 +181,6 @@ If you are sure you want to use this command please use API.send_command("{comma
 
         return ret_data
 
-    async def send_command(
-        self,
-        command: Union[str, bytes],
-        parameters: Union[str, int, bool] = None,
-        ignore_errors: bool = False,
-        allow_warning: bool = True,
-    ) -> dict:
-        """Send an API command to the miner and return the result.
-
-        Parameters:
-            command: The command to sent to the miner.
-            parameters: Any additional parameters to be sent with the command.
-            ignore_errors: Whether to raise APIError when the command returns an error.
-            allow_warning: Whether to warn if the command fails.
-
-        Returns:
-            The return data from the API command parsed from JSON into a dict.
-        """
-        # create the command
-        cmd = {"command": command}
-        if parameters:
-            cmd["parameter"] = parameters
-
-        # send the command
-        data = await self._send_bytes(json.dumps(cmd).encode("utf-8"))
-
-        data = self._load_api_data(data)
-
-        # check for if the user wants to allow errors to return
-        if not ignore_errors:
-            # validate the command succeeded
-            validation = self._validate_command_output(data)
-            if not validation[0]:
-                if allow_warning:
-                    logging.warning(
-                        f"{self.ip}: API Command Error: {command}: {validation[1]}"
-                    )
-                raise APIError(validation[1])
-
-        return data
-
-    async def send_privileged_command(self, *args, **kwargs) -> dict:
-        return await self.send_command(*args, **kwargs)
-
     @staticmethod
     def _validate_command_output(data: dict) -> tuple:
         # check if the data returned is correct or an error
@@ -198,7 +210,6 @@ If you are sure you want to use this command please use API.send_command("{comma
 
     @staticmethod
     def _load_api_data(data: bytes) -> dict:
-        str_data = None
         # some json from the API returns with a null byte (\x00) on the end
         if data.endswith(b"\x00"):
             # handle the null byte

pyasic/API/bmminer.py

@@ -13,8 +13,7 @@
 #  limitations under the License.
 import logging
 
-from pyasic.API import BaseMinerAPI
-from pyasic.API import APIError
+from pyasic.API import APIError, BaseMinerAPI
 
 
 class BMMinerAPI(BaseMinerAPI):
@@ -41,7 +40,6 @@ class BMMinerAPI(BaseMinerAPI):
     async def multicommand(
         self, *commands: str, allow_warning: bool = True
     ) -> dict:
-        logging.debug(f"{self.ip}: Sending multicommand: {[*commands]}")
         # make sure we can actually run each command, otherwise they will fail
         commands = self._check_commands(*commands)
         # standard multicommand format is "command1+command2"
@@ -50,9 +48,8 @@ class BMMinerAPI(BaseMinerAPI):
         try:
             data = await self.send_command(command, allow_warning=allow_warning)
         except APIError:
-            logging.debug(f"{self.ip}: Handling X19 multicommand.")
+            logging.debug(f"{self} - (Multicommand) - Handling X19 multicommand.")
             data = await self._x19_multicommand(*command.split("+"))
-        logging.debug(f"{self.ip}: Received multicommand data.")
         return data
 
     async def _x19_multicommand(self, *commands):
@@ -66,7 +63,7 @@ class BMMinerAPI(BaseMinerAPI):
         except APIError as e:
             raise APIError(e)
         except Exception as e:
-            logging.warning(f"{self.ip}: API Multicommand Error: {e}")
+            logging.warning(f"{self} - ([Hidden] X19 Multicommand) - API Command Error {e}")
         return data
 
     async def version(self) -> dict:

pyasic/API/bosminer.py

@@ -166,7 +166,7 @@ class BOSMinerAPI(BaseMinerAPI):
             return await self.send_command("estats")
 
     async def check(self, command: str) -> dict:
-        """Check if the command command exists in BOSMiner.
+        """Check if the command `command` exists in BOSMiner.
         <details>
             <summary>Expand</summary>
 

pyasic/API/btminer.py

@@ -12,29 +12,27 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import asyncio
-import re
-import json
-import hashlib
-import binascii
 import base64
+import binascii
+import hashlib
+import json
 import logging
+import re
 from typing import Union
 
-from passlib.handlers.md5_crypt import md5_crypt
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+from passlib.handlers.md5_crypt import md5_crypt
 
-from pyasic.errors import APIError
 from pyasic.API import BaseMinerAPI
+from pyasic.errors import APIError
 from pyasic.settings import PyasicSettings
 
-
 ### IMPORTANT ###
 # you need to change the password of the miners using the Whatsminer
 # tool, then you can set them back to admin with this tool, but they
 # must be changed to something else and set back to admin with this
 # or the privileged API will not work using admin as the password.  If
-# you change the password, you can pass that to the this class as pwd,
+# you change the password, you can pass that to this class as pwd,
 # or add it as the Whatsminer_pwd in the settings.toml file.
 
 
@@ -83,7 +81,7 @@ def _add_to_16(string: str) -> bytes:
 def parse_btminer_priviledge_data(token_data: dict, data: dict):
     """Parses data returned from the BTMiner privileged API.
 
-    Parses data from the BTMiner privileged API using the the token
+    Parses data from the BTMiner privileged API using the token
     from the API in an AES format.
 
     Parameters:
@@ -190,6 +188,7 @@ class BTMinerAPI(BaseMinerAPI):
     async def send_privileged_command(
         self, command: Union[str, bytes], ignore_errors: bool = False, **kwargs
     ) -> dict:
+        logging.debug(f"{self} - (Send Privileged Command) - {command} " +  f'with args {kwargs}' if len(kwargs) > 0 else '')
         command = {"cmd": command}
         for kwarg in kwargs:
             if kwargs[kwarg]:
@@ -199,6 +198,8 @@ class BTMinerAPI(BaseMinerAPI):
         enc_command = create_privileged_cmd(token_data, command)
 
         data = await self._send_bytes(enc_command)
+        if not data:
+            raise APIError("No data was returned from the API.")
         data = self._load_api_data(data)
 
         try:
@@ -224,6 +225,7 @@ class BTMinerAPI(BaseMinerAPI):
             An encoded token and md5 password, which are used for the privileged API.
         </details>
         """
+        logging.debug(f"{self} - (Get Token) - Getting token")
         # get the token
         data = await self.send_command("get_token")
 
@@ -246,6 +248,7 @@ class BTMinerAPI(BaseMinerAPI):
             "host_sign": host_sign,
             "host_passwd_md5": host_passwd_md5,
         }
+        logging.debug(f"{self} - (Get Token) - Gathered token data: {self.current_token}")
         return self.current_token
 
     #### PRIVILEGED COMMANDS ####
@@ -583,7 +586,7 @@ class BTMinerAPI(BaseMinerAPI):
         return await self.send_privileged_command("set_hostname", hostname=hostname)
 
     async def set_power_pct(self, percent: int) -> dict:
-        """Set the power percentage of the miner.
+        """Set the power percentage of the miner based on current power.  Used for temporary adjustment.
 
         <details>
             <summary>Expand</summary>
@@ -643,6 +646,119 @@ class BTMinerAPI(BaseMinerAPI):
             "pre_power_on", complete="false", msg=msg
         )
 
+    ### ADDED IN V2.0.5 Whatsminer API ###
+    async def set_temp_offset(self, temp_offset: int):
+        """Set the offset of miner hash board target temperature.
+
+        <details>
+            <summary>Expand</summary>
+
+        Set the offset of miner hash board target temperature, only works after
+        changing the password of the miner using the Whatsminer tool.
+
+        Parameters:
+            temp_offset: Target temperature offset.
+        Returns:
+
+            A reply informing of the status of setting temp offset.
+        </details>
+
+        """
+        if not -30 < temp_offset < 0:
+            raise APIError(
+                f"Temp offset is outside of the allowed "
+                f"range.  Please set a number between -30 and "
+                f"0."
+            )
+
+        return await self.send_privileged_command("set_temp_offset", temp_offset=temp_offset)
+
+    async def adjust_power_limit(self, power_limit: int):
+        """Set the upper limit of the miner's power. Cannot be higher than the ordinary power of the machine.
+
+        <details>
+            <summary>Expand</summary>
+
+        Set the upper limit of the miner's power, only works after
+        changing the password of the miner using the Whatsminer tool.
+        The miner will reboot after this is set.
+
+        Parameters:
+            power_limit: New power limit.
+        Returns:
+
+            A reply informing of the status of setting power limit.
+        </details>
+
+        """
+        return await self.send_privileged_command("adjust_power_limit", power_limit=power_limit)
+
+
+    async def adjust_upfreq_speed(self, upfreq_speed: int):
+        """Set the upfreq speed, 0 is the normal speed, 9 is the fastest speed.
+
+        <details>
+            <summary>Expand</summary>
+
+        Set the upfreq speed, 0 is the normal speed, 9 is the fastest speed, only works after
+        changing the password of the miner using the Whatsminer tool.
+        The faster the speed, the greater the final hash rate and power deviation, and the stability
+        may be impacted. Fast boot mode cannot be used at the same time.
+
+        Parameters:
+            upfreq_speed: New upfreq speed.
+        Returns:
+
+            A reply informing of the status of setting upfreq speed.
+        </details>
+        """
+        if not 0 < upfreq_speed < 9:
+            raise APIError(
+                f"Upfreq speed is outside of the allowed "
+                f"range.  Please set a number between 0 (Normal) and "
+                f"9 (Fastest)."
+            )
+        return await self.send_privileged_command("adjust_upfreq_speed", upfreq_speed=upfreq_speed)
+
+    async def set_poweroff_cool(self, poweroff_cool: bool):
+        """Set whether to cool the machine when mining is stopped.
+
+        <details>
+            <summary>Expand</summary>
+
+        Set whether to cool the machine when mining is stopped, only works after
+        changing the password of the miner using the Whatsminer tool.
+
+        Parameters:
+            poweroff_cool: Whether to cool the miner during power off mode.
+        Returns:
+
+            A reply informing of the status of setting power off cooling mode.
+        </details>
+        """
+
+        return await self.send_privileged_command("set_poweroff_cool", poweroff_cool=int(poweroff_cool))
+
+    async def set_fan_zero_speed(self, fan_zero_speed: bool):
+        """Sets whether the fan speed supports the lowest 0 speed.
+
+        <details>
+            <summary>Expand</summary>
+
+        Sets whether the fan speed supports the lowest 0 speed, only works after
+        changing the password of the miner using the Whatsminer tool.
+
+        Parameters:
+            fan_zero_speed: Whether the fan is allowed to support 0 speed.
+        Returns:
+
+            A reply informing of the status of setting fan minimum speed.
+        </details>
+
+        """
+        return await self.send_privileged_command("set_fan_zero_speed", fan_zero_speed=int(fan_zero_speed))
+
+
     #### END privileged COMMANDS ####
 
     async def summary(self) -> dict:

pyasic/API/cgminer.py

@@ -12,10 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from pyasic.API import BaseMinerAPI, APIError
-
 import logging
 
+from pyasic.API import APIError, BaseMinerAPI
+
 
 class CGMinerAPI(BaseMinerAPI):
     """An abstraction of the CGMiner API.
@@ -41,18 +41,16 @@ class CGMinerAPI(BaseMinerAPI):
     async def multicommand(
         self, *commands: str, allow_warning: bool = True
     ) -> dict:
-        logging.debug(f"{self.ip}: Sending multicommand: {[*commands]}")
         # make sure we can actually run each command, otherwise they will fail
         commands = self._check_commands(*commands)
         # standard multicommand format is "command1+command2"
-        # doesnt work for S19 which uses the backup _x19_multicommand
+        # doesn't work for S19 which uses the backup _x19_multicommand
         command = "+".join(commands)
         try:
             data = await self.send_command(command, allow_warning=allow_warning)
         except APIError:
-            logging.debug(f"{self.ip}: Handling X19 multicommand.")
+            logging.debug(f"{self} - (Multicommand) - Handling X19 multicommand.")
             data = await self._x19_multicommand(*command.split("+"))
-        logging.debug(f"{self.ip}: Received multicommand data.")
         return data
 
     async def _x19_multicommand(self, *commands):
@@ -66,7 +64,7 @@ class CGMinerAPI(BaseMinerAPI):
         except APIError as e:
             raise APIError(e)
         except Exception as e:
-            logging.warning(f"{self.ip}: API Multicommand Error: {e}")
+            logging.warning(f"{self} - ([Hidden] X19 Multicommand) - API Command Error {e}")
         return data
 
     async def version(self) -> dict:

pyasic/API/unknown.py

@@ -18,7 +18,7 @@ from pyasic.API import BaseMinerAPI
 class UnknownAPI(BaseMinerAPI):
     """An abstraction of an API for a miner which is unknown.
 
-    This class is designed to try to be a intersection of as many miner APIs
+    This class is designed to try to be an intersection of as many miner APIs
     and API commands as possible (API ⋂ API), to ensure that it can be used
     with as many APIs as possible.
     """

pyasic/__init__.py

@@ -16,26 +16,20 @@ from pyasic.API.bosminer import BOSMinerAPI
 from pyasic.API.btminer import BTMinerAPI
 from pyasic.API.cgminer import CGMinerAPI
 from pyasic.API.unknown import UnknownAPI
-
 from pyasic.config import MinerConfig
-
 from pyasic.data import (
-    MinerData,
     BraiinsOSError,
     InnosiliconError,
+    MinerData,
     WhatsminerError,
     X19Error,
 )
-
 from pyasic.errors import APIError, APIWarning
-
 from pyasic.miners import get_miner
 from pyasic.miners.base import AnyMiner
 from pyasic.miners.miner_factory import MinerFactory
 from pyasic.miners.miner_listener import MinerListener
-
 from pyasic.network import MinerNetwork
-
 from pyasic.settings import PyasicSettings
 
 __all__ = [

pyasic/config/__init__.py

@@ -12,15 +12,16 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from dataclasses import dataclass, asdict, fields
-from typing import Literal, List
+import json
+import logging
 import random
 import string
+import time
+from dataclasses import asdict, dataclass, fields
+from typing import Dict, List, Literal
 
 import toml
 import yaml
-import json
-import time
 
 
 @dataclass
@@ -193,7 +194,7 @@ class _PoolGroup:
         return pools
 
     def as_wm(self, user_suffix: str = None) -> List[dict]:
-        """Convert the data in this class to a list usable by an Whatsminer device.
+        """Convert the data in this class to a list usable by a Whatsminer device.
 
         Parameters:
              user_suffix: The suffix to append to username.
@@ -277,6 +278,7 @@ class MinerConfig:
 
     def as_dict(self) -> dict:
         """Convert the data in this class to a dict."""
+        logging.debug(f"MinerConfig - (To Dict) - Dumping Dict config")
         data_dict = asdict(self)
         for key in asdict(self).keys():
             if data_dict[key] is None:
@@ -285,10 +287,12 @@ class MinerConfig:
 
     def as_toml(self) -> str:
         """Convert the data in this class to toml."""
+        logging.debug(f"MinerConfig - (To TOML) - Dumping TOML config")
         return toml.dumps(self.as_dict())
 
     def as_yaml(self) -> str:
         """Convert the data in this class to yaml."""
+        logging.debug(f"MinerConfig - (To YAML) - Dumping YAML config")
         return yaml.dump(self.as_dict(), sort_keys=False)
 
     def from_raw(self, data: dict):
@@ -298,6 +302,7 @@ class MinerConfig:
         Parameters:
              data: The raw config data to convert.
         """
+        logging.debug(f"MinerConfig - (From Raw) - Loading raw config")
         pool_groups = []
         for key in data.keys():
             if key == "pools":
@@ -360,6 +365,12 @@ class MinerConfig:
         return self
 
     def from_api(self, pools: list):
+        """Convert list output from the `AnyMiner.api.pools()` command into a usable data and save it to this class.
+
+        Parameters:
+            pools: The list of pool data to convert.
+        """
+        logging.debug(f"MinerConfig - (From API) - Loading API config")
         _pools = []
         for pool in pools:
             url = pool.get("URL")
@@ -374,6 +385,7 @@ class MinerConfig:
         Parameters:
             data: The dict config data to convert.
         """
+        logging.debug(f"MinerConfig - (From Dict) - Loading Dict config")
         pool_groups = []
         for group in data["pool_groups"]:
             pool_groups.append(_PoolGroup().from_dict(group))
@@ -389,6 +401,7 @@ class MinerConfig:
         Parameters:
             data: The toml config data to convert.
         """
+        logging.debug(f"MinerConfig - (From TOML) - Loading TOML config")
         return self.from_dict(toml.loads(data))
 
     def from_yaml(self, data: str):
@@ -397,15 +410,17 @@ class MinerConfig:
         Parameters:
             data: The yaml config data to convert.
         """
+        logging.debug(f"MinerConfig - (From YAML) - Loading YAML config")
         return self.from_dict(yaml.load(data, Loader=yaml.SafeLoader))
 
-    def as_wm(self, user_suffix: str = None) -> List[dict]:
-        """Convert the data in this class to a config usable by an Whatsminer device.
+    def as_wm(self, user_suffix: str = None) -> Dict[str, int]:
+        """Convert the data in this class to a config usable by a Whatsminer device.
 
         Parameters:
             user_suffix: The suffix to append to username.
         """
-        return self.pool_groups[0].as_wm(user_suffix=user_suffix)
+        logging.debug(f"MinerConfig - (As Whatsminer) - Generating Whatsminer config")
+        return {"pools": self.pool_groups[0].as_wm(user_suffix=user_suffix), "wattage": self.autotuning_wattage}
 
     def as_inno(self, user_suffix: str = None) -> dict:
         """Convert the data in this class to a config usable by an Innosilicon device.
@@ -413,6 +428,7 @@ class MinerConfig:
         Parameters:
             user_suffix: The suffix to append to username.
         """
+        logging.debug(f"MinerConfig - (As Inno) - Generating Innosilicon config")
         return self.pool_groups[0].as_inno(user_suffix=user_suffix)
 
     def as_x19(self, user_suffix: str = None) -> str:
@@ -421,6 +437,7 @@ class MinerConfig:
         Parameters:
             user_suffix: The suffix to append to username.
         """
+        logging.debug(f"MinerConfig - (As X19) - Generating X19 config")
         cfg = {
             "pools": self.pool_groups[0].as_x19(user_suffix=user_suffix),
             "bitmain-fan-ctrl": False,
@@ -444,6 +461,7 @@ class MinerConfig:
         Parameters:
             user_suffix: The suffix to append to username.
         """
+        logging.debug(f"MinerConfig - (As Avalon) - Generating AvalonMiner config")
         cfg = self.pool_groups[0].as_avalon(user_suffix=user_suffix)
         return cfg
 
@@ -454,6 +472,7 @@ class MinerConfig:
             model: The model of the miner to be used in the format portion of the config.
             user_suffix: The suffix to append to username.
         """
+        logging.debug(f"MinerConfig - (As BOS) - Generating BOSMiner config")
         cfg = {
             "format": {
                 "version": "1.2+",

pyasic/data/__init__.py

@@ -12,15 +12,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from typing import Union, List
-from dataclasses import dataclass, field, asdict, fields
-from datetime import datetime, timezone
-from functools import reduce
-import time
-import json
 import copy
+import json
+import logging
+import time
+from dataclasses import asdict, dataclass, field, fields
+from datetime import datetime, timezone
+from typing import List, Union
 
-from .error_codes import X19Error, WhatsminerError, BraiinsOSError, InnosiliconError
+from .error_codes import BraiinsOSError, InnosiliconError, WhatsminerError, X19Error
 
 
 @dataclass
@@ -372,6 +372,7 @@ class MinerData:
         Returns:
             A dictionary version of this class.
         """
+        logging.debug(f"MinerData - (To Dict) - Dumping Dict data")
         return asdict(self)
 
     def as_json(self) -> str:
@@ -380,6 +381,7 @@ class MinerData:
         Returns:
             A JSON version of this class.
         """
+        logging.debug(f"MinerData - (To JSON) - Dumping JSON data")
         data = self.asdict()
         data["datetime"] = str(int(time.mktime(data["datetime"].timetuple())))
         return json.dumps(data)
@@ -390,6 +392,7 @@ class MinerData:
         Returns:
             A CSV version of this class with no headers.
         """
+        logging.debug(f"MinerData - (To CSV) - Dumping CSV data")
         data = self.asdict()
         data["datetime"] = str(int(time.mktime(data["datetime"].timetuple())))
         errs = []
@@ -408,6 +411,7 @@ class MinerData:
         Returns:
             A influxdb line protocol version of this class.
         """
+        logging.debug(f"MinerData - (To InfluxDB) - Dumping InfluxDB data")
         tag_data = [measurement_name]
         field_data = []
 

pyasic/data/error_codes/X19.py

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from dataclasses import dataclass, asdict, fields
+from dataclasses import asdict, dataclass, fields
 
 
 @dataclass

pyasic/data/error_codes/__init__.py

@@ -12,13 +12,13 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .whatsminer import WhatsminerError
-from .bos import BraiinsOSError
-from .X19 import X19Error
-from .innosilicon import InnosiliconError
-
 from typing import TypeVar
 
+from .bos import BraiinsOSError
+from .innosilicon import InnosiliconError
+from .whatsminer import WhatsminerError
+from .X19 import X19Error
+
 MinerErrorData = TypeVar(
     "MinerErrorData", WhatsminerError, BraiinsOSError, X19Error, InnosiliconError
 )

pyasic/data/error_codes/bos.py

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from dataclasses import dataclass, asdict, fields
+from dataclasses import asdict, dataclass, fields
 
 
 @dataclass

pyasic/data/error_codes/innosilicon.py

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from dataclasses import dataclass, field, asdict, fields
+from dataclasses import asdict, dataclass, field, fields
 
 
 @dataclass

pyasic/data/error_codes/whatsminer.py

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from dataclasses import dataclass, field, asdict, fields
+from dataclasses import asdict, dataclass, field, fields
 
 
 @dataclass

pyasic/logger/__init__.py

@@ -13,6 +13,7 @@
 #  limitations under the License.
 
 import logging
+
 from pyasic.settings import PyasicSettings
 
 

pyasic/miners/__init__.py

@@ -15,9 +15,10 @@
 import ipaddress
 from typing import Union
 
-from pyasic.miners.base import BaseMiner, AnyMiner
+from pyasic.miners.base import AnyMiner, BaseMiner
 from pyasic.miners.miner_factory import MinerFactory
 
+
 # abstracted version of get miner that is easier to access
 async def get_miner(ip: Union[ipaddress.ip_address, str]) -> AnyMiner:
     return await MinerFactory().get_miner(ip)

pyasic/miners/_backends/bmminer.py

@@ -14,16 +14,13 @@
 
 import ipaddress
 import logging
-from typing import Union, List
-
+from typing import List, Union
 
 from pyasic.API.bmminer import BMMinerAPI
-from pyasic.miners.base import BaseMiner
-
-from pyasic.data import MinerData, HashBoard
 from pyasic.config import MinerConfig
+from pyasic.data import HashBoard, MinerData
 from pyasic.data.error_codes import MinerErrorData
-
+from pyasic.miners.base import BaseMiner
 from pyasic.settings import PyasicSettings
 
 
@@ -352,3 +349,7 @@ class BMMiner(BaseMiner):
                 data.pool_split = str(quota)
 
         return data
+
+
+    async def set_power_limit(self, wattage: int) -> bool:
+        return False

pyasic/miners/_backends/bosminer.py

@@ -13,22 +13,19 @@
 #  limitations under the License.
 
 import ipaddress
-import logging
 import json
-from typing import Union, List
+import logging
+from typing import List, Union
 
+import httpx
 import toml
 
-
-from pyasic.miners.base import BaseMiner
 from pyasic.API.bosminer import BOSMinerAPI
-from pyasic.errors import APIError
-
-from pyasic.data.error_codes import BraiinsOSError, MinerErrorData
-from pyasic.data import MinerData, HashBoard
-
 from pyasic.config import MinerConfig
-
+from pyasic.data import HashBoard, MinerData
+from pyasic.data.error_codes import BraiinsOSError, MinerErrorData
+from pyasic.errors import APIError
+from pyasic.miners.base import BaseMiner
 from pyasic.settings import PyasicSettings
 
 
@@ -69,6 +66,27 @@ class BOSMiner(BaseMiner):
         # return the result, either command output or None
         return str(result)
 
+    async def send_graphql_query(self, query) -> Union[dict, None]:
+        url = f"http://{self.ip}/graphql"
+        try:
+            async with httpx.AsyncClient() as client:
+                _auth = await client.post(
+                    url,
+                    json={
+                        "query": 'mutation{auth{login(username:"'
+                        + self.uname
+                        + '", password:"'
+                        + self.pwd
+                        + '"){__typename}}}'
+                    },
+                )
+                d = await client.post(url, json={"query": query})
+            if d.status_code == 200:
+                return d.json()
+        except (httpx.ReadError, httpx.ReadTimeout):
+            return None
+        return None
+
     async def fault_light_on(self) -> bool:
         """Sends command to turn on fault light on the miner."""
         logging.debug(f"{self}: Sending fault_light on command.")
@@ -152,6 +170,11 @@ class BOSMiner(BaseMiner):
         """
         if self.hostname:
             return self.hostname
+        # get hostname through GraphQL
+        if data := await self.send_graphql_query("{bos {hostname}}"):
+            self.hostname = data["data"]["bos"]["hostname"]
+            return self.hostname
+
         try:
             async with (await self._get_ssh_connection()) as conn:
                 if conn is not None:
@@ -215,8 +238,14 @@ class BOSMiner(BaseMiner):
         if self.version:
             logging.debug(f"Found version for {self.ip}: {self.version}")
             return self.version
+        version_data = None
+        # try to get data from graphql
+        data = await self.send_graphql_query("{bos{info{version{full}}}}")
+        if data:
+            version_data = data["bos"]["info"]["version"]["full"]
 
-        # get output of bos version file
+        if not version_data:
+            # try version data file
             version_data = await self.send_ssh_command("cat /etc/bos_version")
 
         # if we get the version data, parse it
@@ -248,6 +277,15 @@ class BOSMiner(BaseMiner):
     async def check_light(self) -> bool:
         if self.light:
             return self.light
+        # get light through GraphQL
+        if data := await self.send_graphql_query("{bos {faultLight}}"):
+            try:
+                self.light = data["data"]["bos"]["faultLight"]
+                return self.light
+            except (TypeError, KeyError, ValueError, IndexError):
+                pass
+
+        # get light via ssh if that fails (10x slower)
         data = (
             await self.send_ssh_command("cat /sys/class/leds/'Red LED'/delay_off")
         ).strip()
@@ -289,6 +327,7 @@ class BOSMiner(BaseMiner):
                             if board["Status"] not in [
                                 "Stable",
                                 "Testing performance profile",
+                                "Tuning individual chips"
                             ]:
                                 _error = board["Status"].split(" {")[0]
                                 _error = _error[0].lower() + _error[1:]
@@ -303,6 +342,10 @@ class BOSMiner(BaseMiner):
         Returns:
             A [`MinerData`][pyasic.data.MinerData] instance containing the miners data.
         """
+        d = await self._graphql_get_data()
+        if d:
+            return d
+
         data = MinerData(
             ip=str(self.ip),
             ideal_chips=self.nominal_chips * self.ideal_hashboards,
@@ -313,9 +356,6 @@ class BOSMiner(BaseMiner):
             ],
         )
 
-        board_offset = -1
-        fan_offset = -1
-
         model = await self.get_model()
         hostname = await self.get_hostname()
         mac = await self.get_mac()
@@ -342,7 +382,7 @@ class BOSMiner(BaseMiner):
                     "devdetails",
                     "fans",
                     "devs",
-                    allow_warning=allow_warning
+                    allow_warning=allow_warning,
                 )
             except APIError as e:
                 if str(e.message) == "Not ready":
@@ -441,7 +481,7 @@ class BOSMiner(BaseMiner):
                     wattage_limit = tuner[0].get("PowerLimit")
                     if wattage_limit:
                         data.wattage_limit = wattage_limit
-                    if wattage:
+                    if wattage is not None:
                         data.wattage = wattage
 
                     chain_status = tuner[0].get("TunerChainStatus")
@@ -493,6 +533,152 @@ class BOSMiner(BaseMiner):
                         data.hashboards[_id].hashrate = hashrate
         return data
 
+    async def _graphql_get_data(self) -> Union[MinerData, None]:
+        data = MinerData(
+            ip=str(self.ip),
+            ideal_chips=self.nominal_chips * self.ideal_hashboards,
+            ideal_hashboards=self.ideal_hashboards,
+            hashboards=[
+                HashBoard(slot=i, expected_chips=self.nominal_chips, missing=True)
+                for i in range(self.ideal_hashboards)
+            ],
+        )
+        query = "{bos {hostname}, bosminer{config{... on BosminerConfig{groups{pools{url, user}, strategy{... on QuotaStrategy {quota}}}}}, info{fans{name, rpm}, workSolver{realHashrate{mhs1M}, temperatures{degreesC}, power{limitW, approxConsumptionW}, childSolvers{name, realHashrate{mhs1M}, hwDetails{chips}, tuner{statusMessages}, temperatures{degreesC}}}}}}"
+        query_data = await self.send_graphql_query(query)
+        if not query_data:
+            return None
+        query_data = query_data["data"]
+        if not query_data:
+            return None
+
+        data.mac = await self.get_mac()
+        data.model = await self.get_model()
+        if query_data.get("bos"):
+            if query_data["bos"].get("hostname"):
+                data.hostname = query_data["bos"]["hostname"]
+
+        try:
+            if query_data["bosminer"]["info"]["workSolver"]["realHashrate"].get("mhs1M"):
+                data.hashrate = round(
+                    query_data["bosminer"]["info"]["workSolver"]["realHashrate"]["mhs1M"]
+                    / 1000000,
+                    2,
+                )
+        except (TypeError, KeyError, ValueError, IndexError):
+            pass
+
+        boards = None
+        if query_data.get("bosminer"):
+            if query_data["bosminer"].get("info"):
+                if query_data["bosminer"]["info"].get("workSolver"):
+                    boards = query_data["bosminer"]["info"]["workSolver"].get("childSolvers")
+        if boards:
+            offset = 6 if int(boards[0]["name"]) in [6, 7, 8] else int(boards[0]["name"])
+            for hb in boards:
+                _id = int(hb["name"]) - offset
+
+                board = data.hashboards[_id]
+                board.hashrate = round(hb["realHashrate"]["mhs1M"] / 1000000, 2)
+                temps = hb["temperatures"]
+                try:
+                    if len(temps) > 0:
+                        board.temp = round(hb["temperatures"][0]["degreesC"])
+                    if len(temps) > 1:
+                        board.chip_temp = round(hb["temperatures"][1]["degreesC"])
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                details = hb.get("hwDetails")
+                if details:
+                    if chips := details["chips"]:
+                        board.chips = chips
+                board.missing = False
+
+                tuner = hb.get("tuner")
+                if tuner:
+                    if msg := tuner.get("statusMessages"):
+                        if len(msg) > 0:
+                            if hb["tuner"]["statusMessages"][0] not in [
+                                "Stable",
+                                "Testing performance profile",
+                                "Tuning individual chips"
+                            ]:
+                                data.errors.append(
+                                    BraiinsOSError(f"Slot {_id} {hb['tuner']['statusMessages'][0]}")
+                                )
+        try:
+            data.wattage = query_data["bosminer"]["info"]["workSolver"]["power"]["approxConsumptionW"]
+        except (TypeError, KeyError, ValueError, IndexError):
+            data.wattage = 0
+        try:
+            data.wattage_limit = query_data["bosminer"]["info"]["workSolver"]["power"]["limitW"]
+        except (TypeError, KeyError, ValueError, IndexError):
+            pass
+
+
+        for n in range(self.fan_count):
+            try:
+                setattr(data, f"fan_{n + 1}", query_data["bosminer"]["info"]["fans"][n]["rpm"])
+            except (TypeError, KeyError, ValueError, IndexError):
+                pass
+
+        groups = None
+        if query_data.get("bosminer"):
+            if query_data["bosminer"].get("config"):
+                groups = query_data["bosminer"]["config"].get("groups")
+        if groups:
+            if len(groups) == 1:
+                try:
+                    data.pool_1_user = groups[0]["pools"][0]["user"]
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                try:
+                    data.pool_1_url = groups[0]["pools"][0]["url"]
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                try:
+                    data.pool_2_user = groups[0]["pools"][1]["user"]
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                try:
+                    data.pool_2_url = groups[0]["pools"][1]["url"]
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                data.quota = 0
+            else:
+                try:
+                    data.pool_1_user = groups[0]["pools"][0]["user"]
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                try:
+                    data.pool_1_url = groups[0]["pools"][0]["url"]
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                try:
+                    data.pool_2_user = groups[1]["pools"][0]["user"]
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                try:
+                    data.pool_2_url = groups[1]["pools"][0]["url"]
+                except (TypeError, KeyError, ValueError, IndexError):
+                    pass
+                if groups[0]["strategy"].get("quota"):
+                    data.quota = str(groups[0]["strategy"]["quota"]) + "/" + str(groups[1]["strategy"]["quota"])
+
+        data.fault_light = await self.check_light()
+
+        return data
+
     async def get_mac(self):
         result = await self.send_ssh_command("cat /sys/class/net/eth0/address")
         return result.upper().strip()
+
+    async def set_power_limit(self, wattage: int) -> bool:
+        try:
+            cfg = await self.get_config()
+            cfg.autotuning_wattage = wattage
+            await self.send_config(cfg)
+        except Exception as e:
+            logging.warning(f"{self} set_power_limit: {e}")
+            return False
+        else:
+            return True

pyasic/miners/_backends/bosminer_old.py

@@ -12,16 +12,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import logging
-
 import ipaddress
-from typing import Union, List
+import logging
+from typing import List, Union
 
 from pyasic.API.bosminer import BOSMinerAPI
-from pyasic.miners.base import BaseMiner
 from pyasic.config import MinerConfig
 from pyasic.data import MinerData
 from pyasic.data.error_codes import MinerErrorData
+from pyasic.miners.base import BaseMiner
 
 
 class BOSMinerOld(BaseMiner):
@@ -105,5 +104,8 @@ class BOSMinerOld(BaseMiner):
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
         return None
 
-    async def get_data(self) -> MinerData:
+    async def get_data(self, **kwargs) -> MinerData:
         return MinerData(ip=str(self.ip))
+
+    async def set_power_limit(self, wattage: int) -> bool:
+        return False

pyasic/miners/_backends/btminer.py

@@ -14,17 +14,14 @@
 
 import ipaddress
 import logging
-from typing import Union, List
-
+from typing import List, Union
 
 from pyasic.API.btminer import BTMinerAPI
-from pyasic.miners.base import BaseMiner
-from pyasic.errors import APIError
-
-from pyasic.data import MinerData, HashBoard
-from pyasic.data.error_codes import WhatsminerError, MinerErrorData
 from pyasic.config import MinerConfig
-
+from pyasic.data import HashBoard, MinerData
+from pyasic.data.error_codes import MinerErrorData, WhatsminerError
+from pyasic.errors import APIError
+from pyasic.miners.base import BaseMiner
 from pyasic.settings import PyasicSettings
 
 
@@ -199,14 +196,20 @@ class BTMiner(BaseMiner):
         return False
 
     async def stop_mining(self) -> bool:
+        try:
             data = await self.api.power_off(respbefore=True)
+        except APIError:
+            return False
         if data.get("Msg"):
             if data["Msg"] == "API command OK":
                 return True
         return False
 
     async def resume_mining(self) -> bool:
+        try:
             data = await self.api.power_on()
+        except APIError:
+            return False
         if data.get("Msg"):
             if data["Msg"] == "API command OK":
                 return True
@@ -214,18 +217,24 @@ class BTMiner(BaseMiner):
 
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
         conf = config.as_wm(user_suffix=user_suffix)
+        pools_conf = conf["pools"]
 
         await self.api.update_pools(
-            conf[0]["url"],
-            conf[0]["user"],
-            conf[0]["pass"],
-            conf[1]["url"],
-            conf[1]["user"],
-            conf[1]["pass"],
-            conf[2]["url"],
-            conf[2]["user"],
-            conf[2]["pass"],
+            pools_conf[0]["url"],
+            pools_conf[0]["user"],
+            pools_conf[0]["pass"],
+            pools_conf[1]["url"],
+            pools_conf[1]["user"],
+            pools_conf[1]["pass"],
+            pools_conf[2]["url"],
+            pools_conf[2]["user"],
+            pools_conf[2]["pass"],
         )
+        try:
+            await self.api.adjust_power_limit(conf["wattage"])
+        except APIError:
+            # cannot set wattage
+            pass
 
     async def get_config(self) -> MinerConfig:
         pools = None
@@ -435,3 +444,13 @@ class BTMiner(BaseMiner):
             data.mac = mac
 
         return data
+
+
+    async def set_power_limit(self, wattage: int) -> bool:
+        try:
+            await self.api.adjust_power_limit(wattage)
+        except Exception as e:
+            logging.warning(f"{self} set_power_limit: {e}")
+            return False
+        else:
+            return True

pyasic/miners/_backends/cgminer.py

@@ -14,17 +14,14 @@
 
 import ipaddress
 import logging
-from typing import Union, List
-
+from typing import List, Union
 
 from pyasic.API.cgminer import CGMinerAPI
-from pyasic.miners.base import BaseMiner
-from pyasic.errors import APIError
 from pyasic.config import MinerConfig
-
-from pyasic.data import MinerData, HashBoard
+from pyasic.data import HashBoard, MinerData
 from pyasic.data.error_codes import MinerErrorData
-
+from pyasic.errors import APIError
+from pyasic.miners.base import BaseMiner
 from pyasic.settings import PyasicSettings
 
 
@@ -338,3 +335,6 @@ class CGMiner(BaseMiner):
                 data.pool_split = str(quota)
 
         return data
+
+    async def set_power_limit(self, wattage: int) -> bool:
+        return False

pyasic/miners/_backends/hiveon.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from pyasic.miners._backends import BMMiner
 import ipaddress
 
+from pyasic.miners._backends import BMMiner
+
 
 class Hiveon(BMMiner):
     def __init__(self, ip: str) -> None:
@@ -60,3 +61,6 @@ class Hiveon(BMMiner):
                         bad_boards[board] = []
                     bad_boards[board].append(chain)
         return bad_boards
+
+    async def set_power_limit(self, wattage: int) -> bool:
+        return False

pyasic/miners/_types/__init__.py

@@ -14,5 +14,5 @@
 
 from .antminer import *
 from .avalonminer import *
-from .whatsminer import *
 from .innosilicon import *
+from .whatsminer import *

pyasic/miners/_types/antminer/X17/S17.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S17(BaseMiner):
+class S17(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X17/S17_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S17Plus(BaseMiner):
+class S17Plus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X17/S17_Pro.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S17Pro(BaseMiner):
+class S17Pro(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X17/S17e.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S17e(BaseMiner):
+class S17e(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X17/T17.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class T17(BaseMiner):
+class T17(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X17/T17_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class T17Plus(BaseMiner):
+class T17Plus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X17/T17e.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class T17e(BaseMiner):
+class T17e(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X17/__init__.py

@@ -16,7 +16,6 @@ from .S17 import S17
 from .S17_Plus import S17Plus
 from .S17_Pro import S17Pro
 from .S17e import S17e
-
 from .T17 import T17
 from .T17_Plus import T17Plus
 from .T17e import T17e

pyasic/miners/_types/antminer/X19/S19.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S19(BaseMiner):
+class S19(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X19/S19_Pro.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S19Pro(BaseMiner):
+class S19Pro(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X19/S19_XP.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S19XP(BaseMiner):
+class S19XP(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X19/S19a.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S19a(BaseMiner):
+class S19a(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X19/S19a_Pro.py

@@ -0,0 +1,24 @@
+#  Copyright 2022 Upstream Data Inc
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+from pyasic.miners.base import BaseMiner
+
+
+class S19aPro(BaseMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str):
+        super().__init__()
+        self.ip = ip
+        self.model = "S19a Pro"
+        self.nominal_chips = 100
+        self.fan_count = 4

pyasic/miners/_types/antminer/X19/S19j.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S19j(BaseMiner):
+class S19j(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X19/S19j_Pro.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S19jPro(BaseMiner):
+class S19jPro(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X19/T19.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class T19(BaseMiner):
+class T19(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X19/__init__.py

@@ -14,12 +14,9 @@
 
 from .S19 import S19
 from .S19_Pro import S19Pro
-
+from .S19_XP import S19XP
+from .S19a import S19a
+from .S19a_Pro import S19aPro
 from .S19j import S19j
 from .S19j_Pro import S19jPro
-
-from .S19_XP import S19XP
-
-from .S19a import S19a
-
 from .T19 import T19

pyasic/miners/_types/antminer/X9/S9.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S9(BaseMiner):
+class S9(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X9/S9i.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class S9i(BaseMiner):
+class S9i(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/antminer/X9/T9.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class T9(BaseMiner):
+class T9(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/avalonminer/A10X/A1026.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon1026(BaseMiner):
+class Avalon1026(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/avalonminer/A10X/A1047.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon1047(BaseMiner):
+class Avalon1047(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/avalonminer/A10X/A1066.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon1066(BaseMiner):
+class Avalon1066(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/avalonminer/A7X/A721.py

@@ -15,10 +15,11 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon721(BaseMiner):
+class Avalon721(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
         self.model = "Avalon 721"
-        self.chip_count = 18  # This miner has 4 boards totaling 72
-        self.fan_count = 1  # also only 1 fan
+        self.ideal_hashboards = 4
+        self.chip_count = 18
+        self.fan_count = 1

pyasic/miners/_types/avalonminer/A7X/A741.py

@@ -15,10 +15,11 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon741(BaseMiner):
+class Avalon741(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
         self.model = "Avalon 741"
-        self.chip_count = 22  # This miner has 4 boards totaling 88
-        self.fan_count = 1  # also only 1 fan
+        self.ideal_hashboards = 4
+        self.chip_count = 22
+        self.fan_count = 1

pyasic/miners/_types/avalonminer/A7X/A761.py

@@ -15,10 +15,11 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon761(BaseMiner):
+class Avalon761(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
         self.model = "Avalon 761"
-        self.chip_count = 18  # This miner has 4 boards totaling 72
-        self.fan_count = 1  # also only 1 fan
+        self.ideal_hashboards = 4
+        self.chip_count = 18
+        self.fan_count = 1

pyasic/miners/_types/avalonminer/A8X/A821.py

@@ -15,10 +15,11 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon821(BaseMiner):
+class Avalon821(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
         self.model = "Avalon 821"
-        self.chip_count = 26  # This miner has 4 boards totaling 104
-        self.fan_count = 1  # also only 1 fan
+        self.ideal_hashboards = 4
+        self.chip_count = 26
+        self.fan_count = 1

pyasic/miners/_types/avalonminer/A8X/A841.py

@@ -15,10 +15,11 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon841(BaseMiner):
+class Avalon841(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
         self.model = "Avalon 841"
-        self.chip_count = 26  # This miner has 4 boards totaling 104
-        self.fan_count = 1  # also only 1 fan
+        self.ideal_hashboards = 4
+        self.chip_count = 26
+        self.fan_count = 1

pyasic/miners/_types/avalonminer/A8X/A851.py

@@ -15,10 +15,11 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon851(BaseMiner):
+class Avalon851(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
         self.model = "Avalon 851"
-        self.chip_count = 26  # This miner has 4 boards totaling 104
-        self.fan_count = 1  # also only 1 fan
+        self.ideal_hashboards = 4
+        self.chip_count = 26
+        self.fan_count = 1

pyasic/miners/_types/avalonminer/A9X/A921.py

@@ -15,10 +15,11 @@
 from pyasic.miners.base import BaseMiner
 
 
-class Avalon921(BaseMiner):
+class Avalon921(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
         self.model = "Avalon 921"
-        self.chip_count = 26  # This miner has 4 boards totaling 104
-        self.fan_count = 1  # also only 1 fan
+        self.ideal_hashboards = 4
+        self.chip_count = 26
+        self.fan_count = 1

pyasic/miners/_types/innosilicon/T3X/T3H_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class InnosiliconT3HPlus(BaseMiner):
+class InnosiliconT3HPlus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str) -> None:
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M2X/M20.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M20(BaseMiner):
+class M20(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M20(BaseMiner):
         self.fan_count = 2
 
 
-class M20V10(BaseMiner):
+class M20V10(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M2X/M20S.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M20S(BaseMiner):
+class M20S(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M20S(BaseMiner):
         self.fan_count = 2
 
 
-class M20SV10(BaseMiner):
+class M20SV10(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -33,7 +33,7 @@ class M20SV10(BaseMiner):
         self.fan_count = 2
 
 
-class M20SV20(BaseMiner):
+class M20SV20(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M2X/M20S_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M20SPlus(BaseMiner):
+class M20SPlus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M2X/M21.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M21(BaseMiner):
+class M21(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M2X/M21S.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M21S(BaseMiner):
+class M21S(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M21S(BaseMiner):
         self.fan_count = 2
 
 
-class M21SV60(BaseMiner):
+class M21SV60(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -33,7 +33,7 @@ class M21SV60(BaseMiner):
         self.fan_count = 2
 
 
-class M21SV20(BaseMiner):
+class M21SV20(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M2X/M21S_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M21SPlus(BaseMiner):
+class M21SPlus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M2X/__init__.py

@@ -15,7 +15,6 @@
 from .M20 import M20, M20V10
 from .M20S import M20S, M20SV10, M20SV20
 from .M20S_Plus import M20SPlus
-
 from .M21 import M21
 from .M21S import M21S, M21SV20, M21SV60
 from .M21S_Plus import M21SPlus

pyasic/miners/_types/whatsminer/M3X/M30S.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M30S(BaseMiner):
+class M30S(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M30S(BaseMiner):
         self.fan_count = 2
 
 
-class M30SV50(BaseMiner):
+class M30SV50(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -33,7 +33,7 @@ class M30SV50(BaseMiner):
         self.fan_count = 2
 
 
-class M30SVG20(BaseMiner):
+class M30SVG20(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -42,7 +42,7 @@ class M30SVG20(BaseMiner):
         self.fan_count = 2
 
 
-class M30SVE20(BaseMiner):
+class M30SVE20(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -51,7 +51,7 @@ class M30SVE20(BaseMiner):
         self.fan_count = 2
 
 
-class M30SVE10(BaseMiner):
+class M30SVE10(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M3X/M30S_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M30SPlus(BaseMiner):
+class M30SPlus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M30SPlus(BaseMiner):
         self.fan_count = 2
 
 
-class M30SPlusVG60(BaseMiner):
+class M30SPlusVG60(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -33,7 +33,7 @@ class M30SPlusVG60(BaseMiner):
         self.fan_count = 2
 
 
-class M30SPlusVE40(BaseMiner):
+class M30SPlusVE40(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -42,7 +42,7 @@ class M30SPlusVE40(BaseMiner):
         self.fan_count = 2
 
 
-class M30SPlusVF20(BaseMiner):
+class M30SPlusVF20(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M3X/M30S_Plus_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M30SPlusPlus(BaseMiner):
+class M30SPlusPlus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M30SPlusPlus(BaseMiner):
         self.fan_count = 2
 
 
-class M30SPlusPlusVG30(BaseMiner):
+class M30SPlusPlusVG30(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -33,7 +33,7 @@ class M30SPlusPlusVG30(BaseMiner):
         self.fan_count = 2
 
 
-class M30SPlusPlusVG40(BaseMiner):
+class M30SPlusPlusVG40(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -42,7 +42,7 @@ class M30SPlusPlusVG40(BaseMiner):
         self.fan_count = 2
 
 
-class M30SPlusPlusVH60(BaseMiner):
+class M30SPlusPlusVH60(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M3X/M31S.py

@@ -15,10 +15,19 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M31S(BaseMiner):
+class M31S(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
         self.model = "M31S"
-        # TODO: Add chip count for this miner (per board) - self.nominal_chips
+        self.nominal_chips = 111
+        self.fan_count = 2
+
+
+class M31SV70(BaseMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str):
+        super().__init__()
+        self.ip = ip
+        self.model = "M31S V70"
+        self.nominal_chips = 111
         self.fan_count = 2

pyasic/miners/_types/whatsminer/M3X/M31S_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M31SPlus(BaseMiner):
+class M31SPlus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M31SPlus(BaseMiner):
         self.fan_count = 2
 
 
-class M31SPlusVE20(BaseMiner):
+class M31SPlusVE20(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -33,7 +33,7 @@ class M31SPlusVE20(BaseMiner):
         self.fan_count = 2
 
 
-class M31SPlusV30(BaseMiner):
+class M31SPlusV30(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -42,7 +42,7 @@ class M31SPlusV30(BaseMiner):
         self.fan_count = 2
 
 
-class M31SPlusV40(BaseMiner):
+class M31SPlusV40(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -51,7 +51,7 @@ class M31SPlusV40(BaseMiner):
         self.fan_count = 2
 
 
-class M31SPlusV60(BaseMiner):
+class M31SPlusV60(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -60,7 +60,7 @@ class M31SPlusV60(BaseMiner):
         self.fan_count = 2
 
 
-class M31SPlusV80(BaseMiner):
+class M31SPlusV80(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -69,7 +69,7 @@ class M31SPlusV80(BaseMiner):
         self.fan_count = 2
 
 
-class M31SPlusV90(BaseMiner):
+class M31SPlusV90(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M3X/M32.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M32(BaseMiner):
+class M32(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M32(BaseMiner):
         self.fan_count = 2
 
 
-class M32V20(BaseMiner):
+class M32V20(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M3X/M32S.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M32S(BaseMiner):
+class M32S(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M3X/M34S_Plus.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M34SPlus(BaseMiner):
+class M34SPlus(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -25,7 +25,7 @@ class M34SPlus(BaseMiner):
         self.fan_count = 0
 
 
-class M34SPlusVE10(BaseMiner):
+class M34SPlusVE10(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/_types/whatsminer/M3X/__init__.py

@@ -12,26 +12,24 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .M30S import M30S, M30SVE10, M30SVE20, M30SVG20, M30SV50
-from .M30S_Plus import M30SPlus, M30SPlusVG60, M30SPlusVE40, M30SPlusVF20
+from .M30S import M30S, M30SV50, M30SVE10, M30SVE20, M30SVG20
+from .M30S_Plus import M30SPlus, M30SPlusVE40, M30SPlusVF20, M30SPlusVG60
 from .M30S_Plus_Plus import (
     M30SPlusPlus,
     M30SPlusPlusVG30,
     M30SPlusPlusVG40,
     M30SPlusPlusVH60,
 )
-
-from .M31S import M31S
+from .M31S import M31S, M31SV70
 from .M31S_Plus import (
     M31SPlus,
-    M31SPlusVE20,
     M31SPlusV30,
     M31SPlusV40,
-    M31SPlusV80,
     M31SPlusV60,
+    M31SPlusV80,
     M31SPlusV90,
+    M31SPlusVE20,
 )
-
 from .M32 import M32, M32V20
 from .M32S import M32S
 from .M34S_Plus import M34SPlus, M34SPlusVE10

pyasic/miners/_types/whatsminer/M5X/M50.py

@@ -15,7 +15,7 @@
 from pyasic.miners.base import BaseMiner
 
 
-class M50(BaseMiner):
+class M50(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip
@@ -24,7 +24,7 @@ class M50(BaseMiner):
         self.fan_count = 2
 
 
-class M50VH50(BaseMiner):
+class M50VH50(BaseMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str):
         super().__init__()
         self.ip = ip

pyasic/miners/antminer/bmminer/X17/S17.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X17 import BMMinerX17
 from pyasic.miners._types import S17  # noqa - Ignore access to _module
 
+from .X17 import BMMinerX17
+
 
 class BMMinerS17(BMMinerX17, S17):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X17/S17_Plus.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X17 import BMMinerX17
 from pyasic.miners._types import S17Plus  # noqa - Ignore access to _module
 
+from .X17 import BMMinerX17
+
 
 class BMMinerS17Plus(BMMinerX17, S17Plus):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X17/S17_Pro.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X17 import BMMinerX17
 from pyasic.miners._types import S17Pro  # noqa - Ignore access to _module
 
+from .X17 import BMMinerX17
+
 
 class BMMinerS17Pro(BMMinerX17, S17Pro):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X17/S17e.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X17 import BMMinerX17
 from pyasic.miners._types import S17e  # noqa - Ignore access to _module
 
+from .X17 import BMMinerX17
+
 
 class BMMinerS17e(BMMinerX17, S17e):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X17/T17.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X17 import BMMinerX17
 from pyasic.miners._types import T17  # noqa - Ignore access to _module
 
+from .X17 import BMMinerX17
+
 
 class BMMinerT17(BMMinerX17, T17):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X17/T17_Plus.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X17 import BMMinerX17
 from pyasic.miners._types import T17Plus  # noqa - Ignore access to _module
 
+from .X17 import BMMinerX17
+
 
 class BMMinerT17Plus(BMMinerX17, T17Plus):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X17/T17e.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X17 import BMMinerX17
 from pyasic.miners._types import T17e  # noqa - Ignore access to _module
 
+from .X17 import BMMinerX17
+
 
 class BMMinerT17e(BMMinerX17, T17e):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X17/X17.py

@@ -12,12 +12,12 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from pyasic.miners._backends import BMMiner  # noqa - Ignore access to _module
-
-from pyasic.settings import PyasicSettings
+from typing import Union
 
 import httpx
-from typing import Union
+
+from pyasic.miners._backends import BMMiner  # noqa - Ignore access to _module
+from pyasic.settings import PyasicSettings
 
 
 class BMMinerX17(BMMiner):

pyasic/miners/antminer/bmminer/X17/__init__.py

@@ -16,7 +16,6 @@ from .S17 import BMMinerS17
 from .S17_Plus import BMMinerS17Plus
 from .S17_Pro import BMMinerS17Pro
 from .S17e import BMMinerS17e
-
 from .T17 import BMMinerT17
 from .T17_Plus import BMMinerT17Plus
 from .T17e import BMMinerT17e

pyasic/miners/antminer/bmminer/X19/S19.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X19 import BMMinerX19
 from pyasic.miners._types import S19  # noqa - Ignore access to _module
 
+from .X19 import BMMinerX19
+
 
 class BMMinerS19(BMMinerX19, S19):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X19/S19_Pro.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X19 import BMMinerX19
 from pyasic.miners._types import S19Pro  # noqa - Ignore access to _module
 
+from .X19 import BMMinerX19
+
 
 class BMMinerS19Pro(BMMinerX19, S19Pro):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X19/S19_XP.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X19 import BMMinerX19
 from pyasic.miners._types import S19XP  # noqa - Ignore access to _module
 
+from .X19 import BMMinerX19
+
 
 class BMMinerS19XP(BMMinerX19, S19XP):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X19/S19a.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X19 import BMMinerX19
 from pyasic.miners._types import S19a  # noqa - Ignore access to _module
 
+from .X19 import BMMinerX19
+
 
 class BMMinerS19a(BMMinerX19, S19a):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X19/S19a_Pro.py

@@ -0,0 +1,23 @@
+#  Copyright 2022 Upstream Data Inc
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+from pyasic.miners._types import S19aPro  # noqa - Ignore access to _module
+
+from .X19 import BMMinerX19
+
+
+class BMMinerS19aPro(BMMinerX19, S19aPro):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.ip = ip

pyasic/miners/antminer/bmminer/X19/S19j.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X19 import BMMinerX19
 from pyasic.miners._types import S19j  # noqa - Ignore access to _module
 
+from .X19 import BMMinerX19
+
 
 class BMMinerS19j(BMMinerX19, S19j):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X19/S19j_Pro.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X19 import BMMinerX19
 from pyasic.miners._types import S19jPro  # noqa - Ignore access to _module
 
+from .X19 import BMMinerX19
+
 
 class BMMinerS19jPro(BMMinerX19, S19jPro):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X19/T19.py

@@ -12,9 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from .X19 import BMMinerX19
 from pyasic.miners._types import T19  # noqa - Ignore access to _module
 
+from .X19 import BMMinerX19
+
 
 class BMMinerT19(BMMinerX19, T19):
     def __init__(self, ip: str) -> None:

pyasic/miners/antminer/bmminer/X19/X19.py

@@ -12,16 +12,16 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from pyasic.miners._backends import BMMiner  # noqa - Ignore access to _module
-
-from pyasic.config import MinerConfig
-from pyasic.data.error_codes import X19Error, MinerErrorData
-from pyasic.settings import PyasicSettings
+import asyncio
+import json
+from typing import List, Union
 
 import httpx
-import json
-import asyncio
-from typing import Union, List
+
+from pyasic.config import MinerConfig
+from pyasic.data.error_codes import MinerErrorData, X19Error
+from pyasic.miners._backends import BMMiner  # noqa - Ignore access to _module
+from pyasic.settings import PyasicSettings
 
 
 class BMMinerX19(BMMiner):
@@ -62,7 +62,7 @@ class BMMinerX19(BMMiner):
 
         try:
             async with httpx.AsyncClient() as client:
-                await client.post(url, data=conf, auth=auth)
+                await client.post(url, data=conf, auth=auth)  # noqa - ignore conf being a str
         except httpx.ReadTimeout:
             pass
         for i in range(7):
@@ -102,7 +102,7 @@ class BMMinerX19(BMMiner):
         auth = httpx.DigestAuth(self.uname, self.pwd)
         data = json.dumps({"blink": "true"})
         async with httpx.AsyncClient() as client:
-            data = await client.post(url, data=data, auth=auth)
+            data = await client.post(url, data=data, auth=auth)  # noqa - ignore conf being a str
         if data.status_code == 200:
             data = data.json()
             if data.get("code") == "B000":
@@ -115,7 +115,7 @@ class BMMinerX19(BMMiner):
         auth = httpx.DigestAuth(self.uname, self.pwd)
         data = json.dumps({"blink": "false"})
         async with httpx.AsyncClient() as client:
-            data = await client.post(url, data=data, auth=auth)
+            data = await client.post(url, data=data, auth=auth)  # noqa - ignore conf being a str
         if data.status_code == 200:
             data = data.json()
             if data.get("code") == "B100":
@@ -139,7 +139,10 @@ class BMMinerX19(BMMiner):
         async with httpx.AsyncClient() as client:
             data = await client.get(url, auth=auth)
         if data:
+            try:
                 data = data.json()
+            except json.decoder.JSONDecodeError:
+                return []
             if "SUMMARY" in data.keys():
                 if "status" in data["SUMMARY"][0].keys():
                     for item in data["SUMMARY"][0]["status"]:

pyasic/miners/antminer/bmminer/X19/__init__.py

@@ -14,12 +14,9 @@
 
 from .S19 import BMMinerS19
 from .S19_Pro import BMMinerS19Pro
-
+from .S19_XP import BMMinerS19XP
+from .S19a import BMMinerS19a
+from .S19a_Pro import BMMinerS19aPro
 from .S19j import BMMinerS19j
 from .S19j_Pro import BMMinerS19jPro
-
-from .S19_XP import BMMinerS19XP
-
-from .S19a import BMMinerS19a
-
 from .T19 import BMMinerT19

pyasic/miners/antminer/bosminer/X17/__init__.py

@@ -16,7 +16,6 @@ from .S17 import BOSMinerS17
 from .S17_Plus import BOSMinerS17Plus
 from .S17_Pro import BOSMinerS17Pro
 from .S17e import BOSMinerS17e
-
 from .T17 import BOSMinerT17
 from .T17_Plus import BOSMinerT17Plus
 from .T17e import BOSMinerT17e

pyasic/miners/antminer/bosminer/X19/__init__.py

@@ -14,8 +14,6 @@
 
 from .S19 import BOSMinerS19
 from .S19_Pro import BOSMinerS19Pro
-
 from .S19j import BOSMinerS19j
 from .S19j_Pro import BOSMinerS19jPro
-
 from .T19 import BOSMinerT19

pyasic/miners/antminer/cgminer/X17/__init__.py

@@ -16,7 +16,6 @@ from .S17 import CGMinerS17
 from .S17_Plus import CGMinerS17Plus
 from .S17_Pro import CGMinerS17Pro
 from .S17e import CGMinerS17e
-
 from .T17 import CGMinerT17
 from .T17_Plus import CGMinerT17Plus
 from .T17e import CGMinerT17e

pyasic/miners/antminer/cgminer/X19/__init__.py

@@ -14,8 +14,6 @@
 
 from .S19 import CGMinerS19
 from .S19_Pro import CGMinerS19Pro
-
 from .S19j import CGMinerS19j
 from .S19j_Pro import CGMinerS19jPro
-
 from .T19 import CGMinerT19

pyasic/miners/antminer/hiveon/X9/T9.py

@@ -12,10 +12,9 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+from pyasic.data import HashBoard, MinerData
 from pyasic.miners._backends import Hiveon  # noqa - Ignore access to _module
 from pyasic.miners._types import T9  # noqa - Ignore access to _module
-
-from pyasic.data import MinerData, HashBoard
 from pyasic.settings import PyasicSettings
 
 
@@ -45,7 +44,6 @@ class HiveonT9(Hiveon, T9):
             ideal_hashboards=self.ideal_hashboards,
         )
 
-        board_offset = -1
         fan_offset = -1
 
         model = await self.get_model()