Merge pull request #84 from jpcomps/master

pyasic/config/__init__.py

@@ -161,6 +161,15 @@ class MinerConfig:
             power_scaling=PowerScalingConfig.from_bosminer(toml_conf),
         )
 
+    @classmethod
+    def from_epic(cls, web_conf: dict) -> "MinerConfig":
+        return cls(
+            pools=PoolConfig.from_epic(web_conf),
+            fan_mode=FanModeConfig.from_epic(web_conf),
+            temperature=TemperatureConfig.from_epic(web_conf),
+            mining_mode=MiningModeConfig.from_epic(web_conf),
+        )
+
 
 def merge(a: dict, b: dict) -> dict:
     result = deepcopy(a)

pyasic/config/fans.py

@@ -116,6 +116,17 @@ class FanModeConfig(MinerConfigOption):
         else:
             return cls.default()
 
+    @classmethod
+    def from_epic(cls, web_conf: dict):
+        try:
+            fan_mode = web_conf["Fans"]["Fan Mode"]
+            if fan_mode.get("Manual") is not None:
+                return cls.manual(speed=fan_mode.get("Manual"))
+            else:
+                return cls.normal()
+        except KeyError:
+            return cls.default()
+
     @classmethod
     def from_bosminer(cls, toml_conf: dict):
         if toml_conf.get("temp_control") is None:

pyasic/config/mining.py

@@ -186,6 +186,29 @@ class MiningModeConfig(MinerConfigOption):
                 return cls.low()
         return cls.default()
 
+    @classmethod
+    def from_epic(cls, web_conf: dict):
+        try:
+            work_mode = web_conf["PerpetualTune"]["Running"]
+            if work_mode:
+                if (
+                    web_conf["PerpetualTune"]["Algorithm"].get("VoltageOptimizer")
+                    is not None
+                ):
+                    return cls.hashrate_tuning(
+                        web_conf["PerpetualTune"]["Algorithm"]["VoltageOptimizer"][
+                            "Target"
+                        ]
+                    )
+                else:
+                    return cls.hashrate_tuning(
+                        web_conf["PerpetualTune"]["Algorithm"]["ChipTune"]["Target"]
+                    )
+            else:
+                return cls.normal()
+        except KeyError:
+            return cls.default()
+
     @classmethod
     def from_bosminer(cls, toml_conf: dict):
         if toml_conf.get("autotuning") is None:

pyasic/config/pools.py

@@ -108,6 +108,12 @@ class Pool(MinerConfigValue):
     def from_api(cls, api_pool: dict) -> "Pool":
         return cls(url=api_pool["URL"], user=api_pool["User"], password="x")
 
+    @classmethod
+    def from_epic(cls, api_pool: dict) -> "Pool":
+        return cls(
+            url=api_pool["pool"], user=api_pool["login"], password=api_pool["password"]
+        )
+
     @classmethod
     def from_am_modern(cls, web_pool: dict) -> "Pool":
         return cls(
@@ -237,6 +243,13 @@ class PoolGroup(MinerConfigValue):
             pools.append(Pool.from_api(pool))
         return cls(pools=pools)
 
+    @classmethod
+    def from_epic(cls, api_pool_list: list) -> "PoolGroup":
+        pools = []
+        for pool in api_pool_list:
+            pools.append(Pool.from_epic(pool))
+        return cls(pools=pools)
+
     @classmethod
     def from_am_modern(cls, web_pool_list: list) -> "PoolGroup":
         pools = []
@@ -334,6 +347,11 @@ class PoolConfig(MinerConfigValue):
 
         return cls([PoolGroup.from_api(pool_data)])
 
+    @classmethod
+    def from_epic(cls, web_conf: dict) -> "PoolConfig":
+        pool_data = web_conf["StratumConfigs"]
+        return cls([PoolGroup.from_epic(pool_data)])
+
     @classmethod
     def from_am_modern(cls, web_conf: dict) -> "PoolConfig":
         pool_data = web_conf["pools"]

pyasic/config/temperature.py

@@ -56,3 +56,18 @@ class TemperatureConfig(MinerConfigValue):
                 hot=temp_control.get("hot_temp"),
                 danger=temp_control.get("dangerous_temp"),
             )
+
+    @classmethod
+    def from_epic(cls, web_conf: dict) -> "TemperatureConfig":
+        dangerous_temp = None
+        try:
+            hot_temp = web_conf["Misc"]["Shutdown Temp"]
+        except KeyError:
+            hot_temp = None
+        # Need to do this in two blocks to avoid KeyError if one is missing
+        try:
+            target_temp = web_conf["Fans"]["Fan Mode"]["Auto"]["Target Temperature"]
+        except KeyError:
+            target_temp = None
+
+        return cls(target=target_temp, hot=hot_temp, danger=dangerous_temp)

pyasic/data/__init__.py

@@ -161,9 +161,9 @@ class MinerData:
     percent_expected_wattage: float = field(init=False)
     nominal: bool = field(init=False)
     config: MinerConfig = None
