pyasic-umhost 0.2.3.dev7__tar.gz → 0.2.3.dev10__tar.gz

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/PKG-INFO

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

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/device/models.py

@@ -48,6 +48,7 @@ class AntminerModels(MinerModelType):
     S19jProPlus = "S19j Pro+"
     S19jProPlusNoPIC = "S19j Pro+ No PIC"
     S19XP = "S19 XP"
+    S19XPPlusHyd = "S19 XP+ Hydro"
     S19a = "S19a"
     S19aPro = "S19a Pro"
     S19Hydro = "S19 Hydro"

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/bmminer/X19/S19.py

@@ -19,6 +19,7 @@ from pyasic.miners.device.models import (
     S19,
     S19L,
     S19XP,
+    S19XPPlusHyd,
     S19a,
     S19aPro,
     S19Hydro,
@@ -62,6 +63,10 @@ class BMMinerS19XP(AntminerModern, S19XP):
     pass
 
 
+class BMMinerS19XPPlusHydro(AntminerModern, S19XPPlusHyd):
+    pass
+
+
 class BMMinerS19a(AntminerModern, S19a):
     pass
 

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/bmminer/X19/__init__.py

@@ -34,5 +34,6 @@ from .S19 import (
     BMMinerS19ProPlus,
     BMMinerS19ProPlusHydro,
     BMMinerS19XP,
+    BMMinerS19XPPlusHydro,
 )
 from .T19 import BMMinerT19

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/bosminer/X19/S19.py

@@ -18,6 +18,7 @@ from pyasic.miners.backends import BOSer
 from pyasic.miners.device.models import (
     S19,
     S19XP,
+    S19XPPlusHyd,
     S19a,
     S19aPro,
     S19j,
@@ -86,6 +87,10 @@ class BOSMinerS19XP(BOSer, S19XP):
     pass
 
 
+class BOSMinerS19XPPlusHud(BOSer, S19ProPlusHydro):
+    pass
+
+
 class BOSMinerS19ProPlusHydro(BOSer, S19ProPlusHydro):
     pass
 

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/epic/X19/S19.py

@@ -24,6 +24,7 @@ from pyasic.miners.device.models import (
     S19jProPlus,
     S19kPro,
     S19Pro,
+    S19XPPlusHyd,
 )
 
 
@@ -55,6 +56,10 @@ class ePICS19XP(ePIC, S19XP):
     pass
 
 
+class ePICSS19XPPlusHyd(ePIC, S19XPPlusHyd):
+    pass
+
+
 class ePICS19jProDual(ePIC, S19jPro):
     raw_model: MinerModelType = MinerModel.EPIC.S19jProDual
     expected_fans = S19jPro.expected_fans * 2

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/hiveon/X19/S19.py

@@ -33,6 +33,7 @@ from pyasic.miners.device.models import (
     S19ProHydro,
     S19ProPlus,
     S19ProPlusHydro,
+    S19XPPlusHyd,
 )
 
 
@@ -64,6 +65,10 @@ class HiveonS19XP(HiveonModern, S19XP):
     pass
 
 
+class HiveonS19XPPlusHyd(HiveonModern, S19XPPlusHyd):
+    pass
+
+
 class HiveonS19a(HiveonModern, S19a):
     pass
 

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/luxos/X19/S19.py

@@ -22,6 +22,7 @@ from pyasic.miners.device.models import (
     S19jProPlus,
     S19kPro,
     S19Pro,
+    S19XPPlusHyd,
 )
 
 
@@ -47,3 +48,7 @@ class LUXMinerS19kPro(LUXMiner, S19kPro):
 
 class LUXMinerS19XP(LUXMiner, S19XP):
     pass
+
+
+class LUXMinerS19XPPlusHud(LUXMiner, S19XPPlusHyd):
+    pass

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/marathon/X19/S19.py

@@ -23,6 +23,7 @@ from pyasic.miners.device.models import (
     S19jPro,
     S19KPro,
     S19Pro,
+    S19XPPlusHyd,
 )
 
 
@@ -38,6 +39,10 @@ class MaraS19XP(MaraMiner, S19XP):
     pass
 
 
+class MaraS19XPPlusHyd(MaraMiner, S19XPPlusHyd):
+    pass
+
+
 class MaraS19j(MaraMiner, S19j):
     pass
 

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/vnish/X19/S19.py

@@ -30,6 +30,7 @@ from pyasic.miners.device.models import (
     S19ProA,
     S19ProHydro,
     S19XPHydro,
+    S19XPPlusHyd,
 )
 
 
@@ -53,6 +54,10 @@ class VNishS19XP(VNish, S19XP):
     pass
 
 
+class VNishS19XPPlusHyd(VNish, S19XPPlusHyd):
+    pass
+
+
 class VNishS19XPHydro(VNish, S19XPHydro):
     pass
 

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/antminer/vnish/X19/__init__.py

@@ -29,5 +29,6 @@ from .S19 import (
     VNishS19ProHydro,
     VNishS19XP,
     VNishS19XPHydro,
+    VNishS19XPPlusHyd,
 )
 from .T19 import VNishT19

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/device/models/antminer/X19/S19.py

@@ -81,6 +81,15 @@ class S19XP(AntMinerMake):
     algo = MinerAlgo.SHA256
 
 
+class S19XPPlusHyd(AntMinerMake):
+    raw_model = MinerModel.ANTMINER.S19XPPlusHyd
+
+    expected_chips = 180
+    expected_fans = 0
+    expected_hashboards = 3
+    algo = MinerAlgo.SHA256
+
+
 class S19a(AntMinerMake):
     raw_model = MinerModel.ANTMINER.S19a
 

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/device/models/antminer/X19/__init__.py

@@ -18,6 +18,7 @@ from .S19 import (
     S19,
     S19L,
     S19XP,
+    S19XPPlusHyd,
     S19a,
     S19aPro,
     S19Hydro,

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyasic/miners/factory.py

@@ -30,6 +30,10 @@ import httpx
 from pyasic import settings
 from pyasic.logger import logger
 from pyasic.miners.antminer import *
+from pyasic.miners.antminer.bosminer.X19.S19 import BOSMinerS19XPPlusHud
+from pyasic.miners.antminer.epic.X19.S19 import ePICSS19XPPlusHyd
+from pyasic.miners.antminer.hiveon.X19.S19 import HiveonS19XPPlusHyd
+from pyasic.miners.antminer.luxos.X19.S19 import LUXMinerS19XPPlusHud
 from pyasic.miners.auradine import *
 from pyasic.miners.avalonminer import *
 from pyasic.miners.backends import *
@@ -116,6 +120,7 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "ANTMINER S19J+": BMMinerS19jPlus,
         "ANTMINER S19J PRO+": BMMinerS19jProPlus,
         "ANTMINER S19 XP": BMMinerS19XP,
+        "ANTMINER S19 XP+ HYD.": BMMinerS19XPPlusHydro,
         "ANTMINER S19A": BMMinerS19a,
         "ANTMINER S19A PRO": BMMinerS19aPro,
         "ANTMINER S19 HYDRO": BMMinerS19Hydro,
@@ -583,6 +588,7 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "BRAIINS MINI MINER BMM 100": BraiinsBMM100,
         "BRAIINS MINI MINER BMM 101": BraiinsBMM101,
         "ANTMINER S19 XP HYD.": BOSMinerS19XPHydro,
+        "ANTMINER S19 XP PLUS HYD": BOSMinerS19XPPlusHud,
     },
     MinerTypes.VNISH: {
         None: VNish,
@@ -598,6 +604,8 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "ANTMINER S19J": VNishS19j,
         "ANTMINER S19I": VNishS19i,
         "ANTMINER S19 XP": VNishS19XP,
+        "ANTMINER S19 XP PLUS HYD": VNishS19XPPlusHyd,
+        "ANTMINER S19 XP+ HYDRO": VNishS19XPPlusHyd,
         "ANTMINER S19 XP HYD.": VNishS19XPHydro,
         "ANTMINER S19J PRO": VNishS19jPro,
         "ANTMINER S19J PRO A": VNishS19jPro,
@@ -629,6 +637,7 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "ANTMINER S19J PRO+": ePICS19jProPlus,
         "ANTMINER S19K PRO": ePICS19kPro,
         "ANTMINER S19 XP": ePICS19XP,
+        "ANTMINER S19 XP PLUS HYD": ePICSS19XPPlusHyd,
         "ANTMINER S21": ePICS21,
         "ANTMINER S21 PRO": ePICS21Pro,
         "ANTMINER T21": ePICT21,
@@ -645,6 +654,7 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "ANTMINER S19": HiveonS19,
         "ANTMINER S19K PRO": HiveonS19kPro,
         "ANTMINER S19X88": HiveonS19NoPIC,
+        "ANTMINER S19XP PLUS HYD": HiveonS19XPPlusHyd,
     },
     MinerTypes.MSKMINER: {
         None: MSKMiner,
@@ -659,6 +669,7 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "ANTMINER S19J PRO+": LUXMinerS19jProPlus,
         "ANTMINER S19K PRO": LUXMinerS19kPro,
         "ANTMINER S19 XP": LUXMinerS19XP,
+        "ANTMINER S19 XP PLUS HYD": LUXMinerS19XPPlusHud,
         "ANTMINER T19": LUXMinerT19,
         "ANTMINER S21": LUXMinerS21,
         "ANTMINER T21": LUXMinerT21,

pyasic_umhost-0.2.3.dev10/pyasic/test.py

@@ -0,0 +1,125 @@
+import asyncio
+import datetime
+import json
+
+import requests
+from requests.auth import HTTPBasicAuth
+
+from pyasic import get_miner, settings, MinerConfig, MinerNetwork
+from pyasic.miners.antminer import BMMinerS19jPro
+from pyasic.config.pools import Pool
+
+
+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.86"
+    # ip = "10.76.107.252" # L7
+
+    # ip = "10.91.115.27" # M30
+    # ip = "10.91.115.58" # M30
+    # ip = "10.91.115.71" # M30
+
+
+    # ip = "10.7.16.226"
+    # ip = "10.86.120.136" # -- не работает pool
+    # ip = "10.81.120.100" # 'M61VL30'
+    # ip = "10.86.120.86"
+    # ip = "10.7.11.174" # VNISH
+    # ip = "10.7.21.109" # T21
+    # ip = "10.86.120.86" # M61VK70  --- version "20251014.18.REL2"
+    # ip = "10.86.113.97" # нет доступа к http
+    # ip = "10.81.113.161"
+    # ip = "10.85.116.160" # .expected_hashrate = -0.003  --- version='20251121.18.Rel2'
+    # ip = "10.81.113.109"
+
+    # ip = "10.77.112.12" # Avalon
+    # ip = "10.77.112.11"
+
+    # ip = '10.73.112.220'
+
+    # ip = "10.96.106.175" # S19j Pro -- не рабочий -- что-то с сетью
+    # ip = "10.96.106.173" # вернул пуллы и вроде работает
+    # ip = "10.91.106.49" # S19j Pro -- рабочий
+
+    # ip = "10.91.115.34"
+    # ip = "10.91.115.112"
+
+    # ip = "10.91.115.104" # Не выходит из сна
+    # ip = "10.91.115.105"
+    # ip = "10.91.115.48"
+
+    ip = "10.81.146.30"
+
+    # ip = "10.71.111.113" # AntMiner S19j Pro
+    # ip = "10.81.143.178" # Antminer S19 XP+ Hyd
+
+    try:
+        # networks = [f"10.81.146.{i}" for i in range(0, 256)]
+        # network = MinerNetwork(networks)
+        # # Сканируем сеть
+        # miners = await network.scan()
+        # print(f"Найдено майнеров: {len(miners)}")
+
+
+        miner = await get_miner(ip=ip)
+        print(f"{type(miner)=}")
+        print(f"Miner: {miner}")
+
+        # print(await miner.stop_mining())
+
+        # await miner.stop_mining()
+
+        # await miner.resume_mining()
+        #
+        # await asyncio.sleep(5)
+
+        # cfg: MinerConfig = await miner.get_config()
+        # print(f"{cfg.mining_mode=}")
+
+        # await miner.reboot()
+        # await asyncio.sleep(5)
+        miningMode = await miner.is_mining()
+        sleepMode = await miner.is_sleep()
+        errors = await miner.get_errors()
+        minerData = await miner.get_data()
+        # #
+        # # print("\n\n")
+        # # print(minerData.pools)
+        print(f"Is mining: {miningMode}")
+        print(f"Sleep mode: {sleepMode}")
+        print(f"Errors: {errors}")
+        # print(f"{minerData.wattage_limit=}, {minerData.wattage=}")
+        print(f"MinerData: {minerData}")
+
+        ### STOP
+
+        # stop = await miner.stop_mining()
+        # print(f"Stop mining: {stop}")
+
+        ### RESUME
+
+        # resume = await miner.resume_mining()
+        # print(f"Resume mining: {resume}")
+
+        ### REBOOT
+
+        # reboot = await miner.reboot()
+        # print(f"Reboot mining: {reboot}")
+
+        ### LED ON
+        # fault_light_on = await miner.fault_light_on()
+        # print(f"Fault light on: {fault_light_on}")
+
+    except Exception as e:
+        print(f"Error:: {e}")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

{pyasic_umhost-0.2.3.dev7 → pyasic_umhost-0.2.3.dev10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyasic-umhost"
-version = "0.2.3.dev7"
+version = "0.2.3.dev10"
 
 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.3.dev7"
+version = "0.2.3.dev8"
 description = "Fork pyasic"
 
 packages = [

pyasic_umhost-0.2.3.dev7/pyasic/test.py

@@ -1,57 +0,0 @@
-import asyncio
-import datetime
-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.76.107.252"
-    try:
-
-        miner = await get_miner(ip=ip)
-
-        print(f"Miner: {miner}")
-
-        miningMode = await miner.is_mining()
-        sleepMode = await miner.is_sleep()
-        errors = await miner.get_errors()
-        minerData = await miner.get_data()
-
-        print(f"Is mining: {miningMode}")
-        print(f"Sleep mode: {sleepMode}")
-        print(f"Errors: {errors}")
-        print(f"MinerData: {minerData}")
-
-        ### STOP
-
-        # stop = await miner.stop_mining()
-        # print(f"Stop mining: {stop}")
-
-        ### RESUME
-
-        # resume = await miner.resume_mining()
-        # print(f"Resume mining: {resume}")
-
-        ### REBOOT
-
-        # reboot = await miner.reboot()
-        # print(f"Reboot mining: {reboot}")
-
-        ### LED ON
-        # fault_light_on = await miner.fault_light_on()
-        # print(f"Fault light on: {fault_light_on}")
-
-    except Exception as e:
-        print(f"Error:: {e}")
-
-
-if __name__ == "__main__":
-    asyncio.run(main())