Removed closing websession in destructor, and added it as a separate function. Added sphere presence to spheres. Updated data updater for sphere presence.

Author: RicArch97

crownstone_cloud/lib/cloud.py

@@ -20,7 +20,7 @@ def __init__(
             loop: asyncio.AbstractEventLoop = None,
             websession: aiohttp.ClientSession = None
     ) -> None:
-        self.login_data = {'email': email, 'password': password_to_hash(password)}
+        self.login_data = {'email': email, 'password': self.password_to_hash(password)}
         self.loop = loop or asyncio.get_event_loop()
         # set request handler params
         RequestHandler.websession = websession or aiohttp.ClientSession(loop=loop)
@@ -29,7 +29,7 @@ def __init__(
         self.spheres: Optional[Spheres] = None
 
     def __del__(self):
-        self.cleanup()
+        self.reset()
 
     async def initialize(self) -> None:
         """Async initialize the cloud data"""
@@ -68,10 +68,11 @@ async def sync(self) -> None:
         # get the data from the sphere attributes
         for sphere in self.spheres:
             await asyncio.gather(
+                sphere.update_sphere_presence(),
                 sphere.crownstones.update(),
                 sphere.crownstones.update_state(),
                 sphere.locations.update(),
-                sphere.locations.update_presence(),
+                sphere.locations.update_location_presence(),
                 sphere.users.update()
             )
         _LOGGER.warning("Cloud data successfully initialized")
@@ -88,15 +89,27 @@ def get_crownstone_by_id(self, crownstone_id) -> Crownstone:
         for sphere in self.spheres:
             return sphere.crownstones[crownstone_id]
 
-    def cleanup(self) -> None:
+    @staticmethod
+    def reset() -> None:
+        """Cleanup the request handler instance data"""
+        RequestHandler.access_token = None
+        RequestHandler.websession = None
+        RequestHandler.login_data = None
+
+    @staticmethod
+    async def close_session() -> None:
         """Close the websession after we are done"""
-        self.loop.create_task(RequestHandler.websession.close())
+        await RequestHandler.websession.close()
         _LOGGER.warning("Session closed.")
 
+    def close_session_sync(self) -> None:
+        """Sync version of close session"""
+        self.loop.run_until_complete(self.close_session())
 
-def password_to_hash(password):
-    """Generate a sha1 password from string"""
-    if password is None:
-        return None
-    pw_hash = hashlib.sha1(password.encode('utf-8'))
-    return pw_hash.hexdigest()
+    @staticmethod
+    def password_to_hash(password):
+        """Generate a sha1 password from string"""
+        if password is None:
+            return None
+        pw_hash = hashlib.sha1(password.encode('utf-8'))
+        return pw_hash.hexdigest()

crownstone_cloud/lib/cloudModels/locations.py

@@ -26,7 +26,7 @@ async def update(self) -> None:
         for location in location_data:
             self.locations[location['id']] = Location(location)
 
-    async def update_presence(self) -> None:
+    async def update_location_presence(self) -> None:
         """Replaces the current presence with that of the cloud."""
         presence_data = await RequestHandler.get('Spheres', 'presentPeople', model_id=self.sphere_id)
         for presence in presence_data:
@@ -41,7 +41,7 @@ def update_sync(self) -> None:
 
     def update_presence_sync(self) -> None:
         """Sync function for updating the presence"""
-        self.loop.run_until_complete(self.update_presence())
+        self.loop.run_until_complete(self.update_location_presence())
 
     def find(self, location_name: str) -> object or None:
         """Search for a sphere by name and return sphere object if found"""

crownstone_cloud/lib/cloudModels/spheres.py

@@ -57,6 +57,7 @@ def __init__(self, loop: asyncio.AbstractEventLoop, data: dict, user_id: str):
         self.locations = Locations(loop, self.cloud_id)
         self.users = Users(loop, self.cloud_id)
         self.keys: dict = {}
+        self.present_people = []
 
     @property
     def name(self) -> str:
@@ -82,4 +83,10 @@ async def get_keys(self) -> dict:
 
     def get_keys_sync(self) -> dict:
         """Sync get the user keys for this sphere, that can be used for BLE (optional)"""
-        return self.loop.run_until_complete(self.get_keys())
+        return self.loop.run_until_complete(self.get_keys())
+
+    async def update_sphere_presence(self) -> None:
+        """Replaces the current presence with that of the cloud."""
+        presence_data = await RequestHandler.get('Spheres', 'presentPeople', model_id=self.cloud_id)
+        for user in presence_data:
+            self.present_people.append(user['userId'])

crownstone_cloud/util/data_updater.py

@@ -6,6 +6,7 @@ class CloudDataUpdater:
     Optional API.
     Contains callbacks that can be used with the Crownstone SSE lib, or own events.
     """
+
     def __init__(self, cloud_instance: CrownstoneCloud) -> None:
         """
         :param cloud_instance: your instance of the cloud lib.
@@ -35,15 +36,22 @@ def update_presence(self, presence_event) -> None:
         PresenceEvent is a class containing: event_type, sphere_id, location_id, user_id.
         """
         sphere = self.cloud_instance.spheres.find_by_id(presence_event.sphere_id)
-        location = sphere.locations.find_by_id(presence_event.location_id)
         user = sphere.users.find_by_id(presence_event.user_id)
 
         if presence_event.type == 'enterLocation':
+            location = sphere.locations.find_by_id(presence_event.location_id)
             location.present_people.append(user.cloud_id)
 
         if presence_event.type == 'exitLocation':
+            location = sphere.locations.find_by_id(presence_event.location_id)
             location.present_people.remove(user.cloud_id)
 
+        if presence_event.type == 'enterSphere':
+            sphere.present_people.append(user.cloud_id)
+
+        if presence_event.type == 'exitSphere':
+            sphere.present_people.remove(user.cloud_id)
+
     def update_data(self, data_change_event) -> None:
         """
         Replace the current data with new data from the cloud after a change.

examples/asyncSwitchCrownstones.py

@@ -1,7 +1,7 @@
 """
 This is an example how to switch a crownstone using the crownstone python cloud lib.
 
-Last update by Ricardo Steijn on 15-5-2020
+Last update by Ricardo Steijn on 2-6-2020
 """
 from crownstone_cloud.lib.cloud import CrownstoneCloud
 import asyncio
@@ -21,4 +21,6 @@ async def main():
     for crownstone in sphere.crownstones:
         await crownstone.turn_on()
 
+    await cloud.close_session()
+
 asyncio.run(main())

examples/syncSwitchCrownstones.py

@@ -1,7 +1,7 @@
 """
 This is an example how to switch a crownstone using the crownstone python cloud lib.
 
-Last update by Ricardo Steijn on 15-5-2020
+Last update by Ricardo Steijn on 2-6-2020
 """
 from crownstone_cloud.lib.cloud import CrownstoneCloud
 
@@ -10,5 +10,7 @@
 cloud.initialize_sync()
 
 # get a crownstone and turn it on
-crownstone = cloud.get_crownstone('awesomeCrownstone')
-crownstone.turn_on_sync()
+crownstone = cloud.get_crownstone('AwesomePassword')
+crownstone.turn_on_sync()
+
+cloud.close_session_sync()

tests/test_cloud.py

@@ -36,9 +36,6 @@ def test_init(self):
         self.cloud = CrownstoneCloud('email', 'password', loop=self.test_loop)
         assert self.cloud.loop == self.test_loop
 
-        self.cloud = CrownstoneCloud('email', 'password', loop=self.test_loop, websession=self.test_websession)
-        assert RequestHandler.websession == self.test_websession
-
     async def test_initialize(self):
         # test init, only logging in when there's no access token
         with asynctest.patch.object(CrownstoneCloud, 'login') as login_mock:
@@ -115,7 +112,7 @@ async def test_data_structure(self, mock_request):
         mock_request.assert_awaited()
         # presence
         mock_request.return_value = presence_data
-        await sphere.locations.update_presence()
+        await sphere.locations.update_location_presence()
         mock_request.assert_awaited()
 
         # test getting crownstone, users, locations by id & name