Remove flat mode

Author: walker-j

evasdk/Eva.py

@@ -61,14 +61,14 @@ def auth_invalidate_session(self):
 
 
     # Data
-    def data_snapshot(self, mode='flat'):
+    def data_snapshot(self):
         self.__logger.debug('Eva.data_snapshot called')
-        return self.__http_client.data_snapshot(mode=mode)
+        return self.__http_client.data_snapshot()
 
 
-    def data_snapshot_property(self, prop, mode='object'):
+    def data_snapshot_property(self, prop):
         self.__logger.debug('Eva.data_snapshot_property called')
-        return self.__http_client.data_snapshot_property(prop, mode=mode)
+        return self.__http_client.data_snapshot_property(prop)
 
 
     def data_servo_positions(self):

evasdk/eva_http_client.py

@@ -116,16 +116,15 @@ def auth_invalidate_session(self):
 
 
     # DATA
-    # TODO consider adding type for switch between flat and object modes
-    def data_snapshot(self, mode='flat'):
-        r = self.api_call_with_auth('GET', 'data/snapshot?mode=' + mode)
+    def data_snapshot(self):
+        r = self.api_call_with_auth('GET', 'data/snapshot')
         if r.status_code != 200:
             eva_error('data_snapshot request error', r)
         return r.json()['snapshot']
 
 
-    def data_snapshot_property(self, prop, mode='object'):
-        snapshot = self.data_snapshot(mode=mode)
+    def data_snapshot_property(self, prop):
+        snapshot = self.data_snapshot()
         if prop in snapshot:
             return snapshot[prop]
         else:
@@ -171,14 +170,14 @@ def gpio_get(self, pin, pin_type):
 
 
     # GPIO helper function
-    def __globals_editing(self, keys, values, mode='flat'):
+    def __globals_editing(self, keys, values):
         data = {'changes': []}
         if (isinstance(keys, list) and isinstance(values, list)):
             [data['changes'].append({'key': c[0], 'value': c[1]}) for c in zip(keys, values)]
         else:
             data['changes'].append({'key': keys, 'value': values})
         data = json.dumps(data)
-        r = self.api_call_with_auth('POST', 'data/globals?mode=' + mode, data)
+        r = self.api_call_with_auth('POST', 'data/globals', data)
         return r
 
 

evasdk/eva_ws.py

@@ -1,7 +1,7 @@
 import websockets
 
 
-async def ws_connect(host_ip, session_token, data_mode="object"):
+async def ws_connect(host_ip, session_token):
     """
     Connect is an async function that returns a connected Eva websocket
 
@@ -11,7 +11,7 @@ async def ws_connect(host_ip, session_token, data_mode="object"):
     up the websocket connection.
     """
     host_uri = 'ws://{}/api/v1/data/stream'.format(host_ip)
-    subprotocols = ['SessionToken_{}'.format(session_token), data_mode]
+    subprotocols = ['SessionToken_{}'.format(session_token), "object"]
 
     ws = await websockets.client.connect(host_uri, subprotocols=subprotocols)
     return ws