pyasic-umhost 0.2.3.dev0__tar.gz → 0.2.3.dev2__tar.gz

{pyasic_umhost-0.2.3.dev0 → pyasic_umhost-0.2.3.dev2}/PKG-INFO

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

{pyasic_umhost-0.2.3.dev0 → pyasic_umhost-0.2.3.dev2}/pyasic/miners/backends/btminer.py

@@ -18,7 +18,8 @@ import logging
 
 import aiofiles
 import semver
-
+from cryptography.hazmat.primitives.keywrap import aes_key_wrap
+from pyasic.rpc.cgminer import CGMinerRPCAPI
 from pyasic.config import MinerConfig, MiningModeConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, WhatsminerError
@@ -882,7 +883,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.UPTIME): DataFunction(
             "_get_uptime",
@@ -1169,6 +1170,7 @@ class BTMinerV3(StockFirmware):
                         unit=self.algo.unit.TH,  # type: ignore[attr-defined]
                     ),
                     temp=board_data.get("chip-temp-min"),
+                    chip_temp=board_data.get("chip-temp-avg"),
                     inlet_temp=board_data.get("chip-temp-min"),
                     outlet_temp=board_data.get("chip-temp-max"),
                     serial_number=rpc_get_device_info.get("msg", {})
@@ -1184,28 +1186,31 @@ 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(
         self, rpc_get_miner_status_summary: dict | None = None
@@ -1281,7 +1286,7 @@ class BTMinerV3(StockFirmware):
             -0.001 * self.expected_hashboards
         ):
             return None
-        return res
+        return res * 10**12
 
     async def _get_env_temp(
         self, rpc_get_miner_status_summary: dict | None = None

{pyasic_umhost-0.2.3.dev0 → pyasic_umhost-0.2.3.dev2}/pyasic/miners/base.py

@@ -18,6 +18,7 @@ import ipaddress
 import warnings
 from typing import Any, Protocol, TypeVar
 
+from pyasic.rpc.cgminer import CGMinerRPCAPI
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard, MinerData
 from pyasic.data.device import DeviceInfo

{pyasic_umhost-0.2.3.dev0 → pyasic_umhost-0.2.3.dev2}/pyasic/miners/device/models/whatsminer/M6X/M61.py

@@ -1,3 +1,4 @@
+from pyasic.data import PoolMetrics
 from pyasic.device.algorithm import MinerAlgo
 from pyasic.device.models import MinerModel
 from pyasic.miners.device.makes import WhatsMinerMake

{pyasic_umhost-0.2.3.dev0 → pyasic_umhost-0.2.3.dev2}/pyasic/test.py

@@ -5,8 +5,15 @@ import json
 from pyasic import get_miner, settings
 
 
+def print_inheritance(cls, indent=0):
+    """Рекурсивно печатает дерево наследования"""
+    print('  ' * indent + cls.__name__)
+    for base in cls.__bases__:
+        print_inheritance(base, indent + 1)
+
+
 async def main():
-    ip = "10.86.120.136"
+    ip = "10.81.120.93"
     try:
 
         miner = await get_miner(ip=ip)

{pyasic_umhost-0.2.3.dev0 → pyasic_umhost-0.2.3.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyasic-umhost"
-version = "0.2.3dev"
+version = "0.2.3dev2"
 
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = [{name = "UpstreamData", email = "brett@upstreamdata.ca"}]
@@ -124,7 +124,7 @@ line-ending = "auto"
 
 [tool.poetry]
 name = "pyasic-umhost"
-version = "0.2.3dev"
+version = "0.2.3dev2"
 description = "Fork pyasic"
 
 packages = [