version: bump version number.

* feature: Start refactor to new style of get_miner.  Needs testing and stability fixes.

* feature: refactor to aiohttp and fix a lot of bugs with factory.  Still needs support for some miners.

* feature: refactor miner class list to be much more readable.

* bug: remove some redundant .upper() calls.

* bug: remove some redundant .upper() calls.

* feature: add Avalonminer support in update miner factory, and add support for A1166 and A1246.

* feature: refactor get_miner to allow models to be selected as strings then selected in the top level get_miner function.

* bug: fix some naming issues, and add timeout to getting miner model.

* bug: fix not instantiating some web sessions properly.

docs/API/api.md

@@ -10,6 +10,7 @@ All API implementations inherit from [`BaseMinerAPI`][pyasic.API.BaseMinerAPI],
 [`BaseMinerAPI`][pyasic.API.BaseMinerAPI] cannot be instantiated directly, it will raise a `TypeError`.
 Use these instead -
 
+#### [BFGMiner API][pyasic.API.bfgminer.BFGMinerAPI]
 #### [BMMiner API][pyasic.API.bmminer.BMMinerAPI]
 #### [BOSMiner API][pyasic.API.bosminer.BOSMinerAPI]
 #### [BTMiner API][pyasic.API.btminer.BTMinerAPI]

docs/API/bfgminer.md

@@ -0,0 +1,7 @@
+# pyasic
+## BFGMinerAPI
+::: pyasic.API.bfgminer.BFGMinerAPI
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/index.md

@@ -42,21 +42,27 @@ if __name__ == "__main__":
 <br>
 
 ## Creating miners based on IP
-If you already know the IP address of your miner or miners, you can use the [`MinerFactory`][pyasic.miners.miner_factory.MinerFactory] to communicate and identify the miners.
-The function [`MinerFactory().get_miner()`][pyasic.miners.miner_factory.MinerFactory.get_miner] will return any miner it found at the IP address specified, or an `UnknownMiner` if it cannot identify the miner.
+If you already know the IP address of your miner or miners, you can use the [`MinerFactory`][pyasic.miners.miner_factory.MinerFactory] to communicate and identify the miners, or an abstraction of its functionality, [`get_miner()`][pyasic.miners.miner_factory.MinerFactory.get_miner].
+The function [`get_miner()`][pyasic.miners.miner_factory.MinerFactory.get_miner] will return any miner it found at the IP address specified, or an `UnknownMiner` if it cannot identify the miner.
 ```python
 import asyncio  # asyncio for handling the async part
-from pyasic.miners.miner_factory import MinerFactory  # miner factory handles miners creation
+from pyasic import get_miner # handles miner creation
 
 
 async def get_miners():  # define async scan function to allow awaiting
-    # get the miner with miner factory
-    # miner factory is a singleton, and will always use the same object and cache
-    # this means you can always call it as MinerFactory().get_miner()
-    miner_1 = await MinerFactory().get_miner("192.168.1.75")
-    miner_2 = await MinerFactory().get_miner("192.168.1.76")
+    # get the miner with the miner factory
+    # the miner factory is a singleton, and will always use the same object and cache
+    # this means you can always call it as MinerFactory().get_miner(), or just get_miner()
+    miner_1 = await get_miner("192.168.1.75")
+    miner_2 = await get_miner("192.168.1.76")
     print(miner_1, miner_2)
 
+    # can also gather these, since they are async
+    tasks = [get_miner("192.168.1.75"), get_miner("192.168.1.76")]
+    miners = await asyncio.gather(*tasks)
+    print(miners)
+
+
 if __name__ == "__main__":
     asyncio.run(get_miners())  # get the miners asynchronously with asyncio.run()
 ```
@@ -66,7 +72,7 @@ if __name__ == "__main__":
 ## Getting data from miners
 
 Once you have your miner(s) identified, you will likely want to get data from the miner(s).  You can do this using a built in function in each miner called `get_data()`.
