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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyasic-umhost
-Version: 0.2.3.dev13
+Version: 0.2.3.dev15
 Summary: A simplified and standardized interface for Bitcoin ASICs.
 License: Apache 2.0
 License-File: LICENSE.txt
@@ -24,6 +24,7 @@ Requires-Dist: betterproto (==2.0.0b7)
 Requires-Dist: cryptography (>=39.0)
 Requires-Dist: httpx (>=0.26.0)
 Requires-Dist: passlib (>=1.7.4)
+Requires-Dist: playwright (>=1.40)
 Requires-Dist: pyaml (>=23.12.0)
 Requires-Dist: pydantic (>=2.11.0)
 Requires-Dist: semver (>=3.0.4,<4.0.0)

{pyasic_umhost-0.2.3.dev13 → pyasic_umhost-0.2.3.dev15}/pyasic/miners/backends/antminer.py

@@ -17,7 +17,7 @@
 import logging
 from pathlib import Path
 
-from pyasic.config import MinerConfig, MiningModeConfig
+from pyasic.config import MinerConfig, MiningModeConfig, PoolConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import X19Error
 from pyasic.data.pools import PoolMetrics, PoolUrl
@@ -532,7 +532,12 @@ class AntminerModern(BMMiner):
             except LookupError:
                 pass
         return pools_data
-		
+
+    async def set_pools(self, pools: PoolConfig):
+        cfg = await self.get_config()
+        cfg.pools = pools
+        await self.send_config(cfg)
+        return True
 		
     async def _is_sleep(self, web_get_conf: dict = None) -> bool | None:
         if web_get_conf is None:

{pyasic_umhost-0.2.3.dev13 → pyasic_umhost-0.2.3.dev15}/pyasic/miners/backends/avalonminer.py

@@ -17,6 +17,9 @@ import copy
 import re
 import time
 
+import requests
+
+from pyasic.config import PoolConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.device.algorithm import AlgoHashRateType
 from pyasic.errors import APIError
@@ -547,3 +550,62 @@ class AvalonMiner(CGMiner):
 
         except (IndexError, KeyError, ValueError, TypeError, AttributeError):
             return False
+
+    async def _get_kernel_log(self) -> str | None:
+        """Возвращает строку логов устройства"""
+        try:
+            return f"{await self.rpc.summary()}\n{await self.rpc.estats()}"
+        except (IndexError, KeyError, ValueError, TypeError):
+            return None
+
+    async def set_pools(self, pools: PoolConfig) -> bool:
+        """Настройка пулов на Avalon 1346 через cgconf.cgi (синхронная версия)"""
+        try:
+            # Получаем список пулов
+            all_pools = []
+            for group in pools.groups:
+                all_pools.extend(group.pools)
+
+            # Берем первые 3 пула
+            active_pools = all_pools[:3]
+
+            # Формируем данные
+            form_data = {}
+
+            for i in range(3):
+                idx = i + 1
+                if i < len(active_pools):
+                    pool = active_pools[i]
+                    form_data[f"pool{idx}"] = pool.url
+                    form_data[f"worker{idx}"] = pool.user
+                    form_data[f"passwd{idx}"] = pool.password
+                else:
+                    form_data[f"pool{idx}"] = ""
+                    form_data[f"worker{idx}"] = ""
+                    form_data[f"passwd{idx}"] = ""
+
+            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}/"
+            }
+
+            try:
+                response = requests.post(url, data=form_data, headers=headers, timeout=10)
+
+                if response.status_code == 200:
+                    return True
+                else:
+                    return False
+            except Exception:
+                return False
+
+        except Exception:
+            return False

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

@@ -18,8 +18,10 @@ import logging
 
 import aiofiles
 import semver
+from playwright.async_api import async_playwright
+
 from pyasic import settings
-from pyasic.config import MinerConfig, MiningModeConfig
+from pyasic.config import MinerConfig, MiningModeConfig, PoolConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, WhatsminerError
 from pyasic.data.pools import PoolMetrics, PoolUrl
@@ -1417,4 +1419,99 @@ class BTMinerV3(StockFirmware):
                 writer.close()
                 await writer.wait_closed()
         except Exception:
