Pass websession to fyta_cli (#131311)

homeassistant/components/fyta/__init__.py

@@ -15,6 +15,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util.dt import async_get_time_zone
 
 from .const import CONF_EXPIRATION
@@ -39,7 +40,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: FytaConfigEntry) -> bool
         entry.data[CONF_EXPIRATION]
     ).astimezone(await async_get_time_zone(tz))
 
-    fyta = FytaConnector(username, password, access_token, expiration, tz)
+    fyta = FytaConnector(
+        username, password, access_token, expiration, tz, async_get_clientsession(hass)
+    )
 
     coordinator = FytaCoordinator(hass, fyta)
 

homeassistant/components/fyta/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["fyta_cli"],
-  "requirements": ["fyta_cli==0.6.10"]
+  "requirements": ["fyta_cli==0.7.0"]
 }

requirements_all.txt

@@ -947,7 +947,7 @@ freesms==0.2.0
 fritzconnection[qr]==1.14.0
 
 # homeassistant.components.fyta
-fyta_cli==0.6.10
+fyta_cli==0.7.0
 
 # homeassistant.components.google_translate
 gTTS==2.2.4

requirements_test_all.txt

@@ -800,7 +800,7 @@ freebox-api==1.1.0
 fritzconnection[qr]==1.14.0
 
 # homeassistant.components.fyta
-fyta_cli==0.6.10
+fyta_cli==0.7.0
 
 # homeassistant.components.google_translate
 gTTS==2.2.4

tests/components/fyta/fixtures/plant_status1.json

@@ -1,13 +1,16 @@
 {
   "battery_level": 80,
-  "battery_status": true,
+  "low_battery": true,
   "last_updated": "2023-01-10 10:10:00",
   "light": 2,
   "light_status": 3,
   "nickname": "Gummibaum",
+  "nutrients_status": 3,
   "moisture": 61,
   "moisture_status": 3,
   "sensor_available": true,
+  "sensor_id": "FD:1D:B7:E3:D0:E2",
+  "sensor_update_available": false,
   "sw_version": "1.0",
   "status": 1,
   "online": true,
@@ -15,6 +18,7 @@
   "plant_id": 0,
   "plant_origin_path": "",
   "plant_thumb_path": "",
+  "is_productive_plant": false,
   "salinity": 1,
   "salinity_status": 4,
   "scientific_name": "Ficus elastica",

tests/components/fyta/fixtures/plant_status2.json

@@ -1,13 +1,16 @@
 {
   "battery_level": 80,
-  "battery_status": true,
+  "low_battery": true,
   "last_updated": "2023-01-02 10:10:00",
   "light": 2,
   "light_status": 3,
   "nickname": "Kakaobaum",
+  "nutrients_status": 3,
   "moisture": 61,
   "moisture_status": 3,
   "sensor_available": true,
+  "sensor_id": "FD:1D:B7:E3:D0:E3",
+  "sensor_update_available": false,
   "sw_version": "1.0",
   "status": 1,
   "online": true,
@@ -15,6 +18,7 @@
   "plant_id": 0,
   "plant_origin_path": "",
   "plant_thumb_path": "",
+  "is_productive_plant": false,
   "salinity": 1,
   "salinity_status": 4,
   "scientific_name": "Theobroma cacao",

tests/components/fyta/fixtures/plant_status3.json

@@ -1,13 +1,16 @@
 {
   "battery_level": 80,
-  "battery_status": true,
+  "low_battery": true,
   "last_updated": "2023-01-02 10:10:00",
   "light": 2,
   "light_status": 3,
   "nickname": "Tomatenpflanze",
+  "nutrients_status": 0,
   "moisture": 61,
   "moisture_status": 3,
   "sensor_available": true,
+  "sensor_id": "FD:1D:B7:E3:D0:E3",
+  "sensor_update_available": false,
   "sw_version": "1.0",
   "status": 1,
   "online": true,
@@ -15,6 +18,7 @@
   "plant_id": 0,
   "plant_origin_path": "",
   "plant_thumb_path": "",
+  "is_productive_plant": true,
   "salinity": 1,
   "salinity_status": 4,
   "scientific_name": "Solanum lycopersicum",

tests/components/fyta/snapshots/test_diagnostics.ambr

@@ -26,22 +26,34 @@
     'plant_data': dict({
       '0': dict({
         'battery_level': 80.0,
-        'battery_status': True,
+        'fertilise_last': None,
+        'fertilise_next': None,
         'last_updated': '2023-01-10T10:10:00',
         'light': 2.0,
         'light_status': 3,
+        'low_battery': True,
         'moisture': 61.0,
         'moisture_status': 3,
         'name': 'Gummibaum',
+        'notification_light': False,
+        'notification_nutrition': False,
+        'notification_temperature': False,
+        'notification_water': False,
+        'nutrients_status': 3,
         'online': True,
         'ph': None,
         'plant_id': 0,
         'plant_origin_path': '',
         'plant_thumb_path': '',
+        'productive_plant': False,
+        'repotted': False,
         'salinity': 1.0,
         'salinity_status': 4,
         'scientific_name': 'Ficus elastica',
         'sensor_available': True,
+        'sensor_id': 'FD:1D:B7:E3:D0:E2',
+        'sensor_status': 0,
+        'sensor_update_available': False,
         'status': 1,
         'sw_version': '1.0',
         'temperature': 25.2,
@@ -49,22 +61,34 @@
       }),
       '1': dict({
         'battery_level': 80.0,
-        'battery_status': True,
+        'fertilise_last': None,
+        'fertilise_next': None,
         'last_updated': '2023-01-02T10:10:00',
         'light': 2.0,
         'light_status': 3,
+        'low_battery': True,
         'moisture': 61.0,
         'moisture_status': 3,
         'name': 'Kakaobaum',
+        'notification_light': False,
+        'notification_nutrition': False,
+        'notification_temperature': False,
+        'notification_water': False,
+        'nutrients_status': 3,
         'online': True,
         'ph': 7.0,
         'plant_id': 0,
         'plant_origin_path': '',
         'plant_thumb_path': '',
+        'productive_plant': False,
+        'repotted': False,
         'salinity': 1.0,
         'salinity_status': 4,
         'scientific_name': 'Theobroma cacao',
         'sensor_available': True,
+        'sensor_id': 'FD:1D:B7:E3:D0:E3',
+        'sensor_status': 0,
+        'sensor_update_available': False,
         'status': 1,
         'sw_version': '1.0',
         'temperature': 25.2,