fyta-cli 0.3.2__tar.gz → 0.3.4__tar.gz

{fyta_cli-0.3.2 → fyta_cli-0.3.4}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: fyta_cli
-Version: 0.3.2
+Version: 0.3.4
 Summary: Python library to access the FYTA API
 Project-URL: Repository, https://github.com/dontinelli/fyta_cli.git
 Project-URL: Issues, https://github.com/dontinelli/fyta_cli/issues
-Project-URL: Changelog, https://github.com/dontinelli/fyta_cly/blob/master/CHANGELOG.md
+Project-URL: Changelog, https://github.com/dontinelli/fyta_cli/blob/master/CHANGELOG.md
 Project-URL: FYTA homepage, https://fyta.de/
 Project-URL: API Documentation, https://fyta-io.notion.site/FYTA-Public-API-d2f4c30306f74504924c9a40402a3afd
 Author-email: dontinelli <73341522+dontinelli@users.noreply.github.com>
@@ -15,9 +15,6 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
 Requires-Dist: aiohttp
-Requires-Dist: asyncio
-Requires-Dist: dataclasses
-Requires-Dist: datetime
 Description-Content-Type: text/markdown
 
 # Fyta-Cli

{fyta_cli-0.3.2 → fyta_cli-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fyta_cli"
-version = "0.3.2"
+version = "0.3.4"
 authors = [
   { name="dontinelli", email="73341522+dontinelli@users.noreply.github.com" },
 ]
@@ -9,9 +9,6 @@ readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
   "aiohttp",
-  "asyncio",
-  "dataclasses",
-  "datetime",
 ]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -30,6 +27,6 @@ packages = ["src/fyta_cli"]
 [project.urls]
 Repository = "https://github.com/dontinelli/fyta_cli.git"
 Issues = "https://github.com/dontinelli/fyta_cli/issues"
-Changelog = "https://github.com/dontinelli/fyta_cly/blob/master/CHANGELOG.md"
+Changelog = "https://github.com/dontinelli/fyta_cli/blob/master/CHANGELOG.md"
 "FYTA homepage" = "https://fyta.de/"
 "API Documentation" = "https://fyta-io.notion.site/FYTA-Public-API-d2f4c30306f74504924c9a40402a3afd"

{fyta_cli-0.3.2 → fyta_cli-0.3.4}/src/fyta_cli/fyta_client.py

@@ -118,6 +118,7 @@ class Client():
 
         if content_type.count("text/html") > 0:
             text = await response.text()
+            msg = "Error occurred while fetching plant data"
             raise FytaPlantError(
                 msg,
                 {"Content-Type": content_type, "response": text},
@@ -161,6 +162,7 @@ class Client():
 
         if content_type.count("text/html") > 0:
             text = await response.text()
+            msg = f"Error occurred while fetching plant data for plant {plant_id}"
             raise FytaPlantError(
                 msg,
                 {"Content-Type": content_type, "response": text},

{fyta_cli-0.3.2 → fyta_cli-0.3.4}/src/fyta_cli/fyta_connector.py

@@ -1,6 +1,6 @@
 """Connector class to manage access to FYTA API."""
 
-from datetime import datetime, timezone
+from datetime import datetime
 from typing import Any
 from zoneinfo import ZoneInfo
 
@@ -29,7 +29,8 @@ class FytaConnector:
             access_token: str = "",
             expiration: datetime | None = None,
             tz: str = "",
-    ):
+    ) -> None:
+        """Initialize connector class."""
         self.email: str = email
         self.password: str = password
         self.client = Client(email, password, access_token, expiration)
@@ -38,7 +39,7 @@ class FytaConnector:
         self.plants: dict[int, dict[str, Any]] = {}
         self.access_token: str = access_token
         self.expiration: datetime | None = expiration
-        self.timezone: ZoneInfo = timezone.utc if tz == "" else ZoneInfo(tz)
+        self.timezone: ZoneInfo = datetime.UTC if tz == "" else ZoneInfo(tz)
 
     async def test_connection(self) -> bool:
         """Test if connection to FYTA API works."""
@@ -69,7 +70,7 @@ class FytaConnector:
 
         plant_list = await self.update_plant_list()
 
-        for plant in plant_list.keys():
+        for plant in plant_list:
             current_plant = await self.update_plant_data(plant)
             if current_plant != {}:
                 plants |= {plant: current_plant}
@@ -82,13 +83,13 @@ class FytaConnector:
         """Get data of specific plant."""
 
         p: dict = await self.client.get_plant_data(plant_id)
-        plant_data: dict = p["plant"]
 
         current_plant = {}
 
-        if plant_data["sensor"] is None:
+        if ("plant" not in p) or (p["plant"]["sensor"] is None):
             current_plant |= {"sensor_available": False}
         else:
+            plant_data: dict = p["plant"]
             current_plant |= {"online": True}
             current_plant |= {"sensor_available": True}
             current_plant |= {
@@ -98,6 +99,8 @@ class FytaConnector:
             current_plant |= {"name": safe_get(plant_data, "nickname", str)}
             current_plant |= {"scientific_name": safe_get(plant_data, "scientific_name", str)}
             current_plant |= {"status": safe_get(plant_data, "status", int)}
+            current_plant |= {"plant_thumb_path": safe_get(plant_data, "plant_thumb_path", str)}
+            current_plant |= {"plant_origin_path": safe_get(plant_data, "plant_origin_path", str)}
             current_plant |= {
                 "temperature_status": safe_get(plant_data, "measurements.temperature.status", int)}
             current_plant |= {
@@ -127,10 +130,10 @@ class FytaConnector:
 
     @property
     def fyta_id(self) -> str:
-        """ID for FYTA object"""
+        """ID for FYTA object."""
         return self.email
 
     @property
     def data(self) -> dict:
-        """ID for FYTA object"""
+        """ID for FYTA object."""
         return self.plants