mypy compliance for choice_conformance.py and commissioning.py (project-chip#38669)

* fixing 5 mypy errors

* fix mypy issues in commissioning.py

* update the gh action

* fix type hint to align the type definitions with the actual usage and parsing logic, and resolve the mypy error

* fix gh action

* review comments

* lint code

* restyle

* use Mobly assertions but keep type assertions for mypy

* autopep format

Author: asirko-soft

.github/workflows/mypy-validation.yml

@@ -58,6 +58,8 @@ jobs:
             src/python_testing/matter_testing_infrastructure/chip/testing/tasks.py \
             src/python_testing/matter_testing_infrastructure/chip/testing/taglist_and_topology_test.py \
             src/python_testing/matter_testing_infrastructure/chip/testing/pics.py \
+            src/python_testing/matter_testing_infrastructure/chip/testing/choice_conformance.py \
+            src/python_testing/matter_testing_infrastructure/chip/testing/commissioning.py \
             src/python_testing/matter_testing_infrastructure/chip/testing/decorators.py \
             src/python_testing/matter_testing_infrastructure/chip/testing/basic_composition.py"
           

src/python_testing/matter_testing_infrastructure/chip/testing/choice_conformance.py

@@ -31,15 +31,15 @@ def _evaluate_choices(location: AttributePathLocation, counts: dict[Choice, int]
 
 
 def evaluate_feature_choice_conformance(endpoint_id: int, cluster_id: int, xml_clusters: dict[int, XmlCluster], feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> list[ChoiceConformanceProblemNotice]:
-    all_features = [1 << i for i in range(32)]
+    all_features = [uint(1 << i) for i in range(32)]
     all_features = [f for f in all_features if f in xml_clusters[cluster_id].features.keys()]
 
     # Other pieces of the 10.2 test check for unknown features, so just remove them here to check choice conformance
     counts: dict[Choice, int] = {}
     for f in all_features:
         xml_feature = xml_clusters[cluster_id].features[f]
         conformance_decision_with_choice = xml_feature.conformance(feature_map, attribute_list, all_command_list)
-        _add_to_counts_if_required(conformance_decision_with_choice, (feature_map & f), counts)
+        _add_to_counts_if_required(conformance_decision_with_choice, (feature_map & f) != 0, counts)
 
     location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id,
                                      attribute_id=GlobalAttributeIds.FEATURE_MAP_ID)

src/python_testing/matter_testing_infrastructure/chip/testing/commissioning.py

@@ -63,7 +63,7 @@ class CommissioningInfo:
         commissioning_method (Optional[str]):
             The method by which the device is being commissioned.
 
-        thread_operational_dataset (Optional[str]):
+        thread_operational_dataset (Optional[bytes]):
             The Thread operational dataset if applicable during commissioning.
 
         wifi_passphrase (Optional[str]):
@@ -81,7 +81,7 @@ class CommissioningInfo:
     """
     commissionee_ip_address_just_for_testing: Optional[str] = None
     commissioning_method: Optional[str] = None
-    thread_operational_dataset: Optional[str] = None
+    thread_operational_dataset: Optional[bytes] = None
     wifi_passphrase: Optional[str] = None
     wifi_ssid: Optional[str] = None
     tc_version_to_simulate: Optional[int] = None
@@ -158,6 +158,12 @@ async def commission_device(
             return PairingStatus(exception=e)
     elif commissioning_info.commissioning_method == "ble-wifi":
         try:
+            asserts.assert_is_not_none(commissioning_info.wifi_ssid, "WiFi SSID must be provided for ble-wifi commissioning")
+            asserts.assert_is_not_none(commissioning_info.wifi_passphrase,
+                                       "WiFi Passphrase must be provided for ble-wifi commissioning")
+            # Type assertions to help mypy understand these are not None after the asserts
+            assert commissioning_info.wifi_ssid is not None
+            assert commissioning_info.wifi_passphrase is not None
             await dev_ctrl.CommissionWiFi(
                 info.filter_value,
                 info.passcode,
@@ -172,6 +178,10 @@ async def commission_device(
             return PairingStatus(exception=e)
     elif commissioning_info.commissioning_method == "ble-thread":
         try:
+            asserts.assert_is_not_none(commissioning_info.thread_operational_dataset,
+                                       "Thread dataset must be provided for ble-thread commissioning")
+            # Type assertion to help mypy understand this is not None after the assert
+            assert commissioning_info.thread_operational_dataset is not None
             await dev_ctrl.CommissionThread(
                 info.filter_value,
                 info.passcode,

src/python_testing/matter_testing_infrastructure/chip/testing/matter_testing.py

@@ -619,7 +619,7 @@ class MatterTestConfig:
 
     wifi_ssid: Optional[str] = None
     wifi_passphrase: Optional[str] = None
-    thread_operational_dataset: Optional[str] = None
+    thread_operational_dataset: Optional[bytes] = None
 
     pics: dict[bool, str] = field(default_factory=dict)
 

src/python_testing/matter_testing_infrastructure/chip/testing/spec_parsing.py

@@ -29,9 +29,9 @@
 
 import chip.clusters as Clusters
 import chip.testing.conformance as conformance_support
-from chip.testing.conformance import (OPTIONAL_CONFORM, TOP_LEVEL_CONFORMANCE_TAGS, ConformanceDecision, ConformanceException,
-                                      ConformanceParseParameters, feature, is_disallowed, mandatory, optional, or_operation,
-                                      parse_callable_from_xml, parse_device_type_callable_from_xml)
+from chip.testing.conformance import (OPTIONAL_CONFORM, TOP_LEVEL_CONFORMANCE_TAGS, ConformanceDecisionWithChoice,
+                                      ConformanceException, ConformanceParseParameters, feature, is_disallowed, mandatory, optional,
+                                      or_operation, parse_callable_from_xml, parse_device_type_callable_from_xml)
 from chip.testing.global_attribute_ids import GlobalAttributeIds
 from chip.testing.matter_testing import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, DeviceTypePathLocation,
                                          EventPathLocation, FeaturePathLocation, ProblemLocation, ProblemNotice, ProblemSeverity)
@@ -55,7 +55,7 @@ class SpecParsingException(Exception):
 
 
 # passing in feature map, attribute list, command list
-ConformanceCallable = Callable[[uint, list[uint], list[uint]], ConformanceDecision]
+ConformanceCallable = Callable[[uint, list[uint], list[uint]], ConformanceDecisionWithChoice]
 
 
 @dataclass
@@ -92,7 +92,7 @@ def __str__(self):
 class XmlCommand:
     id: int
     name: str
-    conformance: Callable[[uint], ConformanceDecision]
+    conformance: ConformanceCallable
     privilege: Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum
 
     def __str__(self):