diff --git a/upsmon/ups.py b/upsmon/ups.py index a0c2c38..41b914d 100644 --- a/upsmon/ups.py +++ b/upsmon/ups.py @@ -5,7 +5,7 @@ import serial import logging -from utils import * +from pyutils.utils import * from copy import deepcopy from dataclasses import dataclass from influxdb_client_3 import InfluxDBClient3 diff --git a/upsmon/utils.py b/upsmon/utils.py deleted file mode 100644 index d90ec35..0000000 --- a/upsmon/utils.py +++ /dev/null @@ -1,37 +0,0 @@ -import signal -from logging import Logger -from influxdb_client_3 import Point - -class SignalHandler: - running: bool - logger: Logger - - def __init__(self, logger): - self.running: bool = True - self.logger: Logger = logger - signal.signal(signal.SIGINT, self._handle_sigint) - signal.signal(signal.SIGTERM, self._handle_sigint) - - def _handle_sigint(self, signum, frame): - self.logger.info(f"Received SIGNAL: {signal.strsignal(signum)}") - self.running = False - -def dict2Point(measurement: str, fields: dict, tags: dict | None = None) -> Point: - p = Point(measurement) - for k,v in fields.items(): - p.field(k,v) - if tags: - for k,v in tags.items(): - p.tag(k,v) - return p - -def convertInt(d: dict) -> dict: - for k,v in d.items(): - if str.isdecimal(v): - d[k] = int(v) - return d - -def convertIntList(l: list[dict]) -> list[dict]: - for n,d in enumerate(l): - l[n] = convertInt(d) - return l \ No newline at end of file