isort and black to clean things up

BAC0/__init__.py

@@ -13,24 +13,23 @@
     print("=" * 80)
 
 try:
-    from . import core
-    from . import tasks
-    from .scripts.Base import Base
+    from . import core, tasks
     from .core.devices.Device import Device as device
     from .core.devices.Device import DeviceLoad as load
     from .core.devices.Trends import TrendLog as TrendLog
-    from .tasks.Poll import SimplePoll as poll
-    from .tasks.Match import Match as match
-    from .tasks.Devices import AddDevice as add_device
     from .core.utils.notes import update_log_level as log_level
     from .infos import __version__ as version
+    from .scripts.Base import Base
+    from .tasks.Devices import AddDevice as add_device
+    from .tasks.Match import Match as match
+    from .tasks.Poll import SimplePoll as poll
 
     # To be able to use the complete version pandas, flask and bokeh must be installed.
     try:
-        import pandas
         import bokeh
         import flask
         import flask_bootstrap
+        import pandas
 
         _COMPLETE = True
     except ImportError:

BAC0/core/__init__.py

@@ -1,6 +1,3 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from . import app
-from . import functions
-from . import io
-from . import devices
+from . import app, devices, functions, io

BAC0/core/devices/Device.py

@@ -8,11 +8,11 @@
 Device.py - describe a BACnet Device
 
 """
+import os.path
+
 # --- standard Python modules ---
 from collections import namedtuple
 
-import os.path
-
 try:
     import pandas as pd
 
@@ -21,7 +21,7 @@
     _PANDAS = False
 
 try:
-    from xlwings import Workbook, Sheet, Range, Chart  # noqa E401
+    from xlwings import Chart, Range, Sheet, Workbook  # noqa E401
 
     _XLWINGS = True
 except ImportError:
@@ -31,25 +31,22 @@
 # --- this application's modules ---
 from bacpypes.basetypes import ServicesSupported
 
-from .Points import NumericPoint, BooleanPoint, EnumPoint, OfflinePoint
+# from ...bokeh.BokehRenderer import BokehPlot
+from ...db.sql import SQLMixin
+from ...tasks.DoOnce import DoOnce
 from ..io.IOExceptions import (
-    NoResponseFromController,
-    SegmentationNotSupported,
     BadDeviceDefinition,
+    DeviceNotConnected,
+    NoResponseFromController,
     RemovedPointException,
+    SegmentationNotSupported,
     WritePropertyException,
     WrongParameter,
-    DeviceNotConnected,
 )
-
-# from ...bokeh.BokehRenderer import BokehPlot
-from ...db.sql import SQLMixin
-from ...tasks.DoOnce import DoOnce
-from .mixins.read_mixin import ReadPropertyMultiple, ReadProperty
-from .Virtuals import VirtualPoint
-
 from ..utils.notes import note_and_log
-
+from .mixins.read_mixin import ReadProperty, ReadPropertyMultiple
+from .Points import BooleanPoint, EnumPoint, NumericPoint, OfflinePoint
+from .Virtuals import VirtualPoint
 
 # ------------------------------------------------------------------------------
 

BAC0/core/devices/Points.py

@@ -8,11 +8,12 @@
 Points.py - Definition of points so operations on Read results are more convenient.
 """
 
-# --- standard Python modules ---
-from datetime import datetime, timedelta
-from collections import namedtuple
 import time
 import typing as t
+from collections import namedtuple
+
+# --- standard Python modules ---
+from datetime import datetime, timedelta
 
 # --- 3rd party modules ---
 from bacpypes.primitivedata import CharacterString
@@ -29,18 +30,18 @@
 except ImportError:
     _PANDAS = False
 
+from ...tasks.Match import Match, Match_Value
+
 # --- this application's modules ---
 from ...tasks.Poll import SimplePoll as Poll
-from ...tasks.Match import Match, Match_Value
 from ..io.IOExceptions import (
     NoResponseFromController,
-    UnknownPropertyError,
     RemovedPointException,
+    UnknownPropertyError,
     WritePropertyException,
 )
 from ..utils.notes import note_and_log
 
-
 # ------------------------------------------------------------------------------
 
 

