diff --git a/pyzkaccess/aux_input.py b/pyzkaccess/aux_input.py index c1107f4..2a167b1 100644 --- a/pyzkaccess/aux_input.py +++ b/pyzkaccess/aux_input.py @@ -2,9 +2,9 @@ from abc import ABCMeta, abstractmethod from typing import Any, Iterable, TypeVar, Union, overload -from .common import UserTuple -from .event import EventLog -from .sdk import ZKSDK +from pyzkaccess.common import UserTuple +from pyzkaccess.event import EventLog +from pyzkaccess.sdk import ZKSDK class AuxInputInterface(metaclass=ABCMeta): diff --git a/pyzkaccess/device.py b/pyzkaccess/device.py index cf7e0ba..ef0c709 100644 --- a/pyzkaccess/device.py +++ b/pyzkaccess/device.py @@ -1,8 +1,8 @@ __all__ = ["ZKModel", "ZK100", "ZK200", "ZK400", "ZKDevice"] from typing import Any, Dict, Optional, Tuple, Type, Union -from .common import DocDict -from .enums import RelayGroup +from pyzkaccess.common import DocDict +from pyzkaccess.enums import RelayGroup class ZKModel: diff --git a/pyzkaccess/device_data/queryset.py b/pyzkaccess/device_data/queryset.py index c178c0e..1c9271b 100644 --- a/pyzkaccess/device_data/queryset.py +++ b/pyzkaccess/device_data/queryset.py @@ -21,10 +21,9 @@ overload, ) +from pyzkaccess.device_data.model import Field, Model from pyzkaccess.sdk import ZKSDK -from .model import Field, Model - _ModelT = TypeVar("_ModelT", bound=Model) _QuerySetT = TypeVar("_QuerySetT", bound="QuerySet") RecordType = Union[Model, Mapping[str, Any]] diff --git a/pyzkaccess/door.py b/pyzkaccess/door.py index 222e1e8..fc06486 100644 --- a/pyzkaccess/door.py +++ b/pyzkaccess/door.py @@ -2,13 +2,13 @@ from abc import ABCMeta, abstractmethod from typing import Any, Iterable, TypeVar, Union, overload -from .aux_input import AuxInput, AuxInputList -from .common import UserTuple -from .event import EventLog -from .param import DoorParameters -from .reader import Reader, ReaderList -from .relay import RelayList -from .sdk import ZKSDK +from pyzkaccess.aux_input import AuxInput, AuxInputList +from pyzkaccess.common import UserTuple +from pyzkaccess.event import EventLog +from pyzkaccess.param import DoorParameters +from pyzkaccess.reader import Reader, ReaderList +from pyzkaccess.relay import RelayList +from pyzkaccess.sdk import ZKSDK class DoorInterface(metaclass=ABCMeta): diff --git a/pyzkaccess/enums.py b/pyzkaccess/enums.py index c2736c0..4d9814d 100644 --- a/pyzkaccess/enums.py +++ b/pyzkaccess/enums.py @@ -16,7 +16,7 @@ from enum import Enum from typing import Dict, Final -from .common import DocDict +from pyzkaccess.common import DocDict class ControlOperation(Enum): diff --git a/pyzkaccess/event.py b/pyzkaccess/event.py index 8cafdac..2557df6 100644 --- a/pyzkaccess/event.py +++ b/pyzkaccess/event.py @@ -6,9 +6,9 @@ from datetime import datetime from typing import Any, Iterable, Iterator, List, Optional, TypeVar, Union -from .common import DocValue, ZKDatetimeUtils -from .enums import EVENT_TYPES, PassageDirection, VerifyMode -from .sdk import ZKSDK +from pyzkaccess.common import DocValue, ZKDatetimeUtils +from pyzkaccess.enums import EVENT_TYPES, PassageDirection, VerifyMode +from pyzkaccess.sdk import ZKSDK class Event: diff --git a/pyzkaccess/exceptions.py b/pyzkaccess/exceptions.py index bbc92bc..80ebea1 100644 --- a/pyzkaccess/exceptions.py +++ b/pyzkaccess/exceptions.py @@ -2,7 +2,7 @@ from typing import Any -from .enums import PULL_SDK_ERRORS, WSA_ERROR_CODES +from pyzkaccess.enums import PULL_SDK_ERRORS, WSA_ERROR_CODES class ZKSDKError(Exception): diff --git a/pyzkaccess/main.py b/pyzkaccess/main.py index 841eac9..e90ea8a 100644 --- a/pyzkaccess/main.py +++ b/pyzkaccess/main.py @@ -6,18 +6,17 @@ import pyzkaccess.ctypes_ as ctypes import pyzkaccess.sdk +from pyzkaccess.aux_input import AuxInput, AuxInputList +from pyzkaccess.device import ZK400, ZKDevice, ZKModel +from pyzkaccess.device_data.model import Model, models_registry +from pyzkaccess.device_data.queryset import QuerySet +from pyzkaccess.door import Door, DoorList +from pyzkaccess.enums import ChangeIPProtocol, ControlOperation +from pyzkaccess.event import EventLog from pyzkaccess.exceptions import ZKSDKError - -from .aux_input import AuxInput, AuxInputList -from .device import ZK400, ZKDevice, ZKModel -from .device_data.model import Model, models_registry -from .device_data.queryset import QuerySet -from .door import Door, DoorList -from .enums import ChangeIPProtocol, ControlOperation -from .event import EventLog -from .param import DeviceParameters, DoorParameters -from .reader import Reader, ReaderList -from .relay import Relay, RelayList +from pyzkaccess.param import DeviceParameters, DoorParameters +from pyzkaccess.reader import Reader, ReaderList +from pyzkaccess.relay import Relay, RelayList _ZKAccessT = TypeVar("_ZKAccessT", bound="ZKAccess") diff --git a/pyzkaccess/param.py b/pyzkaccess/param.py index 0c3a4ff..8021251 100644 --- a/pyzkaccess/param.py +++ b/pyzkaccess/param.py @@ -11,10 +11,10 @@ from enum import Enum from typing import Any, Callable, Optional, Type, TypeVar -from .common import ZKDatetimeUtils -from .device import ZKModel -from .enums import SensorType, VerifyMode -from .sdk import ZKSDK +from pyzkaccess.common import ZKDatetimeUtils +from pyzkaccess.device import ZKModel +from pyzkaccess.enums import SensorType, VerifyMode +from pyzkaccess.sdk import ZKSDK _DaylightSavingMomentMode1T = TypeVar("_DaylightSavingMomentMode1T", bound="DaylightSavingMomentMode1") diff --git a/pyzkaccess/reader.py b/pyzkaccess/reader.py index 0ff2712..80627c5 100644 --- a/pyzkaccess/reader.py +++ b/pyzkaccess/reader.py @@ -2,9 +2,9 @@ from abc import ABCMeta, abstractmethod from typing import Any, Iterable, TypeVar, Union, overload -from .common import UserTuple -from .event import EventLog -from .sdk import ZKSDK +from pyzkaccess.common import UserTuple +from pyzkaccess.event import EventLog +from pyzkaccess.sdk import ZKSDK class ReaderInterface(metaclass=ABCMeta): diff --git a/pyzkaccess/relay.py b/pyzkaccess/relay.py index c126b5f..a898fd3 100644 --- a/pyzkaccess/relay.py +++ b/pyzkaccess/relay.py @@ -3,9 +3,9 @@ from abc import ABCMeta, abstractmethod from typing import Any, Iterable, TypeVar, Union, overload -from .common import UserTuple -from .enums import ControlOperation, RelayGroup -from .sdk import ZKSDK +from pyzkaccess.common import UserTuple +from pyzkaccess.enums import ControlOperation, RelayGroup +from pyzkaccess.sdk import ZKSDK class RelayInterface(metaclass=ABCMeta): diff --git a/pyzkaccess/sdk.py b/pyzkaccess/sdk.py index 99ade50..f6f1388 100644 --- a/pyzkaccess/sdk.py +++ b/pyzkaccess/sdk.py @@ -3,8 +3,7 @@ from typing import Any, Dict, Generator, List, Mapping, Optional, Sequence import pyzkaccess.ctypes_ as ctypes - -from .exceptions import ZKSDKError +from pyzkaccess.exceptions import ZKSDKError class ZKSDK: diff --git a/pyzkaccess/tables.py b/pyzkaccess/tables.py index 3913517..94718b8 100644 --- a/pyzkaccess/tables.py +++ b/pyzkaccess/tables.py @@ -12,9 +12,9 @@ from datetime import date, datetime, time -from .common import ZKDatetimeUtils -from .device_data.model import Field, Model -from .enums import ( +from pyzkaccess.common import ZKDatetimeUtils +from pyzkaccess.device_data.model import Field, Model +from pyzkaccess.enums import ( EVENT_TYPES, INOUTFUN_INPUT, INOUTFUN_OUTPUT,