refactor: move base classes to base.py in their directories, move data locations to miners.data, and rename types to models.

docs/generate_miners.py

@@ -3,7 +3,7 @@ import importlib
 import os
 import warnings
 
-from pyasic.miners.miner_factory import MINER_CLASSES, MinerTypes
+from pyasic.miners.factory import MINER_CLASSES, MinerTypes
 
 warnings.filterwarnings("ignore")
 

pyasic/__init__.py

@@ -23,10 +23,9 @@ from pyasic.data import (
     X19Error,
 )
 from pyasic.errors import APIError, APIWarning
-from pyasic.miners import get_miner
-from pyasic.miners.base import AnyMiner, DataOptions
-from pyasic.miners.miner_factory import MinerFactory, miner_factory
-from pyasic.miners.miner_listener import MinerListener
+from pyasic.miners import AnyMiner, DataOptions, get_miner
+from pyasic.miners.factory import MinerFactory, miner_factory
+from pyasic.miners.listener import MinerListener
 from pyasic.network import MinerNetwork
 from pyasic.rpc.bmminer import BMMinerRPCAPI
 from pyasic.rpc.bosminer import BOSMinerRPCAPI

pyasic/load/__init__.py

@@ -20,7 +20,7 @@ from typing import List, Union
 from pyasic.errors import APIError
 from pyasic.miners import AnyMiner
 from pyasic.miners.backends import AntminerModern, BOSMiner, BTMiner
-from pyasic.miners.types import S9, S17, T17, S17e, S17Plus, S17Pro, T17e, T17Plus
+from pyasic.miners.models import S9, S17, T17, S17e, S17Plus, S17Pro, T17e, T17Plus
 
 FAN_USAGE = 50  # 50 W per fan
 

pyasic/miners/__init__.py

@@ -18,7 +18,8 @@ import ipaddress
 from typing import Union
 
 from pyasic.miners.base import AnyMiner, BaseMiner
-from pyasic.miners.miner_factory import miner_factory
+from pyasic.miners.data import DataOptions
+from pyasic.miners.factory import miner_factory
 
 
 # abstracted version of get miner that is easier to access

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import S17, S17e, S17Plus, S17Pro
+from pyasic.miners.models import S17, S17e, S17Plus, S17Pro
 
 
 class BMMinerS17(AntminerOld, S17):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import T17, T17e, T17Plus
