From c35b30e949fd9f7b93589a721b87c69fea6d3859 Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Thu, 26 May 2022 13:23:32 -0600 Subject: [PATCH] fixed formatting issues --- API/__init__.py | 2 +- API/btminer.py | 2 +- config/bos.py | 2 +- miners/_backends/bmminer.py | 2 +- miners/_backends/bosminer.py | 19 ++++++++----------- miners/_backends/bosminer_old.py | 9 ++++----- miners/_backends/btminer.py | 12 ++++++------ miners/_backends/cgminer.py | 1 + miners/antminer/bmminer/X17/S17.py | 4 ++-- miners/antminer/bmminer/X17/S17_Plus.py | 4 ++-- miners/antminer/bmminer/X17/S17_Pro.py | 4 ++-- miners/antminer/bmminer/X17/S17e.py | 4 ++-- miners/antminer/bmminer/X17/T17.py | 4 ++-- miners/antminer/bmminer/X17/T17_Plus.py | 4 ++-- miners/antminer/bmminer/X17/T17e.py | 4 ++-- miners/antminer/bmminer/X19/S19.py | 4 ++-- miners/antminer/bmminer/X19/S19_Pro.py | 4 ++-- miners/antminer/bmminer/X19/S19a.py | 4 ++-- miners/antminer/bmminer/X19/S19j.py | 4 ++-- miners/antminer/bmminer/X19/S19j_Pro.py | 4 ++-- miners/antminer/bmminer/X19/T19.py | 4 ++-- miners/antminer/bmminer/X9/S9.py | 4 ++-- miners/antminer/bmminer/X9/S9i.py | 4 ++-- miners/antminer/bmminer/X9/T9.py | 4 ++-- miners/antminer/bosminer/X17/S17.py | 4 ++-- miners/antminer/bosminer/X17/S17_Plus.py | 4 ++-- miners/antminer/bosminer/X17/S17_Pro.py | 4 ++-- miners/antminer/bosminer/X17/S17e.py | 4 ++-- miners/antminer/bosminer/X17/T17.py | 4 ++-- miners/antminer/bosminer/X17/T17_Plus.py | 4 ++-- miners/antminer/bosminer/X17/T17e.py | 4 ++-- miners/antminer/bosminer/X19/S19.py | 4 ++-- miners/antminer/bosminer/X19/S19_Pro.py | 4 ++-- miners/antminer/bosminer/X19/S19j.py | 4 ++-- miners/antminer/bosminer/X19/S19j_Pro.py | 4 ++-- miners/antminer/bosminer/X19/T19.py | 4 ++-- miners/antminer/bosminer/X9/S9.py | 4 ++-- miners/antminer/cgminer/X17/S17.py | 4 ++-- miners/antminer/cgminer/X17/S17_Plus.py | 4 ++-- miners/antminer/cgminer/X17/S17_Pro.py | 4 ++-- miners/antminer/cgminer/X17/S17e.py | 4 ++-- miners/antminer/cgminer/X17/T17.py | 4 ++-- miners/antminer/cgminer/X17/T17_Plus.py | 4 ++-- miners/antminer/cgminer/X17/T17e.py | 4 ++-- miners/antminer/cgminer/X19/S19.py | 4 ++-- miners/antminer/cgminer/X19/S19_Pro.py | 4 ++-- miners/antminer/cgminer/X19/S19j.py | 4 ++-- miners/antminer/cgminer/X19/S19j_Pro.py | 4 ++-- miners/antminer/cgminer/X19/T19.py | 4 ++-- miners/antminer/cgminer/X9/S9.py | 4 ++-- miners/antminer/cgminer/X9/T9.py | 8 +++----- miners/antminer/hiveon/X9/T9.py | 4 ++-- miners/avalonminer/cgminer/A10X/A1047.py | 4 ++-- miners/avalonminer/cgminer/A10X/A1066.py | 4 ++-- miners/avalonminer/cgminer/A8X/A821.py | 4 ++-- miners/avalonminer/cgminer/A8X/A841.py | 4 ++-- miners/miner_listener.py | 3 ++- miners/whatsminer/btminer/M2X/M20S.py | 4 ++-- miners/whatsminer/btminer/M2X/M20S_Plus.py | 4 ++-- miners/whatsminer/btminer/M2X/M21.py | 4 ++-- miners/whatsminer/btminer/M2X/M21S.py | 4 ++-- miners/whatsminer/btminer/M2X/M21S_Plus.py | 4 ++-- miners/whatsminer/btminer/M3X/M30S.py | 4 ++-- miners/whatsminer/btminer/M3X/M30S_Plus.py | 4 ++-- .../whatsminer/btminer/M3X/M30S_Plus_Plus.py | 4 ++-- miners/whatsminer/btminer/M3X/M31S.py | 4 ++-- miners/whatsminer/btminer/M3X/M31S_Plus.py | 4 ++-- miners/whatsminer/btminer/M3X/M32S.py | 4 ++-- misc/bos.py | 2 +- tools/cfg_util/boards/__init__.py | 5 ++++- tools/cfg_util/scan/__init__.py | 6 ++---- tools/cfg_util/ui.py | 4 ++-- tools/web_monitor/app.py | 4 +++- tools/web_monitor/dashboard/func.py | 4 +++- tools/web_monitor/dashboard/ws.py | 4 +++- tools/web_monitor/miner/ws.py | 8 ++++---- tools/web_testbench/_miners.py | 15 ++++++++------- tools/web_testbench/connections.py | 6 +++--- 78 files changed, 177 insertions(+), 173 deletions(-) diff --git a/API/__init__.py b/API/__init__.py index 29939234..677c6873 100644 --- a/API/__init__.py +++ b/API/__init__.py @@ -79,7 +79,7 @@ If you are sure you want to use this command please use API.send_command("{item} data = None try: data = await self.send_command(command) - except APIError as e: + except APIError: try: data = {} # S19 handler, try again diff --git a/API/btminer.py b/API/btminer.py index 5be34194..baa904e7 100644 --- a/API/btminer.py +++ b/API/btminer.py @@ -434,7 +434,7 @@ class BTMinerAPI(BaseMinerAPI): enc_command = create_privileged_cmd(token_data, command) return await self.send_command(enc_command) - async def update_firmware(self): + async def update_firmware(self): # noqa - static # to be determined if this will be added later # requires a file stream in bytes return NotImplementedError diff --git a/config/bos.py b/config/bos.py index 521865eb..85ad44c1 100644 --- a/config/bos.py +++ b/config/bos.py @@ -1,6 +1,6 @@ import time + import yaml -import toml def bos_config_convert(config: dict): diff --git a/miners/_backends/bmminer.py b/miners/_backends/bmminer.py index be0446e5..3fe73187 100644 --- a/miners/_backends/bmminer.py +++ b/miners/_backends/bmminer.py @@ -67,7 +67,7 @@ class BMMiner(BaseMiner): # return ? if we fail to get hostname with no ssh connection logging.warning(f"Failed to get hostname for miner: {self}") return "?" - except Exception as e: + except Exception: # return ? if we fail to get hostname with an exception logging.warning(f"Failed to get hostname for miner: {self}") return "?" diff --git a/miners/_backends/bosminer.py b/miners/_backends/bosminer.py index 7fa71020..b0b1bbaf 100644 --- a/miners/_backends/bosminer.py +++ b/miners/_backends/bosminer.py @@ -23,6 +23,7 @@ class BOSMiner(BaseMiner): self.api_type = "BOSMiner" self.uname = "root" self.pwd = "admin" + self.config = None async def send_ssh_command(self, cmd: str) -> str or None: """Send a command to the miner over ssh. @@ -121,7 +122,7 @@ class BOSMiner(BaseMiner): else: logging.warning(f"Failed to get hostname for miner: {self}") return "?" - except Exception as e: + except Exception: logging.warning(f"Failed to get hostname for miner: {self}") return "?" @@ -167,7 +168,7 @@ class BOSMiner(BaseMiner): # if we get the version data, parse it if version_data: - self.version = version_data.stdout.split("-")[5] + self.version = version_data.split("-")[5] logging.debug(f"Found version for {self.ip}: {self.version}") return self.version @@ -206,10 +207,6 @@ class BOSMiner(BaseMiner): offset = devs[0]["ID"] for board in devs: boards[board["ID"] - offset] = [] - if not board["Chips"] == self.nominal_chips: - nominal = False - else: - nominal = True if not board["Chips"] == self.nominal_chips: nominal = False else: @@ -290,11 +287,11 @@ class BOSMiner(BaseMiner): board_map = {0: "left_board", 1: "center_board", 2: "right_board"} offset = temp[0]["ID"] for board in temp: - id = board["ID"] - offset + _id = board["ID"] - offset chip_temp = round(board["Chip"]) board_temp = round(board["Board"]) - setattr(data, f"{board_map[id]}_chip_temp", chip_temp) - setattr(data, f"{board_map[id]}_temp", board_temp) + setattr(data, f"{board_map[_id]}_chip_temp", chip_temp) + setattr(data, f"{board_map[_id]}_temp", board_temp) if fans: fan_data = fans.get("FANS") @@ -363,9 +360,9 @@ class BOSMiner(BaseMiner): board_map = {0: "left_chips", 1: "center_chips", 2: "right_chips"} offset = boards[0]["ID"] for board in boards: - id = board["ID"] - offset + _id = board["ID"] - offset chips = board["Chips"] - setattr(data, board_map[id], chips) + setattr(data, board_map[_id], chips) return data diff --git a/miners/_backends/bosminer_old.py b/miners/_backends/bosminer_old.py index da004e44..6257d12c 100644 --- a/miners/_backends/bosminer_old.py +++ b/miners/_backends/bosminer_old.py @@ -1,11 +1,10 @@ -from miners import BaseMiner -from API.bosminer import BOSMinerAPI -import toml -from config.bos import bos_config_convert, general_config_convert_bos import logging -from settings import MINER_FACTORY_GET_VERSION_RETRIES as DATA_RETRIES + import asyncssh +from API.bosminer import BOSMinerAPI +from miners import BaseMiner + class BOSMinerOld(BaseMiner): def __init__(self, ip: str) -> None: diff --git a/miners/_backends/btminer.py b/miners/_backends/btminer.py index 09119c24..76d8366c 100644 --- a/miners/_backends/btminer.py +++ b/miners/_backends/btminer.py @@ -43,7 +43,7 @@ class BTMiner(BaseMiner): except APIError: logging.warning(f"Failed to get hostname for miner: {self}") return "?" - except Exception as e: + except Exception: logging.warning(f"Failed to get hostname for miner: {self}") return "?" @@ -141,11 +141,11 @@ class BTMiner(BaseMiner): board_map = {0: "left_board", 1: "center_board", 2: "right_board"} for board in temp_data: - id = board["ID"] + _id = board["ID"] chip_temp = round(board["Chip Temp Avg"]) board_temp = round(board["Temperature"]) - setattr(data, f"{board_map[id]}_chip_temp", chip_temp) - setattr(data, f"{board_map[id]}_temp", board_temp) + setattr(data, f"{board_map[_id]}_chip_temp", chip_temp) + setattr(data, f"{board_map[_id]}_temp", board_temp) if devs: boards = devs.get("DEVS") @@ -158,9 +158,9 @@ class BTMiner(BaseMiner): id_key = "ASC" offset = boards[0][id_key] for board in boards: - id = board[id_key] - offset + _id = board[id_key] - offset chips = board["Effective Chips"] - setattr(data, board_map[id], chips) + setattr(data, board_map[_id], chips) if pools: pool_1 = None diff --git a/miners/_backends/cgminer.py b/miners/_backends/cgminer.py index 6755681b..840c6424 100644 --- a/miners/_backends/cgminer.py +++ b/miners/_backends/cgminer.py @@ -19,6 +19,7 @@ class CGMiner(BaseMiner): self.api_type = "CGMiner" self.uname = "root" self.pwd = "admin" + self.config = None async def get_model(self): if self.model: diff --git a/miners/antminer/bmminer/X17/S17.py b/miners/antminer/bmminer/X17/S17.py index 8ba567d0..d0b36faa 100644 --- a/miners/antminer/bmminer/X17/S17.py +++ b/miners/antminer/bmminer/X17/S17.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S17 +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S17 # noqa - Ignore access to _module class BMMinerS17(BMMiner, S17): diff --git a/miners/antminer/bmminer/X17/S17_Plus.py b/miners/antminer/bmminer/X17/S17_Plus.py index 6120a9f3..d976db5b 100644 --- a/miners/antminer/bmminer/X17/S17_Plus.py +++ b/miners/antminer/bmminer/X17/S17_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S17Plus +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S17Plus # noqa - Ignore access to _module class BMMinerS17Plus(BMMiner, S17Plus): diff --git a/miners/antminer/bmminer/X17/S17_Pro.py b/miners/antminer/bmminer/X17/S17_Pro.py index 932384af..9916303a 100644 --- a/miners/antminer/bmminer/X17/S17_Pro.py +++ b/miners/antminer/bmminer/X17/S17_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S17Pro +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S17Pro # noqa - Ignore access to _module class BMMinerS17Pro(BMMiner, S17Pro): diff --git a/miners/antminer/bmminer/X17/S17e.py b/miners/antminer/bmminer/X17/S17e.py index fb760874..13ddea36 100644 --- a/miners/antminer/bmminer/X17/S17e.py +++ b/miners/antminer/bmminer/X17/S17e.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S17e +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S17e # noqa - Ignore access to _module class BMMinerS17e(BMMiner, S17e): diff --git a/miners/antminer/bmminer/X17/T17.py b/miners/antminer/bmminer/X17/T17.py index db6a6906..eb6db4a6 100644 --- a/miners/antminer/bmminer/X17/T17.py +++ b/miners/antminer/bmminer/X17/T17.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import T17 +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import T17 # noqa - Ignore access to _module class BMMinerT17(BMMiner, T17): diff --git a/miners/antminer/bmminer/X17/T17_Plus.py b/miners/antminer/bmminer/X17/T17_Plus.py index 3d098b06..97f5e99b 100644 --- a/miners/antminer/bmminer/X17/T17_Plus.py +++ b/miners/antminer/bmminer/X17/T17_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import T17Plus +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import T17Plus # noqa - Ignore access to _module class BMMinerT17Plus(BMMiner, T17Plus): diff --git a/miners/antminer/bmminer/X17/T17e.py b/miners/antminer/bmminer/X17/T17e.py index ec84a145..cfc20b12 100644 --- a/miners/antminer/bmminer/X17/T17e.py +++ b/miners/antminer/bmminer/X17/T17e.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import T17e +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import T17e # noqa - Ignore access to _module class BMMinerT17e(BMMiner, T17e): diff --git a/miners/antminer/bmminer/X19/S19.py b/miners/antminer/bmminer/X19/S19.py index 7287c5f9..84d8c08b 100644 --- a/miners/antminer/bmminer/X19/S19.py +++ b/miners/antminer/bmminer/X19/S19.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S19 +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S19 # noqa - Ignore access to _module class BMMinerS19(BMMiner, S19): diff --git a/miners/antminer/bmminer/X19/S19_Pro.py b/miners/antminer/bmminer/X19/S19_Pro.py index 1d06262a..f9479134 100644 --- a/miners/antminer/bmminer/X19/S19_Pro.py +++ b/miners/antminer/bmminer/X19/S19_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S19Pro +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S19Pro # noqa - Ignore access to _module class BMMinerS19Pro(BMMiner, S19Pro): diff --git a/miners/antminer/bmminer/X19/S19a.py b/miners/antminer/bmminer/X19/S19a.py index e85ef1e2..50e2ed59 100644 --- a/miners/antminer/bmminer/X19/S19a.py +++ b/miners/antminer/bmminer/X19/S19a.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S19a +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S19a # noqa - Ignore access to _module class BMMinerS19a(BMMiner, S19a): diff --git a/miners/antminer/bmminer/X19/S19j.py b/miners/antminer/bmminer/X19/S19j.py index 6956c5e8..17b95bfb 100644 --- a/miners/antminer/bmminer/X19/S19j.py +++ b/miners/antminer/bmminer/X19/S19j.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S19j +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S19j # noqa - Ignore access to _module class BMMinerS19j(BMMiner, S19j): diff --git a/miners/antminer/bmminer/X19/S19j_Pro.py b/miners/antminer/bmminer/X19/S19j_Pro.py index 37c49e88..c3e629f4 100644 --- a/miners/antminer/bmminer/X19/S19j_Pro.py +++ b/miners/antminer/bmminer/X19/S19j_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S19jPro +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S19jPro # noqa - Ignore access to _module class BMMinerS19jPro(BMMiner, S19jPro): diff --git a/miners/antminer/bmminer/X19/T19.py b/miners/antminer/bmminer/X19/T19.py index 1860dfdd..5bd91fd2 100644 --- a/miners/antminer/bmminer/X19/T19.py +++ b/miners/antminer/bmminer/X19/T19.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import T19 +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import T19 # noqa - Ignore access to _module class BMMinerT19(BMMiner, T19): diff --git a/miners/antminer/bmminer/X9/S9.py b/miners/antminer/bmminer/X9/S9.py index 1a17ffa4..e49f05ba 100644 --- a/miners/antminer/bmminer/X9/S9.py +++ b/miners/antminer/bmminer/X9/S9.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S9 +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S9 # noqa - Ignore access to _module class BMMinerS9(BMMiner, S9): diff --git a/miners/antminer/bmminer/X9/S9i.py b/miners/antminer/bmminer/X9/S9i.py index 82f76dd6..71b8bf7c 100644 --- a/miners/antminer/bmminer/X9/S9i.py +++ b/miners/antminer/bmminer/X9/S9i.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import S9i +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import S9i # noqa - Ignore access to _module class BMMinerS9i(BMMiner, S9i): diff --git a/miners/antminer/bmminer/X9/T9.py b/miners/antminer/bmminer/X9/T9.py index 46ad8c64..cc76df4e 100644 --- a/miners/antminer/bmminer/X9/T9.py +++ b/miners/antminer/bmminer/X9/T9.py @@ -1,5 +1,5 @@ -from miners._backends import BMMiner -from miners._types import T9 +from miners._backends import BMMiner # noqa - Ignore access to _module +from miners._types import T9 # noqa - Ignore access to _module class BMMinerT9(BMMiner, T9): diff --git a/miners/antminer/bosminer/X17/S17.py b/miners/antminer/bosminer/X17/S17.py index c4179ddc..50ca3bc5 100644 --- a/miners/antminer/bosminer/X17/S17.py +++ b/miners/antminer/bosminer/X17/S17.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S17 +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S17 # noqa - Ignore access to _module class BOSMinerS17(BOSMiner, S17): diff --git a/miners/antminer/bosminer/X17/S17_Plus.py b/miners/antminer/bosminer/X17/S17_Plus.py index abbe51d4..1a0f4c64 100644 --- a/miners/antminer/bosminer/X17/S17_Plus.py +++ b/miners/antminer/bosminer/X17/S17_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S17Plus +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S17Plus # noqa - Ignore access to _module class BOSMinerS17Plus(BOSMiner, S17Plus): diff --git a/miners/antminer/bosminer/X17/S17_Pro.py b/miners/antminer/bosminer/X17/S17_Pro.py index 92995045..fabb66d9 100644 --- a/miners/antminer/bosminer/X17/S17_Pro.py +++ b/miners/antminer/bosminer/X17/S17_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S17Pro +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S17Pro # noqa - Ignore access to _module class BOSMinerS17Pro(BOSMiner, S17Pro): diff --git a/miners/antminer/bosminer/X17/S17e.py b/miners/antminer/bosminer/X17/S17e.py index 61a487f2..4d04848d 100644 --- a/miners/antminer/bosminer/X17/S17e.py +++ b/miners/antminer/bosminer/X17/S17e.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S17e +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S17e # noqa - Ignore access to _module class BOSMinerS17e(BOSMiner, S17e): diff --git a/miners/antminer/bosminer/X17/T17.py b/miners/antminer/bosminer/X17/T17.py index b5aa4f7a..eb7489e6 100644 --- a/miners/antminer/bosminer/X17/T17.py +++ b/miners/antminer/bosminer/X17/T17.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import T17 +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import T17 # noqa - Ignore access to _module class BOSMinerT17(BOSMiner, T17): diff --git a/miners/antminer/bosminer/X17/T17_Plus.py b/miners/antminer/bosminer/X17/T17_Plus.py index 9452d858..d3f2a45f 100644 --- a/miners/antminer/bosminer/X17/T17_Plus.py +++ b/miners/antminer/bosminer/X17/T17_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import T17Plus +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import T17Plus # noqa - Ignore access to _module class BOSMinerT17Plus(BOSMiner, T17Plus): diff --git a/miners/antminer/bosminer/X17/T17e.py b/miners/antminer/bosminer/X17/T17e.py index 8f092c2e..31634b31 100644 --- a/miners/antminer/bosminer/X17/T17e.py +++ b/miners/antminer/bosminer/X17/T17e.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import T17e +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import T17e # noqa - Ignore access to _module class BOSMinerT17e(BOSMiner, T17e): diff --git a/miners/antminer/bosminer/X19/S19.py b/miners/antminer/bosminer/X19/S19.py index be242bf4..dd0e7c60 100644 --- a/miners/antminer/bosminer/X19/S19.py +++ b/miners/antminer/bosminer/X19/S19.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S19 +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S19 # noqa - Ignore access to _module class BOSMinerS19(BOSMiner, S19): diff --git a/miners/antminer/bosminer/X19/S19_Pro.py b/miners/antminer/bosminer/X19/S19_Pro.py index 1641bc37..e8d5a728 100644 --- a/miners/antminer/bosminer/X19/S19_Pro.py +++ b/miners/antminer/bosminer/X19/S19_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S19Pro +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S19Pro # noqa - Ignore access to _module class BOSMinerS19Pro(BOSMiner, S19Pro): diff --git a/miners/antminer/bosminer/X19/S19j.py b/miners/antminer/bosminer/X19/S19j.py index 0fb87aab..51e2ecc7 100644 --- a/miners/antminer/bosminer/X19/S19j.py +++ b/miners/antminer/bosminer/X19/S19j.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S19j +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S19j # noqa - Ignore access to _module class BOSMinerS19j(BOSMiner, S19j): diff --git a/miners/antminer/bosminer/X19/S19j_Pro.py b/miners/antminer/bosminer/X19/S19j_Pro.py index c974be72..43effd5b 100644 --- a/miners/antminer/bosminer/X19/S19j_Pro.py +++ b/miners/antminer/bosminer/X19/S19j_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S19jPro +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S19jPro # noqa - Ignore access to _module class BOSMinerS19jPro(BOSMiner, S19jPro): diff --git a/miners/antminer/bosminer/X19/T19.py b/miners/antminer/bosminer/X19/T19.py index 7ba233b6..b9e10ca2 100644 --- a/miners/antminer/bosminer/X19/T19.py +++ b/miners/antminer/bosminer/X19/T19.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import T19 +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import T19 # noqa - Ignore access to _module class BOSMinerT19(BOSMiner, T19): diff --git a/miners/antminer/bosminer/X9/S9.py b/miners/antminer/bosminer/X9/S9.py index 2a760467..5131e189 100644 --- a/miners/antminer/bosminer/X9/S9.py +++ b/miners/antminer/bosminer/X9/S9.py @@ -1,5 +1,5 @@ -from miners._backends import BOSMiner -from miners._types import S9 +from miners._backends import BOSMiner # noqa - Ignore access to _module +from miners._types import S9 # noqa - Ignore access to _module class BOSMinerS9(BOSMiner, S9): diff --git a/miners/antminer/cgminer/X17/S17.py b/miners/antminer/cgminer/X17/S17.py index b9c1147a..1ccf147f 100644 --- a/miners/antminer/cgminer/X17/S17.py +++ b/miners/antminer/cgminer/X17/S17.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S17 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S17 # noqa - Ignore access to _module class CGMinerS17(CGMiner, S17): diff --git a/miners/antminer/cgminer/X17/S17_Plus.py b/miners/antminer/cgminer/X17/S17_Plus.py index 20bec5d5..52c21b6a 100644 --- a/miners/antminer/cgminer/X17/S17_Plus.py +++ b/miners/antminer/cgminer/X17/S17_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S17Plus +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S17Plus # noqa - Ignore access to _module class CGMinerS17Plus(CGMiner, S17Plus): diff --git a/miners/antminer/cgminer/X17/S17_Pro.py b/miners/antminer/cgminer/X17/S17_Pro.py index 28076822..de9840b5 100644 --- a/miners/antminer/cgminer/X17/S17_Pro.py +++ b/miners/antminer/cgminer/X17/S17_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S17Pro +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S17Pro # noqa - Ignore access to _module class CGMinerS17Pro(CGMiner, S17Pro): diff --git a/miners/antminer/cgminer/X17/S17e.py b/miners/antminer/cgminer/X17/S17e.py index a5f9bf62..8ce7bd1f 100644 --- a/miners/antminer/cgminer/X17/S17e.py +++ b/miners/antminer/cgminer/X17/S17e.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S17e +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S17e # noqa - Ignore access to _module class CGMinerS17e(CGMiner, S17e): diff --git a/miners/antminer/cgminer/X17/T17.py b/miners/antminer/cgminer/X17/T17.py index 9c908b64..85af3c3c 100644 --- a/miners/antminer/cgminer/X17/T17.py +++ b/miners/antminer/cgminer/X17/T17.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import T17 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import T17 # noqa - Ignore access to _module class CGMinerT17(CGMiner, T17): diff --git a/miners/antminer/cgminer/X17/T17_Plus.py b/miners/antminer/cgminer/X17/T17_Plus.py index 14a22cb9..3e13bfee 100644 --- a/miners/antminer/cgminer/X17/T17_Plus.py +++ b/miners/antminer/cgminer/X17/T17_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import T17Plus +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import T17Plus # noqa - Ignore access to _module class CGMinerT17Plus(CGMiner, T17Plus): diff --git a/miners/antminer/cgminer/X17/T17e.py b/miners/antminer/cgminer/X17/T17e.py index 1d63a57e..96eae6b7 100644 --- a/miners/antminer/cgminer/X17/T17e.py +++ b/miners/antminer/cgminer/X17/T17e.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import T17e +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import T17e # noqa - Ignore access to _module class CGMinerT17e(CGMiner, T17e): diff --git a/miners/antminer/cgminer/X19/S19.py b/miners/antminer/cgminer/X19/S19.py index 3828ed2f..a637ec04 100644 --- a/miners/antminer/cgminer/X19/S19.py +++ b/miners/antminer/cgminer/X19/S19.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S19 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S19 # noqa - Ignore access to _module class CGMinerS19(CGMiner, S19): diff --git a/miners/antminer/cgminer/X19/S19_Pro.py b/miners/antminer/cgminer/X19/S19_Pro.py index 7c546a5c..96dda5e7 100644 --- a/miners/antminer/cgminer/X19/S19_Pro.py +++ b/miners/antminer/cgminer/X19/S19_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S19Pro +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S19Pro # noqa - Ignore access to _module class CGMinerS19Pro(CGMiner, S19Pro): diff --git a/miners/antminer/cgminer/X19/S19j.py b/miners/antminer/cgminer/X19/S19j.py index 6abaf2ea..b12c3de2 100644 --- a/miners/antminer/cgminer/X19/S19j.py +++ b/miners/antminer/cgminer/X19/S19j.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S19j +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S19j # noqa - Ignore access to _module class CGMinerS19j(CGMiner, S19j): diff --git a/miners/antminer/cgminer/X19/S19j_Pro.py b/miners/antminer/cgminer/X19/S19j_Pro.py index b6bf8ab7..02a9b006 100644 --- a/miners/antminer/cgminer/X19/S19j_Pro.py +++ b/miners/antminer/cgminer/X19/S19j_Pro.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S19jPro +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S19jPro # noqa - Ignore access to _module class CGMinerS19jPro(CGMiner, S19jPro): diff --git a/miners/antminer/cgminer/X19/T19.py b/miners/antminer/cgminer/X19/T19.py index 3e30e9ce..8e2662bd 100644 --- a/miners/antminer/cgminer/X19/T19.py +++ b/miners/antminer/cgminer/X19/T19.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import T19 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import T19 # noqa - Ignore access to _module class CGMinerT19(CGMiner, T19): diff --git a/miners/antminer/cgminer/X9/S9.py b/miners/antminer/cgminer/X9/S9.py index 4e1c7b9f..2d9bc155 100644 --- a/miners/antminer/cgminer/X9/S9.py +++ b/miners/antminer/cgminer/X9/S9.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import S9 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import S9 # noqa - Ignore access to _module class CGMinerS9(CGMiner, S9): diff --git a/miners/antminer/cgminer/X9/T9.py b/miners/antminer/cgminer/X9/T9.py index 48a394f3..928984c6 100644 --- a/miners/antminer/cgminer/X9/T9.py +++ b/miners/antminer/cgminer/X9/T9.py @@ -1,11 +1,9 @@ -from miners._backends.cgminer import CGMiner +from miners._backends.cgminer import CGMiner # noqa - Ignore access to _module +from miners._types.antminer import T9 # noqa - Ignore access to _module -class CGMinerT9(CGMiner): +class CGMinerT9(CGMiner, T9): def __init__(self, ip: str) -> None: super().__init__(ip) self.model = "T9" self.api_type = "CGMiner" - - def __repr__(self) -> str: - return f"CGMinerT9: {str(self.ip)}" diff --git a/miners/antminer/hiveon/X9/T9.py b/miners/antminer/hiveon/X9/T9.py index 60c35dcc..0f5fc1f1 100644 --- a/miners/antminer/hiveon/X9/T9.py +++ b/miners/antminer/hiveon/X9/T9.py @@ -1,5 +1,5 @@ -from miners._backends import Hiveon -from miners._types import T9 +from miners._backends import Hiveon # noqa - Ignore access to _module +from miners._types import T9 # noqa - Ignore access to _module class HiveonT9(Hiveon, T9): diff --git a/miners/avalonminer/cgminer/A10X/A1047.py b/miners/avalonminer/cgminer/A10X/A1047.py index c57aa7db..78d829e3 100644 --- a/miners/avalonminer/cgminer/A10X/A1047.py +++ b/miners/avalonminer/cgminer/A10X/A1047.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import Avalon1047 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import Avalon1047 # noqa - Ignore access to _module class CGMinerAvalon1047(CGMiner, Avalon1047): diff --git a/miners/avalonminer/cgminer/A10X/A1066.py b/miners/avalonminer/cgminer/A10X/A1066.py index f0babbaa..04723c81 100644 --- a/miners/avalonminer/cgminer/A10X/A1066.py +++ b/miners/avalonminer/cgminer/A10X/A1066.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import Avalon1066 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import Avalon1066 # noqa - Ignore access to _module class CGMinerAvalon1066(CGMiner, Avalon1066): diff --git a/miners/avalonminer/cgminer/A8X/A821.py b/miners/avalonminer/cgminer/A8X/A821.py index afe17dec..c842eba3 100644 --- a/miners/avalonminer/cgminer/A8X/A821.py +++ b/miners/avalonminer/cgminer/A8X/A821.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import Avalon821 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import Avalon821 # noqa - Ignore access to _module class CGMinerAvalon821(CGMiner, Avalon821): diff --git a/miners/avalonminer/cgminer/A8X/A841.py b/miners/avalonminer/cgminer/A8X/A841.py index 4ba357d5..705f4bac 100644 --- a/miners/avalonminer/cgminer/A8X/A841.py +++ b/miners/avalonminer/cgminer/A8X/A841.py @@ -1,5 +1,5 @@ -from miners._backends import CGMiner -from miners._types import Avalon841 +from miners._backends import CGMiner # noqa - Ignore access to _module +from miners._types import Avalon841 # noqa - Ignore access to _module class CGMinerAvalon841(CGMiner, Avalon841): diff --git a/miners/miner_listener.py b/miners/miner_listener.py index fa8b39c1..e596920b 100644 --- a/miners/miner_listener.py +++ b/miners/miner_listener.py @@ -13,11 +13,12 @@ class Singleton(type): class _MinerListener: def __init__(self): self.responses = {} + self.transport = None def connection_made(self, transport): self.transport = transport - def datagram_received(self, data, addr): + def datagram_received(self, data, _addr): m = data.decode() ip, mac = m.split(",") new_miner = {"IP": ip, "MAC": mac.upper()} diff --git a/miners/whatsminer/btminer/M2X/M20S.py b/miners/whatsminer/btminer/M2X/M20S.py index 55ba0af2..ac6e9d5c 100644 --- a/miners/whatsminer/btminer/M2X/M20S.py +++ b/miners/whatsminer/btminer/M2X/M20S.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M20S +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M20S # noqa - Ignore access to _module class BTMinerM20S(BTMiner, M20S): diff --git a/miners/whatsminer/btminer/M2X/M20S_Plus.py b/miners/whatsminer/btminer/M2X/M20S_Plus.py index 3e3a206e..a01854ae 100644 --- a/miners/whatsminer/btminer/M2X/M20S_Plus.py +++ b/miners/whatsminer/btminer/M2X/M20S_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M20SPlus +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M20SPlus # noqa - Ignore access to _module class BTMinerM20SPlus(BTMiner, M20SPlus): diff --git a/miners/whatsminer/btminer/M2X/M21.py b/miners/whatsminer/btminer/M2X/M21.py index 957a2d82..671de3bc 100644 --- a/miners/whatsminer/btminer/M2X/M21.py +++ b/miners/whatsminer/btminer/M2X/M21.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M21 +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M21 # noqa - Ignore access to _module class BTMinerM21(BTMiner, M21): diff --git a/miners/whatsminer/btminer/M2X/M21S.py b/miners/whatsminer/btminer/M2X/M21S.py index 45c272e6..29d9f2c6 100644 --- a/miners/whatsminer/btminer/M2X/M21S.py +++ b/miners/whatsminer/btminer/M2X/M21S.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M21S +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M21S # noqa - Ignore access to _module class BTMinerM21S(BTMiner, M21S): diff --git a/miners/whatsminer/btminer/M2X/M21S_Plus.py b/miners/whatsminer/btminer/M2X/M21S_Plus.py index 7698197c..399a4c5f 100644 --- a/miners/whatsminer/btminer/M2X/M21S_Plus.py +++ b/miners/whatsminer/btminer/M2X/M21S_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M21SPlus +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M21SPlus # noqa - Ignore access to _module class BTMinerM21SPlus(BTMiner, M21SPlus): diff --git a/miners/whatsminer/btminer/M3X/M30S.py b/miners/whatsminer/btminer/M3X/M30S.py index 97d8b03d..18f85993 100644 --- a/miners/whatsminer/btminer/M3X/M30S.py +++ b/miners/whatsminer/btminer/M3X/M30S.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M30S +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M30S # noqa - Ignore access to _module class BTMinerM30S(BTMiner, M30S): diff --git a/miners/whatsminer/btminer/M3X/M30S_Plus.py b/miners/whatsminer/btminer/M3X/M30S_Plus.py index a020d6f4..31f3dac4 100644 --- a/miners/whatsminer/btminer/M3X/M30S_Plus.py +++ b/miners/whatsminer/btminer/M3X/M30S_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M30SPlus +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M30SPlus # noqa - Ignore access to _module class BTMinerM30SPlus(BTMiner, M30SPlus): diff --git a/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py b/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py index 62d547f8..2664db74 100644 --- a/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py +++ b/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M30SPlusPlus +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M30SPlusPlus # noqa - Ignore access to _module class BTMinerM30SPlusPlus(BTMiner, M30SPlusPlus): diff --git a/miners/whatsminer/btminer/M3X/M31S.py b/miners/whatsminer/btminer/M3X/M31S.py index aa9f5cd7..f72be09e 100644 --- a/miners/whatsminer/btminer/M3X/M31S.py +++ b/miners/whatsminer/btminer/M3X/M31S.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M31S +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M31S # noqa - Ignore access to _module class BTMinerM31S(BTMiner, M31S): diff --git a/miners/whatsminer/btminer/M3X/M31S_Plus.py b/miners/whatsminer/btminer/M3X/M31S_Plus.py index 9e2eb085..e020fec2 100644 --- a/miners/whatsminer/btminer/M3X/M31S_Plus.py +++ b/miners/whatsminer/btminer/M3X/M31S_Plus.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M31SPlus +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M31SPlus # noqa - Ignore access to _module class BTMinerM31SPlus(BTMiner, M31SPlus): diff --git a/miners/whatsminer/btminer/M3X/M32S.py b/miners/whatsminer/btminer/M3X/M32S.py index 0c109e52..5686cef8 100644 --- a/miners/whatsminer/btminer/M3X/M32S.py +++ b/miners/whatsminer/btminer/M3X/M32S.py @@ -1,5 +1,5 @@ -from miners._backends import BTMiner -from miners._types import M32S +from miners._backends import BTMiner # noqa - Ignore access to _module +from miners._types import M32S # noqa - Ignore access to _module class BTMinerM32S(BTMiner, M32S): diff --git a/misc/bos.py b/misc/bos.py index 9da1bd3b..35ccdaa8 100644 --- a/misc/bos.py +++ b/misc/bos.py @@ -1,6 +1,6 @@ import asyncio from network import MinerNetwork -from miners._backends.bosminer import BOSMiner +from miners._backends.bosminer import BOSMiner # noqa - Ignore access to _module async def get_bos_bad_tuners(ip: str = "192.168.1.0", mask: int = 24): diff --git a/tools/cfg_util/boards/__init__.py b/tools/cfg_util/boards/__init__.py index 51318197..e83af91b 100644 --- a/tools/cfg_util/boards/__init__.py +++ b/tools/cfg_util/boards/__init__.py @@ -8,7 +8,10 @@ from matplotlib.figure import Figure import numpy as np from reportlab.lib import colors from reportlab.lib.pagesizes import letter, inch -from reportlab.lib.styles import ParagraphStyle, TA_CENTER +from reportlab.lib.styles import ( + ParagraphStyle, + TA_CENTER, # noqa - not declared in __all__ +) from reportlab.lib.utils import ImageReader from reportlab.platypus import ( SimpleDocTemplate, diff --git a/tools/cfg_util/scan/__init__.py b/tools/cfg_util/scan/__init__.py index 3c52d3bb..ec59a916 100644 --- a/tools/cfg_util/scan/__init__.py +++ b/tools/cfg_util/scan/__init__.py @@ -37,10 +37,8 @@ for table in TABLE_HEADERS: async def btn_all(): - table = "scan_table" - window[table].update( - select_rows=([row for row in range(len(window[table].Values))]) - ) + tbl = "scan_table" + window[tbl].update(select_rows=([row for row in range(len(window[tbl].Values))])) async def btn_scan(scan_ip: str): diff --git a/tools/cfg_util/ui.py b/tools/cfg_util/ui.py index 7f63f2cc..3bc96be5 100644 --- a/tools/cfg_util/ui.py +++ b/tools/cfg_util/ui.py @@ -47,7 +47,7 @@ def _table_copy(table): for item in value: values.append(str(item).strip()) _copy_values.append(values) - except Exception as E: + except Exception: pass copy_values = [] @@ -88,7 +88,7 @@ async def ui(): bind_ctrl_a(key) # create images used in the table, they will not show if not saved here - tk_imgs = TkImages() + tk_imgs = TkImages() # noqa - need to save this in memory to hold images # left justify hostnames window["scan_table"].Widget.column(2, anchor=tk.W) diff --git a/tools/web_monitor/app.py b/tools/web_monitor/app.py index afec77c0..35c7bab6 100644 --- a/tools/web_monitor/app.py +++ b/tools/web_monitor/app.py @@ -8,7 +8,9 @@ from fastapi.staticfiles import StaticFiles from tools.web_monitor.dashboard import router as dashboard_router from tools.web_monitor.miner import router as miner_router from tools.web_monitor.scan import router as scan_router -from tools.web_monitor._settings import router as settings_router +from tools.web_monitor._settings import ( # noqa - Ignore access to _module + router as settings_router, +) app = FastAPI() diff --git a/tools/web_monitor/dashboard/func.py b/tools/web_monitor/dashboard/func.py index 08bb3cae..4a7c3e14 100644 --- a/tools/web_monitor/dashboard/func.py +++ b/tools/web_monitor/dashboard/func.py @@ -1,7 +1,9 @@ import asyncio from miners.miner_factory import MinerFactory -from tools.web_monitor._settings.func import get_current_settings +from tools.web_monitor._settings.func import ( # noqa - Ignore access to _module + get_current_settings, +) async def get_miner_data_dashboard(miner_ip): diff --git a/tools/web_monitor/dashboard/ws.py b/tools/web_monitor/dashboard/ws.py index 24bf6563..3a61f544 100644 --- a/tools/web_monitor/dashboard/ws.py +++ b/tools/web_monitor/dashboard/ws.py @@ -5,7 +5,9 @@ import websockets.exceptions from fastapi import WebSocket, WebSocketDisconnect, APIRouter from tools.web_monitor.func import get_current_miner_list -from tools.web_monitor._settings.func import get_current_settings +from tools.web_monitor._settings.func import ( # noqa - Ignore access to _module + get_current_settings, +) from tools.web_monitor.dashboard.func import get_miner_data_dashboard diff --git a/tools/web_monitor/miner/ws.py b/tools/web_monitor/miner/ws.py index e60b3ae7..306fa7c1 100644 --- a/tools/web_monitor/miner/ws.py +++ b/tools/web_monitor/miner/ws.py @@ -5,7 +5,9 @@ import websockets.exceptions from fastapi import WebSocket, WebSocketDisconnect, APIRouter from miners.miner_factory import MinerFactory -from tools.web_monitor._settings.func import get_current_settings +from tools.web_monitor._settings.func import ( # noqa - Ignore access to _module + get_current_settings, +) router = APIRouter() @@ -24,9 +26,7 @@ async def miner_websocket(websocket: WebSocket, miner_ip): cur_miner = await asyncio.wait_for( MinerFactory().get_miner(str(miner_ip)), miner_identify_timeout ) - data = await asyncio.wait_for( - cur_miner.get_data(), miner_identify_timeout - ) + data = await asyncio.wait_for(cur_miner.get_data(), miner_data_timeout) fan_speeds = [ fan if not fan == -1 else 0 diff --git a/tools/web_testbench/_miners.py b/tools/web_testbench/_miners.py index 446bb977..a598a038 100644 --- a/tools/web_testbench/_miners.py +++ b/tools/web_testbench/_miners.py @@ -7,7 +7,7 @@ import datetime from network import ping_miner from miners.miner_factory import MinerFactory from miners.antminer import BOSMinerS9 -from miners._backends.bosminer_old import BOSMinerOld +from miners._backends.bosminer_old import BOSMinerOld # noqa - Ignore access to _module from miners.unknown import UnknownMiner from tools.web_testbench.connections import ConnectionManager from tools.web_testbench.feeds import get_local_versions @@ -54,7 +54,6 @@ class Miners(metaclass=Singleton): self.miners.remove(other) - class TestbenchMiner: def __init__(self, host: ip_address): self.host = host @@ -146,7 +145,9 @@ class TestbenchMiner: elif isinstance(miner, UnknownMiner): await self.add_to_output("Unknown Miner found, attempting to fix.") try: - async with (await miner._get_ssh_connection()) as conn: + async with ( + await miner._get_ssh_connection() # noqa - Ignore access to _function + ) as conn: result = await conn.run("opkg update && opkg upgrade firmware") except: await self.add_to_output("Fix failed, please manually reset miner.") @@ -271,7 +272,7 @@ class TestbenchMiner: await miner.send_ssh_command( "opkg install /tmp/referral.ipk && /etc/init.d/bosminer restart" ) - except Exception as e: + except Exception: await self.add_to_output( "Failed to add referral and configure, restarting." ) @@ -370,7 +371,7 @@ class TestbenchMiner: "Temps": temps_data, "online": self.get_online_time(), "Tuner": tuner_data, - "Count": Miners().get_count() + "Count": Miners().get_count(), } # return stats @@ -401,7 +402,7 @@ class TestbenchMiner: "board_7": {"power_limit": 275, "real_power": 0, "status": "None"}, "board_8": {"power_limit": 275, "real_power": 0, "status": "None"}, }, - "Count": Miners().get_count() + "Count": Miners().get_count(), } async def install_done(self): @@ -418,7 +419,7 @@ class TestbenchMiner: "IP": str(self.host), "Light": "show", "online": self.get_online_time(), - "Count": Miners().get_count() + "Count": Miners().get_count(), } print(f"Getting data failed: {self.host}") diff --git a/tools/web_testbench/connections.py b/tools/web_testbench/connections.py index a5765f51..817b4cf6 100644 --- a/tools/web_testbench/connections.py +++ b/tools/web_testbench/connections.py @@ -1,7 +1,7 @@ -from fastapi import WebSocket import logging -from miners.miner_factory import MinerFactory +from fastapi import WebSocket + from tools.web_testbench._network import miner_network @@ -39,5 +39,5 @@ class ConnectionManager: for connection in ConnectionManager._connections: try: await connection.send_json(data) - except Exception as e: + except Exception: self.disconnect(connection)