.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,7 +1,7 @@
 name: Bug Report / 报告问题
 description: Create a report to help us improve. / 报告问题以帮助我们改进
 body:
-  - type: textarea
+  - type: input
     attributes:
       label: Describe the Bug / 描述问题
       description: |

CHANGELOG.md

@@ -1,20 +1,4 @@
 # CHANGELOG
-## v0.2.4
-### Added
-- Convert the submersion-state, the contact-state and the occupancy-status property to the binary_sensor entity. [#905](https://github.com/XiaoMi/ha_xiaomi_home/pull/905)
-
-### Changed
-- suittc.airrtc.wk168 mode descriptions are set to strings of numbers from 1 to 16. [#921](https://github.com/XiaoMi/ha_xiaomi_home/pull/921)
-- Do not set _attr_suggested_display_precision when the spec.expr is set in spec_modify.yaml [#929](https://github.com/XiaoMi/ha_xiaomi_home/pull/929)
-- Set "unknown event msg" log to info level.
-### Fixed
-- hhcc.plantmonitor.v1 soil moisture and soil ec icon and unit. [#927](https://github.com/XiaoMi/ha_xiaomi_home/pull/27)
-- cuco.plug.cp2 voltage and power value ratio.
-- cgllc.airmonitor.s1 unit ppb.
-- roswan.waterpuri.lte01 tds unit.
-- lumi.relay.c2acn01 power consumption unit
-- xiaomi.bhf_light.s1 fan level of ventilation.
-
 ## v0.2.3
 ### Changed
 - Specify the service name and the property name during the climate entity's on/off feature initialization. [#899](https://github.com/XiaoMi/ha_xiaomi_home/pull/899)

custom_components/xiaomi_home/__init__.py

@@ -156,8 +156,7 @@ async def async_setup_entry(
                         device.entity_list[platform].remove(entity)
                         entity_id = device.gen_service_entity_id(
                             ha_domain=platform,
-                            siid=entity.spec.iid,
+                            siid=entity.spec.iid)  # type: ignore
-                            description=entity.spec.description)
                         if er.async_get(entity_id_or_uuid=entity_id):
                             er.async_remove(entity_id=entity_id)
                 if platform in device.prop_list:

custom_components/xiaomi_home/binary_sensor.py

@@ -89,8 +89,4 @@ class BinarySensor(MIoTPropertyEntity, BinarySensorEntity):
     @property
     def is_on(self) -> bool:
         """On/Off state. True if the binary sensor is on, False otherwise."""
-        if self.spec.name == 'contact-state':
-            return self._value is False
-        elif self.spec.name == 'occupancy-status':
-            return bool(self._value)
         return self._value is True

custom_components/xiaomi_home/climate.py

@@ -55,7 +55,7 @@ from homeassistant.const import UnitOfTemperature
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.components.climate import (
     FAN_ON, FAN_OFF, SWING_OFF, SWING_BOTH, SWING_VERTICAL, SWING_HORIZONTAL,
-    ATTR_TEMPERATURE, HVACMode, HVACAction, ClimateEntity, ClimateEntityFeature)
+    ATTR_TEMPERATURE, HVACMode, ClimateEntity, ClimateEntityFeature)
 
 from .miot.const import DOMAIN
 from .miot.miot_device import MIoTDevice, MIoTServiceEntity, MIoTEntityData
@@ -230,7 +230,6 @@ class FeatureFanMode(MIoTServiceEntity, ClimateEntity):
         self._prop_fan_on = None
         self._prop_fan_level = None
         self._fan_mode_map = None
-        self._attr_fan_modes = None
 
         super().__init__(miot_device=miot_device, entity_data=entity_data)
         # properties
@@ -473,13 +472,6 @@ class Heater(FeatureOnOff, FeatureTargetTemperature, FeatureTemperature,
         return (HVACMode.HEAT if self.get_prop_value(
             prop=self._prop_on) else HVACMode.OFF)
 
-    @property
-    def hvac_action(self) -> Optional[HVACAction]:
-        """The current hvac action."""
-        if self.hvac_mode == HVACMode.HEAT:
-            return HVACAction.HEATING
-        return HVACAction.OFF
-
 
 class AirConditioner(FeatureOnOff, FeatureTargetTemperature,
                      FeatureTargetHumidity, FeatureTemperature, FeatureHumidity,
@@ -569,23 +561,6 @@ class AirConditioner(FeatureOnOff, FeatureTargetTemperature,
                                        prop=self._prop_mode))
                 if self._prop_mode else None)
 
-    @property
-    def hvac_action(self) -> Optional[HVACAction]:
-        """The current hvac action."""
-        if self.hvac_mode is None:
-            return None
-        if self.hvac_mode == HVACMode.OFF:
-            return HVACAction.OFF
-        if self.hvac_mode == HVACMode.FAN_ONLY:
-            return HVACAction.FAN
-        if self.hvac_mode == HVACMode.COOL:
-            return HVACAction.COOLING
-        if self.hvac_mode == HVACMode.HEAT:
-            return HVACAction.HEATING
-        if self.hvac_mode == HVACMode.DRY:
-            return HVACAction.DRYING
-        return HVACAction.IDLE
-
     def __ac_state_changed(self, prop: MIoTSpecProperty, value: Any) -> None:
         del prop
         if not isinstance(value, str):
@@ -754,10 +729,3 @@ class ElectricBlanket(FeatureOnOff, FeatureTargetTemperature,
         """The current hvac mode."""
         return (HVACMode.HEAT if self.get_prop_value(
             prop=self._prop_on) else HVACMode.OFF)
-
-    @property
-    def hvac_action(self) -> Optional[HVACAction]:
-        """The current hvac action."""
-        if self.hvac_mode == HVACMode.OFF:
-            return HVACAction.OFF
-        return HVACAction.HEATING

custom_components/xiaomi_home/manifest.json

@@ -25,7 +25,7 @@
         "cryptography",
         "psutil"
     ],
-    "version": "v0.2.4",
+    "version": "v0.2.3",
     "zeroconf": [
         "_miot-central._tcp.local."
     ]

custom_components/xiaomi_home/miot/miot_device.py

@@ -345,11 +345,10 @@ class MIoTDevice:
             f'{ha_domain}.{self._model_strs[0][:9]}_{self.did_tag}_'
             f'{self._model_strs[-1][:20]}')
 
-    def gen_service_entity_id(self, ha_domain: str, siid: int,
+    def gen_service_entity_id(self, ha_domain: str, siid: int) -> str:
-                              description: str) -> str:
         return (
             f'{ha_domain}.{self._model_strs[0][:9]}_{self.did_tag}_'
-            f'{self._model_strs[-1][:20]}_s_{siid}_{description}')
+            f'{self._model_strs[-1][:20]}_s_{siid}')
 
     def gen_prop_entity_id(
         self, ha_domain: str, spec_name: str, siid: int, piid: int
@@ -895,8 +894,7 @@ class MIoTServiceEntity(Entity):
             self._attr_name = f' {self.entity_data.spec.description_trans}'
         elif isinstance(self.entity_data.spec, MIoTSpecService):
             self.entity_id = miot_device.gen_service_entity_id(
-                DOMAIN, siid=self.entity_data.spec.iid,
+                DOMAIN, siid=self.entity_data.spec.iid)
-                description=self.entity_data.spec.description)
             self._attr_name = (
                 f'{"* "if self.entity_data.spec.proprietary else " "}'
                 f'{self.entity_data.spec.description_trans}')

custom_components/xiaomi_home/miot/miot_mips.py

@@ -1215,7 +1215,7 @@ class MipsLocalClient(_MipsClient):
                 or 'eiid' not in msg
                 # or 'arguments' not in msg
             ):
