Skip to content

Commit e1f29bd

Browse files
authored
[Python] Auto-import all clusters into the chip.clusters namespace (#34928)
* Auto-import all clusters into the chip.clusters namespace * Fix __all__ lists * ZAP-generate __all__ with all clusters
1 parent 5ffe9ec commit e1f29bd

File tree

6 files changed

+149
-59
lines changed

6 files changed

+149
-59
lines changed

scripts/py_matter_idl/matter_idl/lint/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414

1515
from .lint_rules_parser import CreateParser
1616

17-
__all__ = [CreateParser]
17+
__all__ = ['CreateParser']

scripts/tools/memory/memdf/__init__.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@
1818
from memdf.df import DF, DFs, ExtentDF, SectionDF, SegmentDF, SymbolDF
1919
from memdf.util.config import Config, ConfigDescription
2020

21-
__all__ = [DF, SymbolDF, SectionDF, SegmentDF, ExtentDF, DFs, Config, ConfigDescription]
21+
__all__ = [
22+
'DF', 'SymbolDF', 'SectionDF', 'SegmentDF', 'ExtentDF',
23+
'DFs', 'Config', 'ConfigDescription',
24+
]

src/controller/python/chip/clusters/Objects.py

+132
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+2-56
Original file line numberDiff line numberDiff line change
@@ -15,59 +15,5 @@
1515
# limitations under the License.
1616
#
1717

18-
#
19-
# @file
20-
# Provides Python APIs for CHIP.
21-
#
22-
23-
"""Provides Python APIs for CHIP."""
24-
25-
from . import Attribute, CHIPClusters, Command
26-
from .Objects import (AccessControl, AccountLogin, Actions, ActivatedCarbonFilterMonitoring, AdministratorCommissioning, AirQuality,
27-
ApplicationBasic, ApplicationLauncher, AudioOutput, BallastConfiguration, BarrierControl, BasicInformation,
28-
BinaryInputBasic, Binding, BooleanState, BooleanStateConfiguration, BridgedDeviceBasicInformation,
29-
CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, Channel, ColorControl,
30-
CommissionerControl, ContentControl, ContentLauncher, DemandResponseLoadControl, Descriptor,
31-
DeviceEnergyManagement, DeviceEnergyManagementMode, DiagnosticLogs, DishwasherAlarm, DishwasherMode, DoorLock,
32-
EcosystemInformation, ElectricalEnergyMeasurement, ElectricalMeasurement, ElectricalPowerMeasurement,
33-
EnergyEvse, EnergyEvseMode, EnergyPreference, EthernetNetworkDiagnostics, FanControl, FaultInjection,
34-
FixedLabel, FlowMeasurement, FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics,
35-
Globals, GroupKeyManagement, Groups, HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement,
36-
KeypadInput, LaundryDryerControls, LaundryWasherControls, LaundryWasherMode, LevelControl,
37-
LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, MicrowaveOvenControl, MicrowaveOvenMode,
38-
ModeSelect, NetworkCommissioning, NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff,
39-
OnOffSwitchConfiguration, OperationalCredentials, OperationalState, OtaSoftwareUpdateProvider,
40-
OtaSoftwareUpdateRequestor, OvenCavityOperationalState, OvenMode, OzoneConcentrationMeasurement,
41-
Pm1ConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm25ConcentrationMeasurement, PowerSource,
42-
PowerSourceConfiguration, PowerTopology, PressureMeasurement, ProxyConfiguration, ProxyDiscovery, ProxyValid,
43-
PulseWidthModulation, PumpConfigurationAndControl, RadonConcentrationMeasurement, RefrigeratorAlarm,
44-
RefrigeratorAndTemperatureControlledCabinetMode, RelativeHumidityMeasurement, RvcCleanMode,
45-
RvcOperationalState, RvcRunMode, ScenesManagement, ServiceArea, SmokeCoAlarm, SoftwareDiagnostics, Switch,
46-
TargetNavigator, TemperatureControl, TemperatureMeasurement, Thermostat, ThermostatUserInterfaceConfiguration,
47-
ThreadBorderRouterManagement, ThreadNetworkDiagnostics, ThreadNetworkDirectory, TimeFormatLocalization,
48-
TimeSynchronization, TotalVolatileOrganicCompoundsConcentrationMeasurement, UnitLocalization, UnitTesting,
49-
UserLabel, ValveConfigurationAndControl, WakeOnLan, WaterHeaterManagement, WaterHeaterMode,
50-
WiFiNetworkDiagnostics, WindowCovering)
51-
52-
__all__ = [Attribute, CHIPClusters, Command, AccessControl, AccountLogin, Actions, ActivatedCarbonFilterMonitoring, AdministratorCommissioning, AirQuality,
53-
ApplicationBasic, ApplicationLauncher, AudioOutput, BallastConfiguration, BarrierControl, BasicInformation,
54-
BinaryInputBasic, Binding, BooleanState, BooleanStateConfiguration, BridgedDeviceBasicInformation, CarbonDioxideConcentrationMeasurement,
55-
CarbonMonoxideConcentrationMeasurement, Channel, ColorControl, CommissionerControl,
56-
ContentControl, ContentLauncher, DemandResponseLoadControl, Descriptor, DeviceEnergyManagementMode, DeviceEnergyManagement, DeviceEnergyManagementMode, DiagnosticLogs, DishwasherAlarm, DishwasherMode,
57-
DoorLock, EcosystemInformation, ElectricalEnergyMeasurement, ElectricalMeasurement, ElectricalPowerMeasurement, EnergyEvse, EnergyEvseMode, EnergyPreference,
58-
EthernetNetworkDiagnostics, FanControl, FaultInjection, FixedLabel, FlowMeasurement,
59-
FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics, Globals, GroupKeyManagement, Groups,
60-
HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement, KeypadInput, LaundryDryerControls,
61-
LaundryWasherControls, LaundryWasherMode, LevelControl, LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, MicrowaveOvenControl,
62-
MicrowaveOvenMode, ModeSelect, NetworkCommissioning, NitrogenDioxideConcentrationMeasurement,
63-
OccupancySensing, OnOff, OnOffSwitchConfiguration, OperationalCredentials, OperationalState,
64-
OtaSoftwareUpdateProvider, OtaSoftwareUpdateRequestor, OvenCavityOperationalState, OvenMode,
65-
OzoneConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm10ConcentrationMeasurement,
66-
Pm25ConcentrationMeasurement, PowerSource, PowerSourceConfiguration, PowerTopology, PressureMeasurement, ProxyConfiguration,
67-
ProxyDiscovery, ProxyValid, PulseWidthModulation, PumpConfigurationAndControl, RadonConcentrationMeasurement,
68-
RefrigeratorAlarm, RefrigeratorAndTemperatureControlledCabinetMode, RelativeHumidityMeasurement, RvcCleanMode,
69-
RvcOperationalState, RvcRunMode, ScenesManagement, ServiceArea, SmokeCoAlarm, SoftwareDiagnostics,
70-
Switch, TargetNavigator, TemperatureControl, TemperatureMeasurement, Thermostat, ThermostatUserInterfaceConfiguration,
71-
ThreadBorderRouterManagement, ThreadNetworkDiagnostics, ThreadNetworkDirectory, TimeFormatLocalization, TimeSynchronization,
72-
TotalVolatileOrganicCompoundsConcentrationMeasurement, UnitLocalization,
73-
UnitTesting, UserLabel, ValveConfigurationAndControl, WakeOnLan, WaterHeaterManagement, WaterHeaterMode, WiFiNetworkDiagnostics, WindowCovering]
18+
from . import Attribute, CHIPClusters, Command, Objects # noqa: F401
19+
from .Objects import * # noqa: F401, F403

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323

2424
from . import runner
2525

26-
__all__ = [runner]
26+
__all__ = ['runner']

src/controller/python/templates/python-cluster-Objects-py.zapt

+9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ from .ClusterObjects import (Cluster, ClusterAttributeDescriptor, ClusterCommand
1919
ClusterObjectDescriptor, ClusterObjectFieldDescriptor)
2020
from .Types import Nullable, NullValue
2121

22+
23+
__all__ = [
24+
"Globals",
25+
{{#zcl_clusters}}
26+
"{{asUpperCamelCase name}}",
27+
{{/zcl_clusters}}
28+
]
29+
30+
2231
class Globals:
2332
class Enums:
2433
{{#zcl_enums}}

0 commit comments

Comments
 (0)