gravity-controller-operator 2.2.4__py3-none-any.whl → 2.3.0__py3-none-any.whl

gravity_controller_operator/controller_factory.py

@@ -1,28 +1,29 @@
-from gravity_controller_operator.controllers.emulator_contr import EmulatorController
-from gravity_controller_operator.controllers.netping_relay import NetPing2Controller
-from gravity_controller_operator.controllers.arm_k210 import ARMK210Controller
-from gravity_controller_operator.controllers.wb_mr6lv import WBMR6LV
-from gravity_controller_operator.exceptions import UnknownController
-from gravity_controller_operator.controllers.moxa import MoxaE1214
-from gravity_controller_operator.controllers.sigur import Sigur
-
-
-AVAILABLE_CONTROLLERS = [
-    ARMK210Controller,
-    WBMR6LV,
-    NetPing2Controller,
-    EmulatorController,
-    Sigur,
-    MoxaE1214
-]
-
-
-class ControllerCreator:
-    @staticmethod
-    def get_controller(model, emulator=False, *args, **kwargs):
-        for contr in AVAILABLE_CONTROLLERS:
-            if emulator:
-                return EmulatorController(*args, **kwargs)
-            if contr.model.lower() == model.lower():
-                return contr(*args, **kwargs)
-        raise UnknownController(model, [contr.model for contr in AVAILABLE_CONTROLLERS])
+from gravity_controller_operator.controllers.emulator_contr import EmulatorController
+from gravity_controller_operator.controllers.netping_relay import NetPing2Controller
+from gravity_controller_operator.controllers.arm_k210 import ARMK210Controller
+from gravity_controller_operator.controllers.wb_mr6lv import WBMR6LV, WBMR6LVTCP
+from gravity_controller_operator.exceptions import UnknownController
+from gravity_controller_operator.controllers.moxa import MoxaE1214
+from gravity_controller_operator.controllers.sigur import Sigur
+
+
+AVAILABLE_CONTROLLERS = [
+    ARMK210Controller,
+    WBMR6LV,
+    WBMR6LVTCP,
+    NetPing2Controller,
+    EmulatorController,
+    Sigur,
+    MoxaE1214
+]
+
+
+class ControllerCreator:
+    @staticmethod
+    def get_controller(model, emulator=False, *args, **kwargs):
+        for contr in AVAILABLE_CONTROLLERS:
+            if emulator:
+                return EmulatorController(*args, **kwargs)
+            if contr.model.lower() == model.lower():
+                return contr(*args, **kwargs)
+        raise UnknownController(model, [contr.model for contr in AVAILABLE_CONTROLLERS])

gravity_controller_operator/controllers/arm_k210.py