-                self.log_info('unknown event msg, %s', payload)
+                self.log_error('unknown event msg, %s', payload)
                 return
             if 'arguments' not in msg:
                 self.log_info('wrong event msg, %s', payload)

custom_components/xiaomi_home/miot/specs/multi_lang.json

@@ -174,14 +174,5 @@
             "service:003:property:001:valuelist:000": "Idle",
             "service:003:property:001:valuelist:001": "Dry"
         }
-    },
-    "urn:miot-spec-v2:device:plant-monitor:0000A030:hhcc-v1": {
-        "en": {
-            "service:002:property:001": "Soil Moisture"
-        },
-        "zh-Hans": {
-            "service:002:property:001": "土壤湿度",
-            "service:002:property:003": "光照强度"
-        }
     }
 }

custom_components/xiaomi_home/miot/specs/spec_add.json

@@ -1,22 +0,0 @@
-{
-  "urn:miot-spec-v2:device:airer:0000A00D:hyd-lyjpro:1": [
-    {
-      "iid": 3,
-      "type": "urn:miot-spec-v2:service:light:00007802:hyd-lyjpro:1",
-      "description": "Moon Light",
-      "properties": [
-        {
-          "iid": 2,
-          "type": "urn:miot-spec-v2:property:on:00000006:hyd-lyjpro:1",
-          "description": "Switch Status",
-          "format": "bool",
-          "access": [
-            "read",
-            "write",
-            "notify"
-          ]
-        }
-      ]
-    }
-  ]
-}