-            return None
+            return None
+
+    async def set_pools(self, pools: PoolConfig) -> bool:
+        base_url = f"https://{self.ip}"
+        pools_list = []
+        for group in pools.groups:
+            for pool in group.pools:
+                pools_list.append({"url": pool.url, "user": pool.user, "password": pool.password})
+        pools_list = pools_list[:3]
+        if not pools_list:
+            # print("Нет пулов для установки")
+            return False
+
+        async with async_playwright() as p:
+            browser = await p.chromium.launch(headless=True)
+            context = await browser.new_context(ignore_https_errors=True)
+            page = await context.new_page()
+
+            try:
+                # 1. Вход
+                await page.goto(f"{base_url}/cgi-bin/luci")
+                await page.fill('input[name="luci_username"]', "admin")
+                await page.fill('input[name="luci_password"]', "admin")
+                await page.click('input[type="submit"]')
+                await page.wait_for_load_state("networkidle")
+
+                # 2. Переход на Miner Configuration
+                config_url = f"{base_url}/cgi-bin/luci/admin/network/btminer"
+                await page.goto(config_url)
+                await page.wait_for_load_state("networkidle")
+                await page.wait_for_timeout(1000)
+
+                # 3. Вкладка Pool
+                pool_tab = page.locator('a:has-text("Pool"), button:has-text("Pool"), li:has-text("Pool")').first
+                if await pool_tab.count() > 0:
+                    await pool_tab.click()
+                    await page.wait_for_timeout(500)
+
+                # 4. Установка значений через JavaScript
+                for i in range(1, 4):
+                    if i > len(pools_list):
+                        break
+                    data = pools_list[i - 1]
+
+                    await page.evaluate(f"""
+                        () => {{
+                            const url = document.querySelector('input[name="cbid.pools.default.pool{i}url"]');
+                            const user = document.querySelector('input[name="cbid.pools.default.pool{i}user"]');
+                            const pw = document.querySelector('input[name="cbid.pools.default.pool{i}pw"]');
+                            if (url) {{
+                                url.value = '{data["url"]}';
+                                url.dispatchEvent(new Event('change', {{ bubbles: true }}));
+                                url.dispatchEvent(new Event('input', {{ bubbles: true }}));
+                            }}
+                            if (user) {{
+                                user.value = '{data["user"]}';
+                                user.dispatchEvent(new Event('change', {{ bubbles: true }}));
+                            }}
+                            if (pw) {{
+                                pw.value = '{data["password"]}';
+                                pw.dispatchEvent(new Event('change', {{ bubbles: true }}));
+                            }}
+                            // Для Select2
+                            if (typeof $ !== 'undefined' && $) {{
+                                const select = $('#cbid\\.pools\\.default\\.pool{i}url');
+                                if (select.length) {{
+                                    select.val('{data["url"]}').trigger('change');
+                                }}
+                            }}
+                        }}
+                    """)
+
+                # 5. Сохранение
+                save_btn = page.locator('input[value="Save & Apply"], button:has-text("Save & Apply")').first
+                if await save_btn.count() == 0:
+                    # print("Кнопка сохранения не найдена")
+                    return False
+                await save_btn.click()
+                await page.wait_for_load_state("networkidle")
+                await page.wait_for_timeout(3000)
+
+                # 6. Перезагрузка
+                await page.goto(f"{base_url}/cgi-bin/luci/admin/status/btminerstatus/restart")
+                await page.wait_for_timeout(2000)
+                await browser.close()
+
+                await asyncio.sleep(15)
+                # print("Пулы обновлены")
+                return True
+
+            except Exception as e:
+                # print(f"Ошибка: {e}")
+                return False
+            finally:
+                if browser.is_connected():
+                    await browser.close()

{pyasic_umhost-0.2.3.dev13 → pyasic_umhost-0.2.3.dev15}/pyasic/miners/base.py

@@ -19,7 +19,7 @@ import warnings
 from typing import Any, Protocol, TypeVar
 
 from pyasic.rpc.cgminer import CGMinerRPCAPI
-from pyasic.config import MinerConfig
+from pyasic.config import MinerConfig, PoolConfig
 from pyasic.data import Fan, HashBoard, MinerData
 from pyasic.data.device import DeviceInfo
 from pyasic.data.error_codes import MinerErrorData
@@ -641,6 +641,10 @@ class MinerProtocol(Protocol):
         """Возвращает лог в виде строки для отображения"""
         return None
 
+    async def set_pools(self, pools: PoolConfig):
+        """Устанавливает пуллы для майнера"""
+        return None
+
 
 class BaseMiner(MinerProtocol):
     def __init__(self, ip: str, version: str | None = None) -> None:

{pyasic_umhost-0.2.3.dev13 → pyasic_umhost-0.2.3.dev15}/pyasic/miners/factory.py

@@ -628,6 +628,7 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "ANTMINER S21": VNishS21,
         "ANTMINER S21+": VNishS21Plus,
         "ANTMINER S21+ HYD.": VNishS21PlusHydro,
+        "ANTMINER S21+ HYDRO": VNishS21PlusHydro,
         "ANTMINER S21 PRO": VNishS21Pro,
         "ANTMINER S21 HYD.": VNishS21Hydro,
         "ANTMINER S21 XP HYD.": VNishS21XPHydro,

{pyasic_umhost-0.2.3.dev13 → pyasic_umhost-0.2.3.dev15}/pyasic/rpc/btminer.py

@@ -1417,9 +1417,9 @@ If you are sure you want to use this command please use API.send_command("{comma
         raise NotImplementedError
         return await self.send_command("set.miner.cointype")
 
-    async def set_miner_pools(self, *args, **kwargs) -> dict | None:
-        raise NotImplementedError
-        return await self.send_command("set.miner.pools")
+    # async def set_miner_pools(self, *args, **kwargs) -> dict | None:
+    #     raise NotImplementedError
+    #     return await self.send_command("set.miner.pools")
 
     async def set_miner_fastboot(self, *args, **kwargs) -> dict | None:
         raise NotImplementedError

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

@@ -1,6 +1,6 @@
 [project]
 name = "pyasic-umhost"
-version = "0.2.3.dev13"
+version = "0.2.3.dev15"
 
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = [{name = "UpstreamData", email = "brett@upstreamdata.ca"}]
@@ -53,6 +53,7 @@ dependencies = [
     "betterproto==2.0.0b7",
     "pydantic>=2.11.0",
     "semver (>=3.0.4,<4.0.0)",
+    "playwright>=1.40"
 ]
 
 [tool.poetry.group.dev]