Use relative imports in Matter Python library (project-chip#38133)

* Use relative imports in Matter Python library

* Fix unused import warning

* Simplify REPL startup

* Restore chip namespace

* Fix evals

* Restyled by isort

* Suppress warning for eval used import

* Fix another eval

* Fix args passing from REPL runner

* Load REPL extensions to REPL namespace

* Revert changes for REPL startup

* Address review comments

---------

Co-authored-by: Restyled.io <commits@restyled.io>

Author: arkq

src/controller/python/chip/CertificateAuthority.py

@@ -24,10 +24,9 @@
 from datetime import timedelta
 from typing import List, Optional
 
-import chip.exceptions
-from chip import ChipStack, FabricAdmin
-from chip.native import PyChipError
-from chip.storage import PersistentStorage
+from . import ChipStack, FabricAdmin
+from .native import GetLibraryHandle, PyChipError
+from .storage import PersistentStorage
 
 LOGGER = logging.getLogger(__name__)
 
@@ -53,7 +52,7 @@ class CertificateAuthority:
     '''
     @classmethod
     def _Handle(cls):
-        return chip.native.GetLibraryHandle()
+        return GetLibraryHandle()
 
     @classmethod
     def logger(cls):
@@ -229,7 +228,7 @@ class CertificateAuthorityManager:
     '''
     @classmethod
     def _Handle(cls):
-        return chip.native.GetLibraryHandle()
+        return GetLibraryHandle()
 
     @classmethod
     def logger(cls):

src/controller/python/chip/ChipReplStartup.py

@@ -1,3 +1,20 @@
+#
+#    Copyright (c) 2021 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
 import argparse
 import atexit
 import builtins
@@ -15,8 +32,6 @@
 from rich import inspect, pretty
 from rich.console import Console
 
-_fabricAdmins = None
-
 
 def ReplInit(debug):
     #

src/controller/python/chip/ChipStack.py

@@ -32,14 +32,12 @@
 from threading import Condition, Lock
 from typing import Any, Optional
 
-import chip.native
-from chip.native import PyChipError
-
 from .bdx import Bdx
 from .clusters import Attribute as ClusterAttribute
 from .clusters import Command as ClusterCommand
 from .exceptions import ChipStackError, ChipStackException, DeviceError
 from .interaction_model import delegate as im
+from .native import FindNativeLibraryPath, GetLibraryHandle, Library, PyChipError
 from .storage import PersistentStorage
 
 __all__ = [
@@ -264,8 +262,8 @@ def LocateChipDLL(self):
 
     def _loadLib(self):
         if self._ChipStackLib is None:
-            self._ChipStackLib = chip.native.GetLibraryHandle()
-            self._chipDLLPath = chip.native.FindNativeLibraryPath(chip.native.Library.CONTROLLER)
+            self._ChipStackLib = GetLibraryHandle()
+            self._chipDLLPath = FindNativeLibraryPath(Library.CONTROLLER)
 
             self._ChipStackLib.pychip_DeviceController_StackInit.argtypes = [c_void_p, c_bool]
             self._ChipStackLib.pychip_DeviceController_StackInit.restype = PyChipError

src/controller/python/chip/FabricAdmin.py

@@ -21,9 +21,9 @@
 import logging
 from typing import List, Optional
 
-from chip import CertificateAuthority, ChipDeviceCtrl
-from chip.crypto import p256keypair
-from chip.native import GetLibraryHandle
+from . import CertificateAuthority, ChipDeviceCtrl
+from .crypto import p256keypair
+from .native import GetLibraryHandle
 
 LOGGER = logging.getLogger(__name__)
 

src/controller/python/chip/bdx/Bdx.py

@@ -22,9 +22,7 @@
 from ctypes import CFUNCTYPE, POINTER, c_char_p, c_size_t, c_uint8, c_uint16, c_uint64, c_void_p, py_object
 from typing import Callable, Optional
 
-import chip
-from chip.native import PyChipError
-
+from ..native import GetLibraryHandle, NativeLibraryHandleMethodArguments, PyChipError
 from . import BdxTransfer
 
 c_uint8_p = POINTER(c_uint8)
@@ -121,7 +119,7 @@ def _PrepareForBdxTransfer(future: Future, data: Optional[bytes]) -> PyChipError
 
     Returns the CHIP_ERROR result from the C++ side.
     '''
-    handle = chip.native.GetLibraryHandle()
+    handle = GetLibraryHandle()
     transaction = AsyncTransferObtainedTransaction(future=future, event_loop=asyncio.get_running_loop(), data=data)
 
     ctypes.pythonapi.Py_IncRef(ctypes.py_object(transaction))
@@ -163,7 +161,7 @@ def AcceptTransferAndReceiveData(transfer: c_void_p, dataReceivedClosure: Callab
 
     Returns an error if one is encountered while accepting the transfer.
     '''
-    handle = chip.native.GetLibraryHandle()
+    handle = GetLibraryHandle()
     complete_transaction = AsyncTransferCompletedTransaction(future=transferComplete, event_loop=asyncio.get_running_loop())
     ctypes.pythonapi.Py_IncRef(ctypes.py_object(dataReceivedClosure))
     ctypes.pythonapi.Py_IncRef(ctypes.py_object(complete_transaction))
@@ -184,7 +182,7 @@ def AcceptTransferAndSendData(transfer: c_void_p, data: bytearray, transferCompl
 
     Returns an error if one is encountered while accepting the transfer.
     '''
-    handle = chip.native.GetLibraryHandle()
+    handle = GetLibraryHandle()
     complete_transaction = AsyncTransferCompletedTransaction(future=transferComplete, event_loop=asyncio.get_running_loop())
     ctypes.pythonapi.Py_IncRef(ctypes.py_object(complete_transaction))
     res = builtins.chipStack.Call(
@@ -200,17 +198,17 @@ async def RejectTransfer(transfer: c_void_p):
 
     Returns an error if one is encountered while rejecting the transfer.
     '''
-    handle = chip.native.GetLibraryHandle()
+    handle = GetLibraryHandle()
     return await builtins.chipStack.CallAsyncWithResult(
         lambda: handle.pychip_Bdx_RejectTransfer(transfer)
     )
 
 
 def Init():
-    handle = chip.native.GetLibraryHandle()
+    handle = GetLibraryHandle()
     # Uses one of the type decorators as an indicator for everything being initialized.
     if not handle.pychip_Bdx_ExpectBdxTransfer.argtypes:
-        setter = chip.native.NativeLibraryHandleMethodArguments(handle)
+        setter = NativeLibraryHandleMethodArguments(handle)
 
         setter.Set('pychip_Bdx_ExpectBdxTransfer',
                    PyChipError, [py_object])

src/controller/python/chip/ble/__init__.py

@@ -11,8 +11,8 @@
 #    limitations under the License.
 """BLE-related functionality within CHIP"""
 
-from chip.ble.get_adapters import GetAdapters
-from chip.ble.scan_devices import DiscoverAsync, DiscoverSync
+from .get_adapters import GetAdapters
+from .scan_devices import DiscoverAsync, DiscoverSync
 
 __all__ = [
     'GetAdapters',

src/controller/python/chip/ble/commissioning/__init__.py

@@ -19,8 +19,8 @@
 from queue import Queue
 from typing import Optional
 
-from chip.internal import GetCommissioner
-from chip.internal.commissioner import PairingState
+from ...internal import GetCommissioner
+from ...internal.commissioner import PairingState
 
 TEST_NODE_ID = 11223344
 

src/controller/python/chip/ble/get_adapters.py

@@ -1,7 +1,23 @@
+#
+#    Copyright (c) 2021 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
 from dataclasses import dataclass
 from typing import List
 
-from chip.ble.library_handle import _GetBleLibraryHandle
+from .library_handle import _GetBleLibraryHandle
 
 
 @dataclass

src/controller/python/chip/ble/library_handle.py

@@ -17,8 +17,8 @@
 import ctypes
 from ctypes import c_bool, c_char_p, c_uint32, c_void_p, py_object
 
-import chip.native
-from chip.ble.types import DeviceScannedCallback, ScanDoneCallback, ScanErrorCallback
+from ..native import GetLibraryHandle, NativeLibraryHandleMethodArguments
+from .types import DeviceScannedCallback, ScanDoneCallback, ScanErrorCallback
 
 
 # This prevents python auto-casting c_void_p to integers and
@@ -32,16 +32,16 @@ class VoidPointer(c_void_p):
 def _GetBleLibraryHandle() -> ctypes.CDLL:
     """ Get the native library handle with BLE method initialization.
 
-      Retreives the CHIP native library handle and attaches signatures to
+      Retrieves the CHIP native library handle and attaches signatures to
       native methods.
       """
 
-    handle = chip.native.GetLibraryHandle()
+    handle = GetLibraryHandle()
 
     # Uses one of the type decorators as an indicator for everything being
     # initialized. Native methods default to c_int return types
     if handle.pychip_ble_adapter_list_new.restype != VoidPointer:
-        setter = chip.native.NativeLibraryHandleMethodArguments(handle)
+        setter = NativeLibraryHandleMethodArguments(handle)
 
         setter.Set('pychip_ble_adapter_list_new', VoidPointer, [])
         setter.Set('pychip_ble_adapter_list_next', c_bool, [VoidPointer])

src/controller/python/chip/ble/scan_devices.py

@@ -20,8 +20,8 @@
 from threading import Thread
 from typing import Generator
 
-from chip.ble.library_handle import _GetBleLibraryHandle
-from chip.ble.types import DeviceScannedCallback, ScanDoneCallback, ScanErrorCallback
+from .library_handle import _GetBleLibraryHandle
+from .types import DeviceScannedCallback, ScanDoneCallback, ScanErrorCallback
 
 
 @DeviceScannedCallback