custom_components/xiaomi_home/miot/specs/spec_filter.yaml

@@ -5,9 +5,6 @@ urn:miot-spec-v2:device:air-purifier:0000A007:zhimi-ma4:
   - 15.*
   services:
   - '10'
-urn:miot-spec-v2:device:airer:0000A00D:hyd-lyjpro:
-  properties:
-  - '3.2'
 urn:miot-spec-v2:device:curtain:0000A00C:lumi-hmcn01:
   properties:
   - '5.1'

custom_components/xiaomi_home/miot/specs/spec_modify.yaml

@@ -1,70 +1,3 @@
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:1: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:2: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:3: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:4: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:5: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
-urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6:
-  prop.10.6:
-    unit: none
-urn:miot-spec-v2:device:air-monitor:0000A008:cgllc-s1:1:
-  prop.2.5:
-    name: voc-density
-urn:miot-spec-v2:device:airer:0000A00D:hyd-lyjpro:1:
-  prop.2.3:
-    name: current-position-a
-  prop.2.8:
-    name: target-position-a
-  prop.2.9:
-    name: target-position-b
-urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:1:
-  prop.2.3:
-    value-range:
-    - 0
-    - 1
-    - 1
-urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:2: urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:1
-urn:miot-spec-v2:device:airer:0000A00D:mrbond-m33a:1:
-  prop.2.3:
-    name: current-position-a
-  prop.2.11:
-    name: current-position-b
-urn:miot-spec-v2:device:bath-heater:0000A028:mike-2:1:
-  prop.3.1:
-    name: mode-a
-  prop.3.11:
-    name: mode-b
-  prop.3.12:
-    name: mode-c
-urn:miot-spec-v2:device:bath-heater:0000A028:opple-acmoto:1:
-  prop.5.2:
-    value-list:
-    - value: 1
-      description: low
-    - value: 128
-      description: medium
-    - value: 255
-      description: high
-urn:miot-spec-v2:device:bath-heater:0000A028:xiaomi-s1:1:
-  prop.4.4:
-    name: fan-level-ventilation
-urn:miot-spec-v2:device:fan:0000A005:xiaomi-p51:1:
-  prop.2.2:
-    name: fan-level-a
-urn:miot-spec-v2:device:gateway:0000A019:lumi-mcn001:1:
-  prop.2.1:
-    access:
-    - read
-    - notify
-  prop.2.2:
-    icon: mdi:ip
-  prop.2.3:
-    access:
-    - read
-    - notify
-  prop.2.5:
-    access:
-    - read
-    - notify
 urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:1:
   prop.2.1:
     name: access-mode
@@ -81,63 +14,25 @@ urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:1:
     - notify
 urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:2: urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:1
 urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:3: urn:miot-spec-v2:device:gateway:0000A019:xiaomi-hub1:1
-urn:miot-spec-v2:device:light:0000A001:shhf-sfla12:1:
+urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:1:
-  prop.8.11:
-    name: on-a
-urn:miot-spec-v2:device:motion-sensor:0000A014:lumi-acn001:1:
-  prop.3.2:
-    access:
-    - read
-    - notify
-    unit: mV
-urn:miot-spec-v2:device:occupancy-sensor:0000A0BF:izq-24:2:0000C824:
-  prop.2.6:
-    unit: cm
-urn:miot-spec-v2:device:occupancy-sensor:0000A0BF:linp-hb01:2:0000C824:
-  prop.3.3:
-    unit: m
-urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:1: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3
-urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:2: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3
-urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3:
   prop.5.1:
