Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new data points #28

Merged
merged 6 commits into from
Nov 22, 2024
Merged

Add new data points #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d62f3b1
Add new data points in fixtures
dontinelli Nov 22, 2024
0aa8686
Add nutrients status
dontinelli Nov 22, 2024
e4bf333
Bump aiohttp from 3.10.2 to 3.10.11
dependabot[bot] Nov 18, 2024
77fd4cf
Add session to arguments of FytaConnector
dontinelli Nov 22, 2024
be5b589
Add new data points
dontinelli Nov 22, 2024
48d744b
Merge branch 'main' into new-data
dontinelli Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/fyta_cli/fyta_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,23 @@ class Plant(DataClassDictMixin):
# pylint: disable=too-many-instance-attributes

battery_level: float | None
fertilise_last: datetime | None
fertilise_next: datetime | None
last_updated: datetime | None
light: float | None
light_status: PlantMeasurementStatus
low_battery: bool
name: str = field(metadata=field_options(alias="nickname"))
moisture: float | None
moisture_status: PlantMeasurementStatus
notification_light: bool
notification_nutrition: bool
notification_temperature: bool
notification_water: bool
nutrients_status: PlantMeasurementStatus
sensor_available: bool
sensor_id: str | None
sensor_status: SensorStatus
sensor_update_available: bool
sw_version: str
status: PlantStatus
Expand All @@ -62,6 +70,8 @@ class Plant(DataClassDictMixin):
plant_id: int
plant_origin_path: str
plant_thumb_path: str
productive_plant: bool =field(metadata=field_options(alias="is_productive_plant"))
repotted: bool
salinity: float | None
salinity_status: PlantMeasurementStatus
scientific_name: str
Expand All @@ -80,6 +90,7 @@ def __pre_deserialize__(cls, d: dict[Any, Any]) -> dict[Any, Any]:
d |= {"light_status": int(d["measurements"]["light"].get("status") or 0)}
d |= {"moisture": d["measurements"]["moisture"]["values"]["current"]}
d |= {"moisture_status": int(d["measurements"]["moisture"].get("status") or 0)}
d |= {"nutrients_status": int(d["measurements"]["nutrients"].get("status") or 0)}
d |= {"ph": d["measurements"].get("ph").get("values").get("current")}
d |= {"salinity": d["measurements"]["salinity"]["values"]["current"]}
d |= {"salinity_status": int(d["measurements"]["salinity"].get("status") or 0)}
Expand All @@ -90,7 +101,16 @@ def __pre_deserialize__(cls, d: dict[Any, Any]) -> dict[Any, Any]:
d |= {"last_updated": d["sensor"]["received_data_at"]}
d |= {"low_battery": d["sensor"]["is_battery_low"]}
d |= {"sensor_id": d["sensor"]["id"]}
d |= {"sensor_status": int(d["sensor"].get("status") or 0)}
d |= {"sw_version": d["sensor"]["version"]}
d |= {"sensor_status": int(d.get("sensor",{}).get("status") or 0)}

d |= {"notification_light": d.get("notifications",{}).get("light",False)}
d |= {"notification_nutrition": d.get("notifications",{}).get("nutrition",False)}
d |= {"notification_temperature": d.get("notifications",{}).get("temperature",False)}
d |= {"notification_water": d.get("notifications",{}).get("water",False)}

d |= {"fertilise_last": d.get("fertilisation",{}).get("last_fertilised_at")}
d |= {"fertilise_next": d.get("fertilisation",{}).get("fertilise_at")}
d |= {"repotted": d.get("fertilisation",{}).get("was_repotted",False)}