-    errors: List[
+    errors: List[Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]] = (
-        Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]
+        field(default_factory=list)
-    ] = field(default_factory=list)
+    )
     fault_light: Union[bool, None] = None
     efficiency: int = field(init=False)
     is_mining: bool = True

pyasic/miners/backends/bosminer.py

@@ -537,7 +537,7 @@ class BOSMiner(BaseMiner):
                 pass
 
         try:
-            async with (await self._get_ssh_connection()) as conn:
+            async with await self._get_ssh_connection() as conn:
                 if conn is not None:
                     data = await conn.run("cat /proc/sys/kernel/hostname")
                     host = data.stdout.strip()

pyasic/miners/backends/epic.py

@@ -18,6 +18,7 @@ from typing import List, Optional, Tuple, Union
 
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, X19Error
+from pyasic.config import MinerConfig, MiningModeConfig
 from pyasic.errors import APIError
 from pyasic.logger import logger
 from pyasic.miners.backends.bmminer import BMMiner
@@ -74,6 +75,23 @@ class ePIC(BMMiner):
             return self.model + " (ePIC)"
         return "? (ePIC)"
 
+    async def get_config(self) -> MinerConfig:
+        summary = None
+        try:
+            summary = await self.web.summary()
+        except APIError as e:
+            logger.warning(e)
+        except LookupError:
+            pass
+
+        if summary is not None:
+            cfg = MinerConfig.from_epic(summary)
+        else:
+            cfg = MinerConfig()
+
+        self.config = cfg
+        return self.config
+
     async def restart_backend(self) -> bool:
         data = await self.web.restart_epic()
         if data:

pyasic/web/bosminer/__init__.py

@@ -189,11 +189,13 @@ class BOSMinerGQLAPI:
         await client.post(
             url,
             json={
-                "query": 'mutation{auth{login(username:"'
+                "query": (
-                + "root"
+                    'mutation{auth{login(username:"'
-                + '", password:"'
+                    + "root"
-                + self.pwd
+                    + '", password:"'
-                + '"){__typename}}}'
+                    + self.pwd
+                    + '"){__typename}}}'
+                )
             },
         )
 
@@ -233,7 +235,9 @@ class BOSMinerLuCIAPI:
         login = {"luci_username": self.username, "luci_password": self.pwd}
         url = f"http://{self.ip}/cgi-bin/luci"
         headers = {
-            "User-Agent": "BTC Tools v0.1",  # only seems to respond if this user-agent is set
+            "User-Agent": (
+                "BTC Tools v0.1"
+            ),  # only seems to respond if this user-agent is set
             "Content-Type": "application/x-www-form-urlencoded",
         }
         await session.post(url, headers=headers, data=login)

pyasic/web/bosminer/proto/braiins/bos/v1/__init__.py

@@ -2357,17 +2357,21 @@ class ActionsServiceBase(ServiceBase):
                 RebootRequest,
                 RebootResponse,
             ),
-            "/braiins.bos.v1.ActionsService/SetLocateDeviceStatus": grpclib.const.Handler(
+            "/braiins.bos.v1.ActionsService/SetLocateDeviceStatus": (
-                self.__rpc_set_locate_device_status,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_set_locate_device_status,
-                SetLocateDeviceStatusRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                LocateDeviceStatusResponse,
+                    SetLocateDeviceStatusRequest,
+                    LocateDeviceStatusResponse,
+                )
             ),
-            "/braiins.bos.v1.ActionsService/GetLocateDeviceStatus": grpclib.const.Handler(
+            "/braiins.bos.v1.ActionsService/GetLocateDeviceStatus": (
-                self.__rpc_get_locate_device_status,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_get_locate_device_status,
-                GetLocateDeviceStatusRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                LocateDeviceStatusResponse,
+                    GetLocateDeviceStatusRequest,
+                    LocateDeviceStatusResponse,
+                )
             ),
         }
 
@@ -2644,17 +2648,21 @@ class PerformanceServiceBase(ServiceBase):
                 GetTunerStateRequest,
                 GetTunerStateResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/ListTargetProfiles": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/ListTargetProfiles": (
-                self.__rpc_list_target_profiles,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_list_target_profiles,
-                ListTargetProfilesRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                ListTargetProfilesResponse,
+                    ListTargetProfilesRequest,
+                    ListTargetProfilesResponse,
+                )
             ),
-            "/braiins.bos.v1.PerformanceService/SetDefaultPowerTarget": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/SetDefaultPowerTarget": (
-                self.__rpc_set_default_power_target,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_set_default_power_target,
-                SetDefaultPowerTargetRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                SetPowerTargetResponse,
+                    SetDefaultPowerTargetRequest,
+                    SetPowerTargetResponse,
+                )
             ),
             "/braiins.bos.v1.PerformanceService/SetPowerTarget": grpclib.const.Handler(
                 self.__rpc_set_power_target,
@@ -2662,41 +2670,53 @@ class PerformanceServiceBase(ServiceBase):
                 SetPowerTargetRequest,
                 SetPowerTargetResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/IncrementPowerTarget": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/IncrementPowerTarget": (
-                self.__rpc_increment_power_target,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_increment_power_target,
-                IncrementPowerTargetRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                SetPowerTargetResponse,
+                    IncrementPowerTargetRequest,
+                    SetPowerTargetResponse,
+                )
             ),
