Bump aiohttp to 3.7.4, small typing improvements

Author: RicArch97

crownstone_cloud/cloud_models/crownstones.py

@@ -62,22 +62,26 @@ async def async_update_crownstone_data(self) -> None:
         for crownstone_id in removed_items:
             del self.crownstones[crownstone_id]
 
-    def find(self, crownstone_name: str) -> object or None:
+    def find(self, crownstone_name: str) -> "Crownstone" or None:
         """Search for a crownstone by name and return crownstone object if found."""
         for crownstone in self.crownstones.values():
             if crownstone_name == crownstone.name:
                 return crownstone
+        
+        return None
 
-    def find_by_id(self, crownstone_id) -> object or None:
+    def find_by_id(self, crownstone_id) -> "Crownstone" or None:
         """Search for a crownstone by id and return crownstone object if found."""
-        return self.crownstones[crownstone_id]
+        return self.crownstones.get(crownstone_id)
 
-    def find_by_uid(self, crownstone_uid) -> object or None:
+    def find_by_uid(self, crownstone_uid) -> "Crownstone" or None:
         """Search for a crownstone by uid and return crownstone object if found."""
         for crownstone in self.crownstones.values():
             if crownstone_uid == crownstone.unique_id:
                 return crownstone
 
+        return None
+
 
 class CrownstoneAbility:
     """Represents a Crownstone Ability"""
@@ -112,10 +116,9 @@ def __init__(self, cloud, data: Dict[str, Any]) -> None:
         self.cloud = cloud
         self.data: Dict[str, Any] = data
         self.abilities: Dict[str, CrownstoneAbility] = {}
-        # power usage (W)
+        # Not cloud data, store your own data here (from Crownstone USB)
         self.power_usage = 0
-        # energy usage (Joule)
-        self.energy_usage = None
+        self.energy_usage = 0
 
     @property
     def name(self) -> str:

crownstone_cloud/cloud_models/locations.py

@@ -70,17 +70,17 @@ async def async_update_location_presence(self) -> None:
                     if present_location == location.cloud_id:
                         location.present_people.append(presence['userId'])
 
-    def find(self, location_name: str) -> object or None:
+    def find(self, location_name: str) -> "Location" or None:
         """Search for a sphere by name and return sphere object if found."""
         for location in self.locations.values():
             if location_name == location.name:
                 return location
 
         return None
 
-    def find_by_id(self, location_id: str) -> object or None:
+    def find_by_id(self, location_id: str) -> "Location" or None:
         """Search for a sphere by id and return sphere object if found."""
-        return self.locations[location_id]
+        return self.locations.get(location_id)
 
 
 class Location:

crownstone_cloud/cloud_models/spheres.py

@@ -54,17 +54,17 @@ async def async_update_sphere_data(self) -> None:
         for sphere_id in removed_items:
             del self.spheres[sphere_id]
 
-    def find(self, sphere_name: str) -> object or None:
+    def find(self, sphere_name: str) -> "Sphere" or None:
         """Search for a sphere by name and return sphere object if found."""
         for sphere in self.spheres.values():
             if sphere_name == sphere.name:
                 return sphere
 
         return None
 
-    def find_by_id(self, sphere_id: str) -> object or None:
+    def find_by_id(self, sphere_id: str) -> "Sphere" or None:
         """Search for a sphere by id and return sphere object if found."""
-        return self.spheres[sphere_id]
+        return self.spheres.get(sphere_id)
 
 
 class Sphere:

crownstone_cloud/cloud_models/users.py

@@ -1,5 +1,5 @@
 """User handler for Crownstone cloud data."""
-from typing import Dict, Any
+from typing import Dict, Any, List
 
 
 class Users:
@@ -52,7 +52,7 @@ async def async_update_user_data(self) -> None:
         for user_id in removed_items:
             del self.users[user_id]
 
-    def find_by_first_name(self, first_name: str) -> list:
+    def find_by_first_name(self, first_name: str) -> List["User"] or List:
         """Search for a user by first name and return a list with the users found."""
         found_users = []
         for user in self.users.values():
@@ -61,7 +61,7 @@ def find_by_first_name(self, first_name: str) -> list:
 
         return found_users
 
-    def find_by_last_name(self, last_name: str) -> list:
+    def find_by_last_name(self, last_name: str) -> List["User"] or List:
         """Search for a user by last name and return a list with the users found."""
         found_users = []
         for user in self.users.values():
@@ -70,9 +70,9 @@ def find_by_last_name(self, last_name: str) -> list:
 
         return found_users
 
-    def find_by_id(self, user_id: str) -> object or None:
+    def find_by_id(self, user_id: str) -> "User" or None:
         """Search for a user by id and return crownstone object if found."""
-        return self.users[user_id]
+        return self.users.get(user_id)
 
 
 class User:

requirements.txt

@@ -1,4 +1,4 @@
-aiohttp>=3.6.2
+aiohttp>=3.7.4
 asynctest>=0.13.0
 codecov>=2.1.10
 certifi