-    expr: round(src_value*6/1000000, 3)
+    name: power-consumption
+    expr: round(src_value/1000, 3)
+urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:2: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:1
+urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:1
 urn:miot-spec-v2:device:outlet:0000A002:cuco-cp1md:1:
   prop.2.2:
     name: power-consumption
     expr: round(src_value/1000, 3)
-urn:miot-spec-v2:device:outlet:0000A002:cuco-cp2:1: urn:miot-spec-v2:device:outlet:0000A002:cuco-cp2:2
-urn:miot-spec-v2:device:outlet:0000A002:cuco-cp2:2:
-  prop.2.3:
-    expr: round(src_value/10, 1)
-  prop.2.4:
-    unit: mA
-  prop.3.2:
-    expr: round(src_value/10, 1)
 urn:miot-spec-v2:device:outlet:0000A002:cuco-v3:1:
   prop.11.1:
     name: power-consumption
     expr: round(src_value/100, 2)
 urn:miot-spec-v2:device:outlet:0000A002:cuco-v3:2: urn:miot-spec-v2:device:outlet:0000A002:cuco-v3:1
-urn:miot-spec-v2:device:outlet:0000A002:qmi-psv3:1:0000C816:
-  prop.3.3:
-    unit: mV
-  prop.3.4:
-    unit: mA
 urn:miot-spec-v2:device:outlet:0000A002:zimi-zncz01:2:0000C816:
   prop.3.1:
     name: electric-power
     expr: round(src_value/100, 2)
-urn:miot-spec-v2:device:plant-monitor:0000A030:hhcc-v1:1:
-  prop.2.1:
-    name: soil-moisture
-    icon: mdi:watering-can
-  prop.2.2:
-    name: soil-ec
-    icon: mdi:sprout-outline
-    unit: μS/cm
-urn:miot-spec-v2:device:relay:0000A03D:lumi-c2acn01:1:
-  prop.4.1:
-    unit: kWh
 urn:miot-spec-v2:device:router:0000A036:xiaomi-rd08:1:
   prop.2.1:
     name: download-speed
@@ -147,48 +42,82 @@ urn:miot-spec-v2:device:router:0000A036:xiaomi-rd08:1:
     name: upload-speed
     icon: mdi:upload
     unit: B/s
+urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:1:
+  prop.2.3:
+    value-range:
+    - 0
+    - 1
+    - 1
+urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:2: urn:miot-spec-v2:device:airer:0000A00D:hyd-znlyj5:1
+urn:miot-spec-v2:device:bath-heater:0000A028:opple-acmoto:1:
+  prop.5.2:
+    value-list:
+    - value: 1
+      description: low
+    - value: 128
+      description: medium
+    - value: 255
+      description: high
+urn:miot-spec-v2:device:bath-heater:0000A028:mike-2:1:
+  prop.3.1:
+    name: mode-a
+  prop.3.11:
+    name: mode-b
+  prop.3.12:
+    name: mode-c
+urn:miot-spec-v2:device:fan:0000A005:xiaomi-p51:1:
+  prop.2.2:
+    name: fan-level-a
+urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6:
+  prop.10.6:
+    unit: none
+urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:1: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
+urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:2: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
+urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:3: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
+urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:4: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
+urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:5: urn:miot-spec-v2:device:air-conditioner:0000A004:xiaomi-m9:6
+urn:miot-spec-v2:device:airer:0000A00D:mrbond-m33a:1:
+  prop.2.3:
+    name: current-position-a
+  prop.2.11:
+    name: current-position-b
 urn:miot-spec-v2:device:thermostat:0000A031:suittc-wk168:1:
   prop.2.3:
     value-list:
     - value: 1
-      description: '1'
+      description: one
     - value: 2
-      description: '2'
+      description: two
     - value: 3
-      description: '3'
+      description: three
     - value: 4
-      description: '4'
+      description: four
     - value: 5
-      description: '5'
+      description: five
     - value: 6
-      description: '6'
+      description: six
     - value: 7
-      description: '7'
+      description: seven
     - value: 8
-      description: '8'
+      description: eight
     - value: 9