-This function will return a instance of the dataclass [`MinerData`][pyasic.data.MinerData] with all data it can gather from the miner.
+This function will return an instance of the dataclass [`MinerData`][pyasic.data.MinerData] with all data it can gather from the miner.
 Each piece of data in a [`MinerData`][pyasic.data.MinerData] instance can be referenced by getting it as an attribute, such as [`MinerData().hashrate`][pyasic.data.MinerData].
 ```python
 import asyncio

docs/miners/backends/bfgminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## BFGMiner Backend
 
-::: pyasic.miners.kda._backends.bfgminer.BFGMiner
+::: pyasic.miners.backends.bfgminer.BFGMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/bmminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## BMMiner Backend
 
-::: pyasic.miners.btc._backends.bmminer.BMMiner
+::: pyasic.miners.backends.bmminer.BMMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/bosminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## BOSMiner Backend
 
-::: pyasic.miners.btc._backends.bosminer.BOSMiner
+::: pyasic.miners.backends.bosminer.BOSMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/btminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## BTMiner Backend
 
-::: pyasic.miners.btc._backends.btminer.BTMiner
+::: pyasic.miners.backends.btminer.BTMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/cgminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## CGMiner Backend
 
-::: pyasic.miners.btc._backends.cgminer.CGMiner
+::: pyasic.miners.backends.cgminer.CGMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/hiveon.md

@@ -1,7 +1,7 @@
 # pyasic
 ## Hiveon Backend
 
-::: pyasic.miners.btc._backends.hiveon.Hiveon
+::: pyasic.miners.backends.hiveon.Hiveon
     handler: python
     options:
         show_root_heading: false

docs/miners/supported_types.md

@@ -541,7 +541,7 @@ details {
     </ul>
 </details>
 <details>
-<summary>Stock Firmware Goldshell Miners:</summary>
+<summary>Stock Firmware BFGMinerGoldshell Miners:</summary>
     <ul>
         <details>
         <summary>CKX Series:</summary>

mkdocs.yml

@@ -1,54 +1,54 @@
 site_name: pyasic
 repo_url: https://github.com/UpstreamData/pyasic
 nav:
-  - Introduction: "index.md"
-  - Miners:
-      - Supported Miners: "miners/supported_types.md"
-      - Miner Factory: "miners/miner_factory.md"
-      - Backends:
-          - BMMiner: "miners/backends/bmminer.md"
-          - BOSMiner: "miners/backends/bosminer.md"
-          - BFGMiner: "miners/backends/bfgminer.md"
-          - BTMiner: "miners/backends/btminer.md"
-          - CGMiner: "miners/backends/cgminer.md"
-          - Hiveon: "miners/backends/hiveon.md"
-      - Classes:
-          - Antminer X3: "miners/antminer/X3.md"
-          - Antminer X5: "miners/antminer/X5.md"
-          - Antminer X7: "miners/antminer/X7.md"
-          - Antminer X9: "miners/antminer/X9.md"
-          - Antminer X15: "miners/antminer/X15.md"
-          - Antminer X17: "miners/antminer/X17.md"
-          - Antminer X19: "miners/antminer/X19.md"
-          - Avalon 7X: "miners/avalonminer/A7X.md"
-          - Avalon 8X: "miners/avalonminer/A8X.md"
-          - Avalon 9X: "miners/avalonminer/A9X.md"
-          - Avalon 10X: "miners/avalonminer/A10X.md"
-          - Whatsminer M2X: "miners/whatsminer/M2X.md"
-          - Whatsminer M3X: "miners/whatsminer/M3X.md"
-          - Whatsminer M5X: "miners/whatsminer/M5X.md"
-          - Innosilicon T3X: "miners/innosilicon/T3X.md"
-          - Innosilicon A10X: "miners/innosilicon/A10X.md"
-          - Goldshell CKX: "miners/goldshell/CKX.md"
-          - Goldshell HSX: "miners/goldshell/HSX.md"
-          - Goldshell KDX: "miners/goldshell/KDX.md"
-  - Network:
-      - Miner Network: "network/miner_network.md"
-      - Miner Network Range: "network/miner_network_range.md"
-  - Dataclasses:
-      - Miner Data: "data/miner_data.md"
-      - Error Codes: "data/error_codes.md"
-      - Miner Config: "config/miner_config.md"
-  - Advanced:
-      - Miner APIs:
-          - Intro: "API/api.md"
-          - BMMiner: "API/bmminer.md"
-          - BOSMiner: "API/bosminer.md"
-          - BTMiner: "API/btminer.md"
-          - CGMiner: "API/cgminer.md"
-          - Unknown: "API/unknown.md"
-
-      - Base Miner: "miners/base_miner.md"
+- Introduction: "index.md"
+- Miners:
+    - Supported Miners: "miners/supported_types.md"
+    - Miner Factory: "miners/miner_factory.md"
+- Network:
+    - Miner Network: "network/miner_network.md"
+    - Miner Network Range: "network/miner_network_range.md"
+- Dataclasses:
+    - Miner Data: "data/miner_data.md"
+    - Error Codes: "data/error_codes.md"
+    - Miner Config: "config/miner_config.md"
+- Advanced:
+    - Miner APIs:
+        - Intro: "API/api.md"
+        - BFGMiner: "API/bfgminer.md"
+        - BMMiner: "API/bmminer.md"
+        - BOSMiner: "API/bosminer.md"
+        - BTMiner: "API/btminer.md"
+        - CGMiner: "API/cgminer.md"
+        - Unknown: "API/unknown.md"
+    - Backends:
+        - BMMiner: "miners/backends/bmminer.md"
+        - BOSMiner: "miners/backends/bosminer.md"
+        - BFGMiner: "miners/backends/bfgminer.md"
+        - BTMiner: "miners/backends/btminer.md"
+        - CGMiner: "miners/backends/cgminer.md"
+        - Hiveon: "miners/backends/hiveon.md"
+    - Classes:
+        - Antminer X3: "miners/antminer/X3.md"
+        - Antminer X5: "miners/antminer/X5.md"
+        - Antminer X7: "miners/antminer/X7.md"
+        - Antminer X9: "miners/antminer/X9.md"
+        - Antminer X15: "miners/antminer/X15.md"
+        - Antminer X17: "miners/antminer/X17.md"
+        - Antminer X19: "miners/antminer/X19.md"
+        - Avalon 7X: "miners/avalonminer/A7X.md"
+        - Avalon 8X: "miners/avalonminer/A8X.md"
+        - Avalon 9X: "miners/avalonminer/A9X.md"
+        - Avalon 10X: "miners/avalonminer/A10X.md"
+        - Whatsminer M2X: "miners/whatsminer/M2X.md"
+        - Whatsminer M3X: "miners/whatsminer/M3X.md"
+        - Whatsminer M5X: "miners/whatsminer/M5X.md"
+        - Innosilicon T3X: "miners/innosilicon/T3X.md"
+        - Innosilicon A10X: "miners/innosilicon/A10X.md"
+        - Goldshell CKX: "miners/goldshell/CKX.md"
+        - Goldshell HSX: "miners/goldshell/HSX.md"
+        - Goldshell KDX: "miners/goldshell/KDX.md"
+    - Base Miner: "miners/base_miner.md"
 
 
 plugins:

poetry.lock

@@ -1,971 +0,0 @@
-[[package]]
-name = "anyio"
-version = "3.6.2"
-description = "High level compatibility layer for multiple asynchronous event loop implementations"
-category = "main"
-optional = false
-python-versions = ">=3.6.2"
-
-[package.dependencies]
-idna = ">=2.8"
-sniffio = ">=1.1"
-
-[package.extras]
-doc = ["packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"]
-test = ["contextlib2", "coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "mock (>=4)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "uvloop (>=0.15)"]
-trio = ["trio (>=0.16,<0.22)"]
-
-[[package]]
-name = "asyncssh"
-version = "2.13.1"
-description = "AsyncSSH: Asynchronous SSHv2 client and server library"
-category = "main"
-optional = false
-python-versions = ">= 3.6"
-
-[package.dependencies]
-cryptography = ">=3.1"
-typing-extensions = ">=3.6"
-
-[package.extras]
-bcrypt = ["bcrypt (>=3.1.3)"]
-fido2 = ["fido2 (>=0.9.2)"]
-gssapi = ["gssapi (>=1.2.0)"]
-libnacl = ["libnacl (>=1.4.2)"]
-pkcs11 = ["python-pkcs11 (>=0.7.0)"]
-pyopenssl = ["pyOpenSSL (>=17.0.0)"]
-pywin32 = ["pywin32 (>=227)"]
-
-[[package]]
-name = "certifi"
-version = "2022.12.7"
-description = "Python package for providing Mozilla's CA Bundle."
-category = "main"
-optional = false
-python-versions = ">=3.6"
-
-[[package]]
-name = "cffi"
-version = "1.15.1"
-description = "Foreign Function Interface for Python calling C code."
-category = "main"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-pycparser = "*"
-
-[[package]]
-name = "cfgv"
-version = "3.3.1"
-description = "Validate configuration and produce human readable error messages."
-category = "dev"
-optional = false
-python-versions = ">=3.6.1"
-
-[[package]]
-name = "click"
-version = "8.1.3"
-description = "Composable command line interface toolkit"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-colorama = {version = "*", markers = "platform_system == \"Windows\""}
-
-[[package]]
-name = "colorama"
-version = "0.4.6"
-description = "Cross-platform colored terminal text."
-category = "dev"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
-
-[[package]]
-name = "cryptography"
-version = "39.0.1"
-description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
-category = "main"
-optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-cffi = ">=1.12"
-
-[package.extras]
-docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"]
-docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"]
-pep8test = ["black", "check-manifest", "mypy", "ruff", "types-pytz", "types-requests"]
-sdist = ["setuptools-rust (>=0.11.4)"]
-ssh = ["bcrypt (>=3.1.5)"]
-test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist", "pytz"]
-test-randomorder = ["pytest-randomly"]
-tox = ["tox"]
-
-[[package]]
-name = "distlib"
-version = "0.3.6"
-description = "Distribution utilities"
-category = "dev"
-optional = false
-python-versions = "*"
-
-[[package]]
-name = "filelock"
-version = "3.9.0"
-description = "A platform independent file lock."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
-testing = ["covdefaults (>=2.2.2)", "coverage (>=7.0.1)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"]
-
-[[package]]
-name = "ghp-import"
-version = "2.1.0"
-description = "Copy your docs directly to the gh-pages branch."
-category = "dev"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-python-dateutil = ">=2.8.1"
-
-[package.extras]
-dev = ["flake8", "markdown", "twine", "wheel"]
-
-[[package]]
-name = "griffe"
-version = "0.25.5"
-description = "Signatures for entire Python programs. Extract the structure, the frame, the skeleton of your project, to generate API documentation or find breaking changes in your API."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-colorama = ">=0.4"
-
-[package.extras]
-async = ["aiofiles (>=0.7,<1.0)"]
-
-[[package]]
-name = "h11"
-version = "0.14.0"
-description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[[package]]
-name = "httpcore"
-version = "0.16.3"
-description = "A minimal low-level HTTP client."
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-anyio = ">=3.0,<5.0"
-certifi = "*"
-h11 = ">=0.13,<0.15"
-sniffio = ">=1.0.0,<2.0.0"
-
-[package.extras]
-http2 = ["h2 (>=3,<5)"]
-socks = ["socksio (>=1.0.0,<2.0.0)"]
-
-[[package]]
-name = "httpx"
-version = "0.23.3"
-description = "The next generation HTTP client."
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-certifi = "*"
-httpcore = ">=0.15.0,<0.17.0"
-rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]}
-sniffio = "*"
-
-[package.extras]
-brotli = ["brotli", "brotlicffi"]
-cli = ["click (>=8.0.0,<9.0.0)", "pygments (>=2.0.0,<3.0.0)", "rich (>=10,<13)"]
-http2 = ["h2 (>=3,<5)"]
-socks = ["socksio (>=1.0.0,<2.0.0)"]
-
-[[package]]
-name = "identify"
-version = "2.5.18"
-description = "File identification library for Python"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-license = ["ukkonen"]
-
-[[package]]
-name = "idna"
-version = "3.4"
-description = "Internationalized Domain Names in Applications (IDNA)"
-category = "main"
-optional = false
-python-versions = ">=3.5"
-
-[[package]]
-name = "importlib-metadata"
-version = "6.0.0"
-description = "Read metadata from Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-zipp = ">=0.5"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-perf = ["ipython"]
-testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)"]
-
-[[package]]
-name = "isort"
-version = "5.12.0"
-description = "A Python utility / library to sort Python imports."
-category = "dev"
-optional = false
-python-versions = ">=3.8.0"
-
-[package.extras]
-colors = ["colorama (>=0.4.3)"]
-pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
-plugins = ["setuptools"]
-requirements-deprecated-finder = ["pip-api", "pipreqs"]
-
-[[package]]
-name = "Jinja2"
-version = "3.1.2"
-description = "A very fast and expressive template engine."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-MarkupSafe = ">=2.0"
-
-[package.extras]
-i18n = ["Babel (>=2.7)"]
-
-[[package]]
-name = "Markdown"
-version = "3.3.7"
-description = "Python implementation of Markdown."
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-importlib-metadata = {version = ">=4.4", markers = "python_version < \"3.10\""}
-
-[package.extras]
-testing = ["coverage", "pyyaml"]
-
-[[package]]
-name = "MarkupSafe"
-version = "2.1.2"
-description = "Safely add untrusted strings to HTML/XML markup."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[[package]]
-name = "mergedeep"
-version = "1.3.4"
-description = "A deep merge function for 🐍."
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
-[[package]]
-name = "mkdocs"
-version = "1.4.2"
-description = "Project documentation with Markdown."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-click = ">=7.0"
-colorama = {version = ">=0.4", markers = "platform_system == \"Windows\""}
-ghp-import = ">=1.0"
-importlib-metadata = {version = ">=4.3", markers = "python_version < \"3.10\""}
-jinja2 = ">=2.11.1"
-markdown = ">=3.2.1,<3.4"
-mergedeep = ">=1.3.4"
-packaging = ">=20.5"
-pyyaml = ">=5.1"
-pyyaml-env-tag = ">=0.1"
-watchdog = ">=2.0"
-
-[package.extras]
-i18n = ["babel (>=2.9.0)"]
-min-versions = ["babel (==2.9.0)", "click (==7.0)", "colorama (==0.4)", "ghp-import (==1.0)", "importlib-metadata (==4.3)", "jinja2 (==2.11.1)", "markdown (==3.2.1)", "markupsafe (==2.0.1)", "mergedeep (==1.3.4)", "packaging (==20.5)", "pyyaml (==5.1)", "pyyaml-env-tag (==0.1)", "typing-extensions (==3.10)", "watchdog (==2.0)"]
-
-[[package]]
-name = "mkdocs-autorefs"
-version = "0.4.1"
-description = "Automatically link across pages in MkDocs."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-Markdown = ">=3.3"
-mkdocs = ">=1.1"
-
-[[package]]
-name = "mkdocstrings"
-version = "0.20.0"
-description = "Automatic documentation from sources, for MkDocs."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-Jinja2 = ">=2.11.1"
-Markdown = ">=3.3"
-MarkupSafe = ">=1.1"
-mkdocs = ">=1.2"
-mkdocs-autorefs = ">=0.3.1"
-mkdocstrings-python = {version = ">=0.5.2", optional = true, markers = "extra == \"python\""}
-pymdown-extensions = ">=6.3"
-
-[package.extras]
-crystal = ["mkdocstrings-crystal (>=0.3.4)"]
-python = ["mkdocstrings-python (>=0.5.2)"]
-python-legacy = ["mkdocstrings-python-legacy (>=0.2.1)"]
-
-[[package]]
-name = "mkdocstrings-python"
-version = "0.8.3"
-description = "A Python handler for mkdocstrings."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-griffe = ">=0.24"
-mkdocstrings = ">=0.19"
-
-[[package]]
-name = "nodeenv"
-version = "1.7.0"
-description = "Node.js virtual environment builder"
-category = "dev"
-optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
-
-[package.dependencies]
-setuptools = "*"
-
-[[package]]
-name = "packaging"
-version = "23.0"
-description = "Core utilities for Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[[package]]
-name = "passlib"
-version = "1.7.4"
-description = "comprehensive password hashing framework supporting over 30 schemes"
-category = "main"
-optional = false
-python-versions = "*"
-
-[package.extras]
-argon2 = ["argon2-cffi (>=18.2.0)"]
-bcrypt = ["bcrypt (>=3.1.0)"]
-build_docs = ["cloud-sptheme (>=1.10.1)", "sphinx (>=1.6)", "sphinxcontrib-fulltoc (>=1.2.0)"]
-totp = ["cryptography"]
-
-[[package]]
-name = "platformdirs"
-version = "3.0.0"
-description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"]
-test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
-
-[[package]]
-name = "pre-commit"
-version = "3.1.0"
-description = "A framework for managing and maintaining multi-language pre-commit hooks."
-category = "dev"
-optional = false
-python-versions = ">=3.8"
-
-[package.dependencies]
-cfgv = ">=2.0.0"
-identify = ">=1.0.0"
-nodeenv = ">=0.11.1"
-pyyaml = ">=5.1"
-virtualenv = ">=20.10.0"
-
-[[package]]
-name = "pyaml"
-version = "21.10.1"
-description = "PyYAML-based module to produce pretty and readable YAML-serialized data"
-category = "main"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-PyYAML = "*"
-
-[[package]]
-name = "pycparser"
-version = "2.21"
-description = "C parser in Python"
-category = "main"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-
-[[package]]
-name = "pymdown-extensions"
-version = "9.9.2"
-description = "Extension pack for Python Markdown."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-markdown = ">=3.2"
-
-[[package]]
-name = "python-dateutil"
-version = "2.8.2"
-description = "Extensions to the standard Python datetime module"
-category = "dev"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
-
-[package.dependencies]
-six = ">=1.5"
-
-[[package]]
-name = "PyYAML"
-version = "6.0"
-description = "YAML parser and emitter for Python"
-category = "main"
-optional = false
-python-versions = ">=3.6"
-
-[[package]]
-name = "pyyaml_env_tag"
-version = "0.1"
-description = "A custom YAML tag for referencing environment variables in YAML files. "
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-pyyaml = "*"
-
-[[package]]
-name = "rfc3986"
-version = "1.5.0"
-description = "Validating URI References per RFC 3986"
-category = "main"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-idna = {version = "*", optional = true, markers = "extra == \"idna2008\""}
-
-[package.extras]
-idna2008 = ["idna"]
-
-[[package]]
-name = "setuptools"
-version = "67.4.0"
-description = "Easily download, build, install, upgrade, and uninstall Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
-testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
-
-[[package]]
-name = "six"
-version = "1.16.0"
-description = "Python 2 and 3 compatibility utilities"
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
-
-[[package]]
-name = "sniffio"
-version = "1.3.0"
-description = "Sniff out which async library your code is running under"
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[[package]]
-name = "toml"
-version = "0.10.2"
-description = "Python Library for Tom's Obvious, Minimal Language"
-category = "main"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-
-[[package]]
-name = "typing-extensions"
-version = "4.5.0"
-description = "Backported and Experimental Type Hints for Python 3.7+"
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[[package]]
-name = "virtualenv"
-version = "20.19.0"
-description = "Virtual Python Environment builder"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-distlib = ">=0.3.6,<1"
-filelock = ">=3.4.1,<4"
-platformdirs = ">=2.4,<4"
-
-[package.extras]
-docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-test = ["covdefaults (>=2.2.2)", "coverage (>=7.1)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23)", "pytest (>=7.2.1)", "pytest-env (>=0.8.1)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)"]
-
-[[package]]
-name = "watchdog"
-version = "2.2.1"
-description = "Filesystem events monitoring"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
-[package.extras]
-watchmedo = ["PyYAML (>=3.10)"]
-
-[[package]]
-name = "zipp"
-version = "3.14.0"
-description = "Backport of pathlib-compatible object wrapper for zip files"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"]
-
-[metadata]
-lock-version = "1.1"
-python-versions = "^3.8"
-content-hash = "44b511a675e63d02eaf82f3ec78baa2364e5116e990f9f0a6fc2cb8f21cf616f"
-
-[metadata.files]
-anyio = [
-    {file = "anyio-3.6.2-py3-none-any.whl", hash = "sha256:fbbe32bd270d2a2ef3ed1c5d45041250284e31fc0a4df4a5a6071842051a51e3"},
-    {file = "anyio-3.6.2.tar.gz", hash = "sha256:25ea0d673ae30af41a0c442f81cf3b38c7e79fdc7b60335a4c14e05eb0947421"},
-]
-asyncssh = [
-    {file = "asyncssh-2.13.1-py3-none-any.whl", hash = "sha256:c90eb5e2b4f9a7cc6e6af01fd844563d722c0d667f8c5f51fe5b3c2a79fa0575"},
-    {file = "asyncssh-2.13.1.tar.gz", hash = "sha256:ebbb83c05c0b45cf230de1ef2f06059e360f9afa5c3ddf60fc92faf7b94ff887"},
-]
-certifi = [
-    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
-    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
-]
-cffi = [
-    {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"},
-    {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"},
-    {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"},
-    {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"},
-    {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"},
-    {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"},
-    {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"},
-    {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"},
-    {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"},
-    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"},
-    {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"},
-    {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"},
-    {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"},
-    {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"},
-    {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"},
-    {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"},
-    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"},
-    {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"},
-    {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"},
-    {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"},
-    {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"},
-    {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"},
-    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"},
-    {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"},
-    {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"},
-    {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"},
-    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"},
-    {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"},
-    {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"},
-    {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"},
-    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"},
-    {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"},
-    {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"},
-    {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"},
-    {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"},
-    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"},
-    {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"},
-    {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"},
-    {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"},
-    {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"},
-    {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"},
-]
-cfgv = [
-    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
-    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-cryptography = [
-    {file = "cryptography-39.0.1-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965"},
-    {file = "cryptography-39.0.1-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc"},
-    {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41"},
-    {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505"},
-    {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6"},
-    {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502"},
-    {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f"},
-    {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106"},
-    {file = "cryptography-39.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c"},
-    {file = "cryptography-39.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4"},
-    {file = "cryptography-39.0.1-cp36-abi3-win32.whl", hash = "sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8"},
-    {file = "cryptography-39.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac"},
-    {file = "cryptography-39.0.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad"},
-    {file = "cryptography-39.0.1-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c5caeb8188c24888c90b5108a441c106f7faa4c4c075a2bcae438c6e8ca73cef"},
-    {file = "cryptography-39.0.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4789d1e3e257965e960232345002262ede4d094d1a19f4d3b52e48d4d8f3b885"},
-    {file = "cryptography-39.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388"},
-    {file = "cryptography-39.0.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336"},
-    {file = "cryptography-39.0.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2"},
-    {file = "cryptography-39.0.1-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e"},
-    {file = "cryptography-39.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0"},
-    {file = "cryptography-39.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6"},
-    {file = "cryptography-39.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a"},
-    {file = "cryptography-39.0.1.tar.gz", hash = "sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695"},
-]
-distlib = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
-filelock = [
-    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
-    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
-]
-ghp-import = [
-    {file = "ghp-import-2.1.0.tar.gz", hash = "sha256:9c535c4c61193c2df8871222567d7fd7e5014d835f97dc7b7439069e2413d343"},
-    {file = "ghp_import-2.1.0-py3-none-any.whl", hash = "sha256:8337dd7b50877f163d4c0289bc1f1c7f127550241988d568c1db512c4324a619"},
-]
-griffe = [
-    {file = "griffe-0.25.5-py3-none-any.whl", hash = "sha256:1fb9edff48e66d4873014a2ebf21aca5f271d0006a4c937826e3cf592ffb3706"},
-    {file = "griffe-0.25.5.tar.gz", hash = "sha256:11ea3403ef0560a1cbcf7f302eb5d21cf4c1d8ed3f8a16a75aa9f6f458caf3f1"},
-]
-h11 = [
-    {file = "h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"},
-    {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"},
-]
-httpcore = [
-    {file = "httpcore-0.16.3-py3-none-any.whl", hash = "sha256:da1fb708784a938aa084bde4feb8317056c55037247c787bd7e19eb2c2949dc0"},
-    {file = "httpcore-0.16.3.tar.gz", hash = "sha256:c5d6f04e2fc530f39e0c077e6a30caa53f1451096120f1f38b954afd0b17c0cb"},
-]
-httpx = [
-    {file = "httpx-0.23.3-py3-none-any.whl", hash = "sha256:a211fcce9b1254ea24f0cd6af9869b3d29aba40154e947d2a07bb499b3e310d6"},
-    {file = "httpx-0.23.3.tar.gz", hash = "sha256:9818458eb565bb54898ccb9b8b251a28785dd4a55afbc23d0eb410754fe7d0f9"},
-]
-identify = [
-    {file = "identify-2.5.18-py2.py3-none-any.whl", hash = "sha256:93aac7ecf2f6abf879b8f29a8002d3c6de7086b8c28d88e1ad15045a15ab63f9"},
-    {file = "identify-2.5.18.tar.gz", hash = "sha256:89e144fa560cc4cffb6ef2ab5e9fb18ed9f9b3cb054384bab4b95c12f6c309fe"},
-]
-idna = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
-importlib-metadata = [
-    {file = "importlib_metadata-6.0.0-py3-none-any.whl", hash = "sha256:7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad"},
-    {file = "importlib_metadata-6.0.0.tar.gz", hash = "sha256:e354bedeb60efa6affdcc8ae121b73544a7aa74156d047311948f6d711cd378d"},
-]
-isort = [
-    {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"},
-    {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"},
-]
-Jinja2 = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
-Markdown = [
-    {file = "Markdown-3.3.7-py3-none-any.whl", hash = "sha256:f5da449a6e1c989a4cea2631aa8ee67caa5a2ef855d551c88f9e309f4634c621"},
-    {file = "Markdown-3.3.7.tar.gz", hash = "sha256:cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874"},
-]
-MarkupSafe = [
-    {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-win32.whl", hash = "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603"},
-    {file = "MarkupSafe-2.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-win32.whl", hash = "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625"},
-    {file = "MarkupSafe-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-win32.whl", hash = "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859"},
-    {file = "MarkupSafe-2.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-win32.whl", hash = "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2"},
-    {file = "MarkupSafe-2.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-win32.whl", hash = "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7"},
-    {file = "MarkupSafe-2.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed"},
-    {file = "MarkupSafe-2.1.2.tar.gz", hash = "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d"},
-]
-mergedeep = [
-    {file = "mergedeep-1.3.4-py3-none-any.whl", hash = "sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307"},
-    {file = "mergedeep-1.3.4.tar.gz", hash = "sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8"},
-]
-mkdocs = [
-    {file = "mkdocs-1.4.2-py3-none-any.whl", hash = "sha256:c8856a832c1e56702577023cd64cc5f84948280c1c0fcc6af4cd39006ea6aa8c"},
-    {file = "mkdocs-1.4.2.tar.gz", hash = "sha256:8947af423a6d0facf41ea1195b8e1e8c85ad94ac95ae307fe11232e0424b11c5"},
-]
-mkdocs-autorefs = [
-    {file = "mkdocs-autorefs-0.4.1.tar.gz", hash = "sha256:70748a7bd025f9ecd6d6feeba8ba63f8e891a1af55f48e366d6d6e78493aba84"},
-    {file = "mkdocs_autorefs-0.4.1-py3-none-any.whl", hash = "sha256:a2248a9501b29dc0cc8ba4c09f4f47ff121945f6ce33d760f145d6f89d313f5b"},
-]
-mkdocstrings = [
-    {file = "mkdocstrings-0.20.0-py3-none-any.whl", hash = "sha256:f17fc2c4f760ec302b069075ef9e31045aa6372ca91d2f35ded3adba8e25a472"},
-    {file = "mkdocstrings-0.20.0.tar.gz", hash = "sha256:c757f4f646d4f939491d6bc9256bfe33e36c5f8026392f49eaa351d241c838e5"},
-]
-mkdocstrings-python = [
-    {file = "mkdocstrings-python-0.8.3.tar.gz", hash = "sha256:9ae473f6dc599339b09eee17e4d2b05d6ac0ec29860f3fc9b7512d940fc61adf"},
-    {file = "mkdocstrings_python-0.8.3-py3-none-any.whl", hash = "sha256:4e6e1cd6f37a785de0946ced6eb846eb2f5d891ac1cc2c7b832943d3529087a7"},
-]
-nodeenv = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
-packaging = [
-    {file = "packaging-23.0-py3-none-any.whl", hash = "sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2"},
-    {file = "packaging-23.0.tar.gz", hash = "sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97"},
-]
-passlib = [
-    {file = "passlib-1.7.4-py2.py3-none-any.whl", hash = "sha256:aa6bca462b8d8bda89c70b382f0c298a20b5560af6cbfa2dce410c0a2fb669f1"},
-    {file = "passlib-1.7.4.tar.gz", hash = "sha256:defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04"},
-]
-platformdirs = [
-    {file = "platformdirs-3.0.0-py3-none-any.whl", hash = "sha256:b1d5eb14f221506f50d6604a561f4c5786d9e80355219694a1b244bcd96f4567"},
-    {file = "platformdirs-3.0.0.tar.gz", hash = "sha256:8a1228abb1ef82d788f74139988b137e78692984ec7b08eaa6c65f1723af28f9"},
-]
-pre-commit = [
-    {file = "pre_commit-3.1.0-py2.py3-none-any.whl", hash = "sha256:7001dfcd174540658822b1fd3630ceadf4f41375a5d1844b5c3b3830f227348c"},
-    {file = "pre_commit-3.1.0.tar.gz", hash = "sha256:61bd9f1b96d3d1e763f2a9a0f8522aed341646800642ff6803c73fac5781f5b7"},
-]
-pyaml = [
-    {file = "pyaml-21.10.1-py2.py3-none-any.whl", hash = "sha256:19985ed303c3a985de4cf8fd329b6d0a5a5b5c9035ea240eccc709ebacbaf4a0"},
-    {file = "pyaml-21.10.1.tar.gz", hash = "sha256:c6519fee13bf06e3bb3f20cacdea8eba9140385a7c2546df5dbae4887f768383"},
-]
-pycparser = [
-    {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
-    {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
-]
-pymdown-extensions = [
-    {file = "pymdown_extensions-9.9.2-py3-none-any.whl", hash = "sha256:c3d804eb4a42b85bafb5f36436342a5ad38df03878bb24db8855a4aa8b08b765"},
-    {file = "pymdown_extensions-9.9.2.tar.gz", hash = "sha256:ebb33069bafcb64d5f5988043331d4ea4929325dc678a6bcf247ddfcf96499f8"},
-]
-python-dateutil = [
-    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
-    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
-]
-PyYAML = [
-    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
-    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
-    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
-    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
-    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
-    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
-    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
-    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
-    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
-    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
-    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
-    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
-    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
-    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
-    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
-    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
-]
-pyyaml_env_tag = [
-    {file = "pyyaml_env_tag-0.1-py3-none-any.whl", hash = "sha256:af31106dec8a4d68c60207c1886031cbf839b68aa7abccdb19868200532c2069"},
-    {file = "pyyaml_env_tag-0.1.tar.gz", hash = "sha256:70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb"},
-]
-rfc3986 = [
-    {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"},
-    {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"},
-]
-setuptools = [
-    {file = "setuptools-67.4.0-py3-none-any.whl", hash = "sha256:f106dee1b506dee5102cc3f3e9e68137bbad6d47b616be7991714b0c62204251"},
-    {file = "setuptools-67.4.0.tar.gz", hash = "sha256:e5fd0a713141a4a105412233c63dc4e17ba0090c8e8334594ac790ec97792330"},
-]
-six = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
-sniffio = [
-    {file = "sniffio-1.3.0-py3-none-any.whl", hash = "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"},
-    {file = "sniffio-1.3.0.tar.gz", hash = "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101"},
-]
-toml = [
-    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
-    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
-]
-typing-extensions = [
-    {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"},
-    {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"},
-]
-virtualenv = [
-    {file = "virtualenv-20.19.0-py3-none-any.whl", hash = "sha256:54eb59e7352b573aa04d53f80fc9736ed0ad5143af445a1e539aada6eb947dd1"},
-    {file = "virtualenv-20.19.0.tar.gz", hash = "sha256:37a640ba82ed40b226599c522d411e4be5edb339a0c0de030c0dc7b646d61590"},
-]
-watchdog = [
-    {file = "watchdog-2.2.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a09483249d25cbdb4c268e020cb861c51baab2d1affd9a6affc68ffe6a231260"},
-    {file = "watchdog-2.2.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5100eae58133355d3ca6c1083a33b81355c4f452afa474c2633bd2fbbba398b3"},
-    {file = "watchdog-2.2.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e618a4863726bc7a3c64f95c218437f3349fb9d909eb9ea3a1ed3b567417c661"},
-    {file = "watchdog-2.2.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:102a60093090fc3ff76c983367b19849b7cc24ec414a43c0333680106e62aae1"},
-    {file = "watchdog-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:748ca797ff59962e83cc8e4b233f87113f3cf247c23e6be58b8a2885c7337aa3"},
-    {file = "watchdog-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6ccd8d84b9490a82b51b230740468116b8205822ea5fdc700a553d92661253a3"},
-    {file = "watchdog-2.2.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6e01d699cd260d59b84da6bda019dce0a3353e3fcc774408ae767fe88ee096b7"},
-    {file = "watchdog-2.2.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8586d98c494690482c963ffb24c49bf9c8c2fe0589cec4dc2f753b78d1ec301d"},
-    {file = "watchdog-2.2.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:adaf2ece15f3afa33a6b45f76b333a7da9256e1360003032524d61bdb4c422ae"},
-    {file = "watchdog-2.2.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:83a7cead445008e880dbde833cb9e5cc7b9a0958edb697a96b936621975f15b9"},
-    {file = "watchdog-2.2.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8ac23ff2c2df4471a61af6490f847633024e5aa120567e08d07af5718c9d092"},
-    {file = "watchdog-2.2.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:d0f29fd9f3f149a5277929de33b4f121a04cf84bb494634707cfa8ea8ae106a8"},
-    {file = "watchdog-2.2.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:967636031fa4c4955f0f3f22da3c5c418aa65d50908d31b73b3b3ffd66d60640"},
-    {file = "watchdog-2.2.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:96cbeb494e6cbe3ae6aacc430e678ce4b4dd3ae5125035f72b6eb4e5e9eb4f4e"},
-    {file = "watchdog-2.2.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:61fdb8e9c57baf625e27e1420e7ca17f7d2023929cd0065eb79c83da1dfbeacd"},
-    {file = "watchdog-2.2.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4cb5ecc332112017fbdb19ede78d92e29a8165c46b68a0b8ccbd0a154f196d5e"},
-    {file = "watchdog-2.2.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a480d122740debf0afac4ddd583c6c0bb519c24f817b42ed6f850e2f6f9d64a8"},
-    {file = "watchdog-2.2.1-py3-none-manylinux2014_aarch64.whl", hash = "sha256:978a1aed55de0b807913b7482d09943b23a2d634040b112bdf31811a422f6344"},
-    {file = "watchdog-2.2.1-py3-none-manylinux2014_armv7l.whl", hash = "sha256:8c28c23972ec9c524967895ccb1954bc6f6d4a557d36e681a36e84368660c4ce"},
-    {file = "watchdog-2.2.1-py3-none-manylinux2014_i686.whl", hash = "sha256:c27d8c1535fd4474e40a4b5e01f4ba6720bac58e6751c667895cbc5c8a7af33c"},
-    {file = "watchdog-2.2.1-py3-none-manylinux2014_ppc64.whl", hash = "sha256:d6b87477752bd86ac5392ecb9eeed92b416898c30bd40c7e2dd03c3146105646"},
-    {file = "watchdog-2.2.1-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:cece1aa596027ff56369f0b50a9de209920e1df9ac6d02c7f9e5d8162eb4f02b"},
-    {file = "watchdog-2.2.1-py3-none-manylinux2014_s390x.whl", hash = "sha256:8b5cde14e5c72b2df5d074774bdff69e9b55da77e102a91f36ef26ca35f9819c"},
-    {file = "watchdog-2.2.1-py3-none-manylinux2014_x86_64.whl", hash = "sha256:e038be858425c4f621900b8ff1a3a1330d9edcfeaa1c0468aeb7e330fb87693e"},
-    {file = "watchdog-2.2.1-py3-none-win32.whl", hash = "sha256:bc43c1b24d2f86b6e1cc15f68635a959388219426109233e606517ff7d0a5a73"},
-    {file = "watchdog-2.2.1-py3-none-win_amd64.whl", hash = "sha256:17f1708f7410af92ddf591e94ae71a27a13974559e72f7e9fde3ec174b26ba2e"},
-    {file = "watchdog-2.2.1-py3-none-win_ia64.whl", hash = "sha256:195ab1d9d611a4c1e5311cbf42273bc541e18ea8c32712f2fb703cfc6ff006f9"},
-    {file = "watchdog-2.2.1.tar.gz", hash = "sha256:cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f"},
-]
-zipp = [
-    {file = "zipp-3.14.0-py3-none-any.whl", hash = "sha256:188834565033387710d046e3fe96acfc9b5e86cbca7f39ff69cf21a4128198b7"},
-    {file = "zipp-3.14.0.tar.gz", hash = "sha256:9e5421e176ef5ab4c0ad896624e87a7b2f07aca746c9b2aa305952800cb8eecb"},
-]

pyasic/API/__init__.py

@@ -46,6 +46,7 @@ class BaseMinerAPI:
         parameters: Union[str, int, bool] = None,
         ignore_errors: bool = False,
         allow_warning: bool = True,
+        **kwargs,
     ) -> dict:
         """Send an API command to the miner and return the result.
 
@@ -65,7 +66,7 @@ class BaseMinerAPI:
             else ""
         )
         # create the command
-        cmd = {"command": command}
+        cmd = {"command": command, **kwargs}
         if parameters:
             cmd["parameter"] = parameters
 
@@ -92,30 +93,33 @@ class BaseMinerAPI:
     async def send_privileged_command(self, *args, **kwargs) -> dict:
         return await self.send_command(*args, **kwargs)
 
-    async def multicommand(
-        self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True
-    ) -> dict:
+    async def multicommand(self, *commands: str, allow_warning: bool = True) -> dict:
         """Creates and sends multiple commands as one command to the miner.
 
         Parameters:
             *commands: The commands to send as a multicommand to the miner.
-            ignore_errors: Whether to raise APIError when the command returns an error.
             allow_warning: A boolean to supress APIWarnings.
 
         """
-        # make sure we can actually run each command, otherwise they will fail
-        commands = self._check_commands(*commands)
-        # standard multicommand format is "command1+command2"
-        # standard format doesn't work for X19
-        command = "+".join(commands)
-        try:
-            data = await self.send_command(
-                command, allow_warning=allow_warning, ignore_errors=ignore_errors
-            )
-        except APIError:
-            return {command: [{}] for command in commands}
-        logging.debug(f"{self} - (Multicommand) - Received data")
-        return data
+        while True:
+            # make sure we can actually run each command, otherwise they will fail
+            commands = self._check_commands(*commands)
+            # standard multicommand format is "command1+command2"
+            # standard format doesn't work for X19
+            command = "+".join(commands)
+            try:
+                data = await self.send_command(command, allow_warning=allow_warning)
+            except APIError as e:
+                # try to identify the error
+                if ":" in e.message:
+                    err_command = e.message.split(":")[0]
+                    if err_command in commands:
+                        commands.remove(err_command)
+                        continue
+                return {command: [{}] for command in commands}
+            logging.debug(f"{self} - (Multicommand) - Received data")
+            data["multicommand"] = True
+            return data
 
     @property
     def commands(self) -> list:
@@ -146,9 +150,10 @@ class BaseMinerAPI:
         ]
 
     def _check_commands(self, *commands):
-        allowed_commands = self.get_commands()
+        allowed_commands = self.commands
         return_commands = []
-        for command in [*commands]:
+
+        for command in commands:
             if command in allowed_commands:
                 return_commands.append(command)
             else:
@@ -177,7 +182,10 @@ If you are sure you want to use this command please use API.send_command("{comma
         writer.write(data)
         logging.debug(f"{self} - ([Hidden] Send Bytes) - Draining")
         await writer.drain()
-        ret_data = await asyncio.wait_for(reader.read(4096), timeout=timeout)
+        try:
+            ret_data = await asyncio.wait_for(reader.read(4096), timeout=timeout)
+        except ConnectionAbortedError:
+            return b"{}"
         try:
             # Fix for stupid whatsminer bug, reboot/restart seem to not load properly in the loop
             # have to receive, save the data, check if there is more data by reading with a short timeout

pyasic/API/bfgminer.py

@@ -52,9 +52,10 @@ class BFGMinerAPI(BaseMinerAPI):
         except APIError:
             logging.debug(f"{self} - (Multicommand) - Handling X19 multicommand.")
             data = await self._x19_multicommand(*command.split("+"))
+        data["multicommand"] = True
         return data
 
-    async def _x19_multicommand(self, *commands):
+    async def _x19_multicommand(self, *commands) -> dict:
         data = None
         try:
             data = {}

pyasic/API/bmminer.py

@@ -53,9 +53,10 @@ class BMMinerAPI(BaseMinerAPI):
             data = await self._x19_multicommand(
                 *command.split("+"), allow_warning=allow_warning
             )
+        data["multicommand"] = True
         return data
 
-    async def _x19_multicommand(self, *commands, allow_warning: bool = True):
+    async def _x19_multicommand(self, *commands, allow_warning: bool = True) -> dict:
         data = None
         try:
             data = {}

pyasic/API/btminer.py

@@ -224,6 +224,7 @@ class BTMinerAPI(BaseMinerAPI):
         logging.debug(f"{self} - (Multicommand) - Received data")
 
         data = dict(**main_data, **get_commands_data)
+        data["multicommand"] = True
         return data
 
     async def send_privileged_command(

pyasic/API/cgminer.py

@@ -52,9 +52,10 @@ class CGMinerAPI(BaseMinerAPI):
         except APIError:
             logging.debug(f"{self} - (Multicommand) - Handling X19 multicommand.")
             data = await self._x19_multicommand(*command.split("+"))
+        data["multicommand"] = True
         return data
 
-    async def _x19_multicommand(self, *commands):
+    async def _x19_multicommand(self, *commands) -> dict:
         data = None
         try:
             data = {}

pyasic/config/__init__.py

@@ -214,9 +214,8 @@ class _PoolGroup:
             pools.append(pool.as_x19(user_suffix=user_suffix))
         return pools
 
-
     def as_x17(self, user_suffix: str = None) -> dict:
-        """Convert the data in this class to a list usable by an X5 device.
+        """Convert the data in this class to a list usable by an X17 device.
 
         Parameters:
              user_suffix: The suffix to append to username.
@@ -234,7 +233,9 @@ class _PoolGroup:
         }
         for idx, pool in enumerate(self.pools[:3]):
             pools[f"_ant_pool{idx+1}url"] = pool.as_x17(user_suffix=user_suffix)["url"]
-            pools[f"_ant_pool{idx+1}user"] = pool.as_x17(user_suffix=user_suffix)["user"]
+            pools[f"_ant_pool{idx+1}user"] = pool.as_x17(user_suffix=user_suffix)[
+                "user"
+            ]
             pools[f"_ant_pool{idx+1}pw"] = pool.as_x17(user_suffix=user_suffix)["pass"]
 
         return pools
@@ -413,13 +414,13 @@ class MinerConfig:
                 if data[key]:
                     self.miner_mode = X19PowerMode(int(data[key]))
             elif key == "fan_control":
-                for _key in data[key].keys():
+                for _key in data[key]:
                     if _key == "min_fans":
                         self.minimum_fans = data[key][_key]
                     elif _key == "speed":
                         self.fan_speed = data[key][_key]
             elif key == "temp_control":
-                for _key in data[key].keys():
+                for _key in data[key]:
                     if _key == "mode":
                         self.temp_mode = data[key][_key]
                     elif _key == "target_temp":
@@ -434,7 +435,7 @@ class MinerConfig:
                     self.asicboost = data[key]["asic_boost"]
 
             if key == "autotuning":
-                for _key in data[key].keys():
+                for _key in data[key]:
                     if _key == "enabled":
                         self.autotuning_enabled = data[key][_key]
                     elif _key == "psu_power_limit":
@@ -447,7 +448,7 @@ class MinerConfig:
                         self.autotuning_mode = data[key][_key].replace("_target", "")
 
             if key in ["power_scaling", "performance_scaling"]:
-                for _key in data[key].keys():
+                for _key in data[key]:
                     if _key == "enabled":
                         self.dps_enabled = data[key][_key]
                     elif _key == "power_step":
@@ -546,17 +547,21 @@ class MinerConfig:
         """
         logging.debug(f"MinerConfig - (As X19) - Generating X19 config")
         cfg = {
-            "pools": self.pool_groups[0].as_x19(user_suffix=user_suffix),
             "bitmain-fan-ctrl": False,
-            "bitmain-fan-pwn": 100,
-            "miner-mode": self.miner_mode.value,
+            "bitmain-fan-pwn": "100",
+            "freq-level": "100",
+            "miner-mode": str(self.miner_mode.value),
+            "pools": self.pool_groups[0].as_x19(user_suffix=user_suffix),
         }
 
         if not self.temp_mode == "auto":
             cfg["bitmain-fan-ctrl"] = True
 
         if self.fan_speed:
-            cfg["bitmain-fan-ctrl"] = str(self.fan_speed)
+            cfg["bitmain-fan-pwn"] = str(self.fan_speed)
+
+        if self.miner_mode == X19PowerMode.Sleep:
+            cfg["freq-level"] = "0"
 
         return cfg
 
@@ -637,6 +642,13 @@ class MinerConfig:
             cfg["hash_chain_global"] = {}
             cfg["hash_chain_global"]["asic_boost"] = self.asicboost
 
+        if self.minimum_fans is not None or self.fan_speed is not None:
+            cfg["fan_control"] = {}
+            if self.minimum_fans is not None:
+                cfg["fan_control"]["min_fans"] = self.minimum_fans
+            if self.fan_speed is not None:
+                cfg["fan_control"]["speed"] = self.fan_speed
+
         if any(
             [
                 getattr(self, item)

pyasic/data/__init__.py

@@ -96,7 +96,9 @@ class MinerData:
         right_chips: The number of chips online in the left board as an int.
         total_chips: The total number of chips on all boards.  Calculated automatically.
         ideal_chips: The ideal number of chips in the miner as an int.
-        percent_ideal: The percent of total chips out of the ideal count.  Calculated automatically.
+        percent_ideal_chips: The percent of total chips out of the ideal count.  Calculated automatically.
+        percent_ideal_hashrate: The percent of total hashrate out of the ideal hashrate.  Calculated automatically.
+        percent_ideal_wattage: The percent of total wattage out of the ideal wattage.  Calculated automatically.
         nominal: Whether the number of chips in the miner is nominal.  Calculated automatically.
         pool_split: The pool split as a str.
         pool_1_url: The first pool url on the miner as a str.
@@ -116,7 +118,8 @@ class MinerData:
     api_ver: str = "Unknown"
     fw_ver: str = "Unknown"
     hostname: str = "Unknown"
-    hashrate: float = 0
+    hashrate: float = field(init=False)
+    _hashrate: float = 0
     nominal_hashrate: float = 0
     hashboards: List[HashBoard] = field(default_factory=list)
     ideal_hashboards: int = 1
@@ -144,7 +147,9 @@ class MinerData:
     right_chips: int = field(init=False)
     total_chips: int = field(init=False)
     ideal_chips: int = 1
-    percent_ideal: float = field(init=False)
+    percent_ideal_chips: float = field(init=False)
+    percent_ideal_hashrate: float = field(init=False)
+    percent_ideal_wattage: float = field(init=False)
     nominal: int = field(init=False)
     pool_split: str = "0"
     pool_1_url: str = "Unknown"
@@ -213,6 +218,16 @@ class MinerData:
                 setattr(cp, key, item & other_item)
         return cp
 
+    @property
+    def hashrate(self):  # noqa - Skip PyCharm inspection
+        if len(self.hashboards) > 0:
+            return round(sum(map(lambda x: x.hashrate, self.hashboards)), 2)
+        return self._hashrate
+
+    @hashrate.setter
+    def hashrate(self, val):
+        self._hashrate = val
+
     @property
     def fan_1(self):  # noqa - Skip PyCharm inspection
         if len(self.fans) > 0:
@@ -411,13 +426,33 @@ class MinerData:
         pass
 
     @property
-    def percent_ideal(self):  # noqa - Skip PyCharm inspection
+    def percent_ideal_chips(self):  # noqa - Skip PyCharm inspection
         if self.total_chips == 0 or self.ideal_chips == 0:
             return 0
         return round((self.total_chips / self.ideal_chips) * 100)
 
-    @percent_ideal.setter
-    def percent_ideal(self, val):
+    @percent_ideal_chips.setter
+    def percent_ideal_chips(self, val):
+        pass
+
+    @property
+    def percent_ideal_hashrate(self):  # noqa - Skip PyCharm inspection
+        if self.hashrate == 0 or self.nominal_hashrate == 0:
+            return 0
+        return round((self.hashrate / self.nominal_hashrate) * 100)
+
+    @percent_ideal_hashrate.setter
+    def percent_ideal_hashrate(self, val):
+        pass
+
+    @property
+    def percent_ideal_wattage(self):  # noqa - Skip PyCharm inspection
+        if self.wattage_limit == 0 or self.wattage == 0:
+            return 0
+        return round((self.wattage / self.wattage_limit) * 100)
+
+    @percent_ideal_wattage.setter
+    def percent_ideal_wattage(self, val):
         pass
 
     @property

pyasic/data/error_codes/whatsminer.py

@@ -16,7 +16,7 @@
 
 from dataclasses import asdict, dataclass, field, fields
 
-C_N_CODES = ["52", "53", "54", "55"]
+C_N_CODES = ["52", "53", "54", "55", "56"]
 
 
 @dataclass
@@ -264,6 +264,7 @@ ERROR_CODES = {
     53: {"n": {"c": "Slot {n} chip {c} too few nonce."}},
     54: {"n": {"c": "Slot {n} chip {c} temp protected."}},
     55: {"n": {"c": "Slot {n} chip {c} has been reset."}},
+    56: {"n": {"c": "Slot {n} chip {c} does not return to the nonce."}},
     80: {
         0: {0: "The tool version is too low, please update."},
         1: {0: "Low freq."},

pyasic/load/__init__.py

@@ -19,21 +19,8 @@ from typing import List, Union
 
 from pyasic.errors import APIError
 from pyasic.miners import AnyMiner
-from pyasic.miners.btc._backends import (  # noqa - Ignore access to _module
-    X19,
-    BOSMiner,
-    BTMiner,
-)
-from pyasic.miners.btc._types import (  # noqa - Ignore access to _module
-    S9,
-    S17,
-    T17,
-    S17e,
-    S17Plus,
-    S17Pro,
-    T17e,
-    T17Plus,
-)
+from pyasic.miners.backends import AntminerModern, BOSMiner, BTMiner
+from pyasic.miners.types import S9, S17, T17, S17e, S17Plus, S17Pro, T17e, T17Plus
 
 FAN_USAGE = 50  # 50 W per fan
 
@@ -103,7 +90,7 @@ class _MinerPhaseBalancer:
                     self.miners[str(miner.ip)]["tune"] = True
                     self.miners[str(miner.ip)]["shutdown"] = True
                     self.miners[str(miner.ip)]["max"] = 3600
-            elif isinstance(miner, X19):
+            elif isinstance(miner, AntminerModern):
                 self.miners[str(miner.ip)]["tune"] = False
                 self.miners[str(miner.ip)]["shutdown"] = True
                 self.miners[str(miner.ip)]["max"] = 3600

pyasic/miners/__init__.py

@@ -18,9 +18,9 @@ import ipaddress
 from typing import Union
 
 from pyasic.miners.base import AnyMiner, BaseMiner
-from pyasic.miners.miner_factory import MinerFactory
+from pyasic.miners.miner_factory import miner_factory
 
 
 # abstracted version of get miner that is easier to access
 async def get_miner(ip: Union[ipaddress.ip_address, str]) -> AnyMiner:
-    return await MinerFactory().get_miner(ip)
+    return await miner_factory.get_miner(ip)

pyasic/miners/antminer/bmminer/X17/S17.py

@@ -14,13 +14,21 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import BTMiner  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import M31V10, M31V20  # noqa - Ignore access to _module
+from pyasic.miners.backends import AntminerOld
+from pyasic.miners.types import S17, S17e, S17Plus, S17Pro
 
 
-class BTMinerM31V10(BTMiner, M31V10):
+class BMMinerS17(AntminerOld, S17):
     pass
 
 
-class BTMinerM31V20(BTMiner, M31V20):
+class BMMinerS17Plus(AntminerOld, S17Plus):
+    pass
+
+
+class BMMinerS17Pro(AntminerOld, S17Pro):
+    pass
+
+
+class BMMinerS17e(AntminerOld, S17e):
     pass

pyasic/miners/antminer/bmminer/X17/T17.py

@@ -0,0 +1,30 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import AntminerOld
+from pyasic.miners.types import T17, T17e, T17Plus
+
+
+class BMMinerT17(AntminerOld, T17):
+    pass
+
+
+class BMMinerT17Plus(AntminerOld, T17Plus):
+    pass
+
+
+class BMMinerT17e(AntminerOld, T17e):
+    pass

pyasic/miners/antminer/bmminer/X17/__init__.py

@@ -0,0 +1,18 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from .S17 import BMMinerS17, BMMinerS17e, BMMinerS17Plus, BMMinerS17Pro
+from .T17 import BMMinerT17, BMMinerT17e, BMMinerT17Plus

pyasic/miners/antminer/bmminer/X19/S19.py

@@ -14,21 +14,56 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import BTMiner  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import (  # noqa - Ignore access to _module
-    M21SV20,
-    M21SV60,
-    M21SV70,
+from pyasic.miners.backends import AntminerModern
+from pyasic.miners.types import (
+    S19,
+    S19L,
+    S19XP,
+    S19a,
+    S19aPro,
+    S19j,
+    S19jNoPIC,
+    S19jPro,
+    S19Pro,
+    S19ProPlus,
 )
 
 
-class BTMinerM21SV20(BTMiner, M21SV20):
+class BMMinerS19(AntminerModern, S19):
     pass
 
 
-class BTMinerM21SV60(BTMiner, M21SV60):
+class BMMinerS19Pro(AntminerModern, S19Pro):
     pass
 
 
-class BTMinerM21SV70(BTMiner, M21SV70):
+class BMMinerS19ProPlus(AntminerModern, S19ProPlus):
+    pass
+
+
+class BMMinerS19XP(AntminerModern, S19XP):
+    pass
+
+
+class BMMinerS19a(AntminerModern, S19a):
+    pass
+
+
+class BMMinerS19aPro(AntminerModern, S19aPro):
+    pass
+
+
+class BMMinerS19j(AntminerModern, S19j):
+    pass
+
+
+class BMMinerS19jNoPIC(AntminerModern, S19jNoPIC):
+    pass
+
+
+class BMMinerS19jPro(AntminerModern, S19jPro):
+    pass
+
+
+class BMMinerS19L(AntminerModern, S19L):
     pass

pyasic/miners/antminer/bmminer/X19/T19.py

@@ -14,10 +14,11 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import S17Pro  # noqa - Ignore access to _module
+from pyasic.miners.backends import AntminerModern
+from pyasic.miners.types import T19
 
-from .X17 import BMMinerX17
+# noqa - Ignore access to _module
 
 
-class BMMinerS17Pro(BMMinerX17, S17Pro):
+class BMMinerT19(AntminerModern, T19):
     pass

pyasic/miners/antminer/bmminer/X19/__init__.py

@@ -14,12 +14,16 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .S19 import S19
-from .S19_Pro import S19Pro
-from .S19_XP import S19XP
-from .S19a import S19a
-from .S19a_Pro import S19aPro
-from .S19j import S19j
-from .S19j_Pro import S19jPro
-from .S19L import S19L
-from .T19 import T19
+from .S19 import (
+    BMMinerS19,
+    BMMinerS19a,
+    BMMinerS19aPro,
+    BMMinerS19j,
+    BMMinerS19jNoPIC,
+    BMMinerS19jPro,
+    BMMinerS19L,
+    BMMinerS19Pro,
+    BMMinerS19ProPlus,
+    BMMinerS19XP,
+)
+from .T19 import BMMinerT19

pyasic/miners/antminer/bmminer/X3/HS3.py

@@ -14,9 +14,11 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.hns._backends import X3  # noqa - Ignore access to _module
-from pyasic.miners.hns._types import HS3  # noqa - Ignore access to _module
+from pyasic.miners.backends import AntminerModern
+from pyasic.miners.types import HS3
 
 
-class CGMinerHS3(X3, HS3):
-    pass
+class BMMinerHS3(AntminerModern, HS3):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.supports_shutdown = False

pyasic/miners/antminer/bmminer/X3/L3.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import T17  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
+from pyasic.miners.backends import AntminerOld
+from pyasic.miners.types import L3Plus
 
 
-class BMMinerT17(BMMinerX17, T17):
+class BMMinerL3Plus(AntminerOld, L3Plus):
     pass

pyasic/miners/antminer/bmminer/X3/__init__.py

@@ -13,5 +13,5 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
-from .T3H_Plus import InnosiliconT3HPlus
+from .HS3 import BMMinerHS3
+from .L3 import BMMinerL3Plus

pyasic/miners/antminer/bmminer/X7/L7.py

@@ -13,12 +13,11 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
-from pyasic.miners.ltc._backends import X7  # noqa - Ignore access to _module
-from pyasic.miners.ltc._types import L7  # noqa - Ignore access to _module
-
-# noqa - Ignore access to _module
+from pyasic.miners.backends import AntminerModern
+from pyasic.miners.types import L7
 
 
-class BMMinerL7(X7, L7):
-    pass
+class BMMinerL7(AntminerModern, L7):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.supports_shutdown = False

pyasic/miners/antminer/bmminer/X7/__init__.py

@@ -13,5 +13,4 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
 from .L7 import BMMinerL7

pyasic/miners/antminer/bmminer/X9/E9.py

@@ -0,0 +1,24 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import AntminerModern
+from pyasic.miners.types import E9Pro
+
+
+class BMMinerE9Pro(AntminerModern, E9Pro):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.supports_shutdown = False

pyasic/miners/antminer/bmminer/X9/S9.py

@@ -14,9 +14,17 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import BMMiner  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import S9i  # noqa - Ignore access to _module
+from pyasic.miners.backends import BMMiner
+from pyasic.miners.types import S9, S9i, S9j
+
+
+class BMMinerS9(BMMiner, S9):
+    pass
 
 
 class BMMinerS9i(BMMiner, S9i):
     pass
+
+
+class BMMinerS9j(BMMiner, S9j):
+    pass

pyasic/miners/antminer/bmminer/X9/T9.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import BMMiner
+from pyasic.miners.types import T9
+
+
+class BMMinerT9(BMMiner, T9):
+    pass

pyasic/miners/antminer/bmminer/X9/__init__.py

@@ -14,6 +14,6 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .S9 import BMMinerS9
-from .S9i import BMMinerS9i
+from .E9 import BMMinerE9Pro
+from .S9 import BMMinerS9, BMMinerS9i, BMMinerS9j
 from .T9 import BMMinerT9

pyasic/miners/antminer/bmminer/__init__.py

@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from .X3 import *
+from .X7 import *
 from .X9 import *
 from .X17 import *
 from .X19 import *

pyasic/miners/antminer/bosminer/X17/S17.py

@@ -14,9 +14,21 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import BOSMiner  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import S17Plus  # noqa - Ignore access to _module
+from pyasic.miners.backends import BOSMiner
+from pyasic.miners.types import S17, S17e, S17Plus, S17Pro
+
+
+class BOSMinerS17(BOSMiner, S17):
+    pass
 
 
 class BOSMinerS17Plus(BOSMiner, S17Plus):
     pass
+
+
+class BOSMinerS17Pro(BOSMiner, S17Pro):
+    pass
+
+
+class BOSMinerS17e(BOSMiner, S17e):
+    pass

pyasic/miners/antminer/bosminer/X17/T17.py

@@ -14,9 +14,17 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import BOSMiner  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import T17Plus  # noqa - Ignore access to _module
+from pyasic.miners.backends import BOSMiner
+from pyasic.miners.types import T17, T17e, T17Plus
+
+
+class BOSMinerT17(BOSMiner, T17):
+    pass
 
 
 class BOSMinerT17Plus(BOSMiner, T17Plus):
     pass
+
+
+class BOSMinerT17e(BOSMiner, T17e):
+    pass

pyasic/miners/antminer/bosminer/X17/__init__.py

@@ -0,0 +1,18 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from .S17 import BOSMinerS17, BOSMinerS17e, BOSMinerS17Plus, BOSMinerS17Pro
+from .T17 import BOSMinerT17, BOSMinerT17e, BOSMinerT17Plus

pyasic/miners/antminer/bosminer/X19/S19.py

@@ -14,8 +14,24 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import BOSMiner  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import S19jPro  # noqa - Ignore access to _module
+from pyasic.miners.backends import BOSMiner
+from pyasic.miners.types import S19, S19j, S19jNoPIC, S19jPro, S19Pro
+
+
+class BOSMinerS19(BOSMiner, S19):
+    pass
+
+
+class BOSMinerS19Pro(BOSMiner, S19Pro):
+    pass
+
+
+class BOSMinerS19j(BOSMiner, S19j):
+    pass
+
+
+class BOSMinerS19jNoPIC(BOSMiner, S19jNoPIC):
+    pass
 
 
 class BOSMinerS19jPro(BOSMiner, S19jPro):

pyasic/miners/antminer/bosminer/X19/T19.py

@@ -14,8 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import CGMinerAvalon  # noqa - Ignore access to _module
+from pyasic.miners.backends import BOSMiner
+from pyasic.miners.types import T19
 
 
-class CGMinerA7X(CGMinerAvalon):
+class BOSMinerT19(BOSMiner, T19):
     pass

pyasic/miners/antminer/bosminer/X19/__init__.py

@@ -14,8 +14,11 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .S19 import BOSMinerS19
-from .S19_Pro import BOSMinerS19Pro
-from .S19j import BOSMinerS19j
-from .S19j_Pro import BOSMinerS19jPro
+from .S19 import (
+    BOSMinerS19,
+    BOSMinerS19j,
+    BOSMinerS19jNoPIC,
+    BOSMinerS19jPro,
+    BOSMinerS19Pro,
+)
 from .T19 import BOSMinerT19

pyasic/miners/antminer/bosminer/X9/S9.py

@@ -14,8 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import CGMinerAvalon  # noqa - Ignore access to _module
+from pyasic.miners.backends import BOSMiner
+from pyasic.miners.types import S9
 
 
-class CGMinerA8X(CGMinerAvalon):
+class BOSMinerS9(BOSMiner, S9):
     pass

pyasic/miners/antminer/cgminer/X15/Z15.py

@@ -14,9 +14,11 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.zec._backends import X15  # noqa - Ignore access to _module
-from pyasic.miners.zec._types import Z15  # noqa - Ignore access to _module
+from pyasic.miners.backends import AntminerOld
+from pyasic.miners.types import Z15
 
 
-class CGMinerZ15(X15, Z15):
-    pass
+class CGMinerZ15(AntminerOld, Z15):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.supports_shutdown = False

pyasic/miners/antminer/cgminer/X3/D3.py

@@ -0,0 +1,23 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from pyasic.miners.backends import AntminerOld
+from pyasic.miners.types import D3
+
+
+class CGMinerD3(AntminerOld, D3):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.supports_shutdown = False

pyasic/miners/antminer/cgminer/X3/__init__.py

@@ -14,4 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .T3X import *
+from .D3 import CGMinerD3

pyasic/miners/antminer/cgminer/X5/DR5.py

@@ -14,9 +14,11 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.dcr._backends import X5  # noqa - Ignore access to _module
-from pyasic.miners.dcr._types import DR5  # noqa - Ignore access to _module
+from pyasic.miners.backends import AntminerOld
+from pyasic.miners.types import DR5
 
 
-class CGMinerDR5(X5, DR5):
-    pass
+class CGMinerDR5(AntminerOld, DR5):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.supports_shutdown = False

pyasic/miners/antminer/cgminer/__init__.py

@@ -13,4 +13,7 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+
+from .X3 import *
+from .X5 import *
 from .X15 import *

pyasic/miners/antminer/hiveon/X9/T9.py

@@ -20,8 +20,8 @@ import asyncssh
 
 from pyasic.data import HashBoard
 from pyasic.errors import APIError
-from pyasic.miners.btc._backends import Hiveon  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import T9  # noqa - Ignore access to _module
+from pyasic.miners.backends import Hiveon
+from pyasic.miners.types import T9
 
 
 class HiveonT9(Hiveon, T9):
@@ -42,7 +42,7 @@ class HiveonT9(Hiveon, T9):
                 .upper()
             )
             return mac
-        except (TypeError, ValueError, asyncssh.Error, OSError):
+        except (TypeError, ValueError, asyncssh.Error, OSError, AttributeError):
             pass
 
     async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
@@ -62,13 +62,16 @@ class HiveonT9(Hiveon, T9):
                     try:
                         hashboard.board_temp = api_stats["STATS"][1][f"temp{chipset}"]
                         hashboard.chip_temp = api_stats["STATS"][1][f"temp2_{chipset}"]
-                        hashrate += api_stats["STATS"][1][f"chain_rate{chipset}"]
-                        chips += api_stats["STATS"][1][f"chain_acn{chipset}"]
                     except (KeyError, IndexError):
                         pass
                     else:
                         hashboard.missing = False
-            hashboard.hashrate = hashrate
+                try:
+                    hashrate += api_stats["STATS"][1][f"chain_rate{chipset}"]
+                    chips += api_stats["STATS"][1][f"chain_acn{chipset}"]
+                except (KeyError, IndexError):
+                    pass
+            hashboard.hashrate = round(hashrate / 1000, 2)
             hashboard.chips = chips
             hashboards.append(hashboard)
 

pyasic/miners/antminer/vnish/X19/S19.py

@@ -14,8 +14,32 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._backends import VNish  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import S19jPro  # noqa - Ignore access to _module
+from pyasic.miners.backends import VNish
+from pyasic.miners.types import S19, S19XP, S19a, S19aPro, S19j, S19jPro, S19Pro
+
+
+class VNishS19(VNish, S19):
+    pass
+
+
+class VNishS19Pro(VNish, S19Pro):
+    pass
+
+
+class VNishS19XP(VNish, S19XP):
+    pass
+
+
+class VNishS19a(VNish, S19a):
+    pass
+
+
+class VNishS19aPro(VNish, S19aPro):
+    pass
+
+
+class VNishS19j(VNish, S19j):
+    pass
 
 
 class VNishS19jPro(VNish, S19jPro):

pyasic/miners/antminer/vnish/X19/T19.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import VNish
+from pyasic.miners.types import T19
+
+
+class VNishT19(VNish, T19):
+    pass

pyasic/miners/antminer/vnish/X19/__init__.py

@@ -0,0 +1,26 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from .S19 import (
+    VNishS19,
+    VNishS19a,
+    VNishS19aPro,
+    VNishS19j,
+    VNishS19jPro,
+    VNishS19Pro,
+    VNishS19XP,
+)
+from .T19 import VNishT19

pyasic/miners/antminer/vnish/X3/L3.py

@@ -0,0 +1,23 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import VNish
+from pyasic.miners.types import L3Plus
+
+
+class VnishL3Plus(VNish, L3Plus):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)

pyasic/miners/antminer/vnish/X3/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from .L3 import VnishL3Plus

pyasic/miners/antminer/vnish/__init__.py

@@ -14,4 +14,5 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
+from .X3 import *
 from .X19 import *

pyasic/miners/avalonminer/cgminer/A10X/A1026.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import T17e  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1026
 
 
-class BMMinerT17e(BMMinerX17, T17e):
+class CGMinerAvalon1026(CGMinerAvalon, Avalon1026):
     pass

pyasic/miners/avalonminer/cgminer/A10X/A1047.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import S17e  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1047
 
 
-class BMMinerS17e(BMMinerX17, S17e):
+class CGMinerAvalon1047(CGMinerAvalon, Avalon1047):
     pass

pyasic/miners/avalonminer/cgminer/A10X/A1066.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1066
+
+
+class CGMinerAvalon1066(CGMinerAvalon, Avalon1066):
+    pass

pyasic/miners/avalonminer/cgminer/A11X/A1166.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import S17Plus  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1166Pro
 
 
-class BMMinerS17Plus(BMMinerX17, S17Plus):
+class CGMinerAvalon1166Pro(CGMinerAvalon, Avalon1166Pro):
     pass

pyasic/miners/avalonminer/cgminer/A11X/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from .A1166 import CGMinerAvalon1166Pro

pyasic/miners/avalonminer/cgminer/A12X/A1246.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1246
+
+
+class CGMinerAvalon1246(CGMinerAvalon, Avalon1246):
+    pass

pyasic/miners/avalonminer/cgminer/A12X/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from .A1246 import CGMinerAvalon1246

pyasic/miners/avalonminer/cgminer/A7X/A721.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import S17  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon721
 
 
-class BMMinerS17(BMMinerX17, S17):
+class CGMinerAvalon721(CGMinerAvalon, Avalon721):
     pass

pyasic/miners/avalonminer/cgminer/A7X/A741.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon741
+
+
+class CGMinerAvalon741(CGMinerAvalon, Avalon741):
+    pass

pyasic/miners/avalonminer/cgminer/A7X/A761.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon761
+
+
+class CGMinerAvalon761(CGMinerAvalon, Avalon761):
+    pass

pyasic/miners/avalonminer/cgminer/A8X/A821.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon821
+
+
+class CGMinerAvalon821(CGMinerAvalon, Avalon821):
+    pass

pyasic/miners/avalonminer/cgminer/A8X/A841.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon841
+
+
+class CGMinerAvalon841(CGMinerAvalon, Avalon841):
+    pass

pyasic/miners/avalonminer/cgminer/A8X/A851.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon851
+
+
+class CGMinerAvalon851(CGMinerAvalon, Avalon851):
+    pass

pyasic/miners/avalonminer/cgminer/A9X/A921.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon921
+
+
+class CGMinerAvalon921(CGMinerAvalon, Avalon921):
+    pass

pyasic/miners/avalonminer/cgminer/__init__.py

@@ -18,3 +18,5 @@ from .A7X import *
 from .A8X import *
 from .A9X import *
 from .A10X import *
+from .A11X import *
+from .A12X import *

pyasic/miners/backends/__init__.py

@@ -13,7 +13,9 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
+from .antminer import AntminerModern, AntminerOld
+from .bfgminer import BFGMiner
+from .bfgminer_goldshell import BFGMinerGoldshell
 from .bmminer import BMMiner
 from .bosminer import BOSMiner
 from .btminer import BTMiner
@@ -21,4 +23,4 @@ from .cgminer import CGMiner
 from .cgminer_avalon import CGMinerAvalon
 from .hiveon import Hiveon
 from .vnish import VNish
-from .X19 import X19
+from .whatsminer import M2X, M3X, M5X

pyasic/miners/backends/antminer.py

@@ -19,17 +19,46 @@ from typing import List, Optional, Union
 
 from pyasic.API import APIError
 from pyasic.config import MinerConfig, X19PowerMode
-from pyasic.data import HashBoard
+from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, X19Error
-from pyasic.miners.btc._backends import BMMiner  # noqa - Ignore access to _module
-from pyasic.web.X19 import X19WebAPI
+from pyasic.miners.backends.bmminer import BMMiner
+from pyasic.miners.backends.cgminer import CGMiner
+from pyasic.web.antminer import AntminerModernWebAPI, AntminerOldWebAPI
+
+ANTMINER_MODERN_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {}},
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "hostname": {"cmd": "get_hostname", "kwargs": {}},
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_stats": {"api": "stats"}},
+    },
+    "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {}},
+    "wattage_limit": {"cmd": "get_wattage_limit", "kwargs": {}},
+    "fans": {"cmd": "get_fans", "kwargs": {"api_stats": {"api": "stats"}}},
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "errors": {"cmd": "get_errors", "kwargs": {}},
+    "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
 
 
-class X7(BMMiner):
+class AntminerModern(BMMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
-        super().__init__(ip, api_ver=api_ver)
-        self.ip = ip
-        self.web = X19WebAPI(ip)
+        super().__init__(ip, api_ver)
+        # interfaces
+        self.web = AntminerModernWebAPI(ip)
+
+        # static data
+        # data gathering locations
+        self.data_locations = ANTMINER_MODERN_DATA_LOC
+        # autotuning/shutdown support
+        self.supports_shutdown = True
 
     async def get_config(self) -> MinerConfig:
         data = await self.web.get_miner_conf()
@@ -37,101 +66,14 @@ class X7(BMMiner):
             self.config = MinerConfig().from_raw(data)
         return self.config
 
-    async def get_hashrate(self, api_summary: dict = None) -> Optional[float]:
-        # get hr from API
-        if not api_summary:
-            try:
-                api_summary = await self.api.summary()
-            except APIError:
-                pass
-
-        if api_summary:
-            try:
-                # not actually GHS, MHS.
-                return round(float(api_summary["SUMMARY"][0]["GHS 5s"] / 1000000), 5)
-            except (IndexError, KeyError, ValueError, TypeError):
-                pass
-
-    async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
-        hashboards = []
-
-        if not api_stats:
-            try:
-                api_stats = await self.api.stats()
-            except APIError:
-                pass
-
-        if api_stats:
-            try:
-                board_offset = -1
-                boards = api_stats["STATS"]
-                if len(boards) > 1:
-                    for board_num in range(1, 16, 5):
-                        for _b_num in range(5):
-                            b = boards[1].get(f"chain_acn{board_num + _b_num}")
-
-                            if b and not b == 0 and board_offset == -1:
-                                board_offset = board_num
-                    if board_offset == -1:
-                        board_offset = 1
-
-                    for i in range(board_offset, board_offset + self.ideal_hashboards):
-                        hashboard = HashBoard(
-                            slot=i - board_offset, expected_chips=self.nominal_chips
-                        )
-
-                        chip_temp = boards[1].get(f"temp{i}")
-                        if chip_temp:
-                            hashboard.chip_temp = round(chip_temp)
-
-                        temp = boards[1].get(f"temp2_{i}")
-                        if temp:
-                            hashboard.temp = round(temp)
-
-                        hashrate = boards[1].get(f"chain_rate{i}")
-                        if hashrate:
-                            hashboard.hashrate = round(float(hashrate) / 1000, 5)
-
-                        chips = boards[1].get(f"chain_acn{i}")
-                        if chips:
-                            hashboard.chips = chips
-                            hashboard.missing = False
-                        if (not chips) or (not chips > 0):
-                            hashboard.missing = True
-                        hashboards.append(hashboard)
-            except (IndexError, KeyError, ValueError, TypeError):
-                pass
-
-        return hashboards
-
-    async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]:
-        # X19 method, not sure compatibility
-        if not api_stats:
-            try:
-                api_stats = await self.api.stats()
-            except APIError:
-                pass
-
-        if api_stats:
-            try:
-                ideal_rate = api_stats["STATS"][1]["total_rateideal"]
-                try:
-                    rate_unit = api_stats["STATS"][1]["rate_unit"]
-                except KeyError:
-                    rate_unit = "MH"
-                if rate_unit == "GH":
-                    return round(ideal_rate, 2)
-                if rate_unit == "MH":
-                    return round(ideal_rate / 1000000, 5)
-                else:
-                    return round(ideal_rate, 2)
-            except (KeyError, IndexError):
-                pass
-
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
         self.config = config
         conf = config.as_x19(user_suffix=user_suffix)
-        await self.web.set_miner_conf(conf)
+        data = await self.web.set_miner_conf(conf)
+
+        if data:
+            if data.get("code") == "M000":
+                return
 
         for i in range(7):
             data = await self.get_config()
@@ -160,19 +102,16 @@ class X7(BMMiner):
         return False
 
     async def stop_mining(self) -> bool:
-        return False
-        # maybe in a later update
-        # cfg = await self.get_config()
-        # cfg.miner_mode = X19PowerMode.Sleep
-        # await self.send_config(cfg)
-        # return True
+        cfg = await self.get_config()
+        cfg.miner_mode = X19PowerMode.Sleep
+        await self.send_config(cfg)
+        return True
 
     async def resume_mining(self) -> bool:
-        return False
-        # cfg = await self.get_config()
-        # cfg.miner_mode = X19PowerMode.Normal
-        # await self.send_config(cfg)
-        # return True
+        cfg = await self.get_config()
+        cfg.miner_mode = X19PowerMode.Normal
+        await self.send_config(cfg)
+        return True
 
     async def get_hostname(self) -> Union[str, None]:
         try:
@@ -223,6 +162,29 @@ class X7(BMMiner):
             pass
         return self.light
 
+    async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]:
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        if api_stats:
+            try:
+                ideal_rate = api_stats["STATS"][1]["total_rateideal"]
+                try:
+                    rate_unit = api_stats["STATS"][1]["rate_unit"]
+                except KeyError:
+                    rate_unit = "GH"
+                if rate_unit == "GH":
+                    return round(ideal_rate / 1000, 2)
+                if rate_unit == "MH":
+                    return round(ideal_rate / 1000000, 2)
+                else:
+                    return round(ideal_rate, 2)
+            except (KeyError, IndexError):
+                pass
+
     async def set_static_ip(
         self,
         ip: str,
@@ -264,3 +226,202 @@ class X7(BMMiner):
             hostname=hostname,
             protocol=protocol,
         )
+
+
+ANTMINER_OLD_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {}},
+    "model": {
+        "cmd": "get_model",
+        "kwargs": {},
+    },
+    "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "hostname": {
+        "cmd": "get_hostname",
+        "kwargs": {"web_get_system_info": {"web": "get_system_info"}},
+    },
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_stats": {"api": "stats"}},
+    },
+    "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {}},
+    "wattage_limit": {"cmd": "get_wattage_limit", "kwargs": {}},
+    "fans": {"cmd": "get_fans", "kwargs": {"api_stats": {"api": "stats"}}},
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "errors": {"cmd": "get_errors", "kwargs": {}},
+    "fault_light": {
+        "cmd": "get_fault_light",
+        "kwargs": {"web_get_blink_status": {"web": "get_blink_status"}},
+    },
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
+
+
+class AntminerOld(CGMiner):
+    def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
+        super().__init__(ip, api_ver)
+        # interfaces
+        self.web = AntminerOldWebAPI(ip)
+
+        # static data
+        # data gathering locations
+        self.data_locations = ANTMINER_OLD_DATA_LOC
+
+    async def get_config(self) -> MinerConfig:
+        data = await self.web.get_miner_conf()
+        if data:
+            self.config = MinerConfig().from_raw(data)
+        return self.config
+
+    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
+        await self.web.set_miner_conf(config.as_x17(user_suffix=user_suffix))
+
+    async def get_mac(self) -> Union[str, None]:
+        try:
+            data = await self.web.get_system_info()
+            if data:
+                return data["macaddr"]
+        except KeyError:
+            pass
+
+    async def fault_light_on(self) -> bool:
+        # this should time out, after it does do a check
+        await self.web.blink(blink=True)
+        try:
+            data = await self.web.get_blink_status()
+            if data:
+                if data["isBlinking"]:
+                    self.light = True
+        except KeyError:
+            pass
+        return self.light
+
+    async def fault_light_off(self) -> bool:
+        await self.web.blink(blink=False)
+        try:
+            data = await self.web.get_blink_status()
+            if data:
+                if not data["isBlinking"]:
+                    self.light = False
+        except KeyError:
+            pass
+        return self.light
+
+    async def reboot(self) -> bool:
+        data = await self.web.reboot()
+        if data:
+            return True
+        return False
+
+    async def get_fault_light(self, web_get_blink_status: dict = None) -> bool:
+        if self.light:
+            return self.light
+
+        if not web_get_blink_status:
+            try:
+                web_get_blink_status = await self.web.get_blink_status()
+            except APIError:
+                pass
+
+        if web_get_blink_status:
+            try:
+                self.light = web_get_blink_status["isBlinking"]
+            except KeyError:
+                pass
+        return self.light
+
+    async def get_hostname(self, web_get_system_info: dict = None) -> Optional[str]:
+        if not web_get_system_info:
+            try:
+                web_get_system_info = await self.web.get_system_info()
+            except APIError:
+                pass
+
+        if web_get_system_info:
+            try:
+                return web_get_system_info["hostname"]
+            except KeyError:
+                pass
+
+    async def get_fans(self, api_stats: dict = None) -> List[Fan]:
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        fans_data = [Fan(), Fan(), Fan(), Fan()]
+        if api_stats:
+            try:
+                fan_offset = -1
+
+                for fan_num in range(1, 8, 4):
+                    for _f_num in range(4):
+                        f = api_stats["STATS"][1].get(f"fan{fan_num + _f_num}")
+                        if f and not f == 0 and fan_offset == -1:
+                            fan_offset = fan_num + 2
+                if fan_offset == -1:
+                    fan_offset = 3
+
+                for fan in range(self.fan_count):
+                    fans_data[fan] = Fan(
+                        api_stats["STATS"][1].get(f"fan{fan_offset+fan}")
+                    )
+            except (KeyError, IndexError):
+                pass
+        return fans_data
+
+    async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
+        hashboards = []
+
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        if api_stats:
+            try:
+                board_offset = -1
+                boards = api_stats["STATS"]
+                if len(boards) > 1:
+                    for board_num in range(1, 16, 5):
+                        for _b_num in range(5):
+                            b = boards[1].get(f"chain_acn{board_num + _b_num}")
+
+                            if b and not b == 0 and board_offset == -1:
+                                board_offset = board_num
+                    if board_offset == -1:
+                        board_offset = 1
+
+                    for i in range(board_offset, board_offset + self.ideal_hashboards):
+                        hashboard = HashBoard(
+                            slot=i - board_offset, expected_chips=self.nominal_chips
+                        )
+
+                        chip_temp = boards[1].get(f"temp{i}")
+                        if chip_temp:
+                            hashboard.chip_temp = round(chip_temp)
+
+                        temp = boards[1].get(f"temp2_{i}")
+                        if temp:
+                            hashboard.temp = round(temp)
+
+                        hashrate = boards[1].get(f"chain_rate{i}")
+                        if hashrate:
+                            hashboard.hashrate = round(float(hashrate) / 1000, 2)
+
+                        chips = boards[1].get(f"chain_acn{i}")
+                        if chips:
+                            hashboard.chips = chips
+                            hashboard.missing = False
+                        if (not chips) or (not chips > 0):
+                            hashboard.missing = True
+                        hashboards.append(hashboard)
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
+        return hashboards

pyasic/miners/backends/bfgminer.py

@@ -14,8 +14,6 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import ipaddress
-import logging
 from collections import namedtuple
 from typing import List, Optional, Tuple
 
@@ -26,18 +24,44 @@ from pyasic.data.error_codes import MinerErrorData
 from pyasic.errors import APIError
 from pyasic.miners.base import BaseMiner
 
+BFGMINER_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {}},
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "hostname": {"cmd": "get_hostname", "kwargs": {}},
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_stats": {"api": "stats"}},
+    },
+    "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {}},
+    "wattage_limit": {"cmd": "get_wattage_limit", "kwargs": {}},
+    "fans": {"cmd": "get_fans", "kwargs": {"api_stats": {"api": "stats"}}},
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "errors": {"cmd": "get_errors", "kwargs": {}},
+    "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
+
 
 class BFGMiner(BaseMiner):
     """Base handler for BFGMiner based miners."""
 
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip)
-        self.ip = ipaddress.ip_address(ip)
+        # interfaces
         self.api = BFGMinerAPI(ip, api_ver)
+
+        # static data
         self.api_type = "BFGMiner"
+        # data gathering locations
+        self.data_locations = BFGMINER_DATA_LOC
+
+        # data storage
         self.api_ver = api_ver
-        self.uname = "root"
-        self.pwd = "admin"
 
     async def get_config(self) -> MinerConfig:
         # get pool data
@@ -77,30 +101,6 @@ class BFGMiner(BaseMiner):
     async def get_mac(self) -> str:
         return "00:00:00:00:00:00"
 
-    async def get_model(self, api_devdetails: dict = None) -> Optional[str]:
-        if self.model:
-            logging.debug(f"Found model for {self.ip}: {self.model}")
-            return self.model
-
-        if not api_devdetails:
-            try:
-                api_devdetails = await self.api.devdetails()
-            except APIError:
-                pass
-
-        if api_devdetails:
-            try:
-                self.model = api_devdetails["DEVDETAILS"][0]["Model"].replace(
-                    "Antminer ", ""
-                )
-                logging.debug(f"Found model for {self.ip}: {self.model}")
-                return self.model
-            except (TypeError, IndexError, KeyError):
-                pass
-
-        logging.warning(f"Failed to get model for miner: {self}")
-        return None
-
     async def get_api_ver(self, api_version: dict = None) -> Optional[str]:
         # Check to see if the version info is already cached
         if self.api_ver:

pyasic/miners/backends/bfgminer_goldshell.py

@@ -13,20 +13,53 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-from typing import List, Optional
+from typing import List
 
 from pyasic.config import MinerConfig
-from pyasic.data import Fan, HashBoard
+from pyasic.data import HashBoard
 from pyasic.errors import APIError
-from pyasic.miners.hns._backends import BFGMiner
+from pyasic.miners.backends import BFGMiner
 from pyasic.web.goldshell import GoldshellWebAPI
 
+GOLDSHELL_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {"web_setting": {"web": "setting"}}},
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"web_status": {"web": "status"}}},
+    "hostname": {"cmd": "get_hostname", "kwargs": {}},
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_stats": {"api": "stats"}},
+    },
+    "hashboards": {
+        "cmd": "get_hashboards",
+        "kwargs": {
+            "api_devs": {"api": "devs"},
+            "api_devdetails": {"api": "devdetails"},
+        },
+    },
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {}},
+    "wattage_limit": {"cmd": "get_wattage_limit", "kwargs": {}},
+    "fans": {"cmd": "get_fans", "kwargs": {"api_stats": {"api": "stats"}}},
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "errors": {"cmd": "get_errors", "kwargs": {}},
+    "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
 
-class Goldshell(BFGMiner):
+
+class BFGMinerGoldshell(BFGMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip, api_ver)
+        # interfaces
         self.web = GoldshellWebAPI(ip)
 
+        # static data
+        # data gathering locations
+        self.data_locations = GOLDSHELL_DATA_LOC
+
     async def get_config(self) -> MinerConfig:
         return MinerConfig().from_raw(await self.web.pools())
 
@@ -75,7 +108,9 @@ class Goldshell(BFGMiner):
             except KeyError:
                 pass
 
-    async def get_hashboards(self, api_devs: dict = None, api_devdetails: dict = None) -> List[HashBoard]:
+    async def get_hashboards(
+        self, api_devs: dict = None, api_devdetails: dict = None
+    ) -> List[HashBoard]:
         if not api_devs:
             try:
                 api_devs = await self.api.devs()
@@ -88,15 +123,20 @@ class Goldshell(BFGMiner):
         ]
 
         if api_devs:
-            for board in api_devs["DEVS"]:
-                if board.get("ID") is not None:
-                    try:
-                        b_id = board["ID"]
-                        hashboards[b_id].hashrate = round(board["MHS 20s"] / 1000000, 2)
-                        hashboards[b_id].temp = board["tstemp-2"]
-                        hashboards[b_id].missing = False
-                    except KeyError:
-                        pass
+            if api_devs.get("DEVS"):
+                for board in api_devs["DEVS"]:
+                    if board.get("ID") is not None:
+                        try:
+                            b_id = board["ID"]
+                            hashboards[b_id].hashrate = round(
+                                board["MHS 20s"] / 1000000, 2
+                            )
+                            hashboards[b_id].temp = board["tstemp-2"]
+                            hashboards[b_id].missing = False
+                        except KeyError:
+                            pass
+            else:
+                print(self, api_devs)
 
         if not api_devdetails:
             try:
@@ -105,12 +145,15 @@ class Goldshell(BFGMiner):
                 pass
 
         if api_devdetails:
-            for board in api_devdetails["DEVS"]:
-                if board.get("ID") is not None:
-                    try:
-                        b_id = board["ID"]
-                        hashboards[b_id].chips = board["chips-nr"]
-                    except KeyError:
-                        pass
+            if api_devdetails.get("DEVS"):
+                for board in api_devdetails["DEVS"]:
+                    if board.get("ID") is not None:
+                        try:
+                            b_id = board["ID"]
+                            hashboards[b_id].chips = board["chips-nr"]
+                        except KeyError:
+                            pass
+            else:
+                print(self, api_devdetails)
 
         return hashboards

pyasic/miners/backends/bmminer.py

@@ -14,13 +14,10 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import ipaddress
 import logging
 from collections import namedtuple
 from typing import List, Optional, Tuple
 
-import asyncssh
-
 from pyasic.API.bmminer import BMMinerAPI
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
@@ -28,25 +25,51 @@ from pyasic.data.error_codes import MinerErrorData
 from pyasic.errors import APIError
 from pyasic.miners.base import BaseMiner
 
+BMMINER_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {}},
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "hostname": {"cmd": "get_hostname", "kwargs": {}},
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_stats": {"api": "stats"}},
+    },
+    "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {}},
+    "wattage_limit": {"cmd": "get_wattage_limit", "kwargs": {}},
+    "fans": {"cmd": "get_fans", "kwargs": {"api_stats": {"api": "stats"}}},
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "errors": {"cmd": "get_errors", "kwargs": {}},
+    "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
+
 
 class BMMiner(BaseMiner):
     """Base handler for BMMiner based miners."""
 
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip)
-        self.ip = ipaddress.ip_address(ip)
+        # interfaces
         self.api = BMMinerAPI(ip, api_ver)
+
+        # static data
         self.api_type = "BMMiner"
+        # data gathering locations
+        self.data_locations = BMMINER_DATA_LOC
+
+        # data storage
         self.api_ver = api_ver
-        self.uname = "root"
-        self.pwd = "admin"
 
     async def send_ssh_command(self, cmd: str) -> Optional[str]:
         result = None
 
         try:
             conn = await self._get_ssh_connection()
-        except (asyncssh.Error, OSError):
+        except ConnectionError:
             return None
 
         # open an ssh connection
@@ -81,11 +104,11 @@ class BMMiner(BaseMiner):
 
     async def reboot(self) -> bool:
         logging.debug(f"{self}: Sending reboot command.")
-        _ret = await self.send_ssh_command("reboot")
+        ret = await self.send_ssh_command("reboot")
         logging.debug(f"{self}: Reboot command completed.")
-        if isinstance(_ret, str):
-            return True
-        return False
+        if ret is None:
+            return False
+        return True
 
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
         return None
@@ -115,30 +138,6 @@ class BMMiner(BaseMiner):
     async def get_mac(self) -> str:
         return "00:00:00:00:00:00"
 
-    async def get_model(self, api_devdetails: dict = None) -> Optional[str]:
-        if self.model:
-            logging.debug(f"Found model for {self.ip}: {self.model}")
-            return self.model
-
-        if not api_devdetails:
-            try:
-                api_devdetails = await self.api.devdetails()
-            except APIError:
-                pass
-
-        if api_devdetails:
-            try:
-                self.model = api_devdetails["DEVDETAILS"][0]["Model"].replace(
-                    "Antminer ", ""
-                )
-                logging.debug(f"Found model for {self.ip}: {self.model}")
-                return self.model
-            except (TypeError, IndexError, KeyError):
-                pass
-
-        logging.warning(f"Failed to get model for miner: {self}")
-        return None
-
     async def get_api_ver(self, api_version: dict = None) -> Optional[str]:
         # Check to see if the version info is already cached
         if self.api_ver:
@@ -192,9 +191,7 @@ class BMMiner(BaseMiner):
 
     async def get_hostname(self) -> Optional[str]:
         hn = await self.send_ssh_command("cat /proc/sys/kernel/hostname")
-        if hn:
-            self.hostname = hn
-        return self.hostname
+        return hn
 
     async def get_hashrate(self, api_summary: dict = None) -> Optional[float]:
         # get hr from API

pyasic/miners/backends/bosminer.py

@@ -14,14 +14,10 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import ipaddress
-import json
 import logging
 from collections import namedtuple
 from typing import List, Optional, Tuple, Union
 
-import asyncssh
-import httpx
 import toml
 
 from pyasic.API.bosminer import BOSMinerAPI
@@ -30,25 +26,174 @@ from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import BraiinsOSError, MinerErrorData
 from pyasic.errors import APIError
 from pyasic.miners.base import BaseMiner
+from pyasic.web.bosminer import BOSMinerWebAPI
+
+BOSMINER_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {}},
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {
+        "cmd": "get_api_ver",
+        "kwargs": {"api_version": {"api": "version"}},
+    },
+    "fw_ver": {
+        "cmd": "get_fw_ver",
+        "kwargs": {
+            "graphql_version": {"web": {"bos": {"info": {"version": {"full": None}}}}}
+        },
+    },
+    "hostname": {
+        "cmd": "get_hostname",
+        "kwargs": {"graphql_hostname": {"web": {"bos": {"hostname": None}}}},
+    },
+    "hashrate": {
+        "cmd": "get_hashrate",
+        "kwargs": {
+            "api_summary": {"api": "summary"},
+            "graphql_hashrate": {
+                "web": {
+                    "bosminer": {
+                        "info": {"workSolver": {"realHashrate": {"mhs1M": None}}}
+                    }
+                },
+            },
+        },
+    },
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_devs": {"api": "devs"}},
+    },
+    "hashboards": {
+        "cmd": "get_hashboards",
+        "kwargs": {
+            "api_temps": {"api": "temps"},
+            "api_devdetails": {"api": "devdetails"},
+            "api_devs": {"api": "devs"},
+            "graphql_boards": {
+                "web": {
+                    "bosminer": {
+                        "info": {
+                            "workSolver": {
+                                "childSolvers": {
+                                    "name": None,
+                                    "realHashrate": {"mhs1M": None},
+                                    "hwDetails": {"chips": None},
+                                    "temperatures": {"degreesC": None},
+                                }
+                            }
+                        }
+                    }
+                },
+            },
+        },
+    },
+    "wattage": {
+        "cmd": "get_wattage",
+        "kwargs": {
+            "api_tunerstatus": {"api": "tunerstatus"},
+            "graphql_wattage": {
+                "web": {
+                    "bosminer": {
+                        "info": {"workSolver": {"power": {"approxConsumptionW": None}}}
+                    }
+                }
+            },
+        },
+    },
+    "wattage_limit": {
+        "cmd": "get_wattage_limit",
+        "kwargs": {
+            "api_tunerstatus": {"api": "tunerstatus"},
+            "graphql_wattage_limit": {
+                "web": {
+                    "bosminer": {"info": {"workSolver": {"power": {"limitW": None}}}}
+                }
+            },
+        },
+    },
+    "fans": {
+        "cmd": "get_fans",
+        "kwargs": {
+            "api_fans": {"api": "fans"},
+            "graphql_fans": {
+                "web": {"bosminer": {"info": {"fans": {"name": None, "rpm": None}}}}
+            },
+        },
+    },
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "errors": {
+        "cmd": "get_errors",
+        "kwargs": {
+            "api_tunerstatus": {"api": "tunerstatus"},
+            "graphql_errors": {
+                "web": {
+                    "bosminer": {
+                        "info": {
+                            "workSolver": {
+                                "childSolvers": {
+                                    "name": None,
+                                    "tuner": {"statusMessages": None},
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+        },
+    },
+    "fault_light": {
+        "cmd": "get_fault_light",
+        "kwargs": {"graphql_fault_light": {"web": {"bos": {"faultLight": None}}}},
+    },
+    "pools": {
+        "cmd": "get_pools",
+        "kwargs": {
+            "api_pools": {"api": "pools"},
+            "graphql_pools": {
+                "web": {
+                    "bosminer": {
+                        "config": {
+                            "... on BosminerConfig": {
+                                "groups": {
+                                    "pools": {"urluser": None},
+                                    "strategy": {
+                                        "... on QuotaStrategy": {"quota": None}
+                                    },
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+        },
+    },
+}
 
 
 class BOSMiner(BaseMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip)
-        self.ip = ipaddress.ip_address(ip)
+        # interfaces
         self.api = BOSMinerAPI(ip, api_ver)
+        self.web = BOSMinerWebAPI(ip)
+
+        # static data
         self.api_type = "BOSMiner"
+        # data gathering locations
+        self.data_locations = BOSMINER_DATA_LOC
+        # autotuning/shutdown support
+        self.supports_autotuning = True
+        self.supports_shutdown = True
+
+        # data storage
         self.api_ver = api_ver
-        self.uname = "root"
-        self.pwd = "admin"
-        self.config = None
 
     async def send_ssh_command(self, cmd: str) -> Optional[str]:
         result = None
 
         try:
             conn = await self._get_ssh_connection()
-        except (asyncssh.Error, OSError):
+        except ConnectionError:
             return None
 
         # open an ssh connection
@@ -58,8 +203,12 @@ class BOSMiner(BaseMiner):
                 try:
                     # run the command and get the result
                     result = await conn.run(cmd)
+                    stderr = result.stderr
                     result = result.stdout
 
+                    if len(stderr) > len(result):
+                        result = stderr
+
                 except Exception as e:
                     # if the command fails, log it
                     logging.warning(f"{self} command {cmd} error: {e}")
@@ -71,55 +220,12 @@ class BOSMiner(BaseMiner):
         # return the result, either command output or None
         return result
 
-    async def send_graphql_query(self, query) -> Union[dict, None]:
-        # FW version must be equal to or greater than 21.09 to use this
-        if self.fw_ver:
-            try:
-                if not (
-                    (
-                        int(self.fw_ver.split(".")[0]) == 21
-                        and int(self.fw_ver.split(".")[1]) >= 9
-                    )
-                    or int(self.fw_ver.split(".")[0]) > 21
-                ):
-                    logging.info(f"FW version {self.fw_ver} is too low to use graphql.")
-                    return None
-            except ValueError:
-                pass
-
-        url = f"http://{self.ip}/graphql"
-        try:
-            async with httpx.AsyncClient() as client:
-                _auth = await client.post(
-                    url,
-                    json={
-                        "query": 'mutation{auth{login(username:"'
-                        + self.uname
-                        + '", password:"'
-                        + self.pwd
-                        + '"){__typename}}}'
-                    },
-                )
-                d = await client.post(url, json={"query": query})
-            if d.status_code == 200:
-                try:
-                    data = d.json()
-                except json.decoder.JSONDecodeError:
-                    raise APIError(f"GraphQL returned malformed data: {d.text}")
-                if data.get("errors"):
-                    if len(data["errors"]) > 0:
-                        raise APIError(f"GraphQL error: {data['errors'][0]['message']}")
-
-        except httpx.HTTPError:
-            return None
-        return None
-
     async def fault_light_on(self) -> bool:
         """Sends command to turn on fault light on the miner."""
         logging.debug(f"{self}: Sending fault_light on command.")
-        _ret = await self.send_ssh_command("miner fault_light on")
+        ret = await self.send_ssh_command("miner fault_light on")
         logging.debug(f"{self}: fault_light on command completed.")
-        if isinstance(_ret, str):
+        if isinstance(ret, str):
             self.light = True
             return self.light
         return False
@@ -128,23 +234,23 @@ class BOSMiner(BaseMiner):
         """Sends command to turn off fault light on the miner."""
         logging.debug(f"{self}: Sending fault_light off command.")
         self.light = False
-        _ret = await self.send_ssh_command("miner fault_light off")
+        ret = await self.send_ssh_command("miner fault_light off")
         logging.debug(f"{self}: fault_light off command completed.")
-        if isinstance(_ret, str):
+        if isinstance(ret, str):
             self.light = False
             return True
         return False
 
     async def restart_backend(self) -> bool:
-        """Restart bosminer hashing process.  Wraps [`restart_bosminer`][pyasic.miners.btc._backends.bosminer.BOSMiner.restart_bosminer] to standardize."""
+        """Restart bosminer hashing process.  Wraps [`restart_bosminer`][pyasic.miners.backends.bosminer.BOSMiner.restart_bosminer] to standardize."""
         return await self.restart_bosminer()
 
     async def restart_bosminer(self) -> bool:
         """Restart bosminer hashing process."""
         logging.debug(f"{self}: Sending bosminer restart command.")
-        _ret = await self.send_ssh_command("/etc/init.d/bosminer restart")
+        ret = await self.send_ssh_command("/etc/init.d/bosminer restart")
         logging.debug(f"{self}: bosminer restart command completed.")
-        if isinstance(_ret, str):
+        if isinstance(ret, str):
             return True
         return False
 
@@ -171,9 +277,9 @@ class BOSMiner(BaseMiner):
     async def reboot(self) -> bool:
         """Reboots power to the physical miner."""
         logging.debug(f"{self}: Sending reboot command.")
-        _ret = await self.send_ssh_command("/sbin/reboot")
+        ret = await self.send_ssh_command("/sbin/reboot")
         logging.debug(f"{self}: Reboot command completed.")
-        if isinstance(_ret, str):
+        if isinstance(ret, str):
             return True
         return False
 
@@ -187,7 +293,7 @@ class BOSMiner(BaseMiner):
         conn = None
         try:
             conn = await self._get_ssh_connection()
-        except (asyncssh.Error, OSError):
+        except ConnectionError:
             try:
                 pools = await self.api.pools()
             except APIError:
@@ -215,7 +321,7 @@ class BOSMiner(BaseMiner):
         )
         try:
             conn = await self._get_ssh_connection()
-        except (asyncssh.Error, OSError):
+        except ConnectionError:
             return None
         async with conn:
             # BBB check because bitmain suxx
@@ -259,45 +365,12 @@ class BOSMiner(BaseMiner):
     ##################################################
 
     async def get_mac(self) -> Optional[str]:
-        try:
-            result = await self.send_ssh_command("cat /sys/class/net/eth0/address")
-            if result:
-                return result.upper().strip()
-        except (asyncssh.Error, OSError):
-            pass
+        result = await self.send_ssh_command("cat /sys/class/net/eth0/address")
+        if result:
+            return result.upper().strip()
 
     async def get_model(self) -> Optional[str]:
-        # check if model is cached
-        if self.model:
-            logging.debug(f"Found model for {self.ip}: {self.model} (BOS)")
-            return self.model + " (BOS)"
-
-        # get devdetails data
-        try:
-            version_data = await self.api.devdetails()
-        except APIError as e:
-            version_data = None
-            if e.message == "Not ready":
-                cfg = json.loads(await self.send_ssh_command("bosminer config --data"))
-                model = cfg.get("data").get("format").get("model")
-                if model:
-                    model = model.replace("Antminer ", "")
-                    self.model = model
-                    return self.model + " (BOS)"
-
-        # if we get data back, parse it for model
-        if version_data:
-            if not version_data["DEVDETAILS"] == []:
-                # handle Antminer BOSMiner as a base
-                self.model = version_data["DEVDETAILS"][0]["Model"].replace(
-                    "Antminer ", ""
-                )
-                logging.debug(f"Found model for {self.ip}: {self.model} (BOS)")
-                return self.model + " (BOS)"
-
-        # if we don't get devdetails, log a failed attempt
-        logging.warning(f"Failed to get model for miner: {self}")
-        return None
+        return self.model + " (BOS)"
 
     async def get_version(
         self, api_version: dict = None, graphql_version: dict = None
@@ -329,8 +402,8 @@ class BOSMiner(BaseMiner):
     async def get_fw_ver(self, graphql_version: dict = None) -> Optional[str]:
         if not graphql_version:
             try:
-                graphql_version = await self.send_graphql_query(
-                    "{bos{info{version{full}}}}"
+                graphql_version = await self.web.send_command(
+                    {"bos": {"info": {"version": {"full"}}}}
                 )
             except APIError:
                 pass
@@ -348,7 +421,7 @@ class BOSMiner(BaseMiner):
             fw_ver = await self.send_ssh_command("cat /etc/bos_version")
 
         # if we get the version data, parse it
-        if fw_ver:
+        if fw_ver is not None:
             ver = fw_ver.split("-")[5]
             if "." in ver:
                 self.fw_ver = ver
@@ -357,18 +430,20 @@ class BOSMiner(BaseMiner):
         return self.fw_ver
 
     async def get_hostname(self, graphql_hostname: dict = None) -> Union[str, None]:
-        if self.hostname:
-            return self.hostname
+        hostname = None
 
         if not graphql_hostname:
             try:
-                graphql_hostname = await self.send_graphql_query("{bos {hostname}}")
+                graphql_hostname = await self.web.send_command({"bos": {"hostname"}})
             except APIError:
                 pass
 
         if graphql_hostname:
-            self.hostname = graphql_hostname["bos"]["hostname"]
-            return self.hostname
+            try:
+                hostname = graphql_hostname["bos"]["hostname"]
+                return hostname
+            except KeyError:
+                pass
 
         try:
             async with (await self._get_ssh_connection()) as conn:
@@ -376,12 +451,12 @@ class BOSMiner(BaseMiner):
                     data = await conn.run("cat /proc/sys/kernel/hostname")
                     host = data.stdout.strip()
                     logging.debug(f"Found hostname for {self.ip}: {host}")
-                    self.hostname = host
+                    hostname = host
                 else:
                     logging.warning(f"Failed to get hostname for miner: {self}")
         except Exception as e:
             logging.warning(f"Failed to get hostname for miner: {self}, {e}")
-        return self.hostname
+        return hostname
 
     async def get_hashrate(
         self, api_summary: dict = None, graphql_hashrate: dict = None
@@ -390,8 +465,8 @@ class BOSMiner(BaseMiner):
         # get hr from graphql
         if not graphql_hashrate:
             try:
-                graphql_hashrate = await self.send_graphql_query(
-                    "{bosminer{info{workSolver{realHashrate{mhs1M}}}}}"
+                graphql_hashrate = await self.web.send_command(
+                    {"bosminer": {"info": {"workSolver": {"realHashrate": {"mhs1M"}}}}}
                 )
             except APIError:
                 pass
@@ -437,8 +512,21 @@ class BOSMiner(BaseMiner):
 
         if not graphql_boards and not (api_devs or api_temps or api_devdetails):
             try:
-                graphql_boards = await self.send_graphql_query(
-                    "{bosminer{info{workSolver{childSolvers{name, realHashrate {mhs1M}, hwDetails {chips}, temperatures {degreesC}}}}}}"
+                graphql_boards = await self.web.send_command(
+                    {
+                        "bosminer": {
+                            "info": {
+                                "workSolver": {
+                                    "childSolvers": {
+                                        "name": None,
+                                        "realHashrate": {"mhs1M"},
+                                        "hwDetails": {"chips"},
+                                        "temperatures": {"degreesC"},
+                                    }
+                                }
+                            }
+                        }
+                    },
                 )
             except APIError:
                 pass
@@ -536,7 +624,7 @@ class BOSMiner(BaseMiner):
 
         return hashboards
 
-    async def get_env_temp(self, *args, **kwargs) -> Optional[float]:
+    async def get_env_temp(self) -> Optional[float]:
         return None
 
     async def get_wattage(
@@ -544,8 +632,12 @@ class BOSMiner(BaseMiner):
     ) -> Optional[int]:
         if not graphql_wattage and not api_tunerstatus:
             try:
-                graphql_wattage = await self.send_graphql_query(
-                    "{bosminer{info{workSolver{power{approxConsumptionW}}}}}"
+                graphql_wattage = await self.web.send_command(
+                    {
+                        "bosminer": {
+                            "info": {"workSolver": {"power": {"approxConsumptionW"}}}
+                        }
+                    }
                 )
             except APIError:
                 pass
@@ -577,8 +669,8 @@ class BOSMiner(BaseMiner):
     ) -> Optional[int]:
         if not graphql_wattage_limit and not api_tunerstatus:
             try:
-                graphql_wattage_limit = await self.send_graphql_query(
-                    "{bosminer{info{workSolver{power{limitW}}}}}"
+                graphql_wattage_limit = await self.web.send_command(
+                    {"bosminer": {"info": {"workSolver": {"power": {"limitW"}}}}}
                 )
             except APIError:
                 pass
@@ -608,8 +700,8 @@ class BOSMiner(BaseMiner):
     ) -> List[Fan]:
         if not graphql_fans and not api_fans:
             try:
-                graphql_fans = await self.send_graphql_query(
-                    "{bosminer{info{fans{name, rpm}}}"
+                graphql_fans = await self.web.send_command(
+                    {"bosminer": {"info": {"fans": {"name", "rpm"}}}}
                 )
             except APIError:
                 pass
@@ -636,7 +728,7 @@ class BOSMiner(BaseMiner):
             for n in range(self.fan_count):
                 try:
                     fans[f"fan_{n + 1}"].speed = api_fans["FANS"][n]["RPM"]
-                except KeyError:
+                except (IndexError, KeyError):
                     pass
             return [fans["fan_1"], fans["fan_2"], fans["fan_3"], fans["fan_4"]]
         return [Fan(), Fan(), Fan(), Fan()]
@@ -649,8 +741,19 @@ class BOSMiner(BaseMiner):
     ) -> List[dict]:
         if not graphql_pools and not api_pools:
             try:
-                graphql_pools = await self.send_graphql_query(
-                    "bosminer{config{... on BosminerConfig{groups{pools{urluser}strategy{... on QuotaStrategy{quota}}}}}"
+                graphql_pools = await self.web.send_command(
+                    {
+                        "bosminer": {
+                            "config": {
+                                "... on BosminerConfig": {
+                                    "groups": {
+                                        "pools": {"urluser"},
+                                        "strategy": {"... on QuotaStrategy": {"quota"}},
+                                    }
+                                }
+                            }
+                        }
+                    }
                 )
             except APIError:
                 pass
@@ -682,30 +785,44 @@ class BOSMiner(BaseMiner):
         if api_pools:
             seen = []
             groups = [{"quota": "0"}]
-            for i, pool in enumerate(api_pools["POOLS"]):
-                if len(seen) == 0:
-                    seen.append(pool["User"])
-                if not pool["User"] in seen:
-                    # need to use get_config, as this will never read perfectly as there are some bad edge cases
-                    groups = []
-                    cfg = await self.get_config()
-                    if cfg:
-                        for group in cfg.pool_groups:
-                            pools = {"quota": group.quota}
-                            for _i, _pool in enumerate(group.pools):
-                                pools[f"pool_{_i + 1}_url"] = _pool.url.replace(
-                                    "stratum+tcp://", ""
-                                ).replace("stratum2+tcp://", "")
-                                pools[f"pool_{_i + 1}_user"] = _pool.username
-                            groups.append(pools)
-                    return groups
-                else:
-                    groups[0][f"pool_{i + 1}_url"] = (
-                        pool["URL"]
-                        .replace("stratum+tcp://", "")
-                        .replace("stratum2+tcp://", "")
-                    )
-                    groups[0][f"pool_{i + 1}_user"] = pool["User"]
+            if api_pools.get("POOLS"):
+                for i, pool in enumerate(api_pools["POOLS"]):
+                    if len(seen) == 0:
+                        seen.append(pool["User"])
+                    if not pool["User"] in seen:
+                        # need to use get_config, as this will never read perfectly as there are some bad edge cases
+                        groups = []
+                        cfg = await self.get_config()
+                        if cfg:
+                            for group in cfg.pool_groups:
+                                pools = {"quota": group.quota}
+                                for _i, _pool in enumerate(group.pools):
+                                    pools[f"pool_{_i + 1}_url"] = _pool.url.replace(
+                                        "stratum+tcp://", ""
+                                    ).replace("stratum2+tcp://", "")
+                                    pools[f"pool_{_i + 1}_user"] = _pool.username
+                                groups.append(pools)
+                        return groups
+                    else:
+                        groups[0][f"pool_{i + 1}_url"] = (
+                            pool["URL"]
+                            .replace("stratum+tcp://", "")
+                            .replace("stratum2+tcp://", "")
+                        )
+                        groups[0][f"pool_{i + 1}_user"] = pool["User"]
+            else:
+                groups = []
+                cfg = await self.get_config()
+                if cfg:
+                    for group in cfg.pool_groups:
+                        pools = {"quota": group.quota}
+                        for _i, _pool in enumerate(group.pools):
+                            pools[f"pool_{_i + 1}_url"] = _pool.url.replace(
+                                "stratum+tcp://", ""
+                            ).replace("stratum2+tcp://", "")
+                            pools[f"pool_{_i + 1}_user"] = _pool.username
+                        groups.append(pools)
+                return groups
             return groups
 
     async def get_errors(
@@ -713,8 +830,19 @@ class BOSMiner(BaseMiner):
     ) -> List[MinerErrorData]:
         if not graphql_errors and not api_tunerstatus:
             try:
-                graphql_errors = await self.send_graphql_query(
-                    "{bosminer{info{workSolver{childSolvers{name, tuner{statusMessages}}}}}}"
+                graphql_errors = await self.web.send_command(
+                    {
+                        "bosminer": {
+                            "info": {
+                                "workSolver": {
+                                    "childSolvers": {
+                                        "name": None,
+                                        "tuner": {"statusMessages"},
+                                    }
+                                }
+                            }
+                        }
+                    }
                 )
             except APIError:
                 pass
@@ -788,8 +916,8 @@ class BOSMiner(BaseMiner):
                     and int(self.fw_ver.split(".")[1]) > 9
                 ) or int(self.fw_ver.split(".")[0]) > 21:
                     try:
-                        graphql_fault_light = await self.send_graphql_query(
-                            "{bos {faultLight}}"
+                        graphql_fault_light = await self.web.send_command(
+                            {"bos": {"faultLight"}}
                         )
                     except APIError:
                         pass
@@ -800,8 +928,8 @@ class BOSMiner(BaseMiner):
             else:
                 # worth trying
                 try:
-                    graphql_fault_light = await self.send_graphql_query(
-                        "{bos {faultLight}}"
+                    graphql_fault_light = await self.web.send_command(
+                        {"bos": {"faultLight"}}
                     )
                 except APIError:
                     logging.debug(
@@ -822,15 +950,12 @@ class BOSMiner(BaseMiner):
                 pass
 
         # get light via ssh if that fails (10x slower)
-        try:
-            data = (
-                await self.send_ssh_command("cat /sys/class/leds/'Red LED'/delay_off")
-            ).strip()
-            self.light = False
-            if data == "50":
-                self.light = True
-        except Exception as e:
-            logging.debug(f"SSH command failed - Fault Light - {e}")
+        data = (
+            await self.send_ssh_command("cat /sys/class/leds/'Red LED'/delay_off")
+        ).strip()
+        self.light = False
+        if data == "50":
+            self.light = True
         return self.light
 
     async def get_nominal_hashrate(self, api_devs: dict = None) -> Optional[float]:

pyasic/miners/backends/bosminer_old.py

@@ -14,35 +14,25 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import ipaddress
 import logging
 from typing import List, Optional, Tuple
 
-import asyncssh
-
-from pyasic.API.bosminer import BOSMinerAPI
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard, MinerData
 from pyasic.data.error_codes import MinerErrorData
-from pyasic.errors import APIError
-from pyasic.miners.base import BaseMiner
+from pyasic.miners.backends import BOSMiner
 
 
-class BOSMinerOld(BaseMiner):
+class BOSMinerOld(BOSMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
-        super().__init__(ip)
-        self.ip = ipaddress.ip_address(ip)
-        self.api = BOSMinerAPI(ip, api_ver)
-        self.api_type = "BOSMiner"
-        self.uname = "root"
-        self.pwd = "admin"
+        super().__init__(ip, api_ver)
 
     async def send_ssh_command(self, cmd: str) -> Optional[str]:
         result = None
 
         try:
             conn = await self._get_ssh_connection()
-        except (asyncssh.Error, OSError):
+        except ConnectionError:
             return None
 
         # open an ssh connection
@@ -103,80 +93,59 @@ class BOSMinerOld(BaseMiner):
     ### DATA GATHERING FUNCTIONS (get_{some_data}) ###
     ##################################################
 
-    async def get_mac(self) -> Optional[str]:
+    async def get_mac(self, *args, **kwargs) -> Optional[str]:
         return None
 
-    async def get_model(self) -> str:
+    async def get_model(self, *args, **kwargs) -> str:
         return "S9"
 
-    async def get_version(self) -> Tuple[Optional[str], Optional[str]]:
+    async def get_version(self, *args, **kwargs) -> Tuple[Optional[str], Optional[str]]:
         return None, None
 
-    async def get_hostname(self) -> Optional[str]:
+    async def get_hostname(self, *args, **kwargs) -> Optional[str]:
         return None
 
-    async def get_hashrate(self) -> Optional[float]:
+    async def get_hashrate(self, *args, **kwargs) -> Optional[float]:
         return None
 
-    async def get_hashboards(self) -> List[HashBoard]:
+    async def get_hashboards(self, *args, **kwargs) -> List[HashBoard]:
         return []
 
-    async def get_env_temp(self) -> Optional[float]:
+    async def get_env_temp(self, *args, **kwargs) -> Optional[float]:
         return None
 
-    async def get_wattage(self) -> Optional[int]:
+    async def get_wattage(self, *args, **kwargs) -> Optional[int]:
         return None
 
-    async def get_wattage_limit(self) -> Optional[int]:
+    async def get_wattage_limit(self, *args, **kwargs) -> Optional[int]:
         return None
 
     async def get_fans(
         self,
+        *args,
+        **kwargs,
     ) -> List[Fan]:
         return [Fan(), Fan(), Fan(), Fan()]
 
-    async def get_fan_psu(self) -> Optional[int]:
+    async def get_fan_psu(self, *args, **kwargs) -> Optional[int]:
         return None
 
-    async def get_api_ver(self) -> Optional[str]:
+    async def get_api_ver(self, *args, **kwargs) -> Optional[str]:
         return None
 
-    async def get_fw_ver(self) -> Optional[str]:
+    async def get_fw_ver(self, *args, **kwargs) -> Optional[str]:
         return None
 
-    async def get_pools(self, api_pools: dict = None) -> List[dict]:
-        groups = []
-
-        if not api_pools:
-            try:
-                api_pools = await self.api.pools()
-            except APIError:
-                pass
-
-        if api_pools:
-            try:
-                pools = {}
-                for i, pool in enumerate(api_pools["POOLS"]):
-                    pools[f"pool_{i + 1}_url"] = (
-                        pool["URL"]
-                        .replace("stratum+tcp://", "")
-                        .replace("stratum2+tcp://", "")
-                    )
-                    pools[f"pool_{i + 1}_user"] = pool["User"]
-                    pools["quota"] = pool["Quota"] if pool.get("Quota") else "0"
-
-                groups.append(pools)
-            except KeyError:
-                pass
-        return groups
-
-    async def get_errors(self) -> List[MinerErrorData]:
+    async def get_pools(self, *args, **kwargs) -> List[dict]:
         return []
 
-    async def get_fault_light(self) -> bool:
+    async def get_errors(self, *args, **kwargs) -> List[MinerErrorData]:
+        return []
+
+    async def get_fault_light(self, *args, **kwargs) -> bool:
         return False
 
-    async def get_nominal_hashrate(self) -> Optional[float]:
+    async def get_nominal_hashrate(self, *args, **kwargs) -> Optional[float]:
         return None
 
     async def get_data(self, allow_warning: bool = False, **kwargs) -> MinerData:

pyasic/miners/backends/btminer.py

@@ -14,7 +14,6 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import ipaddress
 import logging
 import warnings
 from collections import namedtuple
@@ -27,13 +26,85 @@ from pyasic.data.error_codes import MinerErrorData, WhatsminerError
 from pyasic.errors import APIError
 from pyasic.miners.base import BaseMiner
 
+BTMINER_DATA_LOC = {
+    "mac": {
+        "cmd": "get_mac",
+        "kwargs": {
+            "api_summary": {"api": "summary"},
+            "api_get_miner_info": {"api": "get_miner_info"},
+        },
+    },
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {
+        "cmd": "get_api_ver",
+        "kwargs": {"api_get_version": {"api": "get_version"}},
+    },
+    "fw_ver": {
+        "cmd": "get_fw_ver",
+        "kwargs": {
+            "api_get_version": {"api": "get_version"},
+            "api_summary": {"api": "summary"},
+        },
+    },
+    "hostname": {
+        "cmd": "get_hostname",
+        "kwargs": {"api_get_miner_info": {"api": "get_miner_info"}},
+    },
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_summary": {"api": "summary"}},
+    },
+    "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_devs": {"api": "devs"}}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {"api_summary": {"api": "summary"}}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {"api_summary": {"api": "summary"}}},
+    "wattage_limit": {
+        "cmd": "get_wattage_limit",
+        "kwargs": {"api_summary": {"api": "summary"}},
+    },
+    "fans": {
+        "cmd": "get_fans",
+        "kwargs": {
+            "api_summary": {"api": "summary"},
+            "api_get_psu": {"api": "get_psu"},
+        },
+    },
+    "fan_psu": {
+        "cmd": "get_fan_psu",
+        "kwargs": {
+            "api_summary": {"api": "summary"},
+            "api_get_psu": {"api": "get_psu"},
+        },
+    },
+    "errors": {
+        "cmd": "get_errors",
+        "kwargs": {
+            "api_summary": {"api": "summary"},
+            "api_get_error_code": {"api": "get_error_code"},
+        },
+    },
+    "fault_light": {
+        "cmd": "get_fault_light",
+        "kwargs": {"api_get_miner_info": {"api": "get_miner_info"}},
+    },
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
+
 
 class BTMiner(BaseMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip)
-        self.ip = ipaddress.ip_address(ip)
+        # interfaces
         self.api = BTMinerAPI(ip, api_ver)
+
+        # static data
         self.api_type = "BTMiner"
+        # data gathering locations
+        self.data_locations = BTMINER_DATA_LOC
+        # autotuning/shutdown support
+        self.supports_shutdown = True
+
+        # data storage
         self.api_ver = api_ver
 
     async def _reset_api_pwd_to_admin(self, pwd: str):
@@ -203,28 +274,6 @@ class BTMiner(BaseMiner):
             except (KeyError, IndexError):
                 pass
 
-    async def get_model(self, api_devdetails: dict = None) -> Optional[str]:
-        if self.model:
-            logging.debug(f"Found model for {self.ip}: {self.model}")
-            return self.model
-
-        if not api_devdetails:
-            try:
-                api_devdetails = await self.api.devdetails()
-            except APIError:
-                pass
-
-        if api_devdetails:
-            try:
-                self.model = api_devdetails["DEVDETAILS"][0]["Model"].split("V")[0]
-                logging.debug(f"Found model for {self.ip}: {self.model}")
-                return self.model
-            except (TypeError, IndexError, KeyError):
-                pass
-
-        logging.warning(f"Failed to get model for miner: {self}")
-        return None
-
     async def get_version(
         self, api_get_version: dict = None, api_summary: dict = None
     ) -> Tuple[Optional[str], Optional[str]]:
@@ -302,9 +351,7 @@ class BTMiner(BaseMiner):
         return self.fw_ver
 
     async def get_hostname(self, api_get_miner_info: dict = None) -> Optional[str]:
-        if self.hostname:
-            return self.hostname
-
+        hostname = None
         if not api_get_miner_info:
             try:
                 api_get_miner_info = await self.api.get_miner_info()
@@ -313,11 +360,11 @@ class BTMiner(BaseMiner):
 
         if api_get_miner_info:
             try:
-                self.hostname = api_get_miner_info["Msg"]["hostname"]
+                hostname = api_get_miner_info["Msg"]["hostname"]
             except KeyError:
                 return None
 
-        return self.hostname
+        return hostname
 
     async def get_hashrate(self, api_summary: dict = None) -> Optional[float]:
         # get hr from API

pyasic/miners/backends/cgminer.py

@@ -14,13 +14,10 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import ipaddress
 import logging
 from collections import namedtuple
 from typing import List, Optional, Tuple
 
-import asyncssh
-
 from pyasic.API.cgminer import CGMinerAPI
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
@@ -28,24 +25,49 @@ from pyasic.data.error_codes import MinerErrorData
 from pyasic.errors import APIError
 from pyasic.miners.base import BaseMiner
 
+CGMINER_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {}},
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "hostname": {"cmd": "get_hostname", "kwargs": {}},
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_stats": {"api": "stats"}},
+    },
+    "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {}},
+    "wattage_limit": {"cmd": "get_wattage_limit", "kwargs": {}},
+    "fans": {"cmd": "get_fans", "kwargs": {"api_stats": {"api": "stats"}}},
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "errors": {"cmd": "get_errors", "kwargs": {}},
+    "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
+
 
 class CGMiner(BaseMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip)
-        self.ip = ipaddress.ip_address(ip)
+        # interfaces
         self.api = CGMinerAPI(ip, api_ver)
-        self.api_ver = api_ver
+
+        # static data
         self.api_type = "CGMiner"
-        self.uname = "root"
-        self.pwd = "admin"
-        self.config = None
+        # data gathering locations
+        self.data_locations = CGMINER_DATA_LOC
+
+        # data storage
+        self.api_ver = api_ver
 
     async def send_ssh_command(self, cmd: str) -> Optional[str]:
         result = None
 
         try:
             conn = await self._get_ssh_connection()
-        except (asyncssh.Error, OSError):
+        except ConnectionError:
             return None
 
         # open an ssh connection
@@ -69,64 +91,51 @@ class CGMiner(BaseMiner):
         return result
 
     async def restart_backend(self) -> bool:
-        """Restart cgminer hashing process.  Wraps [`restart_cgminer`][pyasic.miners._backends.cgminer.CGMiner.restart_cgminer] to standardize."""
+        """Restart cgminer hashing process.  Wraps [`restart_cgminer`][pyasic.miners.backends.cgminer.CGMiner.restart_cgminer] to standardize."""
         return await self.restart_cgminer()
 
     async def restart_cgminer(self) -> bool:
         """Restart cgminer hashing process."""
         commands = ["cgminer-api restart", "/usr/bin/cgminer-monitor >/dev/null 2>&1"]
         commands = ";".join(commands)
-        try:
-            _ret = await self.send_ssh_command(commands)
-        except (asyncssh.Error, OSError):
+        ret = await self.send_ssh_command(commands)
+        if ret is None:
             return False
-        else:
-            if isinstance(_ret, str):
-                return True
-        return False
+        return True
 
     async def reboot(self) -> bool:
         """Reboots power to the physical miner."""
         logging.debug(f"{self}: Sending reboot command.")
-        try:
-            _ret = await self.send_ssh_command("reboot")
-        except (asyncssh.Error, OSError):
+        ret = await self.send_ssh_command("reboot")
+        if ret is None:
             return False
-        else:
-            logging.debug(f"{self}: Reboot command completed.")
-            if isinstance(_ret, str):
-                return True
-        return False
+        return True
 
     async def resume_mining(self) -> bool:
-        try:
-            commands = [
-                "mkdir -p /etc/tmp/",
-                'echo "*/3 * * * * /usr/bin/cgminer-monitor" > /etc/tmp/root',
-                "crontab -u root /etc/tmp/root",
-                "/usr/bin/cgminer-monitor >/dev/null 2>&1",
-            ]
-            commands = ";".join(commands)
-            await self.send_ssh_command(commands)
-        except (asyncssh.Error, OSError):
+        commands = [
+            "mkdir -p /etc/tmp/",
+            'echo "*/3 * * * * /usr/bin/cgminer-monitor" > /etc/tmp/root',
+            "crontab -u root /etc/tmp/root",
+            "/usr/bin/cgminer-monitor >/dev/null 2>&1",
+        ]
+        commands = ";".join(commands)
+        ret = await self.send_ssh_command(commands)
+        if ret is None:
             return False
-        else:
-            return True
+        return True
 
     async def stop_mining(self) -> bool:
-        try:
-            commands = [
-                "mkdir -p /etc/tmp/",
-                'echo "" > /etc/tmp/root',
-                "crontab -u root /etc/tmp/root",
-                "killall cgminer",
-            ]
-            commands = ";".join(commands)
-            await self.send_ssh_command(commands)
-        except (asyncssh.Error, OSError):
+        commands = [
+            "mkdir -p /etc/tmp/",
+            'echo "" > /etc/tmp/root',
+            "crontab -u root /etc/tmp/root",
+            "killall cgminer",
+        ]
+        commands = ";".join(commands)
+        ret = await self.send_ssh_command(commands)
+        if ret is None:
             return False
-        else:
-            return True
+        return True
 
     async def get_config(self) -> MinerConfig:
         api_pools = await self.api.pools()
@@ -154,30 +163,6 @@ class CGMiner(BaseMiner):
     async def get_mac(self) -> Optional[str]:
         return None
 
-    async def get_model(self, api_devdetails: dict = None) -> Optional[str]:
-        if self.model:
-            logging.debug(f"Found model for {self.ip}: {self.model}")
-            return self.model
-
-        if not api_devdetails:
-            try:
-                api_devdetails = await self.api.devdetails()
-            except APIError:
-                pass
-
-        if api_devdetails:
-            try:
-                self.model = api_devdetails["DEVDETAILS"][0]["Model"].replace(
-                    "Antminer ", ""
-                )
-                logging.debug(f"Found model for {self.ip}: {self.model}")
-                return self.model
-            except (TypeError, IndexError, KeyError):
-                pass
-
-        logging.warning(f"Failed to get model for miner: {self}")
-        return None
-
     async def get_version(
         self, api_version: dict = None
     ) -> Tuple[Optional[str], Optional[str]]:
@@ -224,13 +209,8 @@ class CGMiner(BaseMiner):
         return self.fw_ver
 
     async def get_hostname(self) -> Optional[str]:
-        try:
-            hn = await self.send_ssh_command("cat /proc/sys/kernel/hostname")
-        except (asyncssh.Error, OSError):
-            return None
-        if hn:
-            self.hostname = hn
-        return self.hostname
+        hn = await self.send_ssh_command("cat /proc/sys/kernel/hostname")
+        return hn
 
     async def get_hashrate(self, api_summary: dict = None) -> Optional[float]:
         # get hr from API

pyasic/miners/backends/cgminer_avalon.py

@@ -22,13 +22,37 @@ from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData
 from pyasic.errors import APIError
-from pyasic.miners.btc._backends import CGMiner
+from pyasic.miners.backends import CGMiner
+
+AVALON_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {"api_version": {"api": "version"}}},
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "hostname": {"cmd": "get_hostname", "kwargs": {"mac": {"web": "mac"}}},
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_stats": {"api": "stats"}},
+    },
+    "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {}},
+    "wattage_limit": {"cmd": "get_wattage_limit", "kwargs": {}},
+    "fans": {"cmd": "get_fans", "kwargs": {"api_stats": {"api": "stats"}}},
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "errors": {"cmd": "get_errors", "kwargs": {}},
+    "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
 
 
 class CGMinerAvalon(CGMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip, api_ver)
-        self.ip = ip
+
+        # data gathering locations
+        self.data_locations = AVALON_DATA_LOC
 
     async def fault_light_on(self) -> bool:
         try:

pyasic/miners/backends/hiveon.py

@@ -14,15 +14,16 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import ipaddress
+from typing import Optional
 
-from pyasic.miners.btc._backends import BMMiner
+from pyasic.miners.backends import BMMiner
 
 
 class Hiveon(BMMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip, api_ver)
-        self.ip = ipaddress.ip_address(ip)
+        # static data
         self.api_type = "Hiveon"
-        self.uname = "root"
-        self.pwd = "admin"
+
+    async def get_model(self) -> Optional[str]:
+        return self.model + " (Hiveon)"

pyasic/miners/backends/vnish.py

@@ -14,39 +14,51 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import logging
 from typing import Optional
 
 from pyasic.errors import APIError
-from pyasic.miners.btc._backends.bmminer import BMMiner
+from pyasic.miners.backends.bmminer import BMMiner
 from pyasic.web.vnish import VNishWebAPI
 
+VNISH_DATA_LOC = {
+    "mac": {"cmd": "get_mac", "kwargs": {"web_summary": {"web": "summary"}}},
+    "model": {"cmd": "get_model", "kwargs": {}},
+    "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
+    "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"web_summary": {"web": "summary"}}},
+    "hostname": {"cmd": "get_hostname", "kwargs": {"web_summary": {"web": "summary"}}},
+    "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
+    "nominal_hashrate": {
+        "cmd": "get_nominal_hashrate",
+        "kwargs": {"api_stats": {"api": "stats"}},
+    },
+    "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
+    "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
+    "wattage": {"cmd": "get_wattage", "kwargs": {"web_summary": {"web": "summary"}}},
+    "wattage_limit": {
+        "cmd": "get_wattage_limit",
+        "kwargs": {"web_settings": {"web": "settings"}},
+    },
+    "fans": {"cmd": "get_fans", "kwargs": {"api_stats": {"api": "stats"}}},
+    "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
+    "errors": {"cmd": "get_errors", "kwargs": {}},
+    "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
+    "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
+}
+
 
 class VNish(BMMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip, api_ver)
-        self.api_type = "VNish"
+        # interfaces
         self.web = VNishWebAPI(ip)
 
-    async def get_model(self, api_stats: dict = None) -> Optional[str]:
-        # check if model is cached
-        if self.model:
-            logging.debug(f"Found model for {self.ip}: {self.model} (VNish)")
-            return self.model + " (VNish)"
+        # static data
+        self.api_type = "VNish"
+        # data gathering locations
+        self.data_locations = VNISH_DATA_LOC
 
-        if not api_stats:
-            try:
-                api_stats = await self.api.stats()
-            except APIError:
-                pass
-
-        if api_stats:
-            try:
-                m_type = api_stats["STATS"][0]["Type"]
-                self.model = m_type.split(" ")[1]
-                return self.model
-            except (KeyError, IndexError):
-                pass
+    async def get_model(self) -> Optional[str]:
+        return self.model + " (VNISH)"
 
     async def restart_backend(self) -> bool:
         data = await self.web.restart_vnish()

pyasic/miners/backends/whatsminer.py

@@ -13,22 +13,20 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
-from pyasic.miners.btc._backends import BTMiner  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import (  # noqa - Ignore access to _module
-    M20SV10,
-    M20SV20,
-    M20SV30,
-)
+from pyasic.miners.backends.btminer import BTMiner
 
 
-class BTMinerM20SV10(BTMiner, M20SV10):
-    pass
-
-
-class BTMinerM20SV20(BTMiner, M20SV20):
-    pass
-
-
-class BTMinerM20SV30(BTMiner, M20SV30):
+class M5X(BTMiner):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.supports_autotuning = True
+
+
+class M3X(BTMiner):
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.supports_autotuning = True
+
+
+class M2X(BTMiner):
     pass

pyasic/miners/base.py

@@ -14,7 +14,6 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-import inspect
 import ipaddress
 import logging
 from abc import ABC, abstractmethod
@@ -25,27 +24,35 @@ import asyncssh
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard, MinerData
 from pyasic.data.error_codes import MinerErrorData
-from pyasic.errors import APIError
 
 
 class BaseMiner(ABC):
-    def __init__(self, *args, **kwargs) -> None:
-        self.ip = None
+    def __init__(self, ip: str, *args, **kwargs) -> None:
+        # interfaces
         self.api = None
         self.web = None
-        self.uname = None
-        self.pwd = None
+
+        # static data
+        self.ip = ip
         self.api_type = None
+        # type
+        self.make = None
+        self.model = None
+        # physical attributes
+        self.ideal_hashboards = 3
+        self.nominal_chips = 0
+        self.fan_count = 2
+        # data gathering locations
+        self.data_locations = None
+        # autotuning/shutdown support
+        self.supports_autotuning = False
+        self.supports_shutdown = False
+
+        # data storage
         self.api_ver = None
         self.fw_ver = None
-        self.model = None
-        self.make = None
         self.light = None
-        self.hostname = None
-        self.nominal_chips = 1
-        self.fan_count = 2
         self.config = None
-        self.ideal_hashboards = 3
 
     def __new__(cls, *args, **kwargs):
         if cls is BaseMiner:
@@ -70,8 +77,8 @@ class BaseMiner(ABC):
             conn = await asyncssh.connect(
                 str(self.ip),
                 known_hosts=None,
-                username=self.uname,
-                password=self.pwd,
+                username="root",
+                password="root",
                 server_host_key_algs=["ssh-rsa"],
             )
             return conn
@@ -86,12 +93,12 @@ class BaseMiner(ABC):
                 )
                 return conn
             except Exception as e:
-                raise e
+                raise ConnectionError from e
         except OSError as e:
             logging.warning(f"Connection refused: {self}")
-            raise e
+            raise ConnectionError from e
         except Exception as e:
-            raise e
+            raise ConnectionError from e
 
     async def check_light(self) -> bool:
         return await self.get_fault_light()
@@ -195,14 +202,13 @@ class BaseMiner(ABC):
         """
         pass
 
-    @abstractmethod
     async def get_model(self) -> Optional[str]:
         """Get the model of the miner and return it as a string.
 
         Returns:
             A string representing the model of the miner.
         """
-        pass
+        return self.model
 
     @abstractmethod
     async def get_api_ver(self, *args, **kwargs) -> Optional[str]:
@@ -250,7 +256,7 @@ class BaseMiner(ABC):
         pass
 
     @abstractmethod
-    async def get_hashboards(self, *args, **kwargs) -> list[HashBoard]:
+    async def get_hashboards(self, *args, **kwargs) -> List[HashBoard]:
         """Get hashboard data from the miner in the form of [`HashBoard`][pyasic.data.HashBoard].
 
         Returns:
@@ -360,76 +366,75 @@ class BaseMiner(ABC):
                 "fault_light",
                 "pools",
             ]
-        api_params = []
-        web_params = []
-        gql = False
+        api_multicommand = []
+        web_multicommand = []
         for data_name in data_to_get:
-            function = getattr(self, "get_" + data_name)
-            sig = inspect.signature(function)
-            for item in sig.parameters:
-                if item.startswith("api_"):
-                    command = item.replace("api_", "")
-                    api_params.append(command)
-                elif item.startswith("graphql_"):
-                    gql = True
-                elif item.startswith("web_"):
-                    web_params.append(item.replace("web_", ""))
-        api_params = list(set(api_params))
-        web_params = list(set(web_params))
-        miner_data = {}
-        command_data = await self.api.multicommand(
-            *api_params, allow_warning=allow_warning
-        )
-        if gql:
             try:
-                gql_data = await self.send_graphql_query(  # noqa: bosminer only anyway
-                    "{bos {hostname}, bosminer{config{... on BosminerConfig{groups{pools{url, user}, strategy{... on QuotaStrategy {quota}}}}}, info{fans{name, rpm}, workSolver{realHashrate{mhs1M}, temperatures{degreesC}, power{limitW, approxConsumptionW}, childSolvers{name, realHashrate{mhs1M}, hwDetails{chips}, tuner{statusMessages}, temperatures{degreesC}}}}}}"
-                )
-            except APIError:
-                # hostname hates me
-                try:
-                    gql_data = await self.send_graphql_query(  # noqa: bosminer only anyway
-                        "{bosminer{config{... on BosminerConfig{groups{pools{url, user}, strategy{... on QuotaStrategy {quota}}}}}, info{fans{name, rpm}, workSolver{realHashrate{mhs1M}, temperatures{degreesC}, power{limitW, approxConsumptionW}, childSolvers{name, realHashrate{mhs1M}, hwDetails{chips}, tuner{statusMessages}, temperatures{degreesC}}}}}}"
-                    )
-                except APIError:
-                    # AGAIN???
-                    gql_data = None
+                fn_args = self.data_locations[data_name]["kwargs"]
+                for arg_name in fn_args:
+                    if fn_args[arg_name].get("api"):
+                        api_multicommand.append(fn_args[arg_name]["api"])
+                    if fn_args[arg_name].get("web"):
+                        web_multicommand.append(fn_args[arg_name]["web"])
+            except KeyError as e:
+                print(e, data_name)
+                continue
+
+        api_multicommand = list(set(api_multicommand))
+        _web_multicommand = web_multicommand
+        for item in web_multicommand:
+            if item not in _web_multicommand:
+                _web_multicommand.append(item)
+        web_multicommand = _web_multicommand
+        if len(api_multicommand) > 0:
+            api_command_data = await self.api.multicommand(
+                *api_multicommand, allow_warning=allow_warning
+            )
+        else:
+            api_command_data = {}
+        if len(web_multicommand) > 0:
+            web_command_data = await self.web.multicommand(
+                *web_multicommand, allow_warning=allow_warning
+            )
+        else:
+            web_command_data = {}
+
+        miner_data = {}
 
-        web_data = {}
-        for command in web_params:
-            try:
-                cmd_func = getattr(self.web, command)
-                data = await cmd_func()  # noqa: web only anyway
-            except (LookupError, APIError):
-                pass
-            else:
-                web_data[command] = data
         for data_name in data_to_get:
-            function = getattr(self, "get_" + data_name)
-            sig = inspect.signature(function)
-            kwargs = {}
-            for arg_name in sig.parameters:
-                if arg_name.startswith("api_"):
-                    try:
-                        kwargs[arg_name] = command_data[arg_name.replace("api_", "")][0]
-                    except (KeyError, IndexError):
-                        kwargs[arg_name] = None
-                elif arg_name.startswith("graphql_"):
-                    kwargs[
-                        arg_name
-                    ] = gql_data  # noqa: variable is not referenced before assignment
-                elif arg_name.startswith("web_"):
-                    try:
-                        kwargs[arg_name] = web_data[arg_name.replace("web_", "")]
-                    except (KeyError, IndexError):
-                        kwargs[arg_name] = None
+            try:
+                fn_args = self.data_locations[data_name]["kwargs"]
+                args_to_send = {k: None for k in fn_args}
+                for arg_name in fn_args:
+                    if fn_args[arg_name].get("api"):
+                        if api_command_data.get("multicommand"):
+                            args_to_send[arg_name] = api_command_data[
+                                fn_args[arg_name]["api"]
+                            ][0]
+                        else:
+                            args_to_send[arg_name] = api_command_data
+                    if fn_args[arg_name].get("web"):
+                        if web_command_data.get("multicommand"):
+                            args_to_send[arg_name] = web_command_data[
+                                fn_args[arg_name]["web"]
+                            ]
+                        else:
+                            if not web_command_data == {"multicommand": False}:
+                                args_to_send[arg_name] = web_command_data
+            except (KeyError, IndexError):
+                continue
+
+            function = getattr(self, self.data_locations[data_name]["cmd"])
             if not data_name == "pools":
-                miner_data[data_name] = await function(**kwargs)
+                miner_data[data_name] = await function(**args_to_send)
             else:
-                pools_data = await function(**kwargs)
+                pools_data = await function(**args_to_send)
                 if pools_data:
-                    miner_data["pool_1_url"] = pools_data[0]["pool_1_url"]
-                    miner_data["pool_1_user"] = pools_data[0]["pool_1_user"]
+                    try:
+                        miner_data["pool_1_url"] = pools_data[0]["pool_1_url"]
+                        miner_data["pool_1_user"] = pools_data[0]["pool_1_user"]
+                    except KeyError:
+                        pass
                     if len(pools_data) > 1:
                         miner_data["pool_2_url"] = pools_data[1]["pool_2_url"]
                         miner_data["pool_2_user"] = pools_data[1]["pool_2_user"]

pyasic/miners/btc/__init__.py

@@ -1,19 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
-#  See the License for the specific language governing permissions and         -
-#  limitations under the License.                                              -
-# ------------------------------------------------------------------------------
-from .antminer import *
-from .avalonminer import *
-from .innosilicon import *
-from .whatsminer import *

pyasic/miners/btc/_backends/X19.py

@@ -1,194 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
-#  See the License for the specific language governing permissions and         -
-#  limitations under the License.                                              -
-# ------------------------------------------------------------------------------
-
-import asyncio
-from typing import List, Optional, Union
-
-from pyasic.API import APIError
-from pyasic.config import MinerConfig, X19PowerMode
-from pyasic.data.error_codes import MinerErrorData, X19Error
-from pyasic.miners.btc._backends import BMMiner  # noqa - Ignore access to _module
-from pyasic.web.X19 import X19WebAPI
-
-
-class X19(BMMiner):
-    def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
-        super().__init__(ip, api_ver=api_ver)
-        self.ip = ip
-        self.web = X19WebAPI(ip)
-
-    async def get_config(self) -> MinerConfig:
-        data = await self.web.get_miner_conf()
-        if data:
-            self.config = MinerConfig().from_raw(data)
-        return self.config
-
-    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
-        self.config = config
-        conf = config.as_x19(user_suffix=user_suffix)
-        await self.web.set_miner_conf(conf)
-
-        for i in range(7):
-            data = await self.get_config()
-            if data.as_x19() == conf:
-                break
-            await asyncio.sleep(1)
-
-    async def fault_light_on(self) -> bool:
-        data = await self.web.blink(blink=True)
-        if data:
-            if data.get("code") == "B000":
-                self.light = True
-        return self.light
-
-    async def fault_light_off(self) -> bool:
-        data = await self.web.blink(blink=False)
-        if data:
-            if data.get("code") == "B100":
-                self.light = True
-        return self.light
-
-    async def reboot(self) -> bool:
-        data = await self.web.reboot()
-        if data:
-            return True
-        return False
-
-    async def stop_mining(self) -> bool:
-        cfg = await self.get_config()
-        cfg.miner_mode = X19PowerMode.Sleep
-        await self.send_config(cfg)
-        return True
-
-    async def resume_mining(self) -> bool:
-        cfg = await self.get_config()
-        cfg.miner_mode = X19PowerMode.Normal
-        await self.send_config(cfg)
-        return True
-
-    async def get_hostname(self) -> Union[str, None]:
-        try:
-            data = await self.web.get_system_info()
-            if data:
-                return data["hostname"]
-        except KeyError:
-            pass
-
-    async def get_mac(self) -> Union[str, None]:
-        try:
-            data = await self.web.get_system_info()
-            if data:
-                return data["macaddr"]
-        except KeyError:
-            pass
-
-        try:
-            data = await self.web.get_network_info()
-            if data:
-                return data["macaddr"]
-        except KeyError:
-            pass
-
-    async def get_errors(self) -> List[MinerErrorData]:
-        errors = []
-        data = await self.web.summary()
-        if data:
-            try:
-                for item in data["SUMMARY"][0]["status"]:
-                    try:
-                        if not item["status"] == "s":
-                            errors.append(X19Error(item["msg"]))
-                    except KeyError:
-                        continue
-            except (KeyError, IndexError):
-                pass
-        return errors
-
-    async def get_fault_light(self) -> bool:
-        if self.light:
-            return self.light
-        try:
-            data = await self.web.get_blink_status()
-            if data:
-                self.light = data["blink"]
-        except KeyError:
-            pass
-        return self.light
-
-    async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]:
-        if not api_stats:
-            try:
-                api_stats = await self.api.stats()
-            except APIError:
-                pass
-
-        if api_stats:
-            try:
-                ideal_rate = api_stats["STATS"][1]["total_rateideal"]
-                try:
-                    rate_unit = api_stats["STATS"][1]["rate_unit"]
-                except KeyError:
-                    rate_unit = "GH"
-                if rate_unit == "GH":
-                    return round(ideal_rate / 1000, 2)
-                if rate_unit == "MH":
-                    return round(ideal_rate / 1000000, 2)
-                else:
-                    return round(ideal_rate, 2)
-            except (KeyError, IndexError):
-                pass
-
-    async def set_static_ip(
-        self,
-        ip: str,
-        dns: str,
-        gateway: str,
-        subnet_mask: str = "255.255.255.0",
-        hostname: str = None,
-    ):
-        if not hostname:
-            hostname = await self.get_hostname()
-        await self.web.set_network_conf(
-            ip=ip,
-            dns=dns,
-            gateway=gateway,
-            subnet_mask=subnet_mask,
-            hostname=hostname,
-            protocol=2,
-        )
-
-    async def set_dhcp(self, hostname: str = None):
-        if not hostname:
-            hostname = await self.get_hostname()
-        await self.web.set_network_conf(
-            ip="", dns="", gateway="", subnet_mask="", hostname=hostname, protocol=1
-        )
-
-    async def set_hostname(self, hostname: str):
-        cfg = await self.web.get_network_info()
-        dns = cfg["conf_dnsservers"]
-        gateway = cfg["conf_gateway"]
-        ip = cfg["conf_ipaddress"]
-        subnet_mask = cfg["conf_netmask"]
-        protocol = 1 if cfg["conf_nettype"] == "DHCP" else 2
-        await self.web.set_network_conf(
-            ip=ip,
-            dns=dns,
-            gateway=gateway,
-            subnet_mask=subnet_mask,
-            hostname=hostname,
-            protocol=protocol,
-        )