version: bump version number.

pyasic/miners/backends/vnish.py

@@ -74,6 +74,24 @@ class VNish(BMMiner):
                 pass
         return False
 
+    async def stop_mining(self) -> bool:
+        data = await self.web.stop_mining()
+        if data:
+            try:
+                return data["success"]
+            except KeyError:
+                pass
+        return False
+
+    async def resume_mining(self) -> bool:
+        data = await self.web.resume_mining()
+        if data:
+            try:
+                return data["success"]
+            except KeyError:
+                pass
+        return False
+
     async def reboot(self) -> bool:
         data = await self.web.reboot()
         if data:

pyasic/miners/base.py

@@ -419,7 +419,7 @@ class BaseMiner(ABC):
             data_to_get = list(self.data_locations.keys())
 
         api_multicommand = set()
-        web_multicommand = set()
+        web_multicommand = []
         for data_name in data_to_get:
             try:
                 fn_args = self.data_locations[data_name]["kwargs"]
@@ -427,7 +427,8 @@ class BaseMiner(ABC):
                     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 +446,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 = {}

pyasic/miners/miner_factory.py

@@ -486,7 +486,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
@@ -775,15 +775,13 @@ 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(
-                    await session.post(
                         f"http://{ip}/api/type",
                         headers={"Authorization": "Bearer " + auth},
                         data={},
-                    )
+                    )).json()
-                ).json()
                 return web_data["type"]
         except (httpx.HTTPError, LookupError):
             pass
@@ -806,7 +804,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/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
+        self.nominal_chips = 50
-        warnings.warn(
-            "Unknown chip count for miner type M29V10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
-        )
         self.fan_count = 2

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 = ipaddress.ip_address(ip)
+        self.ip = ip # ipaddress.ip_address(ip)
         self.username = "root"
         self.pwd = "root"
 

pyasic/web/vnish.py

@@ -116,8 +116,32 @@ class VNishWebAPI(BaseWebAPI):
     async def reboot(self) -> dict:
         return await self.send_command("system/reboot", post=True)
 
+    async def pause_mining(self) -> dict:
+        return await self.send_command("mining/pause", post=True)
+
+    async def resume_mining(self) -> dict:
+        return await self.send_command("mining/resume", post=True)
+
+    async def stop_mining(self) -> dict:
+        return await self.send_command("mining/stop", post=True)
+
+    async def start_mining(self) -> dict:
+        return await self.send_command("mining/start", post=True)
+
     async def info(self):
         return await self.send_command("info")
 
     async def summary(self):
         return await self.send_command("summary")
+
+    async def chips(self):
+        return await self.send_command("chips")
+
+    async def layout(self):
+        return await self.send_command("layout")
+
+    async def status(self):
+        return await self.send_command("status")
+
+    async def settings(self):
+        return await self.send_command("settings")

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.37.4"
+version = "0.37.8"
 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"