return d
36 changes: 30 additions & 6 deletions tests/__snapshots__/test_fyta_cli.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,73 @@
dict({
0: dict({
'battery_level': 100.0,
'battery_status': False,
'fertilise_last': datetime.datetime(2024, 11, 16, 0, 0),
'fertilise_next': datetime.datetime(2025, 1, 11, 0, 0),
'last_updated': datetime.datetime(2023, 1, 1, 10, 10, tzinfo=datetime.timezone.utc),
'light': 2.0,
'light_status': <PlantMeasurementStatus.TOO_LOW: 1>,
'low_battery': False,
'moisture': 61.0,
'moisture_status': <PlantMeasurementStatus.PERFECT: 3>,
'name': 'Gummibaum',
'notification_light': False,
'notification_nutrition': True,
'notification_temperature': False,
'notification_water': True,
'nutrients_status': <PlantMeasurementStatus.PERFECT: 3>,
'online': True,
'ph': None,
'plant_id': 201,
'plant_origin_path': '<url>',
'plant_thumb_path': '<url>',
'productive_plant': False,
'repotted': True,
'salinity': 1.0,
'salinity_status': <PlantMeasurementStatus.LOW: 2>,
'scientific_name': 'Ficus elastica',
'sensor_available': True,
'sensor_id': 'AA:AA:AA:2B:AF:F4',
'sensor_status': <SensorStatus.CORRECT: 1>,
'sensor_update_available': False,
'status': <PlantStatus.NEED_ATTENTION: 2>,
'sw_version': '0.30.0',
'temperature': 18.0,
'temperature_status': <PlantMeasurementStatus.LOW: 2>,
}),
1: dict({
'battery_level': 50.0,
'battery_status': False,
'fertilise_last': None,
'fertilise_next': None,
'last_updated': datetime.datetime(2023, 1, 1, 10, 10, tzinfo=datetime.timezone.utc),
'light': 2.0,
'light_status': <PlantMeasurementStatus.TOO_LOW: 1>,
'light': None,
'light_status': <PlantMeasurementStatus.NO_DATA: 0>,
'low_battery': False,
'moisture': 61.0,
'moisture_status': <PlantMeasurementStatus.PERFECT: 3>,
'name': 'Kakaobaum',
'notification_light': False,
'notification_nutrition': False,
'notification_temperature': False,
'notification_water': False,
'nutrients_status': <PlantMeasurementStatus.PERFECT: 3>,
'online': True,
'ph': None,
'plant_id': 201,
'plant_origin_path': '<url>',
'plant_thumb_path': '<url>',
'productive_plant': True,
'repotted': False,
'salinity': 1.0,
'salinity_status': <PlantMeasurementStatus.LOW: 2>,
'scientific_name': 'Theobroma cacao',
'sensor_available': True,
'sensor_id': 'AA:AA:AA:2B:AF:F4',
'sensor_status': <SensorStatus.CORRECT: 1>,
'sensor_update_available': False,
'status': <PlantStatus.NEED_ATTENTION: 2>,
'sw_version': '0.30.0',
'temperature': 18.0,
'temperature_status': <PlantMeasurementStatus.LOW: 2>,
'temperature': None,
'temperature_status': <PlantMeasurementStatus.NO_DATA: 0>,
}),
})
# ---
Expand Down
17 changes: 17 additions & 0 deletions tests/fixtures/get_plant_details_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,21 @@
"received_data_at": "2023-01-01 10:10:01",
"gathering_data": false,
"is_illegal": false,
"is_productive_plant": false,
"not_supported": false,
"sensor_update_available": false,
"fertilisation": {
"last_fertilised_at": "2024-11-16",
"fertilise_at": "2025-01-11",
"was_repotted": true
},
"notifications": {
"light": false,
"temperature": false,
"water": true,
"nutrition": true
},
"dismissed_sensor_message_at": null,
"garden": {
"id": 123,
"name": "Home"
Expand Down Expand Up @@ -54,6 +67,10 @@
"maxText": "7.5"
}
},
"nutrients": {
"type": "nutrients",
"status": 3
},
"temperature": {
"status": 2,
"values": {
Expand Down
17 changes: 11 additions & 6 deletions tests/fixtures/get_plant_details_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"received_data_at": "2023-01-01 10:10:01",
"gathering_data": false,
"is_illegal": false,
"is_productive_plant": true,
"not_supported": false,
"sensor_update_available": false,
"garden": {
Expand Down Expand Up @@ -54,15 +55,19 @@
"maxText": "7.5"
}
},
"nutrients": {
"type": "nutrients",
"status": 3
},
"temperature": {
"status": 2,
"status": null,
"values": {
"min_good": "17",
"max_good": "36",
"min_acceptable": "10",
"max_acceptable": "42",
"current": "18",
"currentFormatted": "18",
"current": null,
"currentFormatted": null,
"optimal_hours": 22
},
"unit": "°C/h",
Expand All @@ -74,14 +79,14 @@
}
},
"light": {
"status": 1,
"status": null,
"values": {
"min_good": "20",
"max_good": "450",
"min_acceptable": "18",
"max_acceptable": "675",
"current": "2",
"currentFormatted": "2",
"current": null,
"currentFormatted": null,
"optimal_hours": 0
},
"dli_values": {
Expand Down