version: bump version number

.pre-commit-config.yaml

@@ -1,3 +1,6 @@
+ci:
+  skip:
+    - unittest
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
@@ -24,4 +27,3 @@ repos:
         'types': [python]
         args: ["-p '*test.py'"] # Probably this option is absolutely not needed.
         pass_filenames: false
-        stages: [commit]

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
 
 [[package]]
 name = "aiofiles"
@@ -62,21 +62,25 @@ name = "betterproto"
 version = "2.0.0b7"
 description = "A better Protobuf / gRPC generator & library"
 optional = false
-python-versions = "<4.0,>=3.7"
-files = [
-    {file = "betterproto-2.0.0b7-py3-none-any.whl", hash = "sha256:401ab8055e2f814e77b9c88a74d0e1ae3d1e8a969cced6aeb1b59f71ad63fbd2"},
-    {file = "betterproto-2.0.0b7.tar.gz", hash = "sha256:1b1458ca5278d519bcd62556a4c236f998a91d503f0f71c67b0b954747052af2"},
-]
+python-versions = "^3.7"
+files = []
+develop = false
 
 [package.dependencies]
-grpclib = ">=0.4.1,<0.5.0"
-python-dateutil = ">=2.8,<3.0"
-typing-extensions = ">=4.7.1,<5.0.0"
+grpclib = "^0.4.1"
+python-dateutil = "^2.8"
+typing-extensions = "^4.7.1"
 
 [package.extras]
 compiler = ["black (>=23.1.0)", "isort (>=5.11.5,<6.0.0)", "jinja2 (>=3.0.3)"]
 rust-codec = ["betterproto-rust-codec (==0.1.1)"]
 
+[package.source]
+type = "git"
+url = "https://github.com/danielgtaylor/python-betterproto"
+reference = "v.2.0.0b7"
+resolved_reference = "1538e156a1eadb88799eca009a238093d6bb40df"
+
 [[package]]
 name = "certifi"
 version = "2024.8.30"
@@ -1183,4 +1187,4 @@ type = ["pytest-mypy"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.9"
-content-hash = "d611b5e8b0c5611d6ee916cedfb7f07f20dfc90a675ebaed04188e8b3c96aabe"
+content-hash = "503e85a8a0f1720b55634c5706cc6c2f4fbe8d14eb9b585ffce7e1e81811a70d"

pyasic/config/__init__.py

@@ -250,3 +250,9 @@ class MinerConfig:
             pools=PoolConfig.from_bitaxe(web_system_info),
             fan_mode=FanModeConfig.from_bitaxe(web_system_info),
         )
+
+    @classmethod
+    def from_iceriver(cls, web_userpanel: dict) -> "MinerConfig":
+        return cls(
+            pools=PoolConfig.from_iceriver(web_userpanel),
+        )

pyasic/config/pools.py

@@ -222,6 +222,14 @@ class Pool(MinerConfigValue):
             password=web_system_info.get("stratumPassword", ""),
         )
 
+    @classmethod
+    def from_iceriver(cls, web_pool: dict) -> "Pool":
+        return cls(
+            url=web_pool["addr"],
+            user=web_pool["user"],
+            password=web_pool["pass"],
+        )
+
 
 @dataclass
 class PoolGroup(MinerConfigValue):
@@ -402,6 +410,15 @@ class PoolGroup(MinerConfigValue):
     def from_bitaxe(cls, web_system_info: dict) -> "PoolGroup":
         return cls(pools=[Pool.from_bitaxe(web_system_info)])
 
+    @classmethod
+    def from_iceriver(cls, web_userpanel: dict) -> "PoolGroup":
+        return cls(
+            pools=[
+                Pool.from_iceriver(web_pool)
+                for web_pool in web_userpanel["data"]["pools"]
+            ]
+        )
+
 
 @dataclass
 class PoolConfig(MinerConfigValue):
@@ -568,3 +585,7 @@ class PoolConfig(MinerConfigValue):
     @classmethod
     def from_bitaxe(cls, web_system_info: dict) -> "PoolConfig":
         return cls(groups=[PoolGroup.from_bitaxe(web_system_info)])
+
+    @classmethod
+    def from_iceriver(cls, web_userpanel: dict) -> "PoolConfig":
+        return cls(groups=[PoolGroup.from_iceriver(web_userpanel)])

pyasic/data/pools.py

@@ -89,6 +89,8 @@ class PoolMetrics:
     @staticmethod
     def _calculate_percentage(value: int, total: int) -> float:
         """Calculate the percentage."""
+        if value is None or total is None:
+            return 0
         if total == 0:
             return 0
         return (value / total) * 100

pyasic/miners/backends/antminer.py

@@ -597,49 +597,44 @@ class AntminerOld(CGMiner):
                 pass
 
         if rpc_stats is not None:
-            try:
-                board_offset = -1
-                boards = rpc_stats["STATS"]
-                if len(boards) > 1:
-                    for board_num in range(1, 16, 5):
-                        for _b_num in range(5):
-                            b = boards[1].get(f"chain_acn{board_num + _b_num}")
+            board_offset = -1
+            boards = rpc_stats["STATS"]
+            if len(boards) > 1:
+                for board_num in range(1, 16, 5):
+                    for _b_num in range(5):
+                        b = boards[1].get(f"chain_acn{board_num + _b_num}")
 