@@ -1,54 +1,54 @@
-from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
-from pyModbusTCP.client import ModbusClient
-import time
-
-class ARMK210ControllerDI(DIInterface):
-    map_keys_amount = 8
-    starts_with = 0
-
-    def __init__(self, client):
-        self.client = client
-        super().__init__()
-
-    def get_phys_dict(self):
-        for _ in range(5):
-            response = self.client.read_input_registers(self.starts_with, self.map_keys_amount)
-            if response:
-                return {i: val for i, val in enumerate(response)}
-            time.sleep(0.1)  # Не грузим CPU и даём контроллеру время
-        return {"error": "No response from controller"}
-
-
-class ARMK210ControllerRelay(RelayInterface):
-    map_keys_amount = 8
-    starts_with = 0
-
-    def __init__(self, client):
-        self.client = client
-        super().__init__()
-
-    def get_phys_dict(self):
-        for _ in range(5):
-            response = self.client.read_holding_registers(self.starts_with, self.map_keys_amount)
-            if response:
-                return {i: val for i, val in enumerate(response)}
-            time.sleep(0.1)  # Не грузим CPU и даём контроллеру время
-        return {"error": "No response from controller"}
-
-    def change_phys_relay_state(self, addr, state: bool):
-        for _ in range(5):
-            result = self.client.write_single_coil(addr, state)
-            if result:
-                return
-            time.sleep(0.1)
-        raise Exception("Failed to change relay state after 5 tries")
-
-
-class ARMK210Controller:
-    model = "arm_k210"
-
-    def __init__(self, ip: str, port: int = 8234, name="ARM_K210_Controller", *args, **kwargs):
-        client = ModbusClient(host=ip, port=port)
-        di = ARMK210ControllerDI(client)
-        relay = ARMK210ControllerRelay(client)
-        self.interface = ControllerInterface(di_interface=di, relay_interface=relay)
+from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
+from pyModbusTCP.client import ModbusClient
+import time
+
+class ARMK210ControllerDI(DIInterface):
+    map_keys_amount = 8
+    starts_with = 0
+
+    def __init__(self, client):
+        self.client = client
+        super().__init__()
+
+    def get_phys_dict(self):
+        for _ in range(5):
+            response = self.client.read_input_registers(self.starts_with, self.map_keys_amount)
+            if response:
+                return {i: val for i, val in enumerate(response)}
+            time.sleep(0.1)  # Не грузим CPU и даём контроллеру время
+        return {"error": "No response from controller"}
+
+
+class ARMK210ControllerRelay(RelayInterface):
+    map_keys_amount = 8
+    starts_with = 0
+
+    def __init__(self, client):
+        self.client = client
+        super().__init__()
+
+    def get_phys_dict(self):
+        for _ in range(5):
+            response = self.client.read_holding_registers(self.starts_with, self.map_keys_amount)
+            if response:
+                return {i: val for i, val in enumerate(response)}
+            time.sleep(0.1)  # Не грузим CPU и даём контроллеру время
+        return {"error": "No response from controller"}
+
+    def change_phys_relay_state(self, addr, state: bool):
+        for _ in range(5):
+            result = self.client.write_single_coil(addr, state)
+            if result:
+                return
+            time.sleep(0.1)
+        raise Exception("Failed to change relay state after 5 tries")
+
+
+class ARMK210Controller:
+    model = "arm_k210"
+
+    def __init__(self, ip: str, port: int = 8234, name="ARM_K210_Controller", *args, **kwargs):
+        client = ModbusClient(host=ip, port=port)
+        di = ARMK210ControllerDI(client)
+        relay = ARMK210ControllerRelay(client)
+        self.interface = ControllerInterface(di_interface=di, relay_interface=relay)

gravity_controller_operator/controllers/emulator_contr.py

@@ -1,37 +1,37 @@
-from gravity_controller_operator.controllers_super import DIInterface, \
-    RelayInterface, ControllerInterface
-
-
-class EmulatorDI(DIInterface):
-    map_keys_amount = 4
-    starts_with = 1
-
-    def __init__(self):
-        super().__init__()
-
-    def get_phys_dict(self):
-        return {1: 0, 2: 0, 3: 0, 4: 0}
-
-
-class EmulatorRelay(RelayInterface):
-    map_keys_amount = 4
-    starts_with = 1
-
-    def __init__(self):
-        super().__init__()
-
-    def get_phys_dict(self):
-        return {1: 0, 2: 0, 3: 0, 4: 0}
-
-    def change_phys_relay_state(self, addr, state: bool):
-        # Ничего не делает, просто имитация
-        pass
-
-
-class EmulatorController:
-    model = "emulator_controller"
-
-    def __init__(self, *args, **kwargs):
-        di = EmulatorDI()
-        relay = EmulatorRelay()
+from gravity_controller_operator.controllers_super import DIInterface, \
+    RelayInterface, ControllerInterface
+
+
+class EmulatorDI(DIInterface):
+    map_keys_amount = 4
+    starts_with = 1
+
+    def __init__(self):
+        super().__init__()
+
+    def get_phys_dict(self):
+        return {1: 0, 2: 0, 3: 0, 4: 0}
+
+
+class EmulatorRelay(RelayInterface):
+    map_keys_amount = 4
+    starts_with = 1
+
+    def __init__(self):
+        super().__init__()
+
+    def get_phys_dict(self):
+        return {1: 0, 2: 0, 3: 0, 4: 0}
+
+    def change_phys_relay_state(self, addr, state: bool):
+        # Ничего не делает, просто имитация
+        pass
+
+
+class EmulatorController:
+    model = "emulator_controller"
+
+    def __init__(self, *args, **kwargs):
+        di = EmulatorDI()
+        relay = EmulatorRelay()
         self.interface = ControllerInterface(di_interface=di, relay_interface=relay)

