pyasic-umhost 0.2.3.dev16__tar.gz → 0.2.4.dev1__tar.gz

{pyasic_umhost-0.2.3.dev16 → pyasic_umhost-0.2.4.dev1}/PKG-INFO

@@ -1,9 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: pyasic-umhost
-Version: 0.2.3.dev16
-Summary: A simplified and standardized interface for Bitcoin ASICs.
+Version: 0.2.4.dev1
+Summary: Fork of pyasic — a simplified and standardized interface for Bitcoin ASICs.
 License: Apache 2.0
-License-File: LICENSE.txt
 Keywords: python,asic,bitcoin,whatsminer,antminer,braiins-os,vnish,luxos
 Author: UpstreamData
 Author-email: brett@upstreamdata.ca

{pyasic_umhost-0.2.3.dev16 → pyasic_umhost-0.2.4.dev1}/pyasic/miners/backends/antminer.py

@@ -17,7 +17,7 @@
 import logging
 from pathlib import Path
 
-from pyasic.config import MinerConfig, MiningModeConfig, PoolConfig
+from pyasic.config import MinerConfig, MiningModeConfig, MiningModeSleep, PoolConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import X19Error
 from pyasic.data.pools import PoolMetrics, PoolUrl
@@ -227,13 +227,20 @@ class AntminerModern(BMMiner):
         return False
 
     async def stop_mining(self) -> bool:
+        # send_config -> set_miner_conf.cgi на стоковой прошивке Antminer
+        # применяется через системный reboot. Не пушим конфиг, если режим
+        # уже sleep — иначе получим лишнюю перезагрузку устройства.
         cfg = await self.get_config()
+        if isinstance(cfg.mining_mode, MiningModeSleep):
+            return True
         cfg.mining_mode = MiningModeConfig.sleep()
         await self.send_config(cfg)
         return True
 
     async def resume_mining(self) -> bool:
         cfg = await self.get_config()
+        if not isinstance(cfg.mining_mode, MiningModeSleep):
+            return True
         cfg.mining_mode = MiningModeConfig.normal()
         await self.send_config(cfg)
         return True

{pyasic_umhost-0.2.3.dev16 → pyasic_umhost-0.2.4.dev1}/pyasic/miners/backends/avalonminer.py

@@ -17,7 +17,7 @@ import copy
 import re
 import time
 
-import requests
+import httpx
 
 from pyasic.config import PoolConfig
 from pyasic.data import Fan, HashBoard
@@ -159,6 +159,11 @@ class AvalonMiner(CGMiner):
         return False
 
     async def resume_mining(self) -> bool:
+        # ascset(0, "reboot", 1) перезагружает MM-контроллер Avalon
+        # (BOOTBY = AM_BOOTBY_API). Шлём только если устройство реально
+        # в SoftOFF — иначе это бессмысленный ребут уже мающего майнера.
+        if not await self._is_sleep():
+            return True
         try:
             data = await self.rpc.ascset(0, f"reboot", 1)
         except APIError:
@@ -559,19 +564,14 @@ class AvalonMiner(CGMiner):
             return None
 
     async def set_pools(self, pools: PoolConfig) -> bool:
-        """Настройка пулов на Avalon 1346 через cgconf.cgi (синхронная версия)"""
+        """Настройка пулов на Avalon через cgconf.cgi."""
         try:
-            # Получаем список пулов
             all_pools = []
             for group in pools.groups:
                 all_pools.extend(group.pools)
-
-            # Берем первые 3 пула
             active_pools = all_pools[:3]
 
-            # Формируем данные
-            form_data = {}
-
+            form_data: dict[str, str] = {}
             for i in range(3):
                 idx = i + 1
                 if i < len(active_pools):
@@ -587,24 +587,19 @@ class AvalonMiner(CGMiner):
             form_data["mode"] = "1"
             form_data["power_level"] = "0"
 
-            # Отправляем POST запрос
             url = f"http://{self.ip}/cgconf.cgi"
-
             headers = {
                 "Content-Type": "application/x-www-form-urlencoded",
                 "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
                 "Origin": f"http://{self.ip}",
-                "Referer": f"http://{self.ip}/"
+                "Referer": f"http://{self.ip}/",
             }
 
             try:
-                response = requests.post(url, data=form_data, headers=headers, timeout=10)
-
-                if response.status_code == 200:
-                    return True
-                else:
-                    return False
-            except Exception:
+                async with httpx.AsyncClient(timeout=10) as client:
+                    response = await client.post(url, data=form_data, headers=headers)
+                return response.status_code == 200
+            except httpx.HTTPError:
                 return False
 
         except Exception:

{pyasic_umhost-0.2.3.dev16 → pyasic_umhost-0.2.4.dev1}/pyproject.toml

@@ -1,8 +1,7 @@
 [project]
 name = "pyasic-umhost"
-version = "0.2.3.dev16"
-
-description = "A simplified and standardized interface for Bitcoin ASICs."
+version = "0.2.4.dev1"
+description = "Fork of pyasic — a simplified and standardized interface for Bitcoin ASICs."
 authors = [{name = "UpstreamData", email = "brett@upstreamdata.ca"}]
 repository = "https://github.com/UpstreamData/pyasic"
 
@@ -124,10 +123,6 @@ line-ending = "auto"
 
 
 [tool.poetry]
-name = "pyasic-umhost"
-version = "0.2.3.dev12"
-description = "Fork pyasic"
-
 packages = [
   { include = "pyasic" }
 ]