Added unittests, created API for data updating.

Author: RicArch97

MANIFEST.in

@@ -0,0 +1 @@
+include requirements.txt

crownstone_cloud/__init__.py

@@ -1 +1,2 @@
-from crownstone_cloud._RequestHandlerInstance import RequestHandler
+from crownstone_cloud._RequestHandlerInstance import RequestHandler
+from crownstone_cloud.lib.cloud import CrownstoneCloud

crownstone_cloud/lib/__init__.py

@@ -1,3 +1,3 @@
 """Library that communicates with the Crownstone lib"""
 
-__version__ = '0.1'
+__version__ = '1.0.2'

crownstone_cloud/lib/cloud.py

@@ -45,6 +45,10 @@ def initialize_sync(self) -> None:
     def set_access_token(access_token: str) -> None:
         RequestHandler.access_token = access_token
 
+    @staticmethod
+    def get_access_token() -> str:
+        return RequestHandler.access_token
+
     async def login(self) -> None:
         """Login to Crownstone API"""
         result = await RequestHandler.post('users', 'login', json=self.login_data)
@@ -65,7 +69,9 @@ async def sync(self) -> None:
         for sphere in self.spheres:
             await asyncio.gather(
                 sphere.crownstones.update(),
+                sphere.crownstones.update_state(),
                 sphere.locations.update(),
+                sphere.locations.update_presence(),
                 sphere.users.update()
             )
         _LOGGER.warning("Cloud data successfully initialized")

crownstone_cloud/lib/cloudModels/crownstones.py

@@ -1,5 +1,5 @@
 from crownstone_cloud._RequestHandlerInstance import RequestHandler
-from typing import Optional, ValuesView
+from typing import Optional
 import logging
 import asyncio
 
@@ -29,6 +29,8 @@ async def update(self) -> None:
         for crownstone in crownstone_data:
             self.crownstones[crownstone['id']] = Crownstone(self.loop, crownstone)
 
+    async def update_state(self) -> None:
+        """Replaces the switch state of all crownstones with that of the cloud."""
         for crownstone in self.crownstones.values():
             crownstone_state = await RequestHandler.get('Stones', 'currentSwitchState', model_id=crownstone.cloud_id)
             crownstone.state = crownstone_state['switchState']
@@ -37,6 +39,10 @@ def update_sync(self) -> None:
         """Sync function for updating the crownstone data"""
         self.loop.run_until_complete(self.update())
 
+    def update_state_sync(self) -> None:
+        """Sync function for updating the crownstone state"""
+        self.loop.run_until_complete(self.update_state())
+
     def find(self, crownstone_name: str) -> object or None:
         """Search for a crownstone by name and return crownstone object if found"""
         for crownstone in self.crownstones.values():

crownstone_cloud/lib/cloudModels/locations.py

@@ -26,6 +26,8 @@ async def update(self) -> None:
         for location in location_data:
             self.locations[location['id']] = Location(location)
 
+    async def update_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:
             for present_location in presence['locations']:
@@ -37,6 +39,10 @@ def update_sync(self) -> None:
         """Sync function for updating the location data"""
         self.loop.run_until_complete(self.update())
 
+    def update_presence_sync(self) -> None:
+        """Sync function for updating the presence"""
+        self.loop.run_until_complete(self.update_presence())
+
     def find(self, location_name: str) -> object or None:
         """Search for a sphere by name and return sphere object if found"""
         for location in self.locations.values():

crownstone_cloud/lib/requestHandler.py

@@ -105,7 +105,7 @@ async def raise_on_error(self, data) -> bool:
             if 'code' in error:
                 error_type = error['code']
                 try:
-                    if error_type == 'INVALID_TOKEN':
+                    if error_type == 'INVALID_TOKEN' or error_type == 'AUTHORIZATION_REQUIRED':
                         _LOGGER.warning("Token expired. Refreshing now...")
                         await self.refresh_token()
                         return True  # re-run the request

crownstone_cloud/util/__init__.py

@@ -0,0 +1,67 @@
+from crownstone_cloud import CrownstoneCloud
+
+
+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.
+
+        Make sure your instance is initialized with data first!
+        """
+        self.cloud_instance = cloud_instance
+
+    def update_switch_state(self, switch_state_event) -> None:
+        """
+        Updates the switch state of a crownstone.
+
+        :param switch_state_event: Instance of SwitchStateUpdateEvent of the Crownstone SSE lib.
+
+        SwitchStateUpdateEvent is a class containing: sphere_id, cloud_id, unique_id, switch_state.
+        """
+        sphere = self.cloud_instance.spheres.find_by_id(switch_state_event.sphere_id)
+        crownstone = sphere.crownstones.find_by_id(switch_state_event.cloud_id)
+        crownstone.state = switch_state_event.switch_state
+
+    def update_presence(self, presence_event) -> None:
+        """
+        Updates the presence in a location.
+
+        :param presence_event: Instance of PresenceEvent of the Crownstone SSE lib.
+
+        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.present_people.append(user.cloud_id)
+
+        if presence_event.type == 'exitLocation':
+            location.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.
+
+        :param data_change_event: Instance of DataChangeEvent of the Crownstone SSE lib.
+
+        DataChangeEvent is a class containing: operation, sphere_id, changed_item_id, changed_item_name
+        """
+        if data_change_event.type == 'spheres':
+            self.cloud_instance.spheres.update_sync()
+
+        sphere = self.cloud_instance.spheres.find_by_id(data_change_event.sphere_id)
+
+        if data_change_event.type == 'stones':
+            sphere.crownstones.update_sync()
+
+        if data_change_event.type == 'users':
+            sphere.users.update_sync()
+
+        if data_change_event.type == 'locations':
+            sphere.locations.update_sync()

crownstone_cloud/util/data_updater.py

@@ -1 +1,2 @@
-aiohttp==3.6.2
+aiohttp==3.6.2
+asynctest~=0.13.0