gravity_controller_operator/controllers/moxa.py

@@ -1,80 +1,80 @@
-import requests
-from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
-
-
-class MoxaClient:
-    def __init__(self, ip: str):
-        self.base_url = f"http://{ip}/api/slot/0/io"
-        self.headers = {
-            "Content-Type": "application/json",
-            "Accept": "vdn.dac.v1"
-        }
-
-    def get_di(self):
-        url = f"{self.base_url}/di"
-        r = requests.get(url, headers=self.headers, timeout=2)
-        r.raise_for_status()
-        return r.json()["io"]["di"]
-
-    def get_relays(self):
-        url = f"{self.base_url}/relay"
-        r = requests.get(url, headers=self.headers, timeout=2)
-        r.raise_for_status()
-        return r.json()["io"]["relay"]
-
-    def set_relay(self, channel: int, state: int):
-        url = f"{self.base_url}/relay/{channel}/relayStatus"
-        payload = {
-            "slot": "0",
-            "io": {
-                "relay": {
-                    str(channel): {
-                        "relayStatus": str(state)
-                    }
-                }
-            }
-        }
-        headers = self.headers.copy()
-        headers["Content-Length"] = str(len(str(payload)))
-        r = requests.put(url, headers=headers, json=payload, timeout=2)
-        r.raise_for_status()
-        return r.status_code == 200
-
-
-class MoxaDI(DIInterface):
-    map_keys_amount = 16
-    starts_with = 0
-
-    def __init__(self, client):
-        self.client = client
-        super().__init__()
-
-    def get_phys_dict(self):
-        data = self.client.get_di()
-        return {int(item["diIndex"]): item["diStatus"] for item in data}
-
-
-class MoxaRelay(RelayInterface):
-    map_keys_amount = 4
-    starts_with = 0
-
-    def __init__(self, client):
-        self.client = client
-        super().__init__()
-
-    def get_phys_dict(self):
-        data = self.client.get_relays()
-        return {int(item["relayIndex"]): int(item["relayStatus"]) for item in data}
-
-    def change_phys_relay_state(self, addr, state: bool):
-        return self.client.set_relay(addr, int(state))
-
-
-class MoxaE1214:
-    model = "moxa_e1214"
-
-    def __init__(self, ip, *args, **kwargs):
-        client = MoxaClient(ip)
-        di = MoxaDI(client)
-        relay = MoxaRelay(client)
-        self.interface = ControllerInterface(di_interface=di, relay_interface=relay)
+import requests
+from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
+
+
+class MoxaClient:
+    def __init__(self, ip: str):
+        self.base_url = f"http://{ip}/api/slot/0/io"
+        self.headers = {
+            "Content-Type": "application/json",
+            "Accept": "vdn.dac.v1"
+        }
+
+    def get_di(self):
+        url = f"{self.base_url}/di"
+        r = requests.get(url, headers=self.headers, timeout=2)
+        r.raise_for_status()
+        return r.json()["io"]["di"]
+
+    def get_relays(self):
+        url = f"{self.base_url}/relay"
+        r = requests.get(url, headers=self.headers, timeout=2)
+        r.raise_for_status()
+        return r.json()["io"]["relay"]
+
+    def set_relay(self, channel: int, state: int):
+        url = f"{self.base_url}/relay/{channel}/relayStatus"
+        payload = {
+            "slot": "0",
+            "io": {
+                "relay": {
+                    str(channel): {
+                        "relayStatus": str(state)
+                    }
+                }
+            }
+        }
+        headers = self.headers.copy()
+        headers["Content-Length"] = str(len(str(payload)))
+        r = requests.put(url, headers=headers, json=payload, timeout=2)
+        r.raise_for_status()
+        return r.status_code == 200
+
+
+class MoxaDI(DIInterface):
+    map_keys_amount = 16
+    starts_with = 0
+
+    def __init__(self, client):
+        self.client = client
+        super().__init__()
+
+    def get_phys_dict(self):
+        data = self.client.get_di()
+        return {int(item["diIndex"]): item["diStatus"] for item in data}
+
+
+class MoxaRelay(RelayInterface):
+    map_keys_amount = 4
+    starts_with = 0
+
+    def __init__(self, client):
+        self.client = client
+        super().__init__()
+
+    def get_phys_dict(self):
+        data = self.client.get_relays()
+        return {int(item["relayIndex"]): int(item["relayStatus"]) for item in data}
+
+    def change_phys_relay_state(self, addr, state: bool):
+        return self.client.set_relay(addr, int(state))
+
+
+class MoxaE1214:
+    model = "moxa_e1214"
+
+    def __init__(self, ip, *args, **kwargs):
+        client = MoxaClient(ip)
+        di = MoxaDI(client)
+        relay = MoxaRelay(client)
+        self.interface = ControllerInterface(di_interface=di, relay_interface=relay)