-            "/braiins.bos.v1.PerformanceService/DecrementPowerTarget": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/DecrementPowerTarget": (
-                self.__rpc_decrement_power_target,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_decrement_power_target,
-                DecrementPowerTargetRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                SetPowerTargetResponse,
+                    DecrementPowerTargetRequest,
+                    SetPowerTargetResponse,
+                )
             ),
-            "/braiins.bos.v1.PerformanceService/SetDefaultHashrateTarget": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/SetDefaultHashrateTarget": (
-                self.__rpc_set_default_hashrate_target,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_set_default_hashrate_target,
-                SetDefaultHashrateTargetRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                SetHashrateTargetResponse,
+                    SetDefaultHashrateTargetRequest,
+                    SetHashrateTargetResponse,
+                )
             ),
-            "/braiins.bos.v1.PerformanceService/SetHashrateTarget": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/SetHashrateTarget": (
-                self.__rpc_set_hashrate_target,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_set_hashrate_target,
-                SetHashrateTargetRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                SetHashrateTargetResponse,
+                    SetHashrateTargetRequest,
+                    SetHashrateTargetResponse,
+                )
             ),
-            "/braiins.bos.v1.PerformanceService/IncrementHashrateTarget": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/IncrementHashrateTarget": (
-                self.__rpc_increment_hashrate_target,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_increment_hashrate_target,
-                IncrementHashrateTargetRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                SetHashrateTargetResponse,
+                    IncrementHashrateTargetRequest,
+                    SetHashrateTargetResponse,
+                )
             ),
-            "/braiins.bos.v1.PerformanceService/DecrementHashrateTarget": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/DecrementHashrateTarget": (
-                self.__rpc_decrement_hashrate_target,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_decrement_hashrate_target,
-                DecrementHashrateTargetRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                SetHashrateTargetResponse,
+                    DecrementHashrateTargetRequest,
+                    SetHashrateTargetResponse,
+                )
             ),
             "/braiins.bos.v1.PerformanceService/SetDPS": grpclib.const.Handler(
                 self.__rpc_set_dps,
@@ -2704,23 +2724,29 @@ class PerformanceServiceBase(ServiceBase):
                 SetDpsRequest,
                 SetDpsResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/SetPerformanceMode": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/SetPerformanceMode": (
-                self.__rpc_set_performance_mode,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_set_performance_mode,
-                SetPerformanceModeRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                PerformanceMode,
+                    SetPerformanceModeRequest,
+                    PerformanceMode,
+                )
             ),
-            "/braiins.bos.v1.PerformanceService/GetActivePerformanceMode": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/GetActivePerformanceMode": (
-                self.__rpc_get_active_performance_mode,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_get_active_performance_mode,
-                GetPerformanceModeRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                PerformanceMode,
+                    GetPerformanceModeRequest,
+                    PerformanceMode,
+                )
             ),
-            "/braiins.bos.v1.PerformanceService/RemoveTunedProfiles": grpclib.const.Handler(
+            "/braiins.bos.v1.PerformanceService/RemoveTunedProfiles": (
-                self.__rpc_remove_tuned_profiles,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_remove_tuned_profiles,
-                RemoveTunedProfilesRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                RemoveTunedProfilesResponse,
+                    RemoveTunedProfilesRequest,
+                    RemoveTunedProfilesResponse,
+                )
             ),
         }
 
@@ -2836,17 +2862,21 @@ class ConfigurationServiceBase(ServiceBase):
 
     def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
         return {
-            "/braiins.bos.v1.ConfigurationService/GetMinerConfiguration": grpclib.const.Handler(
+            "/braiins.bos.v1.ConfigurationService/GetMinerConfiguration": (
-                self.__rpc_get_miner_configuration,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_get_miner_configuration,
-                GetMinerConfigurationRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                GetMinerConfigurationResponse,
+                    GetMinerConfigurationRequest,
+                    GetMinerConfigurationResponse,
+                )
             ),
-            "/braiins.bos.v1.ConfigurationService/GetConstraints": grpclib.const.Handler(
+            "/braiins.bos.v1.ConfigurationService/GetConstraints": (
-                self.__rpc_get_constraints,
+                grpclib.const.Handler(
-                grpclib.const.Cardinality.UNARY_UNARY,
+                    self.__rpc_get_constraints,
-                GetConstraintsRequest,
+                    grpclib.const.Cardinality.UNARY_UNARY,
-                GetConstraintsResponse,
+                    GetConstraintsRequest,
+                    GetConstraintsResponse,
+                )
             ),
         }