version: bump version number.

pyasic/API/btminer.py

@@ -27,10 +27,10 @@ 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
@@ -192,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

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
@@ -32,7 +33,6 @@ 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__ = [
     "BMMinerAPI",
@@ -53,5 +53,5 @@ __all__ = [
     "MinerFactory",
     "MinerListener",
     "MinerNetwork",
-    "PyasicSettings",
+    "settings",
 ]

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/backends/bosminer.py

@@ -1043,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/miner_factory.py

@@ -101,6 +101,8 @@ MINER_CLASSES = {
         "M20SV10": BTMinerM20SV10,
         "M20SV20": BTMinerM20SV20,
         "M20SV30": BTMinerM20SV30,
+        "M20PV10": BTMinerM20PV10,
+        "M20PV30": BTMinerM20PV30,
         "M20S+V30": BTMinerM20SPlusV30,
         "M21V10": BTMinerM21V10,
         "M21SV20": BTMinerM21SV20,

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/__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/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/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.38.9"
+version = "0.39.1"
 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"