BAC0/core/devices/Virtuals.py

@@ -8,10 +8,11 @@
 Points.py - Definition of points so operations on Read results are more convenient.
 """
 
+import time
+from collections import namedtuple
+
 # --- standard Python modules ---
 from datetime import datetime
-from collections import namedtuple
-import time
 
 # --- 3rd party modules ---
 try:
@@ -28,13 +29,13 @@
 
 from bacpypes.object import TrendLogObject
 
+from ...tasks.Match import Match, Match_Value
+
 # --- this application's modules ---
 from ...tasks.Poll import SimplePoll as Poll
-from ...tasks.Match import Match, Match_Value
 from ..io.IOExceptions import NoResponseFromController, UnknownPropertyError
 from ..utils.notes import note_and_log
 
-
 # ------------------------------------------------------------------------------
 
 

BAC0/core/devices/__init__.py

@@ -1,6 +1,3 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from . import Device
-from . import Points
-from . import Trends
-from . import Virtuals
+from . import Device, Points, Trends, Virtuals

BAC0/core/devices/create_objects.py

@@ -1,27 +1,25 @@
+from bacpypes.basetypes import DateTime, EngineeringUnits, PriorityArray, StatusFlags
+from bacpypes.constructeddata import ArrayOf
+from bacpypes.local.object import (
+    AnalogOutputCmdObject,
+    AnalogValueCmdObject,
+    BinaryOutputCmdObject,
+    BinaryValueCmdObject,
+)
 from bacpypes.object import (
-    MultiStateValueObject,
-    AnalogValueObject,
-    BinaryValueObject,
     AnalogInputObject,
-    BinaryInputObject,
     AnalogOutputObject,
+    AnalogValueObject,
+    BinaryInputObject,
     BinaryOutputObject,
+    BinaryValueObject,
     CharacterStringValueObject,
     DateTimeValueObject,
+    MultiStateValueObject,
     Property,
     register_object_type,
 )
-
-from bacpypes.local.object import (
-    AnalogOutputCmdObject,
-    AnalogValueCmdObject,
-    BinaryOutputCmdObject,
-    BinaryValueCmdObject,
-)
-
-from bacpypes.primitivedata import CharacterString, Date, Time, Real, Boolean
-from bacpypes.constructeddata import ArrayOf
-from bacpypes.basetypes import EngineeringUnits, DateTime, PriorityArray, StatusFlags
+from bacpypes.primitivedata import Boolean, CharacterString, Date, Real, Time
 
 from .mixins.CommandableMixin import LocalBinaryOutputObjectCmd
 

BAC0/core/devices/local/object.py

@@ -1,20 +1,18 @@
-from .decorator import bacnet_properties, make_commandable, create
+import typing as t
+from collections import namedtuple
+
+from bacpypes.basetypes import PriorityArray, Reliability
+from bacpypes.object import TrendLogObject
+from colorama import Fore
 
-from ...utils.notes import note_and_log
 from ....scripts.Base import Base
 from ...app.ScriptApplication import (
     BAC0Application,
     BAC0BBMDDeviceApplication,
     BAC0ForeignDeviceApplication,
 )
-from bacpypes.basetypes import (
-    PriorityArray,
-    Reliability,
-)
-
-import typing as t
-from collections import namedtuple
-from colorama import Fore
+from ...utils.notes import note_and_log
+from .decorator import bacnet_properties, create, make_commandable
 
 
 @note_and_log
@@ -64,13 +62,17 @@ def __init__(
         self._properties = ObjectFactory.default_properties(
             objectType, properties, is_commandable, relinquish_default
         )
-        pv_datatype = ObjectFactory.get_pv_datatype(objectType)
-
-        if not isinstance(presentValue, pv_datatype):
-            try:
-                presentValue = pv_datatype(presentValue)
-            except:
-                raise ValueError("Wrong datatype provided for presentValue")
+        print(f"Obj {objectType} of type {type(objectType)}")
+        if not objectType is TrendLogObject:
+            pv_datatype = ObjectFactory.get_pv_datatype(objectType)
+
+            if not isinstance(presentValue, pv_datatype):
+                try:
+                    presentValue = pv_datatype(presentValue)
+                except:
+                    raise ValueError(
+                        f"Wrong datatype provided for presentValue for {objectType} of type {type(objectType)}"
+                    )
 
         @bacnet_properties(self._properties)
         @make_commandable()

BAC0/core/devices/mixins/CommandableMixin.py

@@ -5,64 +5,61 @@
 Rebuilt Commandable
 """
 