gravity_controller_operator/controllers/netping_relay.py

@@ -1,76 +1,76 @@
-from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
-from netping_contr import mixins
-import requests
-from requests.auth import HTTPBasicAuth
-
-
-class NetPingDevice(mixins.NetPingResponseParser):
-    def __init__(self, ip, port=80, username="visor", password="ping"):
-        self.ip = ip
-        self.port = port
-        self.username = username
-        self.password = password
-        self.schema = "http://"
-
-    def get_full_url(self):
-        return f"{self.schema}{self.ip}:{self.port}"
-
-    def get_all_di_status(self):
-        return requests.get(
-            url=f"{self.get_full_url()}/io.cgi?io",
-            auth=HTTPBasicAuth(self.username, self.password))
-
-    def get_all_relay_states(self):
-        states = {}
-        for i in range(1, 5):
-            r = requests.get(
-                url=f"{self.get_full_url()}/relay.cgi?r{i}",
-                auth=HTTPBasicAuth(self.username, self.password))
-            states[i] = self.parse_relay_state(r)
-        return states
-
-    def change_relay_status(self, relay_num, state):
-        return requests.get(
-            url=f"{self.get_full_url()}/relay.cgi?r{relay_num}={state}",
-            auth=HTTPBasicAuth(self.username, self.password))
-
-
-class NetPingDI(DIInterface):
-    map_keys_amount = 4
-    starts_with = 1
-
-    def __init__(self, controller):
-        self.controller = controller
-        super().__init__()
-
-    def get_phys_dict(self):
-        raw = self.controller.get_all_di_status()
-        return self.controller.parse_all_lines_request(raw)
-
-
-class NetPingRelay(RelayInterface):
-    map_keys_amount = 4
-    starts_with = 1
-
-    def __init__(self, controller):
-        self.controller = controller
-        super().__init__()
-
-    def get_phys_dict(self):
-        return self.controller.get_all_relay_states()
-
-    def change_phys_relay_state(self, addr, state: bool):
-        result = self.controller.change_relay_status(addr, state)
-        while "error" in result:
-            result = self.controller.change_relay_status(addr, state)
-
-
-class NetPing2Controller:
-    model = "netping_relay"
-
-    def __init__(self, ip, port=80, username="visor", password="ping",
-                 name="netping_relay2", *args, **kwargs):
-        device = NetPingDevice(ip=ip, port=port, username=username, password=password)
-        di = NetPingDI(device)
-        relay = NetPingRelay(device)
-        self.interface = ControllerInterface(di_interface=di, relay_interface=relay)
+from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
+from netping_contr import mixins
+import requests
+from requests.auth import HTTPBasicAuth
+
+
+class NetPingDevice(mixins.NetPingResponseParser):
+    def __init__(self, ip, port=80, username="visor", password="ping"):
+        self.ip = ip
+        self.port = port
+        self.username = username
+        self.password = password
+        self.schema = "http://"
+
+    def get_full_url(self):
+        return f"{self.schema}{self.ip}:{self.port}"
+
+    def get_all_di_status(self):
+        return requests.get(
+            url=f"{self.get_full_url()}/io.cgi?io",
+            auth=HTTPBasicAuth(self.username, self.password))
+
+    def get_all_relay_states(self):
+        states = {}
+        for i in range(1, 5):
+            r = requests.get(
+                url=f"{self.get_full_url()}/relay.cgi?r{i}",
+                auth=HTTPBasicAuth(self.username, self.password))
+            states[i] = self.parse_relay_state(r)
+        return states
+
+    def change_relay_status(self, relay_num, state):
+        return requests.get(
+            url=f"{self.get_full_url()}/relay.cgi?r{relay_num}={state}",
+            auth=HTTPBasicAuth(self.username, self.password))
+
+
+class NetPingDI(DIInterface):
+    map_keys_amount = 4
+    starts_with = 1
+
+    def __init__(self, controller):
+        self.controller = controller
+        super().__init__()
+
+    def get_phys_dict(self):
+        raw = self.controller.get_all_di_status()
+        return self.controller.parse_all_lines_request(raw)
+
+
+class NetPingRelay(RelayInterface):
+    map_keys_amount = 4
+    starts_with = 1
+
+    def __init__(self, controller):
+        self.controller = controller
+        super().__init__()
+
+    def get_phys_dict(self):
+        return self.controller.get_all_relay_states()
+
+    def change_phys_relay_state(self, addr, state: bool):
+        result = self.controller.change_relay_status(addr, state)
+        while "error" in result:
+            result = self.controller.change_relay_status(addr, state)
+
+
+class NetPing2Controller:
+    model = "netping_relay"
+
+    def __init__(self, ip, port=80, username="visor", password="ping",
+                 name="netping_relay2", *args, **kwargs):
+        device = NetPingDevice(ip=ip, port=port, username=username, password=password)
+        di = NetPingDI(device)
+        relay = NetPingRelay(device)
+        self.interface = ControllerInterface(di_interface=di, relay_interface=relay)

