version: bump version number.

pyasic/miners/backends/bfgminer.py

@@ -68,7 +68,7 @@ class BFGMiner(BaseMiner):
         except APIError:
             return self.config
 
-        self.config = MinerConfig.from_rpc(pools)
+        self.config = MinerConfig.from_api(pools)
         return self.config
 
     ##################################################
@@ -84,11 +84,11 @@ class BFGMiner(BaseMiner):
 
         if rpc_version is not None:
             try:
-                self.rpc_ver = rpc_version["VERSION"][0]["API"]
+                self.api_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 pass
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
         if rpc_version is None:

pyasic/miners/backends/bmminer.py

@@ -72,7 +72,7 @@ class BMMiner(BaseMiner):
         except APIError:
             return self.config
 
-        self.config = MinerConfig.from_rpc(pools)
+        self.config = MinerConfig.from_api(pools)
         return self.config
 
     ##################################################
@@ -88,11 +88,11 @@ class BMMiner(BaseMiner):
 
         if rpc_version is not None:
             try:
-                self.rpc_ver = rpc_version["VERSION"][0]["API"]
+                self.api_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 pass
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
         if rpc_version is None:

pyasic/miners/backends/braiins_os.py

@@ -305,10 +305,10 @@ class BOSMiner(BaseMiner):
                 rpc_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 rpc_ver = None
-            self.rpc_ver = rpc_ver
+            self.api_ver = rpc_ver
-            self.rpc.rpc_ver = self.rpc_ver
+            self.rpc.rpc_ver = self.api_ver
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, web_bos_info: dict = None) -> Optional[str]:
         if web_bos_info is None:
@@ -731,10 +731,10 @@ class BOSer(BaseMiner):
                 rpc_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 rpc_ver = None
-            self.rpc_ver = rpc_ver
+            self.api_ver = rpc_ver
-            self.rpc.rpc_ver = self.rpc_ver
+            self.rpc.rpc_ver = self.api_ver
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, grpc_miner_details: dict = None) -> Optional[str]:
         if grpc_miner_details is None:

pyasic/miners/backends/btminer.py

@@ -234,7 +234,7 @@ class BTMiner(BaseMiner):
             pass
 
         if pools is not None:
-            cfg = MinerConfig.from_rpc(pools)
+            cfg = MinerConfig.from_api(pools)
         else:
             cfg = MinerConfig()
 
@@ -325,14 +325,14 @@ class BTMiner(BaseMiner):
                         rpc_ver = rpc_get_version["Msg"]
                         if not isinstance(rpc_ver, str):
                             rpc_ver = rpc_ver["rpc_ver"]
-                        self.rpc_ver = rpc_ver.replace("whatsminer v", "")
+                        self.api_ver = rpc_ver.replace("whatsminer v", "")
                     except (KeyError, TypeError):
                         pass
                     else:
-                        self.rpc.rpc_ver = self.rpc_ver
+                        self.rpc.rpc_ver = self.api_ver
-                        return self.rpc_ver
+                        return self.api_ver
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(
         self, rpc_get_version: dict = None, rpc_summary: dict = None

pyasic/miners/backends/cgminer.py

@@ -71,7 +71,7 @@ class CGMiner(BaseMiner):
         except APIError:
             return self.config
 
-        self.config = MinerConfig.from_rpc(pools)
+        self.config = MinerConfig.from_api(pools)
         return self.config
 
     ##################################################
@@ -87,11 +87,11 @@ class CGMiner(BaseMiner):
 
         if rpc_version is not None:
             try:
-                self.rpc_ver = rpc_version["VERSION"][0]["API"]
+                self.api_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 pass
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
         if rpc_version is None:

pyasic/misc/__init__.py

@@ -107,3 +107,4 @@ def validate_command_output(data: dict) -> tuple[bool, str | None]:
                 if data[key][0]["STATUS"][0]["STATUS"] not in ["S", "I"]:
                     # this is an error
                     return False, f"{key}: " + data[key][0]["STATUS"][0]["Msg"]
+        return True, None

pyasic/rpc/base.py

@@ -90,7 +90,7 @@ class BaseMinerRPCAPI:
         if not validation[0]:
             if not ignore_errors:
                 # validate the command succeeded
-                raise APIError(validation[1])
+                raise APIError(f"{command}: {validation[1]}")
             if allow_warning:
                 logging.warning(
                     f"{self.ip}: API Command Error: {command}: {validation[1]}"

pyasic/rpc/btminer.py

@@ -29,7 +29,7 @@ from passlib.handlers.md5_crypt import md5_crypt
 
 from pyasic import settings
 from pyasic.errors import APIError
-from pyasic.misc import api_min_version
+from pyasic.misc import api_min_version, validate_command_output
 from pyasic.rpc.base import BaseMinerRPCAPI
 
 ### IMPORTANT ###
@@ -272,7 +272,7 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
 
         if not ignore_errors:
             # if it fails to validate, it is likely an error
-            validation = self._validate_command_output(data)
+            validation = validate_command_output(data)
             if not validation[0]:
                 raise APIError(validation[1])
 

pyasic/web/epic.py

@@ -44,40 +44,37 @@ class ePICWebAPI(BaseWebAPI):
         post = privileged or not parameters == {}
 
         async with httpx.AsyncClient(transport=settings.transport()) as client:
-            for i in range(settings.get("get_data_retries", 1) + 1):
+            try:
-                try:
+                if post:
-                    if post:
+                    response = await client.post(
-                        response = await client.post(
+                        f"http://{self.ip}:{self.port}/{command}",
-                            f"http://{self.ip}:{self.port}/{command}",
+                        timeout=5,
-                            timeout=5,
+                        json={
-                            json={
+                            **parameters,
-                                **parameters,
+                            "password": self.pwd,
-                                "password": self.pwd,
+                        },
-                            },
+                    )
+                else:
+                    response = await client.get(
+                        f"http://{self.ip}:{self.port}/{command}",
+                        timeout=5,
+                    )
+                if not response.status_code == 200:
+                    if not ignore_errors:
+                        raise APIError(
+                            f"Web command {command} failed with status code {response.status_code}"
                         )
-                    else:
+                    return {}
-                        response = await client.get(
+                json_data = response.json()
-                            f"http://{self.ip}:{self.port}/{command}",
+                if json_data:
-                            timeout=5,
+                    # The API can return a fail status if the miner cannot return the requested data. Catch this and pass
-                        )
+                    if not json_data.get("result", True) and not post:
-                    if not response.status_code == 200:
+                        if not ignore_errors:
-                        continue
+                            raise APIError(json_data["error"])
-                    json_data = response.json()
+                    return json_data
-                    if json_data:
+                return {"success": True}
-                        # The API can return a fail status if the miner cannot return the requested data. Catch this and pass
+            except (httpx.HTTPError, json.JSONDecodeError, AttributeError):
-                        if (
+                pass
-                            "result" in json_data
-                            and json_data["result"] is False
-                            and not post
-                        ):
-                            if not i > settings.get("get_data_retries", 1):
-                                continue
-                            if not ignore_errors:
-                                raise APIError(json_data["error"])
-                        return json_data
-                    return {"success": True}
-                except (httpx.HTTPError, json.JSONDecodeError, AttributeError):
-                    pass
 
     async def multicommand(
         self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.50.2"
+version = "0.50.4"
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"