-      description: '9'
+      description: nine
     - value: 10
-      description: '10'
+      description: ten
     - value: 11
-      description: '11'
+      description: eleven
     - value: 12
-      description: '12'
+      description: twelve
     - value: 13
-      description: '13'
+      description: thirteen
     - value: 14
-      description: '14'
+      description: fourteen
     - value: 15
-      description: '15'
+      description: fifteen
     - value: 16
-      description: '16'
+      description: sixteen
-urn:miot-spec-v2:device:water-purifier:0000A013:roswan-lte01:1:0000D05A:
+urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3:
-  prop.4.1:
+  prop.5.1:
-    unit: ppm
+    expr: round(src_value*6/1000000, 3)
-  prop.4.2:
+urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:1: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3
-    unit: ppm
+urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:2: urn:miot-spec-v2:device:outlet:0000A002:chuangmi-212a01:3
-urn:miot-spec-v2:device:water-purifier:0000A013:yunmi-s20:1:
-  prop.4.1:
-    unit: ppm
-  prop.4.2:
-    unit: ppm

custom_components/xiaomi_home/miot/specs/specv2entity.py

@@ -48,7 +48,6 @@ Conversion rules of MIoT-Spec-V2 instance to Home Assistant entity.
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.components.sensor import SensorStateClass
 from homeassistant.components.event import EventDeviceClass
-from homeassistant.components.binary_sensor import BinarySensorDeviceClass
 
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
@@ -455,28 +454,12 @@ SPEC_PROP_TRANS_MAP: dict = {
             'format': {'int', 'float'},
             'access': {'read'}
         },