gravity_controller_operator/controllers/sigur.py

@@ -1,52 +1,52 @@
-import time
-from http.client import responses
-
-from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
-
-
-class SigurBase:
-    def __init__(self, sock):
-        self.sock = None
-
-class SigurDI(DIInterface, SigurBase):
-    map_keys_amount = 5
-    starts_with = 3
-
-    def __init__(self, sock):
-        SigurBase.__init__(self, sock)
-        DIInterface.__init__(self)
-
-    def get_phys_dict(self):
-        result = {}
-        for point in range(self.starts_with, self.starts_with + self.map_keys_amount):
-            result[point] = 0
-        return result
-
-
-class SigurRelay(RelayInterface, SigurBase):
-    map_keys_amount = 3
-    starts_with = 1
-
-    def __init__(self, sock):
-        SigurBase.__init__(self, sock)
-        RelayInterface.__init__(self)
-
-    def get_phys_dict(self):
-        result = {}
-        for point in range(self.starts_with, self.starts_with + self.map_keys_amount):
-            result[point] = 0
-        return result
-
-    def change_phys_relay_state(self, addr, state: bool):
-        # Имитация действия, при необходимости можно добавить настоящую команду
-        pass
-
-
-class Sigur:
-    model = "sigur"
-
-    def __init__(self, sock, login="Administrator", password="",
-                 name="Sigur", *args, **kwargs):
-        di = SigurDI(sock)
-        relay = SigurRelay(sock)
-        self.interface = ControllerInterface(di_interface=di, relay_interface=relay)
+import time
+from http.client import responses
+
+from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
+
+
+class SigurBase:
+    def __init__(self):
+        pass
+
+class SigurDI(DIInterface, SigurBase):
+    map_keys_amount = 5
+    starts_with = 3
+
+    def __init__(self):
+        SigurBase.__init__(self)
+        DIInterface.__init__(self)
+
+    def get_phys_dict(self):
+        result = {}
+        for point in range(self.starts_with, self.starts_with + self.map_keys_amount):
+            result[point] = 0
+        return result
+
+
+class SigurRelay(RelayInterface, SigurBase):
+    map_keys_amount = 3
+    starts_with = 1
+
+    def __init__(self):
+        SigurBase.__init__(self)
+        RelayInterface.__init__(self)
+
+    def get_phys_dict(self):
+        result = {}
+        for point in range(self.starts_with, self.starts_with + self.map_keys_amount):
+            result[point] = 0
+        return result
+
+    def change_phys_relay_state(self, addr, state: bool):
+        # Имитация действия, при необходимости можно добавить настоящую команду
+        pass
+
+
+class Sigur:
+    model = "sigur"
+
+    def __init__(self, sock, login="Administrator", password="",
+                 name="Sigur", *args, **kwargs):
+        di = SigurDI()
+        relay = SigurRelay()
+        self.interface = ControllerInterface(di_interface=di, relay_interface=relay)