Compare commits
No commits in common. "2dfb3896308b1c161d3fee88919f4d0659b1f1df" and "dcab766cef997778a3c1b81f10b32437ac6c500c" have entirely different histories.
2dfb389630
...
dcab766cef
|
@ -1 +0,0 @@
|
||||||
BinarySensor.vue
|
|
|
@ -1 +0,0 @@
|
||||||
Sensor.vue
|
|
|
@ -1 +0,0 @@
|
||||||
Sensor.vue
|
|
|
@ -1 +0,0 @@
|
||||||
BinarySensor.vue
|
|
|
@ -1 +0,0 @@
|
||||||
Sensor.vue
|
|
|
@ -1 +0,0 @@
|
||||||
Sensor.vue
|
|
|
@ -1 +0,0 @@
|
||||||
Sensor.vue
|
|
|
@ -1 +0,0 @@
|
||||||
Sensor.vue
|
|
|
@ -87,14 +87,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"dew_point_sensor": {
|
|
||||||
"name": "Sensor",
|
|
||||||
"name_plural": "Sensors",
|
|
||||||
"icon": {
|
|
||||||
"class": "fas fa-hand-holding-droplet"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"illuminance_sensor": {
|
"illuminance_sensor": {
|
||||||
"name": "Sensor",
|
"name": "Sensor",
|
||||||
"name_plural": "Sensors",
|
"name_plural": "Sensors",
|
||||||
|
@ -111,30 +103,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"contact_sensor": {
|
|
||||||
"name": "Sensor",
|
|
||||||
"name_plural": "Sensors",
|
|
||||||
"icon": {
|
|
||||||
"class": "far fa-hand"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"presence_sensor": {
|
|
||||||
"name": "Sensor",
|
|
||||||
"name_plural": "Sensors",
|
|
||||||
"icon": {
|
|
||||||
"class": "fas fa-person"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"weight_sensor": {
|
|
||||||
"name": "Sensor",
|
|
||||||
"name_plural": "Sensors",
|
|
||||||
"icon": {
|
|
||||||
"class": "fas fa-weight-scale"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"link_quality": {
|
"link_quality": {
|
||||||
"name": "Link Quality",
|
"name": "Link Quality",
|
||||||
"name_plural": "Link Qualities",
|
"name_plural": "Link Qualities",
|
||||||
|
@ -159,38 +127,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"steps_sensor": {
|
|
||||||
"name": "Sensor",
|
|
||||||
"name_plural": "Sensors",
|
|
||||||
"icon": {
|
|
||||||
"class": "fas fa-shoe-prints"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"heart_rate_sensor": {
|
|
||||||
"name": "Sensor",
|
|
||||||
"name_plural": "Sensors",
|
|
||||||
"icon": {
|
|
||||||
"class": "fas fa-heart-pulse"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"time_duration_sensor": {
|
|
||||||
"name": "Sensor",
|
|
||||||
"name_plural": "Sensors",
|
|
||||||
"icon": {
|
|
||||||
"class": "fas fa-clock"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"pressure_sensor": {
|
|
||||||
"name": "Sensor",
|
|
||||||
"name_plural": "Sensors",
|
|
||||||
"icon": {
|
|
||||||
"class": "fas fa-gauge"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"muted": {
|
"muted": {
|
||||||
"name": "Switch",
|
"name": "Switch",
|
||||||
"name_plural": "Switches",
|
"name_plural": "Switches",
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
from sqlalchemy import Column, Integer, ForeignKey
|
|
||||||
|
|
||||||
from platypush.common.db import Base
|
|
||||||
|
|
||||||
from .sensors import BinarySensor
|
|
||||||
|
|
||||||
|
|
||||||
if 'contact_sensor' not in Base.metadata:
|
|
||||||
|
|
||||||
class ContactSensor(BinarySensor):
|
|
||||||
"""
|
|
||||||
A binary sensor that detects contact.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'contact_sensor'
|
|
||||||
|
|
||||||
id = Column(
|
|
||||||
Integer, ForeignKey(BinarySensor.id, ondelete='CASCADE'), primary_key=True
|
|
||||||
)
|
|
||||||
|
|
||||||
__mapper_args__ = {
|
|
||||||
'polymorphic_identity': __tablename__,
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
from sqlalchemy import Column, Integer, ForeignKey
|
|
||||||
|
|
||||||
from platypush.common.db import Base
|
|
||||||
|
|
||||||
from .sensors import NumericSensor
|
|
||||||
|
|
||||||
|
|
||||||
if 'heart_rate_sensor' not in Base.metadata:
|
|
||||||
|
|
||||||
class HeartRateSensor(NumericSensor):
|
|
||||||
"""
|
|
||||||
A sensor that measures the heart rate.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'heart_rate_sensor'
|
|
||||||
|
|
||||||
id = Column(
|
|
||||||
Integer, ForeignKey(NumericSensor.id, ondelete='CASCADE'), primary_key=True
|
|
||||||
)
|
|
||||||
|
|
||||||
__mapper_args__ = {
|
|
||||||
'polymorphic_identity': __tablename__,
|
|
||||||
}
|
|
|
@ -8,10 +8,6 @@ from .sensors import NumericSensor
|
||||||
if 'humidity_sensor' not in Base.metadata:
|
if 'humidity_sensor' not in Base.metadata:
|
||||||
|
|
||||||
class HumiditySensor(NumericSensor):
|
class HumiditySensor(NumericSensor):
|
||||||
"""
|
|
||||||
A sensor that measures humidity.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'humidity_sensor'
|
__tablename__ = 'humidity_sensor'
|
||||||
|
|
||||||
id = Column(
|
id = Column(
|
||||||
|
@ -21,21 +17,3 @@ if 'humidity_sensor' not in Base.metadata:
|
||||||
__mapper_args__ = {
|
__mapper_args__ = {
|
||||||
'polymorphic_identity': __tablename__,
|
'polymorphic_identity': __tablename__,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if 'dew_point_sensor' not in Base.metadata:
|
|
||||||
|
|
||||||
class DewPointSensor(NumericSensor):
|
|
||||||
"""
|
|
||||||
A sensor that measures the dew point.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'dew_point_sensor'
|
|
||||||
|
|
||||||
id = Column(
|
|
||||||
Integer, ForeignKey(NumericSensor.id, ondelete='CASCADE'), primary_key=True
|
|
||||||
)
|
|
||||||
|
|
||||||
__mapper_args__ = {
|
|
||||||
'polymorphic_identity': __tablename__,
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
from sqlalchemy import Column, Integer, ForeignKey
|
|
||||||
|
|
||||||
from platypush.common.db import Base
|
|
||||||
|
|
||||||
from .sensors import BinarySensor
|
|
||||||
|
|
||||||
|
|
||||||
if 'presence_sensor' not in Base.metadata:
|
|
||||||
|
|
||||||
class PresenceSensor(BinarySensor):
|
|
||||||
"""
|
|
||||||
A binary sensor that detects presence.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'presence_sensor'
|
|
||||||
|
|
||||||
id = Column(
|
|
||||||
Integer, ForeignKey(BinarySensor.id, ondelete='CASCADE'), primary_key=True
|
|
||||||
)
|
|
||||||
|
|
||||||
__mapper_args__ = {
|
|
||||||
'polymorphic_identity': __tablename__,
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
from sqlalchemy import Column, Integer, ForeignKey
|
|
||||||
|
|
||||||
from platypush.common.db import Base
|
|
||||||
|
|
||||||
from .sensors import NumericSensor
|
|
||||||
|
|
||||||
|
|
||||||
if 'pressure_sensor' not in Base.metadata:
|
|
||||||
|
|
||||||
class PressureSensor(NumericSensor):
|
|
||||||
"""
|
|
||||||
A sensor that measures pressure.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'pressure_sensor'
|
|
||||||
|
|
||||||
id = Column(
|
|
||||||
Integer, ForeignKey(NumericSensor.id, ondelete='CASCADE'), primary_key=True
|
|
||||||
)
|
|
||||||
|
|
||||||
__mapper_args__ = {
|
|
||||||
'polymorphic_identity': __tablename__,
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
from sqlalchemy import Column, Integer, ForeignKey
|
|
||||||
|
|
||||||
from platypush.common.db import Base
|
|
||||||
|
|
||||||
from .sensors import NumericSensor
|
|
||||||
|
|
||||||
|
|
||||||
if 'steps_sensor' not in Base.metadata:
|
|
||||||
|
|
||||||
class StepsSensor(NumericSensor):
|
|
||||||
"""
|
|
||||||
A sensor that measures the number of steps taken.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'steps_sensor'
|
|
||||||
|
|
||||||
id = Column(
|
|
||||||
Integer, ForeignKey(NumericSensor.id, ondelete='CASCADE'), primary_key=True
|
|
||||||
)
|
|
||||||
|
|
||||||
__mapper_args__ = {
|
|
||||||
'polymorphic_identity': __tablename__,
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
from sqlalchemy import Column, Integer, ForeignKey
|
|
||||||
|
|
||||||
from platypush.common.db import Base
|
|
||||||
|
|
||||||
from .sensors import NumericSensor
|
|
||||||
|
|
||||||
|
|
||||||
if 'time_duration_sensor' not in Base.metadata:
|
|
||||||
|
|
||||||
class TimeDurationSensor(NumericSensor):
|
|
||||||
"""
|
|
||||||
A sensor that measures a time duration.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'time_duration_sensor'
|
|
||||||
|
|
||||||
id = Column(
|
|
||||||
Integer, ForeignKey(NumericSensor.id, ondelete='CASCADE'), primary_key=True
|
|
||||||
)
|
|
||||||
|
|
||||||
__mapper_args__ = {
|
|
||||||
'polymorphic_identity': __tablename__,
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
from sqlalchemy import Column, Integer, ForeignKey
|
|
||||||
|
|
||||||
from platypush.common.db import Base
|
|
||||||
|
|
||||||
from .sensors import NumericSensor
|
|
||||||
|
|
||||||
|
|
||||||
if 'weight_sensor' not in Base.metadata:
|
|
||||||
|
|
||||||
class WeightSensor(NumericSensor):
|
|
||||||
"""
|
|
||||||
A sensor that measures weight.
|
|
||||||
"""
|
|
||||||
|
|
||||||
__tablename__ = 'weight_sensor'
|
|
||||||
|
|
||||||
id = Column(
|
|
||||||
Integer, ForeignKey(NumericSensor.id, ondelete='CASCADE'), primary_key=True
|
|
||||||
)
|
|
||||||
|
|
||||||
__mapper_args__ = {
|
|
||||||
'polymorphic_identity': __tablename__,
|
|
||||||
}
|
|
|
@ -14,24 +14,17 @@ from TheengsGateway._decoder import decodeBLE, getAttribute, getProperties
|
||||||
from platypush.entities import Entity
|
from platypush.entities import Entity
|
||||||
from platypush.entities.batteries import Battery
|
from platypush.entities.batteries import Battery
|
||||||
from platypush.entities.bluetooth import BluetoothDevice
|
from platypush.entities.bluetooth import BluetoothDevice
|
||||||
from platypush.entities.contact import ContactSensor
|
|
||||||
from platypush.entities.electricity import (
|
from platypush.entities.electricity import (
|
||||||
CurrentSensor,
|
CurrentSensor,
|
||||||
EnergySensor,
|
EnergySensor,
|
||||||
PowerSensor,
|
PowerSensor,
|
||||||
VoltageSensor,
|
VoltageSensor,
|
||||||
)
|
)
|
||||||
from platypush.entities.heart import HeartRateSensor
|
from platypush.entities.humidity import HumiditySensor
|
||||||
from platypush.entities.humidity import DewPointSensor, HumiditySensor
|
|
||||||
from platypush.entities.illuminance import IlluminanceSensor
|
from platypush.entities.illuminance import IlluminanceSensor
|
||||||
from platypush.entities.motion import MotionSensor
|
from platypush.entities.motion import MotionSensor
|
||||||
from platypush.entities.presence import PresenceSensor
|
|
||||||
from platypush.entities.pressure import PressureSensor
|
|
||||||
from platypush.entities.sensors import BinarySensor, NumericSensor, RawSensor
|
from platypush.entities.sensors import BinarySensor, NumericSensor, RawSensor
|
||||||
from platypush.entities.steps import StepsSensor
|
|
||||||
from platypush.entities.temperature import TemperatureSensor
|
from platypush.entities.temperature import TemperatureSensor
|
||||||
from platypush.entities.time import TimeDurationSensor
|
|
||||||
from platypush.entities.weight import WeightSensor
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
|
@ -60,122 +53,46 @@ class NullSensor:
|
||||||
|
|
||||||
# Maps property names to transformer methods (first mapper choice).
|
# Maps property names to transformer methods (first mapper choice).
|
||||||
_property_to_entity: Dict[str, Callable[[Any, Dict[str, Any]], Entity]] = {
|
_property_to_entity: Dict[str, Callable[[Any, Dict[str, Any]], Entity]] = {
|
||||||
'activity heart rate': lambda value, _: HeartRateSensor(value=value),
|
|
||||||
'atmospheric pressure': lambda value, conf: PressureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'battery': lambda value, conf: Battery(
|
'battery': lambda value, conf: Battery(
|
||||||
value=value,
|
value=value,
|
||||||
unit=conf.get('unit', '%'),
|
unit=conf.get('unit', '%'),
|
||||||
min=conf.get('min', 0),
|
min=conf.get('min', 0),
|
||||||
max=conf.get('min', 100),
|
max=conf.get('min', 100),
|
||||||
),
|
),
|
||||||
'contact': lambda value, _: ContactSensor(value=value),
|
|
||||||
'current': lambda value, conf: CurrentSensor(
|
'current': lambda value, conf: CurrentSensor(
|
||||||
value=value,
|
value=value,
|
||||||
unit=conf.get('unit', 'A'),
|
unit=conf.get('unit', 'A'),
|
||||||
),
|
),
|
||||||
'dew_point_sensor': lambda value, conf: DewPointSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'duration': lambda value, conf: TimeDurationSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'energy': lambda value, conf: EnergySensor(
|
'energy': lambda value, conf: EnergySensor(
|
||||||
value=value,
|
value=value,
|
||||||
unit=conf.get('unit', 'kWh'),
|
unit=conf.get('unit', 'kWh'),
|
||||||
),
|
),
|
||||||
'heart rate': lambda value, _: HeartRateSensor(value=value),
|
|
||||||
'humidity': lambda value, conf: HumiditySensor(
|
'humidity': lambda value, conf: HumiditySensor(
|
||||||
value=value,
|
value=value,
|
||||||
unit=conf.get('unit', '%'),
|
unit=conf.get('unit', '%'),
|
||||||
min=conf.get('min', 0),
|
min=conf.get('min', 0),
|
||||||
max=conf.get('min', 100),
|
max=conf.get('min', 100),
|
||||||
),
|
),
|
||||||
'light level': lambda value, conf: IlluminanceSensor(
|
'light level': lambda value, _: IlluminanceSensor(value=value),
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'luminance': lambda value, conf: IlluminanceSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'moisture': lambda value, conf: HumiditySensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'motion': lambda value, _: MotionSensor(value=value),
|
|
||||||
'open': lambda value, _: BinarySensor(value=value),
|
|
||||||
'power': lambda value, conf: PowerSensor(
|
'power': lambda value, conf: PowerSensor(
|
||||||
value=value,
|
value=value,
|
||||||
unit=conf.get('unit', 'W'),
|
unit=conf.get('unit', 'W'),
|
||||||
),
|
),
|
||||||
'presence': lambda value, _: PresenceSensor(value=value),
|
'motion': lambda value, _: MotionSensor(value=value),
|
||||||
'pressure': lambda value, conf: PressureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'steps': lambda value, _: StepsSensor(value=value),
|
|
||||||
'temperature': lambda value, conf: TemperatureSensor(
|
'temperature': lambda value, conf: TemperatureSensor(
|
||||||
value=value,
|
value=value,
|
||||||
unit=conf.get('unit', 'C'),
|
unit=conf.get('unit', 'C'),
|
||||||
),
|
),
|
||||||
'temperature2': lambda value, conf: TemperatureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'C'),
|
|
||||||
),
|
|
||||||
'temperature3': lambda value, conf: TemperatureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'C'),
|
|
||||||
),
|
|
||||||
'temperature4': lambda value, conf: TemperatureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'C'),
|
|
||||||
),
|
|
||||||
'temperature5': lambda value, conf: TemperatureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'C'),
|
|
||||||
),
|
|
||||||
'temperature6': lambda value, conf: TemperatureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'C'),
|
|
||||||
),
|
|
||||||
'temperature7': lambda value, conf: TemperatureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'C'),
|
|
||||||
),
|
|
||||||
'temperature8': lambda value, conf: TemperatureSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'C'),
|
|
||||||
),
|
|
||||||
'volt': lambda value, conf: VoltageSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'V'),
|
|
||||||
),
|
|
||||||
'voltage': lambda value, conf: VoltageSensor(
|
'voltage': lambda value, conf: VoltageSensor(
|
||||||
value=value,
|
value=value,
|
||||||
unit=conf.get('unit', 'V'),
|
unit=conf.get('unit', 'V'),
|
||||||
),
|
),
|
||||||
'weight': lambda value, conf: WeightSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit', 'kg'),
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Maps reported units to transformer methods (second mapper choice).
|
# Maps reported units to transformer methods (second mapper choice).
|
||||||
_unit_to_entity: Dict[str, Callable[[Any, Dict[str, Any]], Entity]] = {
|
_unit_to_entity: Dict[str, Callable[[Any, Dict[str, Any]], Entity]] = {
|
||||||
'status': lambda value, _: BinarySensor(value=value),
|
'status': lambda value, _: BinarySensor(value=value),
|
||||||
'int': lambda value, conf: NumericSensor(
|
'int': lambda value, _: NumericSensor(value=value),
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'float': lambda value, conf: NumericSensor(
|
|
||||||
value=value,
|
|
||||||
unit=conf.get('unit'),
|
|
||||||
),
|
|
||||||
'%': lambda value, conf: NumericSensor(
|
'%': lambda value, conf: NumericSensor(
|
||||||
value=value,
|
value=value,
|
||||||
unit='%',
|
unit='%',
|
||||||
|
@ -188,9 +105,9 @@ _unit_to_entity: Dict[str, Callable[[Any, Dict[str, Any]], Entity]] = {
|
||||||
# Maps value types to transformer methods (third mapper choice).
|
# Maps value types to transformer methods (third mapper choice).
|
||||||
_value_type_to_entity: Dict[type, Callable[[Any, Dict[str, Any]], Entity]] = {
|
_value_type_to_entity: Dict[type, Callable[[Any, Dict[str, Any]], Entity]] = {
|
||||||
bool: lambda value, _: BinarySensor(value=value),
|
bool: lambda value, _: BinarySensor(value=value),
|
||||||
int: lambda value, conf: NumericSensor(value=value, unit=conf.get('unit')),
|
int: lambda value, _: NumericSensor(value=value),
|
||||||
float: lambda value, conf: NumericSensor(value=value, unit=conf.get('unit')),
|
float: lambda value, _: NumericSensor(value=value),
|
||||||
str: lambda value, conf: RawSensor(value=value, unit=conf.get('unit')),
|
str: lambda value, _: RawSensor(value=value),
|
||||||
bytes: lambda value, _: RawSensor(value=value),
|
bytes: lambda value, _: RawSensor(value=value),
|
||||||
bytearray: lambda value, _: RawSensor(value=value),
|
bytearray: lambda value, _: RawSensor(value=value),
|
||||||
}
|
}
|
||||||
|
@ -301,7 +218,7 @@ def parse_device_args(device: BLEDevice) -> Dict[str, Any]:
|
||||||
object.
|
object.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
props = (device.details or {}).get('props', {})
|
props = device.details.get('props', {})
|
||||||
return {
|
return {
|
||||||
'name': device.name or device.address,
|
'name': device.name or device.address,
|
||||||
'connected': props.get('Connected', False),
|
'connected': props.get('Connected', False),
|
||||||
|
@ -345,8 +262,7 @@ def _parse_service_data(device: BLEDevice) -> Dict[str, str]:
|
||||||
"""
|
"""
|
||||||
return {
|
return {
|
||||||
service_uuid: ''.join([f'{x:02x}' for x in value])
|
service_uuid: ''.join([f'{x:02x}' for x in value])
|
||||||
for service_uuid, value in (device.details or {})
|
for service_uuid, value in device.details.get('props', {})
|
||||||
.get('props', {})
|
|
||||||
.get('ServiceData', {})
|
.get('ServiceData', {})
|
||||||
.items()
|
.items()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue