pyasic-umhost 0.3.0.dev3__tar.gz → 0.3.0.dev4__tar.gz

{pyasic_umhost-0.3.0.dev3 → pyasic_umhost-0.3.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyasic-umhost
-Version: 0.3.0.dev3
+Version: 0.3.0.dev4
 Summary: Fork of pyasic — a simplified and standardized interface for Bitcoin ASICs.
 License: Apache 2.0
 License-File: LICENSE.txt

{pyasic_umhost-0.3.0.dev3 → pyasic_umhost-0.3.0.dev4}/pyasic/device/models.py

@@ -34,6 +34,7 @@ class AntminerModels(MinerModelType):
     T17Plus = "T17+"
     T17e = "T17e"
     S19 = "S19"
+    S1990T = "S19 90 TH/s"
     S19NoPIC = "S19 No PIC"
     S19L = "S19L"
     S19Pro = "S19 Pro"

{pyasic_umhost-0.3.0.dev3 → pyasic_umhost-0.3.0.dev4}/pyasic/miners/antminer/vnish/X19/S19.py

@@ -17,6 +17,7 @@
 from pyasic.miners.backends import VNish
 from pyasic.miners.device.models import (
     S19,
+    S1990T,
     S19XP,
     S19a,
     S19aPro,
@@ -41,6 +42,10 @@ class VNishS19(VNish, S19):
     pass
 
 
+class VNishS1990T(VNish, S1990T):
+    pass
+
+
 class VNishS19NoPIC(VNish, S19NoPIC):
     pass
 

{pyasic_umhost-0.3.0.dev3 → pyasic_umhost-0.3.0.dev4}/pyasic/miners/antminer/vnish/X19/__init__.py

@@ -16,6 +16,7 @@
 
 from .S19 import (
     VNishS19,
+    VNishS1990T,
     VNishS19a,
     VNishS19aPro,
     VNishS19Hydro,

{pyasic_umhost-0.3.0.dev3 → pyasic_umhost-0.3.0.dev4}/pyasic/miners/device/models/antminer/X19/S19.py

@@ -27,6 +27,15 @@ class S19(AntMinerMake):
     algo = MinerAlgo.SHA256
 
 
+class S1990T(AntMinerMake):
+    raw_model = MinerModel.ANTMINER.S1990T
+
+    expected_chips = 88
+    expected_fans = 4
+    expected_hashboards = 3
+    algo = MinerAlgo.SHA256
+
+
 class S19NoPIC(AntMinerMake):
     raw_model = MinerModel.ANTMINER.S19NoPIC
 

{pyasic_umhost-0.3.0.dev3 → pyasic_umhost-0.3.0.dev4}/pyasic/miners/device/models/antminer/X19/__init__.py

@@ -16,6 +16,7 @@
 
 from .S19 import (
     S19,
+    S1990T,
     S19L,
     S19XP,
     S19XPPlusHyd,

{pyasic_umhost-0.3.0.dev3 → pyasic_umhost-0.3.0.dev4}/pyasic/miners/factory.py

@@ -611,6 +611,11 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "ANTMINER S17+": VNishS17Plus,
         "ANTMINER S17 PRO": VNishS17Pro,
         "ANTMINER S19": VNishS19,
+        "ANTMINER S19 90 TH/S": VNishS1990T,
+        "ANTMINER S19 90T": VNishS1990T,
+        "ANTMINER S19 90TH": VNishS1990T,
+        "ANTMINER S19 88": VNishS1990T,
+        "ANTMINER S19-88": VNishS1990T,
         "ANTMINER S19NOPIC": VNishS19NoPIC,
         "ANTMINER S19 PRO": VNishS19Pro,
         "ANTMINER S19J": VNishS19j,
@@ -1510,21 +1515,61 @@ class MinerFactory:
             pass
         return None
 
+    @staticmethod
+    def _vnish_stats_has_chip_count(
+        sock_json_data: dict, chip_count: int
+    ) -> bool:
+        stats = sock_json_data.get("STATS")
+        if not isinstance(stats, list):
+            return False
+
+        for stats_entry in stats:
+            if not isinstance(stats_entry, dict):
+                continue
+            for key, value in stats_entry.items():
+                if not re.fullmatch(r"chain_acn\d+", str(key), flags=re.IGNORECASE):
+                    continue
+                try:
+                    if float(value) == chip_count:
+                        return True
+                except (TypeError, ValueError):
+                    continue
+        return False
+
     async def get_miner_model_vnish(self, ip: str) -> str | None:
         sock_json_data = await self.send_api_command(ip, "stats")
         if sock_json_data is not None:
             try:
                 miner_model = sock_json_data["STATS"][0]["Type"]
+
+                # Newer VNish versions report the 88-chip S19 as
+                # `Antminer S19 (88) (Vnish ...)`. Remember and remove the chip
+                # marker before stripping the firmware suffix so it is not lost
+                # at the first ` (`.
+                has_88_marker = bool(re.search(r"\(88\)", miner_model))
+                miner_model = re.sub(
+                    r"\s*\(88\)", "", miner_model, flags=re.IGNORECASE
+                )
+
                 if " (" in miner_model:
-                    split_miner_model = miner_model.split(" (")
+                    split_miner_model = miner_model.split(" (", maxsplit=1)
                     miner_model = split_miner_model[0]
 
-                if "(88)" in miner_model:
-                    miner_model = miner_model.replace("(88)", "NOPIC")
-
                 if " AML" in miner_model:
                     miner_model = miner_model.replace(" AML", "")
 
+                # Some VNish builds only return `Antminer S19` in Type. The
+                # same stats payload still contains the physical chip count for
+                # each chain, which safely distinguishes S19/88 from S19/76.
+                if (
+                    miner_model.strip().upper() == "ANTMINER S19"
+                    and (
+                        has_88_marker
+                        or self._vnish_stats_has_chip_count(sock_json_data, 88)
+                    )
+                ):
+                    miner_model = "Antminer S19 90 TH/s"
+
                 return miner_model
             except (TypeError, LookupError):
                 pass

{pyasic_umhost-0.3.0.dev3 → pyasic_umhost-0.3.0.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyasic-umhost"
-version = "0.3.0.dev3"
+version = "0.3.0.dev4"
 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"