-        'binary_sensor': {
-            'format': {'bool', 'int'},
-            'access': {'read'}
-        },
         'switch': {
             'format': {'bool'},
             'access': {'read', 'write'}
         }
     },
     'properties': {
-        'submersion-state': {
-            'device_class': BinarySensorDeviceClass.MOISTURE,
-            'entity': 'binary_sensor'
-        },
-        'contact-state': {
-            'device_class': BinarySensorDeviceClass.DOOR,
-            'entity': 'binary_sensor'
-        },
-        'occupancy-status': {
-            'device_class': BinarySensorDeviceClass.OCCUPANCY,
-            'entity': 'binary_sensor',
-        },
         'temperature': {
             'device_class': SensorDeviceClass.TEMPERATURE,
             'entity': 'sensor',
@@ -523,11 +506,7 @@ SPEC_PROP_TRANS_MAP: dict = {
             'entity': 'sensor',
             'state_class': SensorStateClass.MEASUREMENT
         },
-        'voc-density': {
+        'voc-density': 'tvoc-density',
-            'device_class': SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-            'entity': 'sensor',
-            'state_class': SensorStateClass.MEASUREMENT
-        },
         'battery-level': {
             'device_class': SensorDeviceClass.BATTERY,
             'entity': 'sensor',

custom_components/xiaomi_home/sensor.py

@@ -110,7 +110,7 @@ class Sensor(MIoTPropertyEntity, SensorEntity):
                 self._attr_native_unit_of_measurement = list(
                     unit_sets)[0] if unit_sets else None
             # Set suggested precision
-            if spec.format_ in {int, float} and spec.expr is None:
+            if spec.format_ in {int, float}:
                 self._attr_suggested_display_precision = spec.precision
             # Set state_class
             if spec.state_class:

test/check_rule_format.py

@@ -15,13 +15,14 @@ TRANS_RELATIVE_PATH: str = path.join(
 MIOT_I18N_RELATIVE_PATH: str = path.join(
     ROOT_PATH, '../custom_components/xiaomi_home/miot/i18n')
 SPEC_BOOL_TRANS_FILE = path.join(
-    ROOT_PATH, '../custom_components/xiaomi_home/miot/specs/bool_trans.yaml')
+    ROOT_PATH,
+    '../custom_components/xiaomi_home/miot/specs/bool_trans.yaml')
 SPEC_FILTER_FILE = path.join(
-    ROOT_PATH, '../custom_components/xiaomi_home/miot/specs/spec_filter.yaml')
+    ROOT_PATH,
-SPEC_ADD_FILE = path.join(
+    '../custom_components/xiaomi_home/miot/specs/spec_filter.yaml')
-    ROOT_PATH, '../custom_components/xiaomi_home/miot/specs/spec_add.json')
 SPEC_MODIFY_FILE = path.join(
-    ROOT_PATH, '../custom_components/xiaomi_home/miot/specs/spec_modify.yaml')
+    ROOT_PATH,
+    '../custom_components/xiaomi_home/miot/specs/spec_modify.yaml')
 
 
 def load_json_file(file_path: str) -> Optional[dict]:
@@ -29,7 +30,7 @@ def load_json_file(file_path: str) -> Optional[dict]:
         with open(file_path, 'r', encoding='utf-8') as file:
             return json.load(file)
     except FileNotFoundError:
-        _LOGGER.info('%s is not found.', file_path)
+        _LOGGER.info('%s is not found.', file_path,)
         return None
     except json.JSONDecodeError:
         _LOGGER.info('%s is not a valid JSON file.', file_path)
@@ -55,12 +56,9 @@ def load_yaml_file(file_path: str) -> Optional[dict]:
 
 def save_yaml_file(file_path: str, data: dict) -> None:
     with open(file_path, 'w', encoding='utf-8') as file:
-        yaml.safe_dump(data,
+        yaml.safe_dump(
-                       file,
+            data, file, default_flow_style=False,
-                       default_flow_style=False,
+            allow_unicode=True, indent=2, sort_keys=False)
-                       allow_unicode=True,
-                       indent=2,
-                       sort_keys=False)
 
 
 def dict_str_str(d: dict) -> bool:
@@ -134,112 +132,13 @@ def bool_trans(d: dict) -> bool:
     for key, trans in d['translate'].items():
         trans_keys: set[str] = set(trans.keys())
         if set(trans.keys()) != default_keys:
-            _LOGGER.info('bool trans inconsistent, %s, %s, %s', key,
+            _LOGGER.info(
-                         default_keys, trans_keys)
+                'bool trans inconsistent, %s, %s, %s',
+                key, default_keys, trans_keys)
             return False
     return True
 
 
-def spec_add(data: dict) -> bool:
-    """dict[str, list[dict[str, int| str | list]]]"""
-    if not isinstance(data, dict):
-        return False
-    for urn, content in data.items():
-        if not isinstance(urn, str) or not isinstance(content, (list, str)):
-            return False
-        if isinstance(content, str):
-            continue
-        for service in content:
-            if ('iid' not in service) or ('type' not in service) or (
-                    'description'
-                    not in service) or (('properties' not in service) and
-                                        ('actions' not in service) and
-                                        ('events' not in service)):
-                return False
-            type_strs: list[str] = service['type'].split(':')
-            if type_strs[1] != 'miot-spec-v2':
-                return False
-            if 'properties' in service:
-                if not isinstance(service['properties'], list):
-                    return False
-                for prop in service['properties']:
-                    if ('iid' not in prop) or ('type' not in prop) or (
-                            'description' not in prop) or (
-                                'format' not in prop) or ('access' not in prop):
-                        return False
-                    if not isinstance(prop['iid'], int) or not isinstance(
-                            prop['type'], str) or not isinstance(
-                                prop['description'], str) or not isinstance(
-                                    prop['format'], str) or not isinstance(
-                                        prop['access'], list):
-                        return False
-                    type_strs = prop['type'].split(':')
-                    if type_strs[1] != 'miot-spec-v2':
-                        return False
-                    for access in prop['access']:
-                        if access not in ['read', 'write', 'notify']:
-                            return False
-                    if 'value-range' in prop:
-                        if not isinstance(prop['value-range'], list):
-                            return False
-                        for value in prop['value-range']:
-                            if not isinstance(value, (int, float)):
-                                return False
-                    if 'value-list' in prop:
-                        if not isinstance(prop['value-list'], list):
-                            return False
-                        for item in prop['value-list']:
-                            if 'value' not in item or 'description' not in item:
-                                return False
-                            if not isinstance(item['value'],
-                                              int) or not isinstance(
-                                                  item['description'], str):
-                                return False
-            if 'actions' in service:
-                if not isinstance(service['actions'], list):
-                    return False
-                for action in service['actions']:
-                    if ('iid' not in action) or ('type' not in action) or (
-                            'description' not in action) or (
-                                'in' not in action) or ('out' not in action):
-                        return False
-                    if not isinstance(action['iid'], int) or not isinstance(
-                            action['type'], str) or not isinstance(
-                                action['description'], str) or not isinstance(
-                                    action['in'], list) or not isinstance(
-                                        action['out'], list):
-                        return False
-                    type_strs = action['type'].split(':')
-                    if type_strs[1] != 'miot-spec-v2':
-                        return False
-                    for param in action['in']:
-                        if not isinstance(param, int):
-                            return False
-                    for param in action['out']:
-                        if not isinstance(param, int):
-                            return False
-            if 'events' in service:
-                if not isinstance(service['events'], list):
-                    return False
-                for event in service['events']:
-                    if ('iid' not in event) or ('type' not in event) or (
-                            'description' not in event) or ('arguments'
-                                                            not in event):
-                        return False
-                    if not isinstance(event['iid'], int) or not isinstance(
-                            event['type'], str) or not isinstance(
-                                event['description'], str) or not isinstance(
-                                    event['arguments'], list):
-                        return False
-                    type_strs = event['type'].split(':')
-                    if type_strs[1] != 'miot-spec-v2':
-                        return False
-                    for param in event['arguments']:
-                        if not isinstance(param, int):
-                            return False
-    return True
-
-
 def spec_modify(data: dict) -> bool:
     """dict[str, str | dict[str, dict]]"""
     if not isinstance(data, dict):
@@ -260,22 +159,25 @@ def compare_dict_structure(dict1: dict, dict2: dict) -> bool:
         _LOGGER.info('invalid type')
         return False
     if dict1.keys() != dict2.keys():
-        _LOGGER.info('inconsistent key values, %s, %s', dict1.keys(),
+        _LOGGER.info(
-                     dict2.keys())
+            'inconsistent key values, %s, %s', dict1.keys(), dict2.keys())
         return False
     for key in dict1:
         if isinstance(dict1[key], dict) and isinstance(dict2[key], dict):
             if not compare_dict_structure(dict1[key], dict2[key]):
-                _LOGGER.info('inconsistent key values, dict, %s', key)
+                _LOGGER.info(
+                    'inconsistent key values, dict, %s', key)
                 return False
         elif isinstance(dict1[key], list) and isinstance(dict2[key], list):
             if not all(
                     isinstance(i, type(j))
                     for i, j in zip(dict1[key], dict2[key])):
-                _LOGGER.info('inconsistent key values, list, %s', key)
+                _LOGGER.info(
+                    'inconsistent key values, list, %s', key)
                 return False
         elif not isinstance(dict1[key], type(dict2[key])):
-            _LOGGER.info('inconsistent key values, type, %s', key)
+            _LOGGER.info(
+                'inconsistent key values, type, %s', key)
             return False
     return True
 
@@ -298,12 +200,6 @@ def sort_spec_filter(file_path: str):
     return filter_data
 
 
-def sort_spec_add(file_path: str):
-    filter_data = load_json_file(file_path=file_path)
-    assert isinstance(filter_data, dict), f'{file_path} format error'
-    return dict(sorted(filter_data.items()))
-
-
 def sort_spec_modify(file_path: str):
     filter_data = load_yaml_file(file_path=file_path)
     assert isinstance(filter_data, dict), f'{file_path} format error'
@@ -326,14 +222,6 @@ def test_spec_filter():
     assert spec_filter(data), f'{SPEC_FILTER_FILE} format error'
 
 
-@pytest.mark.github
-def test_spec_add():
-    data = load_json_file(SPEC_ADD_FILE)
-    assert isinstance(data, dict)
-    assert data, f'load {SPEC_ADD_FILE} failed'
-    assert spec_add(data), f'{SPEC_ADD_FILE} format error'
-
-
 @pytest.mark.github
 def test_spec_modify():
     data = load_yaml_file(SPEC_MODIFY_FILE)
@@ -367,8 +255,7 @@ def test_miot_lang_integrity():
     # pylint: disable=import-outside-toplevel
     from miot.const import INTEGRATION_LANGUAGES
     integration_lang_list: list[str] = [
-        f'{key}.json' for key in list(INTEGRATION_LANGUAGES.keys())
+        f'{key}.json' for key in list(INTEGRATION_LANGUAGES.keys())]
-    ]
     translations_names: set[str] = set(listdir(TRANS_RELATIVE_PATH))
     assert len(translations_names) == len(integration_lang_list)
     assert translations_names == set(integration_lang_list)
