refactor: move models to pyasic.miners.devices

pyasic/load/__init__.py

@@ -20,7 +20,16 @@ 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.models import S9, S17, T17, S17e, S17Plus, S17Pro, T17e, T17Plus
+from pyasic.miners.device.models import (
+    S9,
+    S17,
+    T17,
+    S17e,
+    S17Plus,
+    S17Pro,
+    T17e,
+    T17Plus,
+)
 
 FAN_USAGE = 50  # 50 W per fan
 

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.models import S17, S17e, S17Plus, S17Pro
+from pyasic.miners.device.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.models import T17, T17e, T17Plus
+from pyasic.miners.device.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.models import (
+from pyasic.miners.device.models import (
     S19,
     S19L,
     S19XP,
@@ -26,12 +26,12 @@ from pyasic.miners.models import (
     S19j,
     S19jNoPIC,
     S19jPro,
+    S19KPro,
     S19Plus,
     S19Pro,
     S19ProHydro,
     S19ProPlus,
     S19ProPlusHydro,
-    S19KPro,
 )
 
 

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

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

pyasic/miners/antminer/bmminer/X21/S21.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.models import S21
+from pyasic.miners.device.models import S21
 
 
 class BMMinerS21(AntminerModern, S21):

pyasic/miners/antminer/bmminer/X21/T21.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.models import T21
+from pyasic.miners.device.models import T21
 
 
 class BMMinerT21(AntminerModern, T21):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.models import HS3
+from pyasic.miners.device.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.models import L3Plus
+from pyasic.miners.device.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.models import L7
+from pyasic.miners.device.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.models import E9Pro
+from pyasic.miners.device.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.models import S9, S9i, S9j
+from pyasic.miners.device.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.models import T9
+from pyasic.miners.device.models import T9
 
 
 class BMMinerT9(BMMiner, T9):

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

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

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

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

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSer
-from pyasic.miners.models import (
+from pyasic.miners.device.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.models import T19
+from pyasic.miners.device.models import T19
 
 
 class BOSMinerT19(BOSer, T19):

pyasic/miners/antminer/bosminer/X21/S21.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSer
-from pyasic.miners.models import S21
+from pyasic.miners.device.models import S21
 
 
 class BOSMinerS21(BOSer, S21):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSMiner
-from pyasic.miners.models import S9
+from pyasic.miners.device.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.models import Z15
+from pyasic.miners.device.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.models import D3
+from pyasic.miners.device.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.models import DR5
+from pyasic.miners.device.models import DR5
 
 
 class CGMinerDR5(AntminerOld, DR5):

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

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

pyasic/miners/antminer/epic/X21/S21.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import ePIC
-from pyasic.miners.models import S21
+from pyasic.miners.device.models import S21
 
 
 class ePICS21(ePIC, S21):

pyasic/miners/antminer/epic/X21/T21.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import ePIC
-from pyasic.miners.models import T21
+from pyasic.miners.device.models import T21
 
 
 class ePICT21(ePIC, T21):

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

@@ -22,7 +22,7 @@ from pyasic.data import HashBoard
 from pyasic.errors import APIError
 from pyasic.miners.backends import Hiveon
 from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
-from pyasic.miners.models import T9
+from pyasic.miners.device.models import T9
 
 HIVEON_T9_DATA_LOC = DataLocations(
     **{

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

@@ -15,7 +15,14 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import LUXMiner
-from pyasic.miners.models import S19, S19XP, S19jPro, S19jProPlus, S19kPro, S19Pro
+from pyasic.miners.device.models import (
+    S19,
+    S19XP,
+    S19jPro,
+    S19jProPlus,
+    S19kPro,
+    S19Pro,
+)
 
 
 class LUXMinerS19(LUXMiner, S19):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import LUXMiner
-from pyasic.miners.models import T19
+from pyasic.miners.device.models import T19
 
 
 class LUXMinerT19(LUXMiner, T19):

pyasic/miners/antminer/luxos/X21/S21.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import LUXMiner
-from pyasic.miners.models import S21
+from pyasic.miners.device.models import S21
 
 
 class LUXMinerS21(LUXMiner, S21):

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

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

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

@@ -15,7 +15,15 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import MaraMiner
-from pyasic.miners.models import S19, S19XP, S19j, S19jNoPIC, S19jPro, S19KPro, S19Pro
+from pyasic.miners.device.models import (
+    S19,
+    S19XP,
+    S19j,
+    S19jNoPIC,
+    S19jPro,
+    S19KPro,
+    S19Pro,
+)
 
 
 class MaraS19(MaraMiner, S19):

pyasic/miners/antminer/marathon/X21/S21.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import MaraMiner
-from pyasic.miners.models import S21
+from pyasic.miners.device.models import S21
 
 
 class MaraS21(MaraMiner, S21):

pyasic/miners/antminer/marathon/X21/T21.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import MaraMiner
-from pyasic.miners.models import T21
+from pyasic.miners.device.models import T21
 
 
 class MaraT21(MaraMiner, T21):

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

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import VNish
-from pyasic.miners.models import S17Plus, S17Pro
+from pyasic.miners.device.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.models import (
+from pyasic.miners.device.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.models import T19
+from pyasic.miners.device.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.models import L3Plus
+from pyasic.miners.device.models import L3Plus
 
 
 class VnishL3Plus(VNish, L3Plus):

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

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import VNish
-from pyasic.miners.models import L7
+from pyasic.miners.device.models import L7
 
 
 class VnishL7(VNish, L7):

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

@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.models import AuradineAT1500
+from pyasic.miners.device.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.models import AuradineAT2860, AuradineAT2880
+from pyasic.miners.device.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.models import AuradineAI2500
+from pyasic.miners.device.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.models import AuradineAI3680
+from pyasic.miners.device.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.models import AuradineAD2500
+from pyasic.miners.device.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.models import AuradineAD3500
+from pyasic.miners.device.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.models import Avalon1026
+from pyasic.miners.device.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.models import Avalon1047
+from pyasic.miners.device.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.models import Avalon1066
+from pyasic.miners.device.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.models import Avalon1166Pro
+from pyasic.miners.device.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.models import Avalon1246
+from pyasic.miners.device.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.models import Avalon721
+from pyasic.miners.device.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.models import Avalon741
+from pyasic.miners.device.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.models import Avalon761
+from pyasic.miners.device.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.models import Avalon821
+from pyasic.miners.device.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.models import Avalon841
+from pyasic.miners.device.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.models import Avalon851
+from pyasic.miners.device.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.models import Avalon921
+from pyasic.miners.device.models import Avalon921
 
 
 class CGMinerAvalon921(AvalonMiner, Avalon921):

pyasic/miners/blockminer/epic/blockminer/blockminer.py

@@ -15,8 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import ePIC
-from pyasic.miners.models import BlockMiner520i
+from pyasic.miners.device.models import BlockMiner520i, BlockMiner720i
-from pyasic.miners.models import BlockMiner720i
 
 
 class ePICBlockMiner520i(ePIC, BlockMiner520i):

pyasic/miners/device/models/__init__.py

@@ -17,7 +17,7 @@
 from .antminer import *
 from .auradine import *
 from .avalonminer import *
+from .epic import *
 from .goldshell import *
 from .innosilicon import *
 from .whatsminer import *
-from .epic import *

pyasic/miners/device/models/antminer/X21/__init__.py

@@ -14,9 +14,5 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .S21 import (
+from .S21 import S21
-    S21,
+from .T21 import T21
-)
-from .T21 import (
-    T21,
-)