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

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

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

{pyasic_umhost-0.2.3.dev4 → pyasic_umhost-0.2.3.dev7}/pyasic/__init__.py

@@ -25,4 +25,7 @@ from pyasic.rpc import *
 from pyasic.ssh import *
 from pyasic.web import *
 
-__version__ = importlib.metadata.version("pyasic-umhost")
+try:
+    __version__ = importlib.metadata.version("pyasic-umhost")
+except importlib.metadata.PackageNotFoundError:
+    __version__ = "0.0.0"

{pyasic_umhost-0.2.3.dev4 → pyasic_umhost-0.2.3.dev7}/pyasic/miners/antminer/bmminer/X7/L7.py

@@ -14,8 +14,11 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import AntminerModern
+from pyasic.data import HashBoard
+from pyasic.device.algorithm import AlgoHashRateType
+from pyasic.errors import APIError
 from pyasic.miners.device.models import L7
 
 
 class BMMinerL7(AntminerModern, L7):
-    supports_shutdown = False
+    supports_shutdown = False

{pyasic_umhost-0.2.3.dev4 → pyasic_umhost-0.2.3.dev7}/pyasic/miners/backends/antminer.py

@@ -121,9 +121,10 @@ class AntminerModern(BMMiner):
 
     async def get_config(self) -> MinerConfig:
         data = await self.web.get_miner_conf()
-        if data:
-            self.config = MinerConfig.from_am_modern(data)
-        return self.config or MinerConfig()
+        if not data:
+            raise APIError("No data was returned from the API")
+        self.config = MinerConfig.from_am_modern(data)
+        return self.config
 
     async def send_config(
         self, config: MinerConfig, user_suffix: str | None = None
@@ -233,7 +234,7 @@ class AntminerModern(BMMiner):
 
     async def resume_mining(self) -> bool:
         cfg = await self.get_config()
-        cfg.mining_mode = MiningModeConfig.normal()
+        cfg.mining_mode = MiningModeConfig.low()
         await self.send_config(cfg)
         return True
 
@@ -313,9 +314,10 @@ class AntminerModern(BMMiner):
         if rpc_stats is not None:
             try:
                 for board in rpc_stats["STATS"][0]["chain"]:
+                    unit = getattr(self, "default_unit", "GH")
                     hashboards[board["index"]].hashrate = self.algo.hashrate(
                         rate=board["rate_real"],
-                        unit=self.algo.unit.GH,  # type: ignore[attr-defined]
+                        unit=self.algo.unit.from_str(unit),  # type: ignore[attr-defined]
                     ).into(
                         self.algo.unit.default  # type: ignore[attr-defined]
                     )
@@ -398,10 +400,12 @@ class AntminerModern(BMMiner):
         if rpc_stats is not None:
             try:
                 expected_rate = rpc_stats["STATS"][1]["total_rateideal"]
-                try:
+                # Проверка на наличие единицы измерения, Если нет берем из атрибута класса модели
+                if "rate_unit" in rpc_stats["STATS"][1]:
                     rate_unit = rpc_stats["STATS"][1]["rate_unit"]
-                except KeyError:
-                    rate_unit = "GH"
+                else:
+                    rate_unit = getattr(self, "default_unit", "GH")
+
                 return self.algo.hashrate(
                     rate=float(expected_rate), unit=self.algo.unit.from_str(rate_unit)
                 ).into(self.algo.unit.default)  # type: ignore[attr-defined]

{pyasic_umhost-0.2.3.dev4 → pyasic_umhost-0.2.3.dev7}/pyasic/miners/device/models/antminer/X7/L7.py

@@ -24,4 +24,5 @@ class L7(AntMinerMake):
     expected_chips = 120
     expected_fans = 4
     expected_hashboards = 3
+    default_unit = "MH" # Единица измерения
     algo = MinerAlgo.SCRYPT

{pyasic_umhost-0.2.3.dev4 → pyasic_umhost-0.2.3.dev7}/pyasic/test.py

@@ -13,7 +13,7 @@ def print_inheritance(cls, indent=0):
 
 
 async def main():
-    ip = "10.86.120.86"
+    ip = "10.76.107.252"
     try:
 
         miner = await get_miner(ip=ip)

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

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