Fix imports at runtime (#694)

matter_server/common/models.py

@@ -4,11 +4,9 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass, field
+from datetime import datetime  # noqa: TCH003
 from enum import Enum
-from typing import TYPE_CHECKING, Any
-
-if TYPE_CHECKING:
-    from datetime import datetime
+from typing import Any
 
 # Enums and constants
 

matter_server/server/stack.py

@@ -4,6 +4,7 @@
 import os
 from typing import TYPE_CHECKING
 
+import chip.CertificateAuthority
 from chip.ChipStack import ChipStack
 import chip.logging
 from chip.logging import (
@@ -17,7 +18,7 @@
 import chip.native
 
 if TYPE_CHECKING:
-    from chip.CertificateAuthority import CertificateAuthorityManager
+    from chip.FabricAdmin import FabricAdmin
 
     from .server import MatterServer
 
@@ -111,10 +112,8 @@ def __init__(
 
         # Initialize Certificate Authority Manager
         # yeah this is a bit weird just to prevent a circular import in the underlying SDK
-        self.certificate_authority_manager: CertificateAuthorityManager = (
-            chip.CertificateAuthority.CertificateAuthorityManager(
-                chipStack=self._chip_stack
-            )
+        self.certificate_authority_manager: chip.CertificateAuthority.CertificateAuthorityManager = chip.CertificateAuthority.CertificateAuthorityManager(
+            chipStack=self._chip_stack
         )
         self.certificate_authority_manager.LoadAuthoritiesFromStorage()
 
@@ -131,7 +130,7 @@ def __init__(
                 admin.vendorId == server.vendor_id
                 and admin.fabricId == server.fabric_id
             ):
-                self.fabric_admin = admin
+                self.fabric_admin: FabricAdmin = admin
                 break
         else:
             self.fabric_admin = cert_auth.NewFabricAdmin(