pyasic-umhost 0.2.3.dev15__tar.gz → 0.2.3.dev16__tar.gz

{pyasic_umhost-0.2.3.dev15 → pyasic_umhost-0.2.3.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyasic-umhost
-Version: 0.2.3.dev15
+Version: 0.2.3.dev16
 Summary: A simplified and standardized interface for Bitcoin ASICs.
 License: Apache 2.0
 License-File: LICENSE.txt

{pyasic_umhost-0.2.3.dev15 → pyasic_umhost-0.2.3.dev16}/pyasic/miners/backends/btminer.py

@@ -21,6 +21,7 @@ import semver
 from playwright.async_api import async_playwright
 
 from pyasic import settings
+from pyasic.rpc.cgminer import CGMinerRPCAPI
 from pyasic.config import MinerConfig, MiningModeConfig, PoolConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, WhatsminerError
@@ -886,7 +887,7 @@ BTMINERV3_DATA_LOC = DataLocations(
         ),
         str(DataOptions.WATTAGE_LIMIT): DataFunction(
             "_get_wattage_limit",
-            [RPCAPICommand("rpc_get_miner_status_summary", "get.miner.status:summary")],
+            [RPCAPICommand("rpc_get_device_info", "get.device.info")],
         ),
         str(DataOptions.FANS): DataFunction(
             "_get_fans",
@@ -911,7 +912,7 @@ BTMINERV3_DATA_LOC = DataLocations(
         ),
         str(DataOptions.POOLS): DataFunction(
             "_get_pools",
-            [RPCAPICommand("rpc_get_miner_status_summary", "get.miner.status:summary")],
+            [RPCAPICommand("get_miner_status_pools", "get.miner.status:pools")],
         ),
         str(DataOptions.SERIAL_NUMBER): DataFunction(
             "_get_serial_number",
@@ -1135,22 +1136,18 @@ class BTMinerV3(StockFirmware):
         return None
 
     async def _get_wattage_limit(
-        self, rpc_get_miner_status_summary: dict | None = None
+        self, rpc_get_device_info: dict | None = None
     ) -> int | None:
-        if rpc_get_miner_status_summary is None:
+        if rpc_get_device_info is None:
             try:
-                rpc_get_miner_status_summary = await self.rpc.get_miner_status_summary()
+                rpc_get_device_info = await self.rpc.get_device_info()
             except APIError:
                 return None
-        if rpc_get_miner_status_summary is None:
+        if rpc_get_device_info is None:
             return None
-        val = (
-            rpc_get_miner_status_summary.get("msg", {})
-            .get("summary", {})
-            .get("power-limit")
-        )
+        val = rpc_get_device_info.get("msg", {}).get("miner", {}).get("power-limit-set")
         try:
-            return val
+            return int(float(val))
         except (ValueError, TypeError):
             return None
 
@@ -1284,28 +1281,30 @@ class BTMinerV3(StockFirmware):
         return boards
 
     async def _get_pools(
-            self, rpc_get_miner_status_summary: dict | None = None
-    ) -> list[PoolMetrics]:
-        if rpc_get_miner_status_summary is None:
-            try:
-                rpc_get_miner_status_summary = await self.rpc.get_miner_status_summary()
-            except APIError:
-                return []
-        pools = []
-        if rpc_get_miner_status_summary is None:
+        self, get_miner_status_pools: dict | None = None) -> list[PoolMetrics]:
+        return await self.get_pools()
+
+    async def get_pools(self) -> list[PoolMetrics]:
+        search_pools = await CGMinerRPCAPI(ip=self.ip).pools()
+        if not search_pools:
             return []
-        msg_pools = rpc_get_miner_status_summary.get("msg", {}).get("pools", [])
-        for idx, pool in enumerate(msg_pools):
-            pools.append(
-                PoolMetrics(
-                    index=idx,
-                    user=pool.get("account"),
-                    alive=pool.get("status") == "alive",
-                    active=pool.get("stratum-active"),
-                    url=pool.get("url"),
-                )
+        resurt = []
+        for index, data in enumerate(search_pools.get("POOLS", [])):
+            url = data.get("URL")
+            pool_url = PoolUrl.from_str(url) if url else None
+            pool = PoolMetrics(
+                accepted=data.get("Accepted"),
+                rejected=data.get("Rejected"),
+                get_failures=data.get("Get Failures"),
+                remote_failures=data.get("Remote Failures"),
+                active=data.get("Stratum Active"),
+                alive=data.get("Status") == "Alive",
+                url=pool_url,
+                user=data.get("User"),
+                index=data.get("POOL"),
             )
-        return pools
+            resurt.append(pool)
+        return resurt
 
 
     async def _get_uptime(

{pyasic_umhost-0.2.3.dev15 → pyasic_umhost-0.2.3.dev16}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyasic-umhost"
-version = "0.2.3.dev15"
+version = "0.2.3.dev16"
 
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = [{name = "UpstreamData", email = "brett@upstreamdata.ca"}]