-                            if b and not b == 0 and board_offset == -1:
-                                board_offset = board_num
-                    if board_offset == -1:
-                        board_offset = 1
+                        if b and not b == 0 and board_offset == -1:
+                            board_offset = board_num
+                if board_offset == -1:
+                    board_offset = 1
 
-                    for i in range(
-                        board_offset, board_offset + self.expected_hashboards
-                    ):
-                        hashboard = HashBoard(
-                            slot=i - board_offset, expected_chips=self.expected_chips
-                        )
+                for i in range(board_offset, board_offset + self.expected_hashboards):
+                    hashboard = HashBoard(
+                        slot=i - board_offset, expected_chips=self.expected_chips
+                    )
 
-                        chip_temp = boards[1].get(f"temp{i}")
-                        if chip_temp:
-                            hashboard.chip_temp = round(chip_temp)
+                    chip_temp = boards[1].get(f"temp{i}")
+                    if chip_temp:
+                        hashboard.chip_temp = round(chip_temp)
 
-                        temp = boards[1].get(f"temp2_{i}")
-                        if temp:
-                            hashboard.temp = round(temp)
+                    temp = boards[1].get(f"temp2_{i}")
+                    if temp:
+                        hashboard.temp = round(temp)
 
-                        hashrate = boards[1].get(f"chain_rate{i}")
-                        if hashrate:
-                            hashboard.hashrate = AlgoHashRate.SHA256(
-                                hashrate, HashUnit.SHA256.GH
-                            ).into(self.algo.unit.default)
+                    hashrate = boards[1].get(f"chain_rate{i}")
+                    if hashrate:
+                        hashboard.hashrate = AlgoHashRate.SHA256(
+                            float(hashrate), HashUnit.SHA256.GH
+                        ).into(self.algo.unit.default)
 
-                        chips = boards[1].get(f"chain_acn{i}")
-                        if chips:
-                            hashboard.chips = chips
-                            hashboard.missing = False
-                        if (not chips) or (not chips > 0):
-                            hashboard.missing = True
-                        hashboards.append(hashboard)
-            except (LookupError, ValueError, TypeError):
-                pass
+                    chips = boards[1].get(f"chain_acn{i}")
+                    if chips:
+                        hashboard.chips = chips
+                        hashboard.missing = False
+                    if (not chips) or (not chips > 0):
+                        hashboard.missing = True
+                    hashboards.append(hashboard)
 
         return hashboards
 

pyasic/miners/backends/iceriver.py

@@ -1,6 +1,8 @@
 from typing import List, Optional
 
+from pyasic import MinerConfig
 from pyasic.data import AlgoHashRate, Fan, HashBoard, HashUnit
+from pyasic.data.pools import PoolMetrics, PoolUrl
 from pyasic.device import MinerAlgo
 from pyasic.errors import APIError
 from pyasic.miners.data import DataFunction, DataLocations, DataOptions, WebAPICommand
@@ -41,6 +43,10 @@ ICERIVER_DATA_LOC = DataLocations(
             "_get_uptime",
             [WebAPICommand("web_userpanel", "userpanel")],
         ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools",
+            [WebAPICommand("web_userpanel", "userpanel")],
+        ),
     }
 )
 
@@ -67,6 +73,11 @@ class IceRiver(StockFirmware):
             return False
         return True
 
+    async def get_config(self) -> MinerConfig:
+        web_userpanel = await self.web.userpanel()
+
+        return MinerConfig.from_iceriver(web_userpanel)
+
     async def _get_fans(self, web_userpanel: dict = None) -> List[Fan]:
         if web_userpanel is None:
             try:
@@ -202,3 +213,36 @@ class IceRiver(StockFirmware):
                 )
             except (LookupError, ValueError, TypeError):
                 pass
+
+    async def _get_pools(self, web_userpanel: dict = None) -> List[PoolMetrics]:
+        if web_userpanel is None:
+            try:
+                web_userpanel = await self.web.userpanel()
+            except APIError:
+                pass
+
+        pools_data = []
+        if web_userpanel is not None:
+            try:
+                pools = web_userpanel["userpanel"]["data"]["pools"]
+                for pool_info in pools:
+                    pool_num = pool_info.get("no")
+                    if pool_num is not None:
+                        pool_num = int(pool_num)
+                    if pool_info["addr"] == "":
+                        continue
+                    url = pool_info.get("addr")
+                    pool_url = PoolUrl.from_str(url) if url else None
+                    pool_data = PoolMetrics(
+                        accepted=pool_info.get("accepted"),
+                        rejected=pool_info.get("rejected"),
+                        active=pool_info.get("connect"),
+                        alive=int(pool_info.get("state", 0)) == 1,
+                        url=pool_url,
+                        user=pool_info.get("user"),
+                        index=pool_num,
+                    )
+                    pools_data.append(pool_data)
+            except LookupError:
+                pass
+        return pools_data

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.61.9"
+version = "0.61.15"
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"
@@ -15,8 +15,8 @@ passlib = ">=1.7.4"
 pyaml = ">=23.12.0"
 tomli = { version = ">=2.0.1", python = "<3.11" }
 tomli-w = "^1.0.0"
-betterproto = "2.0.0b7"
 aiofiles = ">=23.2.1"
+betterproto = "2.0.0b7"
 
 [tool.poetry.group.dev]
 optional = true