-from bacpypes.debugging import bacpypes_debugging, ModuleLogger
-from bacpypes.consolelogging import ConfigArgumentParser
-
-from bacpypes.core import run
-from bacpypes.task import OneShotTask
-from bacpypes.errors import ExecutionError
-
-from bacpypes.primitivedata import (
-    BitString,
-    CharacterString,
-    Date,
-    Integer,
-    Double,
-    Enumerated,
-    OctetString,
-    Real,
-    Time,
-    Unsigned,
-)
+from bacpypes.app import BIPSimpleApplication
 from bacpypes.basetypes import (
     BinaryPV,
     ChannelValue,
     DateTime,
     DoorValue,
-    PriorityValue,
     PriorityArray,
+    PriorityValue,
 )
+from bacpypes.consolelogging import ConfigArgumentParser
+from bacpypes.core import run
+from bacpypes.debugging import ModuleLogger, bacpypes_debugging
+from bacpypes.errors import ExecutionError
+from bacpypes.local.device import LocalDeviceObject
+from bacpypes.local.object import CurrentPropertyListMixIn
 from bacpypes.object import (
-    Property,
-    ReadableProperty,
-    WritableProperty,
-    register_object_type,
     AccessDoorObject,
     AnalogOutputObject,
     AnalogValueObject,
     BinaryOutputObject,
     BinaryValueObject,
     BitStringValueObject,
+    ChannelObject,
     CharacterStringValueObject,
-    DateValueObject,
     DatePatternValueObject,
     DateTimePatternValueObject,
     DateTimeValueObject,
+    DateValueObject,
     IntegerValueObject,
     LargeAnalogValueObject,
     LightingOutputObject,
     MultiStateOutputObject,
     MultiStateValueObject,
     OctetStringValueObject,
     PositiveIntegerValueObject,
-    TimeValueObject,
+    Property,
+    ReadableProperty,
     TimePatternValueObject,
-    ChannelObject,
+    TimeValueObject,
+    WritableProperty,
+    register_object_type,
 )
-
-from bacpypes.app import BIPSimpleApplication
-from bacpypes.local.object import CurrentPropertyListMixIn
-from bacpypes.local.device import LocalDeviceObject
+from bacpypes.primitivedata import (
+    BitString,
+    CharacterString,
+    Date,
+    Double,
+    Enumerated,
+    Integer,
+    OctetString,
+    Real,
+    Time,
+    Unsigned,
+)
+from bacpypes.task import OneShotTask
 
 # some debugging
 _debug = 0

BAC0/core/functions/Calendar.py

@@ -4,21 +4,22 @@
 # Copyright (C) 2015 by Christian Tremblay, P.Eng <[email protected]>
 # Licensed under LGPLv3, see file LICENSE in this source tree.
 #
-from ..io.Read import find_reason
-from ..io.IOExceptions import NoResponseFromController
-from ...core.utils.notes import note_and_log
-
 # --- standard Python modules ---
 import datetime
 import typing as t
 
+from bacpypes.apdu import SimpleAckPDU, WritePropertyRequest
+from bacpypes.basetypes import CalendarEntry, DateRange
+from bacpypes.constructeddata import Any, ArrayOf
+from bacpypes.core import deferred
+from bacpypes.iocb import IOCB
+
 # --- 3rd party modules ---
 from bacpypes.pdu import Address
-from bacpypes.apdu import WritePropertyRequest, SimpleAckPDU
-from bacpypes.iocb import IOCB
-from bacpypes.core import deferred
-from bacpypes.basetypes import CalendarEntry, DateRange
-from bacpypes.constructeddata import ArrayOf, Any
+
+from ...core.utils.notes import note_and_log
+from ..io.IOExceptions import NoResponseFromController
+from ..io.Read import find_reason
 
 
 @note_and_log