+from pyasic.miners.models import T17, T17e, T17Plus
 
 
 class BMMinerT17(AntminerOld, T17):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import (
+from pyasic.miners.models import (
     S19,
     S19L,
     S19XP,

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import T19
+from pyasic.miners.models import T19
 
 
 class BMMinerT19(AntminerModern, T19):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import HS3
+from pyasic.miners.models import HS3
 
 
 class BMMinerHS3(AntminerModern, HS3):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import L3Plus
+from pyasic.miners.models import L3Plus
 
 
 class BMMinerL3Plus(AntminerOld, L3Plus):

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

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import L7
+from pyasic.miners.models import L7
 
 
 class BMMinerL7(AntminerModern, L7):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import E9Pro
+from pyasic.miners.models import E9Pro
 
 
 class BMMinerE9Pro(AntminerModern, E9Pro):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BMMiner
-from pyasic.miners.types import S9, S9i, S9j
+from pyasic.miners.models import S9, S9i, S9j
 
 
 class BMMinerS9(BMMiner, S9):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BMMiner
-from pyasic.miners.types import T9
+from pyasic.miners.models import T9
 
 
 class BMMinerT9(BMMiner, T9):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSer
-from pyasic.miners.types import S17, S17e, S17Plus, S17Pro
+from pyasic.miners.models import S17, S17e, S17Plus, S17Pro
 
 
 class BOSMinerS17(BOSer, S17):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSer
-from pyasic.miners.types import T17, T17e, T17Plus
+from pyasic.miners.models import T17, T17e, T17Plus
 
 
 class BOSMinerT17(BOSer, T17):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSer
-from pyasic.miners.types import (
+from pyasic.miners.models import (
     S19,
     S19XP,
     S19a,

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSer
-from pyasic.miners.types import T19
+from pyasic.miners.models import T19
 
 
 class BOSMinerT19(BOSer, T19):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSMiner
-from pyasic.miners.types import S9
+from pyasic.miners.models import S9
 
 
 class BOSMinerS9(BOSMiner, S9):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import Z15
+from pyasic.miners.models import Z15
 
 
 class CGMinerZ15(AntminerOld, Z15):

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

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import D3
+from pyasic.miners.models import D3
 
 
 class CGMinerD3(AntminerOld, D3):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import DR5
+from pyasic.miners.models import DR5
 
 
 class CGMinerDR5(AntminerOld, DR5):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import ePIC
-from pyasic.miners.types import S19, S19XP, S19j, S19jPro, S19jProPlus, S19kPro, S19Pro
+from pyasic.miners.models import S19, S19XP, S19j, S19jPro, S19jProPlus, S19kPro, S19Pro
 
 
 class ePICS19(ePIC, S19):

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

@@ -21,8 +21,8 @@ import asyncssh
 from pyasic.data import HashBoard
 from pyasic.errors import APIError
 from pyasic.miners.backends import Hiveon
-from pyasic.miners.base import DataFunction, DataLocations, DataOptions, RPCAPICommand
-from pyasic.miners.types import T9
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
+from pyasic.miners.models import T9
 
 HIVEON_T9_DATA_LOC = DataLocations(
     **{

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import LUXMiner
-from pyasic.miners.types import S9
+from pyasic.miners.models import S9
 
 
 class LUXMinerS9(LUXMiner, S9):

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

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import VNish
-from pyasic.miners.types import S17Plus, S17Pro
+from pyasic.miners.models import S17Plus, S17Pro
 
 
 class VNishS17Plus(VNish, S17Plus):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import VNish
-from pyasic.miners.types import (
+from pyasic.miners.models import (
     S19,
     S19XP,
     S19a,

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import VNish
-from pyasic.miners.types import T19
+from pyasic.miners.models import T19
 
 
 class VNishT19(VNish, T19):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import VNish
-from pyasic.miners.types import L3Plus
+from pyasic.miners.models import L3Plus
 
 
 class VnishL3Plus(VNish, L3Plus):

pyasic/miners/auradine/flux/AD/AT1.py

@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAT1500
+from pyasic.miners.models import AuradineAT1500
 
 
 class AuradineFluxAT1500(AuradineAT1500, Auradine):

pyasic/miners/auradine/flux/AD/AT2.py

@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAT2860, AuradineAT2880
+from pyasic.miners.models import AuradineAT2860, AuradineAT2880
 
 
 class AuradineFluxAT2860(AuradineAT2860, Auradine):

pyasic/miners/auradine/flux/AI/AI2.py

@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAI2500
+from pyasic.miners.models import AuradineAI2500
 
 
 class AuradineFluxAI2500(AuradineAI2500, Auradine):

pyasic/miners/auradine/flux/AI/AI3.py

@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAI3680
+from pyasic.miners.models import AuradineAI3680
 
 
 class AuradineFluxAI3680(AuradineAI3680, Auradine):

pyasic/miners/auradine/flux/AT/AD2.py

@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAD2500
+from pyasic.miners.models import AuradineAD2500
 
 
 class AuradineFluxAD2500(AuradineAD2500, Auradine):

pyasic/miners/auradine/flux/AT/AD3.py

@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAD3500
+from pyasic.miners.models import AuradineAD3500
 
 
 class AuradineFluxAD3500(AuradineAD3500, Auradine):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1026
+from pyasic.miners.models import Avalon1026
 
 
 class CGMinerAvalon1026(AvalonMiner, Avalon1026):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1047
+from pyasic.miners.models import Avalon1047
 
 
 class CGMinerAvalon1047(AvalonMiner, Avalon1047):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1066
+from pyasic.miners.models import Avalon1066
 
 
 class CGMinerAvalon1066(AvalonMiner, Avalon1066):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1166Pro
+from pyasic.miners.models import Avalon1166Pro
 
 
 class CGMinerAvalon1166Pro(AvalonMiner, Avalon1166Pro):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1246
+from pyasic.miners.models import Avalon1246
 
 
 class CGMinerAvalon1246(AvalonMiner, Avalon1246):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon721
+from pyasic.miners.models import Avalon721
 
 
 class CGMinerAvalon721(AvalonMiner, Avalon721):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon741
+from pyasic.miners.models import Avalon741
 
 
 class CGMinerAvalon741(AvalonMiner, Avalon741):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon761
+from pyasic.miners.models import Avalon761
 
 
 class CGMinerAvalon761(AvalonMiner, Avalon761):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon821
+from pyasic.miners.models import Avalon821
 
 
 class CGMinerAvalon821(AvalonMiner, Avalon821):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon841
+from pyasic.miners.models import Avalon841
 
 
 class CGMinerAvalon841(AvalonMiner, Avalon841):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon851
+from pyasic.miners.models import Avalon851
 
 
 class CGMinerAvalon851(AvalonMiner, Avalon851):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon921
+from pyasic.miners.models import Avalon921
 
 
 class CGMinerAvalon921(AvalonMiner, Avalon921):

pyasic/miners/backends/antminer.py

@@ -19,16 +19,16 @@ from typing import List, Optional, Union
 from pyasic.config import MinerConfig, MiningModeConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, X19Error
+from pyasic.errors import APIError
 from pyasic.miners.backends.bmminer import BMMiner
 from pyasic.miners.backends.cgminer import CGMiner
-from pyasic.miners.base import (
+from pyasic.miners.data import (
     DataFunction,
     DataLocations,
     DataOptions,
     RPCAPICommand,
     WebAPICommand,
 )
-from pyasic.rpc import APIError
 from pyasic.ssh.antminer import AntminerModernSSH
 from pyasic.web.antminer import AntminerModernWebAPI, AntminerOldWebAPI
 

pyasic/miners/backends/auradine.py

@@ -17,10 +17,11 @@ import logging
 from enum import Enum
 from typing import List, Optional
 
-from pyasic import APIError, MinerConfig
+from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
-from pyasic.miners.base import (
-    BaseMiner,
+from pyasic.errors import APIError
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import (
     DataFunction,
     DataLocations,
     DataOptions,
@@ -28,7 +29,7 @@ from pyasic.miners.base import (
     WebAPICommand,
 )
 from pyasic.rpc.gcminer import GCMinerRPCAPI
-from pyasic.web.auradine import FluxWebAPI
+from pyasic.web.auradine import AuradineWebAPI
 
 AURADINE_DATA_LOC = DataLocations(
     **{
@@ -117,8 +118,8 @@ class Auradine(BaseMiner):
 
     _api_cls = GCMinerRPCAPI
     api: GCMinerRPCAPI
-    _web_cls = FluxWebAPI
-    web: FluxWebAPI
+    _web_cls = AuradineWebAPI
+    web: AuradineWebAPI
 
     data_locations = AURADINE_DATA_LOC
 

pyasic/miners/backends/avalonminer.py

@@ -20,7 +20,7 @@ from typing import List, Optional
 from pyasic.data import Fan, HashBoard
 from pyasic.errors import APIError
 from pyasic.miners.backends.cgminer import CGMiner
-from pyasic.miners.base import DataFunction, DataLocations, DataOptions, RPCAPICommand
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
 
 AVALON_DATA_LOC = DataLocations(
     **{

pyasic/miners/backends/bfgminer.py

@@ -19,13 +19,8 @@ from typing import List, Optional
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.errors import APIError
-from pyasic.miners.base import (
-    BaseMiner,
-    DataFunction,
-    DataLocations,
-    DataOptions,
-    RPCAPICommand,
-)
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
 from pyasic.rpc.bfgminer import BFGMinerRPCAPI
 
 BFGMINER_DATA_LOC = DataLocations(

pyasic/miners/backends/bmminer.py

@@ -19,13 +19,8 @@ from typing import List, Optional
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.errors import APIError
-from pyasic.miners.base import (
-    BaseMiner,
-    DataFunction,
-    DataLocations,
-    DataOptions,
-    RPCAPICommand,
-)
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
 from pyasic.rpc.bmminer import BMMinerRPCAPI
 
 BMMINER_DATA_LOC = DataLocations(

pyasic/miners/backends/braiins_os.py

@@ -24,8 +24,8 @@ from pyasic.config.mining import MiningModePowerTune
 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.miners.base import BaseMiner
+from pyasic.miners.data import (
     DataFunction,
     DataLocations,
     DataOptions,

pyasic/miners/backends/btminer.py

@@ -21,13 +21,8 @@ from pyasic.config import MinerConfig, MiningModeConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, WhatsminerError
 from pyasic.errors import APIError
-from pyasic.miners.base import (
-    BaseMiner,
-    DataFunction,
-    DataLocations,
-    DataOptions,
-    RPCAPICommand,
-)
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
 from pyasic.rpc.btminer import BTMinerRPCAPI
 
 BTMINER_DATA_LOC = DataLocations(

pyasic/miners/backends/cgminer.py

@@ -18,13 +18,8 @@ from typing import Optional
 
 from pyasic.config import MinerConfig
 from pyasic.errors import APIError
-from pyasic.miners.base import (
-    BaseMiner,
-    DataFunction,
-    DataLocations,
-    DataOptions,
-    RPCAPICommand,
-)
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
 from pyasic.rpc.cgminer import CGMinerRPCAPI
 
 CGMINER_DATA_LOC = DataLocations(

pyasic/miners/backends/epic.py

@@ -21,13 +21,8 @@ from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, X19Error
 from pyasic.errors import APIError
 from pyasic.logger import logger
-from pyasic.miners.base import (
-    BaseMiner,
-    DataFunction,
-    DataLocations,
-    DataOptions,
-    WebAPICommand,
-)
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, WebAPICommand
 from pyasic.web.epic import ePICWebAPI
 
 EPIC_DATA_LOC = DataLocations(

pyasic/miners/backends/goldshell.py

@@ -20,7 +20,7 @@ from pyasic.data import HashBoard
 from pyasic.errors import APIError
 from pyasic.logger import logger
 from pyasic.miners.backends import BFGMiner
-from pyasic.miners.base import (
+from pyasic.miners.data import (
     DataFunction,
     DataLocations,
     DataOptions,

pyasic/miners/backends/innosilicon.py

@@ -21,7 +21,7 @@ from pyasic.data.error_codes import MinerErrorData
 from pyasic.data.error_codes.innosilicon import InnosiliconError
 from pyasic.errors import APIError
 from pyasic.miners.backends import CGMiner
-from pyasic.miners.base import (
+from pyasic.miners.data import (
     DataFunction,
     DataLocations,
     DataOptions,

pyasic/miners/backends/luxminer.py

@@ -18,13 +18,8 @@ from typing import List, Optional
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.errors import APIError
-from pyasic.miners.base import (
-    BaseMiner,
-    DataFunction,
-    DataLocations,
-    DataOptions,
-    RPCAPICommand,
-)
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
 from pyasic.rpc.luxminer import LUXMinerRPCAPI
 
 LUXMINER_DATA_LOC = DataLocations(

pyasic/miners/backends/unknown.py

@@ -1,18 +1,16 @@
-# ------------------------------------------------------------------------------
-#  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.                                              -
-# ------------------------------------------------------------------------------
+#  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 typing import List, Optional, Tuple
 

pyasic/miners/backends/vnish.py

@@ -19,7 +19,7 @@ from typing import Optional
 from pyasic import MinerConfig
 from pyasic.errors import APIError
 from pyasic.miners.backends.bmminer import BMMiner
-from pyasic.miners.base import (
+from pyasic.miners.data import (
     DataFunction,
     DataLocations,
     DataOptions,

pyasic/miners/base.py

@@ -16,8 +16,6 @@
 import asyncio
 import ipaddress
 import warnings
-from dataclasses import dataclass, field, make_dataclass
-from enum import Enum
 from typing import List, Optional, Protocol, Tuple, Type, TypeVar, Union
 
 from pyasic.config import MinerConfig
@@ -25,79 +23,7 @@ from pyasic.data import Fan, HashBoard, MinerData
 from pyasic.data.error_codes import MinerErrorData
 from pyasic.errors import APIError
 from pyasic.logger import logger
-
-
-class DataOptions(Enum):
-    MAC = "mac"
-    API_VERSION = "api_ver"
-    FW_VERSION = "fw_ver"
-    HOSTNAME = "hostname"
-    HASHRATE = "hashrate"
-    EXPECTED_HASHRATE = "expected_hashrate"
-    HASHBOARDS = "hashboards"
-    ENVIRONMENT_TEMP = "env_temp"
-    WATTAGE = "wattage"
-    WATTAGE_LIMIT = "wattage_limit"
-    FANS = "fans"
-    FAN_PSU = "fan_psu"
-    ERRORS = "errors"
-    FAULT_LIGHT = "fault_light"
-    IS_MINING = "is_mining"
-    UPTIME = "uptime"
-    CONFIG = "config"
-
-    def __str__(self):
-        return self.value
-
-    def default_command(self):
-        if str(self.value) == "config":
-            return "get_config"
-        elif str(self.value) == "is_mining":
-            return "_is_mining"
-        else:
-            return f"_get_{str(self.value)}"
-
-
-@dataclass
-class RPCAPICommand:
-    name: str
-    cmd: str
-
-
-@dataclass
-class WebAPICommand:
-    name: str
-    cmd: str
-
-
-@dataclass
-class GRPCCommand(WebAPICommand):
-    name: str
-    cmd: str
-
-
-@dataclass
-class DataFunction:
-    cmd: str
-    kwargs: List[Union[RPCAPICommand, WebAPICommand, GRPCCommand]] = field(
-        default_factory=list
-    )
-
-    def __call__(self, *args, **kwargs):
-        return self
-
-
-DataLocations = make_dataclass(
-    "DataLocations",
-    [
-        (
-            enum_value.value,
-            DataFunction,
-            field(default_factory=DataFunction(enum_value.default_command())),
-        )
-        for enum_value in DataOptions
-    ],
-)
+from pyasic.miners.data import DataLocations, DataOptions, RPCAPICommand, WebAPICommand
 
 
 class MinerProtocol(Protocol):

pyasic/miners/data.py

@@ -0,0 +1,84 @@
+# ------------------------------------------------------------------------------
+#  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 dataclasses import dataclass, field, make_dataclass
+from enum import Enum
+from typing import List, Union
+
+
+class DataOptions(Enum):
+    MAC = "mac"
+    API_VERSION = "api_ver"
+    FW_VERSION = "fw_ver"
+    HOSTNAME = "hostname"
+    HASHRATE = "hashrate"
+    EXPECTED_HASHRATE = "expected_hashrate"
+    HASHBOARDS = "hashboards"
+    ENVIRONMENT_TEMP = "env_temp"
+    WATTAGE = "wattage"
+    WATTAGE_LIMIT = "wattage_limit"
+    FANS = "fans"
+    FAN_PSU = "fan_psu"
+    ERRORS = "errors"
+    FAULT_LIGHT = "fault_light"
+    IS_MINING = "is_mining"
+    UPTIME = "uptime"
+    CONFIG = "config"
+
+    def __str__(self):
+        return self.value
+
+    def default_command(self):
+        if str(self.value) == "config":
+            return "get_config"
+        elif str(self.value) == "is_mining":
+            return "_is_mining"
+        else:
+            return f"_get_{str(self.value)}"
+
+
+@dataclass
+class RPCAPICommand:
+    name: str
+    cmd: str
+
+
+@dataclass
+class WebAPICommand:
+    name: str
+    cmd: str
+
+
+@dataclass
+class DataFunction:
+    cmd: str
+    kwargs: List[Union[RPCAPICommand, WebAPICommand]] = field(default_factory=list)
+
+    def __call__(self, *args, **kwargs):
+        return self
+
+
+DataLocations = make_dataclass(
+    "DataLocations",
+    [
+        (
+            enum_value.value,
+            DataFunction,
+            field(default_factory=DataFunction(enum_value.default_command())),
+        )
+        for enum_value in DataOptions
+    ],
+)

pyasic/miners/factory.py

@@ -25,6 +25,7 @@ import httpx
 
 from pyasic import settings
 from pyasic.logger import logger
+from pyasic.miners import AnyMiner
 from pyasic.miners.antminer import *
 from pyasic.miners.auradine import *
 from pyasic.miners.avalonminer import *
@@ -41,10 +42,9 @@ from pyasic.miners.backends import (
     VNish,
     ePIC,
 )
-from pyasic.miners.base import AnyMiner
+from pyasic.miners.backends.unknown import UnknownMiner
 from pyasic.miners.goldshell import *
 from pyasic.miners.innosilicon import *
-from pyasic.miners.unknown import UnknownMiner
 from pyasic.miners.whatsminer import *
 
 

pyasic/miners/goldshell/bfgminer/X5/CK5.py

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import GoldshellMiner
-from pyasic.miners.types import CK5
+from pyasic.miners.models import CK5
 
 
 class GoldshellCK5(GoldshellMiner, CK5):

pyasic/miners/goldshell/bfgminer/X5/HS5.py

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import GoldshellMiner
-from pyasic.miners.types import HS5
+from pyasic.miners.models import HS5
 
 
 class GoldshellHS5(GoldshellMiner, HS5):

pyasic/miners/goldshell/bfgminer/X5/KD5.py

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import GoldshellMiner
-from pyasic.miners.types import KD5
+from pyasic.miners.models import KD5
 
 
 class GoldshellKD5(GoldshellMiner, KD5):

pyasic/miners/goldshell/bfgminer/XMax/KDMax.py

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import GoldshellMiner
-from pyasic.miners.types import KDMax
+from pyasic.miners.models import KDMax
 
 
 class GoldshellKDMax(GoldshellMiner, KDMax):

pyasic/miners/innosilicon/cgminer/A10X/A10X.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends.innosilicon import Innosilicon
-from pyasic.miners.types import A10X
+from pyasic.miners.models import A10X
 
 
 class InnosiliconA10X(Innosilicon, A10X):

pyasic/miners/innosilicon/cgminer/T3X/T3H.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends.innosilicon import Innosilicon
-from pyasic.miners.types import T3HPlus
+from pyasic.miners.models import T3HPlus
 
 
 class InnosiliconT3HPlus(Innosilicon, T3HPlus):