@@ -384,18 +271,21 @@ def test_miot_lang_integrity():
     default_dict = load_json_file(
         path.join(TRANS_RELATIVE_PATH, integration_lang_list[0]))
     for name in list(integration_lang_list)[1:]:
-        compare_dict = load_json_file(path.join(TRANS_RELATIVE_PATH, name))
+        compare_dict = load_json_file(
+            path.join(TRANS_RELATIVE_PATH, name))
         if not compare_dict_structure(default_dict, compare_dict):
-            _LOGGER.info('compare_dict_structure failed /translations, %s',
+            _LOGGER.info(
-                         name)
+                'compare_dict_structure failed /translations, %s', name)
             assert False
     # Check i18n files structure
     default_dict = load_json_file(
         path.join(MIOT_I18N_RELATIVE_PATH, integration_lang_list[0]))
     for name in list(integration_lang_list)[1:]:
-        compare_dict = load_json_file(path.join(MIOT_I18N_RELATIVE_PATH, name))
+        compare_dict = load_json_file(
+            path.join(MIOT_I18N_RELATIVE_PATH, name))
         if not compare_dict_structure(default_dict, compare_dict):
-            _LOGGER.info('compare_dict_structure failed /miot/i18n, %s', name)
+            _LOGGER.info(
+                'compare_dict_structure failed /miot/i18n, %s', name)
             assert False
 
 
