version: bump version number.

README.md

@@ -1,5 +1,5 @@
 # pyasic
-*A set of modules for interfacing with many common types of ASIC bitcoin miners, using both their API and SSH.*
+*A simplified and standardized interface for Bitcoin ASICs.*
 
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![pypi](https://img.shields.io/pypi/v/pyasic.svg)](https://pypi.org/project/pyasic/)

docs/index.md

@@ -263,7 +263,7 @@ Pyasic implements a few dataclasses as helpers to make data return types consist
 
 [`MinerData`][pyasic.data.MinerData] is a return from the [`get_data()`](#get-data) function, and is used to have a consistent dataset across all returns.
 
-You can call [`MinerData.asdict()`][pyasic.data.MinerData.asdict] to get the dataclass as a dictionary, and there are many other helper functions contained in the class to convert to different data formats.
+You can call [`MinerData.as_dict()`][pyasic.data.MinerData.as_dict] to get the dataclass as a dictionary, and there are many other helper functions contained in the class to convert to different data formats.
 
 [`MinerData`][pyasic.data.MinerData] instances can also be added to each other to combine their data and can be divided by a number to divide all their data, allowing you to get average data from many miners by doing -
 ```python
@@ -288,3 +288,27 @@ It is the return from [`get_config()`](#get-config).
 
 Each miner has a unique way to convert the [`MinerConfig`][pyasic.config.MinerConfig] to their specific type, there are helper functions in the class.
 In most cases these helper functions should not be used, as [`send_config()`](#send-config) takes a [`MinerConfig`][pyasic.config.MinerConfig] and will do the conversion to the right type for you.
+
+## Settings
+`pyasic` has settings designed to make using large groups of miners easier.  You can set the default password for all types of miners using the [`pyasic.settings`][pyasic.settings] module, used as follows:
+
+```python
+from pyasic import settings
+
+settings.update("default_antminer_password", "my_pwd")
+```
+
+Here are of all the settings, and their default values:
+```
+"network_ping_retries": 1,
+"network_ping_timeout": 3,
+"network_scan_threads": 300,
+"factory_get_retries": 1,
+"get_data_retries": 1,
+"default_whatsminer_password": "admin",
+"default_innosilicon_password": "admin",
+"default_antminer_password": "root",
+"default_bosminer_password": "root",
+"default_vnish_password": "admin",
+"default_goldshell_password": "123456789",
+```

docs/miners/miner_factory.md

@@ -1,6 +1,14 @@
 # pyasic
 ## Miner Factory
 
+[`MinerFactory`][pyasic.miners.miner_factory.MinerFactory] is the way to create miner types in `pyasic`.  The most important method is [`get_miner()`][pyasic.get_miner], which is mapped to [`pyasic.get_miner()`][pyasic.get_miner], and should be used from there.
+
+The instance used for [`pyasic.get_miner()`][pyasic.get_miner] is `pyasic.miner_factory`.
+
+[`MinerFactory`][pyasic.MinerFactory] also keeps a cache, which can be cleared if needed with `pyasic.miner_factory.clear_cached_miners()`.
+
+Finally, there is functionality to get multiple miners without using `asyncio.gather()` explicitly.  Use `pyasic.miner_factory.get_multiple_miners()` with a list of IPs as strings to get a list of miner instances.  You can also get multiple miners with an `AsyncGenerator` by using `pyasic.miner_factory.get_miner_generator()`.
+
 ::: pyasic.miners.miner_factory.MinerFactory
     handler: python
     options:

docs/settings/settings.md

@@ -0,0 +1,23 @@
+# pyasic
+## settings
+
+::: pyasic.settings
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+
+### get
+::: pyasic.settings.get
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+### update
+::: pyasic.settings.update
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

mkdocs.yml

@@ -53,7 +53,8 @@ nav:
         - Goldshell X5: "miners/goldshell/X5.md"
         - Goldshell XMax: "miners/goldshell/XMax.md"
     - Base Miner: "miners/base_miner.md"
-
+- Settings:
+      - Settings: "settings/settings.md"
 
 plugins:
   - mkdocstrings

pyasic/API/__init__.py

@@ -20,7 +20,7 @@ import json
 import logging
 import re
 import warnings
-from typing import Tuple, Union
+from typing import Union
 
 from pyasic.errors import APIError, APIWarning
 
@@ -258,9 +258,12 @@ If you are sure you want to use this command please use API.send_command("{comma
                 return False, data["Msg"]
         else:
             # make sure the command succeeded
-            if type(data["STATUS"]) == str:
+            if isinstance(data["STATUS"], str):
                 if data["STATUS"] in ["RESTART"]:
                     return True, None
+            elif isinstance(data["STATUS"], dict):
+                if data["STATUS"].get("STATUS") in ["S", "I"]:
+                    return True, None
             elif data["STATUS"][0]["STATUS"] not in ("S", "I"):
                 # this is an error
                 if data["STATUS"][0]["STATUS"] not in ("S", "I"):

pyasic/API/btminer.py

@@ -22,15 +22,15 @@ import hashlib
 import json
 import logging
 import re
-from typing import Union
+from typing import Literal, Union
 
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from passlib.handlers.md5_crypt import md5_crypt
 
+from pyasic import settings
 from pyasic.API import BaseMinerAPI
 from pyasic.errors import APIError
 from pyasic.misc import api_min_version
-from pyasic.settings import PyasicSettings
 
 ### IMPORTANT ###
 # you need to change the password of the miners using the Whatsminer
@@ -40,6 +40,12 @@ from pyasic.settings import PyasicSettings
 # 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.
 
+PrePowerOnMessage = Union[
+    Literal["wait for adjust temp"],
+    Literal["adjust complete"],
+    Literal["adjust continue"],
+]
+
 
 def _crypt(word: str, salt: str) -> str:
     """Encrypts a word with a salt, using a standard salt format.
@@ -186,7 +192,7 @@ class BTMinerAPI(BaseMinerAPI):
         ip: str,
         api_ver: str = "0.0.0",
         port: int = 4028,
-        pwd: str = PyasicSettings().global_whatsminer_password,
+        pwd: str = settings.get("default_whatsminer_password", "admin"),
     ):
         super().__init__(ip, port)
         self.pwd = pwd
@@ -693,7 +699,7 @@ class BTMinerAPI(BaseMinerAPI):
             )
         return await self.send_privileged_command("set_power_pct", percent=str(percent))
 
-    async def pre_power_on(self, complete: bool, msg: str) -> dict:
+    async def pre_power_on(self, complete: bool, msg: PrePowerOnMessage) -> dict:
         """Configure or check status of pre power on.
 
         <details>
@@ -713,7 +719,7 @@ class BTMinerAPI(BaseMinerAPI):
         </details>
         """
 
-        if not msg == "wait for adjust temp" or "adjust complete" or "adjust continue":
+        if msg not in ("wait for adjust temp", "adjust complete", "adjust continue"):
             raise APIError(
                 "Message is incorrect, please choose one of "
                 '["wait for adjust temp", '
@@ -729,6 +735,34 @@ class BTMinerAPI(BaseMinerAPI):
         )
 
     ### ADDED IN V2.0.5 Whatsminer API ###
+
+    @api_min_version("2.0.5")
+    async def set_power_pct_v2(self, percent: int) -> dict:
+        """Set the power percentage of the miner based on current power.  Used for temporary adjustment.  Added in API v2.0.5.
+
+        <details>
+            <summary>Expand</summary>
+
+        Set the power percentage of the miner, only works after changing
+        the password of the miner using the Whatsminer tool.
+
+        Parameters:
+            percent: The power percentage to set.
+        Returns:
+            A reply informing of the status of setting the power percentage.
+        </details>
+        """
+
+        if not 0 < percent < 100:
+            raise APIError(
+                f"Power PCT % is outside of the allowed "
+                f"range.  Please set a % between 0 and "
+                f"100"
+            )
+        return await self.send_privileged_command(
+            "set_power_pct_v2", percent=str(percent)
+        )
+
     @api_min_version("2.0.5")
     async def set_temp_offset(self, temp_offset: int) -> dict:
         """Set the offset of miner hash board target temperature.

pyasic/__init__.py

@@ -13,6 +13,7 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from pyasic import settings
 from pyasic.API.bmminer import BMMinerAPI
 from pyasic.API.bosminer import BOSMinerAPI
 from pyasic.API.btminer import BTMinerAPI
@@ -29,10 +30,9 @@ from pyasic.data import (
 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_factory import MinerFactory, miner_factory
 from pyasic.miners.miner_listener import MinerListener
 from pyasic.network import MinerNetwork
-from pyasic.settings import PyasicSettings
 
 __all__ = [
     "BMMinerAPI",
@@ -51,7 +51,8 @@ __all__ = [
     "get_miner",
     "AnyMiner",
     "MinerFactory",
+    "miner_factory",
     "MinerListener",
     "MinerNetwork",
-    "PyasicSettings",
+    "settings",
 ]

pyasic/data/__init__.py

@@ -241,7 +241,7 @@ class MinerData:
                 if item.hashrate is not None:
                     hr_data.append(item.hashrate)
             if len(hr_data) > 0:
-                return sum(hr_data)
+                return round(sum(hr_data), 2)
         return self._hashrate
 
     @hashrate.setter
@@ -338,13 +338,16 @@ class MinerData:
         pass
 
     def asdict(self) -> dict:
+        logging.debug(f"MinerData - (To Dict) - Dumping Dict data")
+        return asdict(self)
+
+    def as_dict(self) -> dict:
         """Get this dataclass as a dictionary.
 
         Returns:
             A dictionary version of this class.
         """
-        logging.debug(f"MinerData - (To Dict) - Dumping Dict data")
-        return asdict(self)
+        return self.asdict()
 
     def as_json(self) -> str:
         """Get this dataclass as JSON.

pyasic/data/error_codes/whatsminer.py

@@ -16,8 +16,6 @@
 
 from dataclasses import asdict, dataclass, field, fields
 
-C_N_CODES = ["52", "53", "54", "55", "56"]
-
 
 @dataclass
 class WhatsminerError:
@@ -37,10 +35,8 @@ class WhatsminerError:
 
     @property
     def error_message(self):  # noqa - Skip PyCharm inspection
-        if len(str(self.error_code)) > 3 and str(self.error_code)[:2] in C_N_CODES:
-            # 55 error code base has chip numbers, so the format is
-            # 55 -> board num len 1 -> chip num len 3
-            err_type = 55
+        if len(str(self.error_code)) == 6 and not str(self.error_code)[:1] == "1":
+            err_type = int(str(self.error_code)[:2])
             err_subtype = int(str(self.error_code)[2:3])
             err_value = int(str(self.error_code)[3:])
         else:
@@ -88,7 +84,9 @@ class WhatsminerError:
 
 ERROR_CODES = {
     1: {  # Fan error
-        0: {0: "Fan unknown."},
+        0: {
+            0: "Fan unknown.",
+        },
         1: {  # Fan speed error of 1000+
             0: "Intake fan speed error.",
             1: "Exhaust fan speed error.",
@@ -101,7 +99,9 @@ ERROR_CODES = {
             0: "Intake fan speed error.  Fan speed deviates by more than 3000.",
             1: "Exhaust fan speed error.  Fan speed deviates by more than 3000.",
         },
-        4: {0: "Fan speed too high."},  # High speed
+        4: {
+            0: "Fan speed too high.",
+        },  # High speed
     },
     2: {  # Power error
         0: {
@@ -126,6 +126,7 @@ ERROR_CODES = {
             6: "Power remained unchanged for a long time.",
             7: "Power set enable error.",
             8: "Power input voltage is lower than 230V for high power mode.",
+            9: "Power input current is incorrect.",
         },
         3: {
             3: "Power output high temperature protection error.",
@@ -159,6 +160,8 @@ ERROR_CODES = {
         6: {
             3: "Power communication warning.",
             4: "Power communication error.",
+            5: "Power unknown error.",
+            6: "Power unknown error.",
             7: "Power watchdog protection.",
             8: "Power output high current protection.",
             9: "Power input high current protection.",
@@ -170,57 +173,134 @@ ERROR_CODES = {
             3: "Power input too high warning.",
             4: "Power fan warning.",
             5: "Power high temperature warning.",
+            6: "Power unknown error.",
+            7: "Power unknown error.",
+            8: "Power unknown error.",
+            9: "Power unknown error.",
+        },
+        8: {
+            0: "Power unknown error.",
+            1: "Power vendor status 1 bit 0 error.",
+            2: "Power vendor status 1 bit 1 error.",
+            3: "Power vendor status 1 bit 2 error.",
+            4: "Power vendor status 1 bit 3 error.",
+            5: "Power vendor status 1 bit 4 error.",
+            6: "Power vendor status 1 bit 5 error.",
+            7: "Power vendor status 1 bit 6 error.",
+            8: "Power vendor status 1 bit 7 error.",
+            9: "Power vendor status 2 bit 0 error.",
+        },
+        9: {
+            0: "Power vendor status 2 bit 1 error.",
+            1: "Power vendor status 2 bit 2 error.",
+            2: "Power vendor status 2 bit 3 error.",
+            3: "Power vendor status 2 bit 4 error.",
+            4: "Power vendor status 2 bit 5 error.",
+            5: "Power vendor status 2 bit 6 error.",
+            6: "Power vendor status 2 bit 7 error.",
         },
     },
     3: {  # temperature error
         0: {  # sensor detection error
-            "n": "Slot {n} temperature sensor detection error."
+            "n": "Slot {n} temperature sensor detection error.",
         },
         2: {  # temperature reading error
             "n": "Slot {n} temperature reading error.",
             9: "Control board temperature sensor communication error.",
         },
-        5: {"n": "Slot {n} temperature protecting."},  # temperature protection
-        6: {0: "Hashboard high temperature error."},  # high temp
+        5: {
+            "n": "Slot {n} temperature protecting.",
+        },  # temperature protection
+        6: {
+            0: "Hashboard high temperature error.",
+            1: "Hashboard high temperature error.",
+            2: "Hashboard high temperature error.",
+            3: "Hashboard high temperature error.",
+        },  # high temp
+        7: {
+            0: "The environment temperature fluctuates too much.",
+        },  # env temp
         8: {
             0: "Humidity sensor not found.",
             1: "Humidity sensor read error.",
             2: "Humidity sensor read error.",
             3: "Humidity sensor protecting.",
-        },
+        },  # humidity
     },
     4: {  # EEPROM error
-        0: {0: "Eeprom unknown error."},
-        1: {"n": "Slot {n} eeprom detection error."},  # EEPROM detection error
-        2: {"n": "Slot {n} eeprom parsing error."},  # EEPROM parsing error
-        3: {"n": "Slot {n} chip bin type error."},  # chip bin error
-        4: {"n": "Slot {n} eeprom chip number X error."},  # EEPROM chip number error
-        5: {"n": "Slot {n} eeprom xfer error."},  # EEPROM xfer error
+        0: {
+            0: "Eeprom unknown error.",
+        },
+        1: {
+            "n": "Slot {n} eeprom detection error.",
+        },  # EEPROM detection error
+        2: {
+            "n": "Slot {n} eeprom parsing error.",
+        },  # EEPROM parsing error
+        3: {
+            "n": "Slot {n} chip bin type error.",
+        },  # chip bin error
+        4: {
+            "n": "Slot {n} eeprom chip number X error.",
+        },  # EEPROM chip number error
+        5: {
+            "n": "Slot {n} eeprom xfer error.",
+        },  # EEPROM xfer error
     },
     5: {  # hashboard error
-        0: {0: "Board unknown error."},
-        1: {"n": "Slot {n} miner type error."},  # board miner type error
-        2: {"n": "Slot {n} bin type error."},  # chip bin type error
-        3: {"n": "Slot {n} not found."},  # board not found error
-        4: {"n": "Slot {n} error reading chip id."},  # reading chip id error
-        5: {"n": "Slot {n} has bad chips."},  # board has bad chips error
-        6: {"n": "Slot {n} loss of balance error."},  # loss of balance error
-        7: {"n": "Slot {n} xfer error chip."},  # xfer error
-        8: {"n": "Slot {n} reset error."},  # reset error
-        9: {"n": "Slot {n} frequency too low."},  # freq error
+        0: {
+            0: "Board unknown error.",
+        },
+        1: {
+            "n": "Slot {n} miner type error.",
+        },  # board miner type error
+        2: {
+            "n": "Slot {n} bin type error.",
+        },  # chip bin type error
+        3: {
+            "n": "Slot {n} not found.",
+        },  # board not found error
+        4: {
+            "n": "Slot {n} error reading chip id.",
+        },  # reading chip id error
+        5: {
+            "n": "Slot {n} has bad chips.",
+        },  # board has bad chips error
+        6: {
+            "n": "Slot {n} loss of balance error.",
+        },  # loss of balance error
+        7: {
+            "n": "Slot {n} xfer error chip.",
+        },  # xfer error
+        8: {
+            "n": "Slot {n} reset error.",
+        },  # reset error
+        9: {
+            "n": "Slot {n} frequency too low.",
+        },  # freq error
     },
     6: {  # env temp error
-        0: {0: "Environment temperature is too high."},  # normal env temp error
+        0: {
+            0: "Environment temperature is too high.",
+        },  # normal env temp error
         1: {  # high power env temp error
-            0: "Environment temperature is too high for high performance mode."
+            0: "Environment temperature is too high for high performance mode.",
         },
     },
     7: {  # control board error
-        0: {0: "MAC address invalid", 1: "Control board no support chip."},
+        0: {
+            0: "MAC address invalid",
+            1: "Control board no support chip.",
+        },
         1: {
             0: "Control board rebooted as an exception.",
             1: "Control board rebooted as exception and cpufreq reduced, please upgrade the firmware",
             2: "Control board rebooted as an exception.",
+            3: "The network is unstable, change time.",
+            4: "Unknown error.",
+        },
+        2: {
+            "n": "Control board slot {n} frame error.",
         },
     },
     8: {  # checksum error
@@ -228,63 +308,152 @@ ERROR_CODES = {
             0: "CGMiner checksum error.",
             1: "System monitor checksum error.",
             2: "Remote daemon checksum error.",
-        }
+        },
+        1: {0: "Air to liquid PCB serial # does not match."},
     },
-    9: {0: {1: "Power rate error."}},  # power rate error
+    9: {
+        0: {0: "Unknown error.", 1: "Power rate error.", 2: "Unknown error."}
+    },  # power rate error
     20: {  # pool error
-        1: {0: "All pools are disabled."},  # all disabled error
-        2: {"n": "Pool {n} connection failed."},  # pool connection failed error
-        3: {0: "High rejection rate on pool."},  # rejection rate error
+        0: {
+            0: "No pool information configured.",
+        },
+        1: {
+            0: "All pools are disabled.",
+        },  # all disabled error
+        2: {
+            "n": "Pool {n} connection failed.",
+        },  # pool connection failed error
+        3: {
+            0: "High rejection rate on pool.",
+        },  # rejection rate error
         4: {  # asicboost not supported error
-            0: "The pool does not support asicboost mode."
+            0: "The pool does not support asicboost mode.",
         },
     },
-    21: {1: {"n": "Slot {n} factory test step failed."}},
+    21: {
+        1: {
+            "n": "Slot {n} factory test step failed.",
+        }
+    },
     23: {  # hashrate error
-        1: {0: "Hashrate is too low."},
-        2: {0: "Hashrate is too low."},
-        3: {0: "Hashrate loss is too high."},
-        4: {0: "Hashrate loss is too high."},
-        5: {0: "Hashrate loss."},
+        1: {
+            0: "Hashrate is too low.",
+        },
+        2: {
+            0: "Hashrate is too low.",
+        },
+        3: {
+            0: "Hashrate loss is too high.",
+        },
+        4: {
+            0: "Hashrate loss is too high.",
+        },
+        5: {
+            0: "Hashrate loss.",
+        },
     },
     50: {  # water velocity error/voltage error
-        1: {"n": "Slot {n} chip voltage too low."},
-        2: {"n": "Slot {n} chip voltage changed."},
-        3: {"n": "Slot {n} chip temperature difference is too large."},
-        4: {"n": "Slot {n} chip hottest temperature difference is too large."},
-        7: {"n": "Slot {n} water velocity is abnormal."},  # abnormal water velocity
-        8: {0: "Chip temp calibration failed, please restore factory settings."},
-        9: {"n": "Slot {n} chip temp calibration check no balance."},
+        1: {
+            "n": "Slot {n} chip voltage too low.",
+        },
+        2: {
+            "n": "Slot {n} chip voltage changed.",
+        },
+        3: {
+            "n": "Slot {n} chip temperature difference is too large.",
+        },
+        4: {
+            "n": "Slot {n} chip hottest temperature difference is too large.",
+        },
+        5: {"n": "Slot {n} stopped hashing, chips temperature protecting."},
+        7: {
+            "n": "Slot {n} water velocity is abnormal.",
+        },  # abnormal water velocity
+        8: {
+            0: "Chip temp calibration failed, please restore factory settings.",
+        },
+        9: {
+            "n": "Slot {n} chip temp calibration check no balance.",
+        },
     },
     51: {  # frequency error
-        1: {"n": "Slot {n} frequency up timeout."},  # frequency up timeout
-        7: {"n": "Slot {n} frequency up timeout."},  # frequency up timeout
+        1: {
+            "n": "Slot {n} frequency up timeout.",
+        },  # frequency up timeout
+        2: {"n": "Slot {n} too many CRC errors."},
+        3: {"n": "Slot {n} unstable."},
+        7: {
+            "n": "Slot {n} frequency up timeout.",
+        },  # frequency up timeout
+    },
+    52: {
+        "n": {
+            "c": "Slot {n} chip {c} error nonce.",
+        },
+    },
+    53: {
+        "n": {
+            "c": "Slot {n} chip {c} too few nonce.",
+        },
+    },
+    54: {
+        "n": {
+            "c": "Slot {n} chip {c} temp protected.",
+        },
+    },
+    55: {
+        "n": {
+            "c": "Slot {n} chip {c} has been reset.",
+        },
+    },
+    56: {
+        "n": {
+            "c": "Slot {n} chip {c} zero nonce.",
+        },
     },
-    52: {"n": {"c": "Slot {n} chip {c} error nonce."}},
-    53: {"n": {"c": "Slot {n} chip {c} too few nonce."}},
-    54: {"n": {"c": "Slot {n} chip {c} temp protected."}},
-    55: {"n": {"c": "Slot {n} chip {c} has been reset."}},
-    56: {"n": {"c": "Slot {n} chip {c} does not return to the nonce."}},
     80: {
-        0: {0: "The tool version is too low, please update."},
-        1: {0: "Low freq."},
-        2: {0: "Low hashrate."},
-        3: {5: "High env temp."},
+        0: {
+            0: "The tool version is too low, please update.",
+        },
+        1: {
+            0: "Low freq.",
+        },
+        2: {
+            0: "Low hashrate.",
+        },
+        3: {
+            5: "High env temp.",
+        },
     },
     81: {
-        0: {0: "Chip data error."},
+        0: {
+            0: "Chip data error.",
+        },
     },
     82: {
-        0: {0: "Power version error."},
-        1: {0: "Miner type error."},
-        2: {0: "Version info error."},
+        0: {
+            0: "Power version error.",
+        },
+        1: {
+            0: "Miner type error.",
+        },
+        2: {
+            0: "Version info error.",
+        },
     },
     83: {
-        0: {0: "Empty level error."},
+        0: {
+            0: "Empty level error.",
+        },
     },
     84: {
-        0: {0: "Old firmware."},
-        1: {0: "Software version error."},
+        0: {
+            0: "Old firmware.",
+        },
+        1: {
+            0: "Software version error.",
+        },
     },
     85: {
         "n": {
@@ -296,8 +465,12 @@ ERROR_CODES = {
         },
     },
     86: {
-        0: {0: "Missing product serial #."},
-        1: {0: "Missing product type."},
+        0: {
+            0: "Missing product serial #.",
+        },
+        1: {
+            0: "Missing product type.",
+        },
         2: {
             0: "Missing miner serial #.",
             1: "Wrong miner serial # length.",
@@ -314,12 +487,34 @@ ERROR_CODES = {
             3: "Wrong power model rate.",
             4: "Wrong power model format.",
         },
-        5: {0: "Wrong hash board struct."},
-        6: {0: "Wrong miner cooling type."},
-        7: {0: "Missing PCB serial #."},
+        5: {
+            0: "Wrong hash board struct.",
+        },
+        6: {
+            0: "Wrong miner cooling type.",
+        },
+        7: {
+            0: "Missing PCB serial #.",
+        },
+    },
+    87: {
+        0: {
+            0: "Miner power mismatch.",
+        },
+    },
+    90: {
+        0: {
+            0: "Process error, exited with signal: 3.",
+        },
+        1: {
+            0: "Process error, exited with signal: 3.",
+        },
+    },
+    99: {
+        9: {
+            9: "Miner unknown error.",
+        },
     },
-    87: {0: {0: "Miner power mismatch."}},
-    99: {9: {9: "Miner unknown error."}},
     1000: {
         0: {
             0: "Security library error, please upgrade firmware",
@@ -328,7 +523,11 @@ ERROR_CODES = {
             3: "/antiv/dig/pf_partial.dig illegal.",
         },
     },
-    1001: {0: {0: "Security BTMiner removed, please upgrade firmware."}},
+    1001: {
+        0: {
+            0: "Security BTMiner removed, please upgrade firmware.",
+        },
+    },
     1100: {
         0: {
             0: "Security illegal file, please upgrade firmware.",

pyasic/logger/__init__.py

@@ -16,31 +16,29 @@
 
 import logging
 
-from pyasic.settings import PyasicSettings
-
 
 def init_logger():
-    if PyasicSettings().logfile:
-        logging.basicConfig(
-            filename="logfile.txt",
-            filemode="a",
-            format="%(pathname)s:%(lineno)d in %(funcName)s\n[%(levelname)s][%(asctime)s](%(name)s) - %(message)s",
-            datefmt="%x %X",
-        )
-    else:
-        logging.basicConfig(
-            format="%(pathname)s:%(lineno)d in %(funcName)s\n[%(levelname)s][%(asctime)s](%(name)s) - %(message)s",
-            datefmt="%x %X",
-        )
+    # if PyasicSettings().logfile:
+    #     logging.basicConfig(
+    #         filename="logfile.txt",
+    #         filemode="a",
+    #         format="%(pathname)s:%(lineno)d in %(funcName)s\n[%(levelname)s][%(asctime)s](%(name)s) - %(message)s",
+    #         datefmt="%x %X",
+    #     )
+    # else:
+    logging.basicConfig(
+        format="%(pathname)s:%(lineno)d in %(funcName)s\n[%(levelname)s][%(asctime)s](%(name)s) - %(message)s",
+        datefmt="%x %X",
+    )
 
     _logger = logging.getLogger()
 
-    if PyasicSettings().debug:
-        _logger.setLevel(logging.DEBUG)
-        logging.getLogger("asyncssh").setLevel(logging.DEBUG)
-    else:
-        _logger.setLevel(logging.WARNING)
-        logging.getLogger("asyncssh").setLevel(logging.WARNING)
+    # if PyasicSettings().debug:
+    #     _logger.setLevel(logging.DEBUG)
+    #     logging.getLogger("asyncssh").setLevel(logging.DEBUG)
+    # else:
+    _logger.setLevel(logging.WARNING)
+    logging.getLogger("asyncssh").setLevel(logging.WARNING)
 
     return _logger
 

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

@@ -21,9 +21,11 @@ from pyasic.miners.types import (
     S19XP,
     S19a,
     S19aPro,
+    S19i,
     S19j,
     S19jNoPIC,
     S19jPro,
+    S19Plus,
     S19Pro,
     S19ProPlus,
 )
@@ -33,6 +35,14 @@ class BMMinerS19(AntminerModern, S19):
     pass
 
 
+class BMMinerS19Plus(AntminerModern, S19Plus):
+    pass
+
+
+class BMMinerS19i(AntminerModern, S19i):
+    pass
+
+
 class BMMinerS19Pro(AntminerModern, S19Pro):
     pass
 

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

@@ -18,10 +18,12 @@ from .S19 import (
     BMMinerS19,
     BMMinerS19a,
     BMMinerS19aPro,
+    BMMinerS19i,
     BMMinerS19j,
     BMMinerS19jNoPIC,
     BMMinerS19jPro,
     BMMinerS19L,
+    BMMinerS19Plus,
     BMMinerS19Pro,
     BMMinerS19ProPlus,
     BMMinerS19XP,

pyasic/miners/backends/antminer.py

@@ -109,7 +109,7 @@ class AntminerModern(BMMiner):
         data = await self.web.blink(blink=False)
         if data:
             if data.get("code") == "B100":
-                self.light = True
+                self.light = False
         return self.light
 
     async def reboot(self) -> bool:
@@ -274,7 +274,11 @@ class AntminerModern(BMMiner):
 
         if web_get_conf:
             try:
-                return False if int(web_get_conf["bitmain-work-mode"]) == 1 else True
+                if web_get_conf["bitmain-work-mode"].isdigit():
+                    return (
+                        False if int(web_get_conf["bitmain-work-mode"]) == 1 else True
+                    )
+                return False
             except LookupError:
                 pass
 

pyasic/miners/backends/bmminer.py

@@ -235,7 +235,22 @@ class BMMiner(BaseMiner):
                     if board_offset == -1:
                         board_offset = 1
 
-                    for i in range(board_offset, board_offset + self.ideal_hashboards):
+                    real_slots = []
+
+                    for i in range(board_offset, board_offset + 4):
+                        try:
+                            key = f"chain_acs{i}"
+                            if boards[1].get(key, "") != "":
+                                real_slots.append(i)
+                        except LookupError:
+                            pass
+
+                    if len(real_slots) < 3:
+                        real_slots = list(
+                            range(board_offset, board_offset + self.ideal_hashboards)
+                        )
+
+                    for i in real_slots:
                         hashboard = HashBoard(
                             slot=i - board_offset, expected_chips=self.nominal_chips
                         )
@@ -259,7 +274,7 @@ class BMMiner(BaseMiner):
                         if (not chips) or (not chips > 0):
                             hashboard.missing = True
                         hashboards.append(hashboard)
-            except (IndexError, KeyError, ValueError, TypeError):
+            except (LookupError, ValueError, TypeError):
                 pass
 
         return hashboards

pyasic/miners/backends/bosminer.py

@@ -303,17 +303,12 @@ class BOSMiner(BaseMiner):
             The config from `self.config`.
         """
         logging.debug(f"{self}: Getting config.")
-        conn = None
+
         try:
             conn = await self._get_ssh_connection()
         except ConnectionError:
-            try:
-                pools = await self.api.pools()
-            except APIError:
-                return self.config
-            if pools:
-                self.config = MinerConfig().from_api(pools["POOLS"])
-                return self.config
+            conn = None
+
         if conn:
             async with conn:
                 # good ol' BBB compatibility :/
@@ -365,6 +360,8 @@ class BOSMiner(BaseMiner):
     async def set_power_limit(self, wattage: int) -> bool:
         try:
             cfg = await self.get_config()
+            if cfg is None:
+                return False
             cfg.autotuning_wattage = wattage
             await self.send_config(cfg)
         except Exception as e:
@@ -790,7 +787,7 @@ class BOSMiner(BaseMiner):
                 )
             except APIError:
                 pass
-        if graphql_fans:
+        if graphql_fans.get("data"):
             fans = []
             for n in range(self.fan_count):
                 try:
@@ -1046,7 +1043,7 @@ class BOSMiner(BaseMiner):
             if data == "50":
                 self.light = True
             return self.light
-        except TypeError:
+        except (TypeError, AttributeError):
             return self.light
 
     async def get_nominal_hashrate(self, api_devs: dict = None) -> Optional[float]:

pyasic/miners/backends/btminer.py

@@ -442,7 +442,8 @@ class BTMiner(BaseMiner):
 
         if api_summary:
             try:
-                return api_summary["SUMMARY"][0]["Power"]
+                wattage = api_summary["SUMMARY"][0]["Power"]
+                return wattage if not wattage == -1 else None
             except (KeyError, IndexError):
                 pass
 

pyasic/miners/backends/cgminer_avalon.py

@@ -179,11 +179,12 @@ class CGMinerAvalon(CGMiner):
                 pass
 
     async def get_hostname(self, mac: str = None) -> Optional[str]:
-        if not mac:
-            mac = await self.get_mac()
-
-        if mac:
-            return f"Avalon{mac.replace(':', '')[-6:]}"
+        return None
+        # if not mac:
+        #     mac = await self.get_mac()
+        #
+        # if mac:
+        #     return f"Avalon{mac.replace(':', '')[-6:]}"
 
     async def get_hashrate(self, api_devs: dict = None) -> Optional[float]:
         if not api_devs:

pyasic/miners/base.py

@@ -413,21 +413,29 @@ class BaseMiner(ABC):
         """
         pass
 
-    async def _get_data(self, allow_warning: bool, data_to_get: list = None) -> dict:
-        if not data_to_get:
+    async def _get_data(
+        self, allow_warning: bool, include: list = None, exclude: list = None
+    ) -> dict:
+        if include is None:
             # everything
-            data_to_get = list(self.data_locations.keys())
+            include = list(self.data_locations.keys())
+
+        if exclude is not None:
+            for item in exclude:
+                if item in include:
+                    include.remove(item)
 
         api_multicommand = set()
-        web_multicommand = set()
-        for data_name in data_to_get:
+        web_multicommand = []
+        for data_name in include:
             try:
                 fn_args = self.data_locations[data_name]["kwargs"]
                 for arg_name in fn_args:
                     if fn_args[arg_name].get("api"):
                         api_multicommand.add(fn_args[arg_name]["api"])
                     if fn_args[arg_name].get("web"):
-                        web_multicommand.add(fn_args[arg_name]["web"])
+                        if not fn_args[arg_name]["web"] in web_multicommand:
+                            web_multicommand.append(fn_args[arg_name]["web"])
             except KeyError as e:
                 logger.error(e, data_name)
                 continue
@@ -445,8 +453,6 @@ class BaseMiner(ABC):
         else:
             web_command_task = asyncio.sleep(0)
 
-        from datetime import datetime
-
         web_command_data = await web_command_task
         if web_command_data is None:
             web_command_data = {}
@@ -457,7 +463,7 @@ class BaseMiner(ABC):
 
         miner_data = {}
 
-        for data_name in data_to_get:
+        for data_name in include:
             try:
                 fn_args = self.data_locations[data_name]["kwargs"]
                 args_to_send = {k: None for k in fn_args}
@@ -511,13 +517,14 @@ class BaseMiner(ABC):
         return miner_data
 
     async def get_data(
-        self, allow_warning: bool = False, data_to_get: list = None
+        self, allow_warning: bool = False, include: list = None, exclude: list = None
     ) -> MinerData:
         """Get data from the miner in the form of [`MinerData`][pyasic.data.MinerData].
 
         Parameters:
             allow_warning: Allow warning when an API command fails.
-            data_to_get: Names of data items you want to gather. Defaults to all data.
+            include: Names of data items you want to gather. Defaults to all data.
+            exclude: Names of data items to exclude.  Exclusion happens after considering included items.
 
         Returns:
             A [`MinerData`][pyasic.data.MinerData] instance containing data from the miner.
@@ -533,7 +540,9 @@ class BaseMiner(ABC):
             ],
         )
 
-        gathered_data = await self._get_data(allow_warning, data_to_get=data_to_get)
+        gathered_data = await self._get_data(
+            allow_warning, include=include, exclude=exclude
+        )
         for item in gathered_data:
             if gathered_data[item] is not None:
                 setattr(data, item, gathered_data[item])

pyasic/miners/miner_factory.py

@@ -20,7 +20,7 @@ import enum
 import ipaddress
 import json
 import re
-from typing import Callable, List, Optional, Tuple, Union
+from typing import AsyncGenerator, Callable, List, Optional, Tuple, Union
 
 import httpx
 
@@ -85,6 +85,8 @@ MINER_CLASSES = {
         "ANTMINER S19L": BMMinerS19L,
         "ANTMINER S19 PRO": BMMinerS19Pro,
         "ANTMINER S19J": BMMinerS19j,
+        "ANTMINER S19I": BMMinerS19i,
+        "ANTMINER S19+": BMMinerS19Plus,
         "ANTMINER S19J88NOPIC": BMMinerS19jNoPIC,
         "ANTMINER S19PRO+": BMMinerS19ProPlus,
         "ANTMINER S19J PRO": BMMinerS19jPro,
@@ -99,6 +101,8 @@ MINER_CLASSES = {
         "M20SV10": BTMinerM20SV10,
         "M20SV20": BTMinerM20SV20,
         "M20SV30": BTMinerM20SV30,
+        "M20PV10": BTMinerM20PV10,
+        "M20PV30": BTMinerM20PV30,
         "M20S+V30": BTMinerM20SPlusV30,
         "M21V10": BTMinerM21V10,
         "M21SV20": BTMinerM21SV20,
@@ -375,7 +379,9 @@ class MinerFactory:
     def clear_cached_miners(self):
         self.cache = {}
 
-    async def get_multiple_miners(self, ips: List[str], limit: int = 200):
+    async def get_multiple_miners(
+        self, ips: List[str], limit: int = 200
+    ) -> List[AnyMiner]:
         results = []
 
         async for miner in self.get_miner_generator(ips, limit):
@@ -383,7 +389,7 @@ class MinerFactory:
 
         return results
 
-    async def get_miner_generator(self, ips: list, limit: int = 200):
+    async def get_miner_generator(self, ips: list, limit: int = 200) -> AsyncGenerator:
         tasks = []
         semaphore = asyncio.Semaphore(limit)
 
@@ -391,13 +397,10 @@ class MinerFactory:
             tasks.append(asyncio.create_task(self.get_miner(ip)))
 
         for task in tasks:
-            await semaphore.acquire()
-            try:
+            async with semaphore:
                 result = await task
                 if result is not None:
                     yield result
-            finally:
-                semaphore.release()
 
     async def get_miner(self, ip: str):
         ip = str(ip)
@@ -486,7 +489,7 @@ class MinerFactory:
             "location", ""
         ):
             return MinerTypes.WHATSMINER
-        if "Braiins OS" in web_text or 'href="/cgi-bin/luci"' in web_text:
+        if "Braiins OS" in web_text:
             return MinerTypes.BRAIINS_OS
         if "cloud-box" in web_text:
             return MinerTypes.GOLDSHELL
@@ -751,7 +754,8 @@ class MinerFactory:
     async def get_miner_model_whatsminer(self, ip: str):
         sock_json_data = await self.send_api_command(ip, "devdetails")
         try:
-            miner_model = sock_json_data["DEVDETAILS"][0]["Model"]
+            miner_model = sock_json_data["DEVDETAILS"][0]["Model"].replace("_", "")
+            miner_model = miner_model[:-1] + "0"
 
             return miner_model
         except (TypeError, LookupError):
@@ -775,9 +779,9 @@ class MinerFactory:
                     f"http://{ip}/api/auth",
                     data={"username": "admin", "password": "admin"},
                 )
-                auth = (await auth_req.json())["jwt"]
+                auth = auth_req.json()["jwt"]
 
-                web_data = await (
+                web_data = (
                     await session.post(
                         f"http://{ip}/api/type",
                         headers={"Authorization": "Bearer " + auth},
@@ -806,7 +810,7 @@ class MinerFactory:
                     json={"query": "{bosminer {info{modelName}}}"},
                 )
             if d.status_code == 200:
-                json_data = await d.json()
+                json_data = d.json()
                 miner_model = json_data["data"]["bosminer"]["info"]["modelName"]
                 return miner_model
         except (httpx.HTTPError, LookupError):

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

@@ -44,6 +44,24 @@ class S19Pro(AntMiner):  # noqa - ignore ABC method implementation
         self.fan_count = 4
 
 
+class S19i(AntMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.ip = ip
+        self.model = "S19i"
+        self.nominal_chips = 80
+        self.fan_count = 4
+
+
+class S19Plus(AntMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.ip = ip
+        self.model = "S19+"
+        self.nominal_chips = 80
+        self.fan_count = 4
+
+
 class S19ProPlus(AntMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str, api_ver: str = "0.0.0"):
         super().__init__(ip, api_ver)

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

@@ -20,10 +20,12 @@ from .S19 import (
     S19XP,
     S19a,
     S19aPro,
+    S19i,
     S19j,
     S19jNoPIC,
     S19jPro,
     S19NoPIC,
+    S19Plus,
     S19Pro,
     S19ProPlus,
 )

pyasic/miners/types/whatsminer/M2X/M20P.py

@@ -0,0 +1,35 @@
+# ------------------------------------------------------------------------------
+#  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.makes import WhatsMiner
+
+
+class M20PV10(WhatsMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.ip = ip
+        self.model = "M20P V10"
+        self.nominal_chips = 156
+        self.fan_count = 2
+
+
+class M20PV30(WhatsMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.ip = ip
+        self.model = "M20P V30"
+        self.nominal_chips = 148
+        self.fan_count = 2

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

@@ -42,8 +42,5 @@ class M20SV30(WhatsMiner):  # noqa - ignore ABC method implementation
         super().__init__(ip, api_ver)
         self.ip = ip
         self.model = "M20S V30"
-        self.nominal_chips = 0
-        warnings.warn(
-            "Unknown chip count for miner type M20SV30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
-        )
+        self.nominal_chips = 140
         self.fan_count = 2

pyasic/miners/types/whatsminer/M2X/M29.py

@@ -24,8 +24,5 @@ class M29V10(WhatsMiner):  # noqa - ignore ABC method implementation
         super().__init__(ip, api_ver)
         self.ip = ip
         self.model = "M29 V10"
-        self.nominal_chips = 0
-        warnings.warn(
-            "Unknown chip count for miner type M29V10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
-        )
+        self.nominal_chips = 50
         self.fan_count = 2

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

@@ -15,6 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from .M20 import M20V10
+from .M20P import M20PV10, M20PV30
 from .M20S import M20SV10, M20SV20, M20SV30
 from .M20S_Plus import M20SPlusV30
 from .M21 import M21V10

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

@@ -165,10 +165,7 @@ class M30SPlusVE50(WhatsMiner):  # noqa - ignore ABC method implementation
         super().__init__(ip, api_ver)
         self.ip = ip
         self.model = "M30S+ VE50"
-        self.nominal_chips = 0
-        warnings.warn(
-            "Unknown chip count for miner type M30S+ VE50, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
-        )
+        self.nominal_chips = 164
         self.fan_count = 2
 
 

pyasic/miners/whatsminer/btminer/M2X/M20P.py

@@ -0,0 +1,26 @@
+# ------------------------------------------------------------------------------
+#  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.backends import M2X
+from pyasic.miners.types import M20PV10, M20PV30
+
+
+class BTMinerM20PV10(M2X, M20PV10):
+    pass
+
+
+class BTMinerM20PV30(M2X, M20PV30):
+    pass

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

@@ -15,6 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from .M20 import BTMinerM20V10
+from .M20P import BTMinerM20PV10, BTMinerM20PV30
 from .M20S import BTMinerM20SV10, BTMinerM20SV20, BTMinerM20SV30
 from .M20S_Plus import BTMinerM20SPlusV30
 from .M21 import BTMinerM21V10

pyasic/network/__init__.py

@@ -19,9 +19,9 @@ import ipaddress
 import logging
 from typing import AsyncIterator, List, Union
 
+from pyasic import settings
 from pyasic.miners.miner_factory import AnyMiner, miner_factory
 from pyasic.network.net_range import MinerNetworkRange
-from pyasic.settings import PyasicSettings
 
 
 class MinerNetwork:
@@ -108,7 +108,7 @@ class MinerNetwork:
         # clear cached miners
         miner_factory.clear_cached_miners()
 
-        limit = asyncio.Semaphore(PyasicSettings().network_scan_threads)
+        limit = asyncio.Semaphore(settings.get("network_scan_threads", 300))
         miners = await asyncio.gather(
             *[self.ping_and_get_miner(host, limit) for host in local_network.hosts()]
         )
@@ -136,7 +136,7 @@ class MinerNetwork:
         local_network = self.get_network()
 
         # create a list of scan tasks
-        limit = asyncio.Semaphore(PyasicSettings().network_scan_threads)
+        limit = asyncio.Semaphore(settings.get("network_scan_threads", 300))
         miners = asyncio.as_completed(
             [
                 loop.create_task(self.ping_and_get_miner(host, limit))
@@ -191,12 +191,12 @@ class MinerNetwork:
 async def ping_miner(
     ip: ipaddress.ip_address, port=4028
 ) -> Union[None, ipaddress.ip_address]:
-    for i in range(PyasicSettings().network_ping_retries):
+    for i in range(settings.get("network_ping_retries", 1)):
         try:
             connection_fut = asyncio.open_connection(str(ip), port)
             # get the read and write streams from the connection
             reader, writer = await asyncio.wait_for(
-                connection_fut, timeout=PyasicSettings().network_ping_timeout
+                connection_fut, timeout=settings.get("network_ping_timeout", 3)
             )
             # immediately close connection, we know connection happened
             writer.close()
@@ -220,12 +220,12 @@ async def ping_miner(
 async def ping_and_get_miner(
     ip: ipaddress.ip_address, port=4028
 ) -> Union[None, AnyMiner]:
-    for i in range(PyasicSettings().network_ping_retries):
+    for i in range(settings.get("network_ping_retries", 1)):
         try:
             connection_fut = asyncio.open_connection(str(ip), port)
             # get the read and write streams from the connection
             reader, writer = await asyncio.wait_for(
-                connection_fut, timeout=PyasicSettings().network_ping_timeout
+                connection_fut, timeout=settings.get("network_ping_timeout", 3)
             )
             # immediately close connection, we know connection happened
             writer.close()

pyasic/settings/__init__.py

@@ -14,27 +14,26 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from dataclasses import dataclass
+from typing import Any
 
-from pyasic.misc import Singleton
+_settings = {  # defaults
+    "network_ping_retries": 1,
+    "network_ping_timeout": 3,
+    "network_scan_threads": 300,
+    "factory_get_retries": 1,
+    "get_data_retries": 1,
+    "default_whatsminer_password": "admin",
+    "default_innosilicon_password": "admin",
+    "default_antminer_password": "root",
+    "default_bosminer_password": "root",
+    "default_vnish_password": "admin",
+    "default_goldshell_password": "123456789",
+}
 
 
-@dataclass
-class PyasicSettings(metaclass=Singleton):
-    network_ping_retries: int = 1
-    network_ping_timeout: int = 3
-    network_scan_threads: int = 300
+def get(key: str, other: Any = None) -> Any:
+    return _settings.get(key, other)
 
-    miner_factory_get_version_retries: int = 1
 
-    miner_get_data_retries: int = 1
-
-    global_whatsminer_password = "admin"
-    global_innosilicon_password = "admin"
-    global_antminer_password = "root"
-    global_bosminer_password = "root"
-    global_vnish_password = "admin"
-    global_goldshell_password = "123456789"
-
-    debug: bool = False
-    logfile: bool = False
+def update(key: str, val: Any) -> Any:
+    _settings[key] = val

pyasic/web/__init__.py

@@ -24,7 +24,7 @@ from pyasic.errors import APIWarning
 class BaseWebAPI(ABC):
     def __init__(self, ip: str) -> None:
         # ip address of the miner
-        self.ip = ip # ipaddress.ip_address(ip)
+        self.ip = ip  # ipaddress.ip_address(ip)
         self.username = "root"
         self.pwd = "root"
 

pyasic/web/antminer.py

@@ -19,14 +19,14 @@ from typing import Union
 
 import httpx
 
-from pyasic.settings import PyasicSettings
+from pyasic import settings
 from pyasic.web import BaseWebAPI
 
 
 class AntminerModernWebAPI(BaseWebAPI):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
-        self.pwd = PyasicSettings().global_antminer_password
+        self.pwd = settings.get("default_antminer_password", "root")
 
     async def send_command(
         self,
@@ -137,7 +137,7 @@ class AntminerModernWebAPI(BaseWebAPI):
 class AntminerOldWebAPI(BaseWebAPI):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
-        self.pwd = PyasicSettings().global_antminer_password
+        self.pwd = settings.get("default_antminer_password", "root")
 
     async def send_command(
         self,

pyasic/web/bosminer.py

@@ -18,15 +18,14 @@ from typing import Union
 
 import httpx
 
-from pyasic import APIError
-from pyasic.settings import PyasicSettings
+from pyasic import APIError, settings
 from pyasic.web import BaseWebAPI
 
 
 class BOSMinerWebAPI(BaseWebAPI):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
-        self.pwd = PyasicSettings().global_bosminer_password
+        self.pwd = settings.get("default_bosminer_password", "root")
 
     async def send_command(
         self,

pyasic/web/goldshell.py

@@ -19,7 +19,7 @@ from typing import Union
 
 import httpx
 
-from pyasic.settings import PyasicSettings
+from pyasic import settings
 from pyasic.web import BaseWebAPI
 
 
@@ -27,7 +27,7 @@ class GoldshellWebAPI(BaseWebAPI):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
         self.username = "admin"
-        self.pwd = PyasicSettings().global_goldshell_password
+        self.pwd = settings.get("default_goldshell_password", "123456789")
         self.jwt = None
 
     async def auth(self):
@@ -72,7 +72,7 @@ class GoldshellWebAPI(BaseWebAPI):
         if not self.jwt:
             await self.auth()
         async with httpx.AsyncClient() as client:
-            for i in range(PyasicSettings().miner_get_data_retries):
+            for i in range(settings.get("get_data_retries", 1)):
                 try:
                     if parameters:
                         response = await client.put(

pyasic/web/inno.py

@@ -19,8 +19,8 @@ from typing import Union
 
 import httpx
 
+from pyasic import settings
 from pyasic.errors import APIError
-from pyasic.settings import PyasicSettings
 from pyasic.web import BaseWebAPI
 
 
@@ -28,7 +28,7 @@ class InnosiliconWebAPI(BaseWebAPI):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
         self.username = "admin"
-        self.pwd = PyasicSettings().global_innosilicon_password
+        self.pwd = settings.get("default_innosilicon_password", "admin")
         self.jwt = None
 
     async def auth(self):
@@ -55,7 +55,7 @@ class InnosiliconWebAPI(BaseWebAPI):
         if not self.jwt:
             await self.auth()
         async with httpx.AsyncClient() as client:
-            for i in range(PyasicSettings().miner_get_data_retries):
+            for i in range(settings.get("get_data_retries", 1)):
                 try:
                     response = await client.post(
                         f"http://{self.ip}/api/{command}",

pyasic/web/vnish.py

@@ -19,7 +19,7 @@ from typing import Union
 
 import httpx
 
-from pyasic.settings import PyasicSettings
+from pyasic import settings
 from pyasic.web import BaseWebAPI
 
 
@@ -27,7 +27,7 @@ class VNishWebAPI(BaseWebAPI):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
         self.username = "admin"
-        self.pwd = PyasicSettings().global_vnish_password
+        self.pwd = settings.get("default_vnish_password", "admin")
         self.token = None
 
     async def auth(self):
@@ -59,7 +59,7 @@ class VNishWebAPI(BaseWebAPI):
         if not self.token:
             await self.auth()
         async with httpx.AsyncClient() as client:
-            for i in range(PyasicSettings().miner_get_data_retries):
+            for i in range(settings.get("get_data_retries", 1)):
                 try:
                     auth = self.token
                     if command.startswith("system"):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.37.5"
+version = "0.39.4"
 description = "A set of modules for interfacing with many common types of ASIC bitcoin miners, using both their API and SSH."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"