@@ -413,21 +303,12 @@ def test_miot_data_sort():
                 f'{SPEC_BOOL_TRANS_FILE} not sorted, goto project root path'
                 ' and run the following command sorting, ',
                 'pytest -s -v -m update ./test/check_rule_format.py')
-    assert json.dumps(load_yaml_file(file_path=SPEC_FILTER_FILE)) == json.dumps(
+    assert json.dumps(
-        sort_spec_filter(file_path=SPEC_FILTER_FILE)), (
+        load_yaml_file(file_path=SPEC_FILTER_FILE)) == json.dumps(
-            f'{SPEC_FILTER_FILE} not sorted, goto project root path'
+            sort_spec_filter(file_path=SPEC_FILTER_FILE)), (
-            ' and run the following command sorting, ',
+                f'{SPEC_FILTER_FILE} not sorted, goto project root path'
-            'pytest -s -v -m update ./test/check_rule_format.py')
+                ' and run the following command sorting, ',
-    assert json.dumps(load_json_file(file_path=SPEC_ADD_FILE)) == json.dumps(
+                'pytest -s -v -m update ./test/check_rule_format.py')
-        sort_spec_add(file_path=SPEC_ADD_FILE)), (
-            f'{SPEC_ADD_FILE} not sorted, goto project root path'
-            ' and run the following command sorting, ',
-            'pytest -s -v -m update ./test/check_rule_format.py')
-    assert json.dumps(load_yaml_file(file_path=SPEC_MODIFY_FILE)) == json.dumps(
-        sort_spec_modify(file_path=SPEC_MODIFY_FILE)), (
-            f'{SPEC_MODIFY_FILE} not sorted, goto project root path'
-            ' and run the following command sorting, ',
-            'pytest -s -v -m update ./test/check_rule_format.py')
 
 
 @pytest.mark.update
@@ -438,9 +319,6 @@ def test_sort_spec_data():
     sort_data = sort_spec_filter(file_path=SPEC_FILTER_FILE)
     save_yaml_file(file_path=SPEC_FILTER_FILE, data=sort_data)
     _LOGGER.info('%s formatted.', SPEC_FILTER_FILE)
-    sort_data = sort_spec_add(file_path=SPEC_ADD_FILE)
-    save_json_file(file_path=SPEC_ADD_FILE, data=sort_data)
-    _LOGGER.info('%s formatted.', SPEC_ADD_FILE)
     sort_data = sort_spec_modify(file_path=SPEC_MODIFY_FILE)
     save_yaml_file(file_path=SPEC_MODIFY_FILE, data=sort_data)
     _LOGGER.info('%s formatted.', SPEC_MODIFY_FILE)