Merge pull request #289 from uzlonewolf/cloud

Rework Cloud device list fetching

Author: jasonacox

tinytuya/Cloud.py

@@ -83,6 +83,7 @@ def __init__(self, apiRegion=None, apiKey=None, apiSecret=None, apiDeviceID=None
         self.error = None
         self.new_sign_algorithm = new_sign_algorithm
         self.server_time_offset = 0
+        self.use_old_device_list = False
 
         if (not apiKey) or (not apiSecret):
             try:
@@ -93,7 +94,8 @@ def __init__(self, apiRegion=None, apiKey=None, apiSecret=None, apiDeviceID=None
                     self.apiRegion = config['apiRegion']
                     self.apiKey = config['apiKey']
                     self.apiSecret = config['apiSecret']
-                    self.apiDeviceID = config['apiDeviceID']
+                    if 'apiDeviceID' in config:
+                        self.apiDeviceID = config['apiDeviceID']
             except:
                 self.error = error_json(
                     ERR_CLOUDKEY,
@@ -305,24 +307,63 @@ def cloudrequest(self, url, action=None, post=None, query=None):
             action = 'POST' if post else 'GET'
         return self._tuyaplatform(url, action=action, post=post, ver=None, query=query)
 
+    def _get_all_devices(self):
+        fetches = 0
+        our_result = { 'result': [] }
+        last_row_key = None
+        has_more = True
+        total = 0
+        query = {'size':'50'}
+
+        while has_more:
+            # API docu: https://developer.tuya.com/en/docs/cloud/fc19523d18?id=Kakr4p8nq5xsc
+            result = self.cloudrequest( '/v1.0/iot-01/associated-users/devices', query=query )
+            fetches += 1
+            has_more = False
+
+            if type(result) == dict:
+                log.debug( 'Cloud response:' )
+                log.debug( json.dumps( result, indent=2 ) )
+            else:
+                log.debug( 'Cloud response: %r', result )
+
+            # format it the same as before, basically just moves result->devices into result
+            for i in result:
+                if i == 'result':
+                    our_result[i] += result[i]['devices']
+                    if 'total' in result[i]: total = result[i]['total']
+                    if 'last_row_key' in result[i]:
+                        has_more = result[i]['has_more']
+                        query['last_row_key'] = result[i]['last_row_key']
+                else:
+                    our_result[i] = result[i]
+
+        our_result['fetches'] = fetches
+        our_result['total'] = total
+
+        return our_result
+
     def getdevices(self, verbose=False):
         """
         Return dictionary of all devices.
         If verbose is true, return full Tuya device
         details.
         """
-        uid = self._getuid(self.apiDeviceID)
-        if uid is None:
-            return error_json(
-                ERR_CLOUD,
-                "Unable to get uid for device list"
-            )
-        elif isinstance( uid, dict):
-            return uid
+        if self.apiDeviceID and self.use_old_device_list:
+            uid = self._getuid(self.apiDeviceID)
+            if uid is None:
+                return error_json(
+                    ERR_CLOUD,
+                    "Unable to get uid for device list"
+                )
+            elif isinstance( uid, dict):
+                return uid
 
-        # Use UID to get list of all Devices for User
-        uri = 'users/%s/devices' % uid
-        json_data = self._tuyaplatform(uri)
+            # Use UID to get list of all Devices for User
+            uri = 'users/%s/devices' % uid
+            json_data = self._tuyaplatform(uri)
+        else:
+            json_data = self._get_all_devices()
 
         if verbose:
             return json_data
@@ -335,26 +376,41 @@ def getdevices(self, verbose=False):
             # Filter to only Name, ID and Key
             return self.filter_devices( json_data['result'] )
 
+    def _get_hw_addresses( self, maclist, devices ):
+        while devices:
+            # returns id, mac, uuid (and sn if available)
+            uri = 'devices/factory-infos?device_ids=%s' % (",".join(devices[:50]))
+            result = self._tuyaplatform(uri)
+            log.debug( json.dumps( result, indent=2 ) )
+            if 'result' in result:
+                for dev in result['result']:
+                    if 'id' in dev:
+                        dev_id = dev['id']
+                        del dev['id']
+                        maclist[dev_id] = dev
+            devices = devices[50:]
+
     def filter_devices( self, devs, ip_list=None ):
-        # Use Device ID to get MAC addresses
-        uri = 'devices/factory-infos?device_ids=%s' % (",".join(i['id'] for i in devs))
-        json_mac_data = self._tuyaplatform(uri)
+        json_mac_data = {}
+        # mutable json_mac_data will be modified
+        self._get_hw_addresses( json_mac_data, [i['id'] for i in devs] )
 
         tuyadevices = []
         icon_host = 'https://images.' + self.urlhost.split( '.', 1 )[1] + '/'
 
         for i in devs:
-            item = {}
-            item['name'] = i['name'].strip()
-            item['id'] = i['id']
-            item['key'] = i['local_key']
-            if 'mac' in i:
-                item['mac'] = i['mac']
-            else:
-                try:
-                    item['mac'] = next((m['mac'] for m in json_mac_data['result'] if m['id'] == i['id']), "")
-                except:
-                    pass
+            dev_id = i['id']
+            item = {
+                'name': '' if 'name' not in i else i['name'].strip(),
+                'id': dev_id,
+                'key': '' if 'local_key' not in i else i['local_key'],
+                'mac': '' if 'mac' not in i else i['mac']
+            }
+
+            if dev_id in json_mac_data:
+                for k in ('mac','uuid','sn'):
+                    if k in json_mac_data[dev_id]:
+                        item[k] = json_mac_data[dev_id][k]
 
             if ip_list and 'mac' in item and item['mac'] in ip_list:
                 item['ip'] = ip_list[item['mac']]

tinytuya/core.py

@@ -119,7 +119,7 @@
 RAWFILE = 'tuya-raw.json'
 SNAPSHOTFILE = 'snapshot.json'
 
-DEVICEFILE_SAVE_VALUES = ('category', 'product_name', 'product_id', 'biz_type', 'model', 'sub', 'icon', 'version', 'last_ip', 'uuid', 'node_id')
+DEVICEFILE_SAVE_VALUES = ('category', 'product_name', 'product_id', 'biz_type', 'model', 'sub', 'icon', 'version', 'last_ip', 'uuid', 'node_id', 'sn')
 
 # Tuya Command Types
 # Reference: https://github.com/tuya/tuya-iotos-embeded-sdk-wifi-ble-bk7231n/blob/master/sdk/include/lan_protocol.h

tinytuya/wizard.py

@@ -25,6 +25,7 @@
 from __future__ import print_function
 import json
 from colorama import init
+from datetime import datetime
 import tinytuya
 
 # Backward compatibility for python2
@@ -91,11 +92,12 @@ def wizard(color=True, retries=None, forcescan=False, nocloud=False):
     print('')
 
     if (config['apiKey'] != '' and config['apiSecret'] != '' and
-            config['apiRegion'] != '' and config['apiDeviceID'] != ''):
+            config['apiRegion'] != ''):
         needconfigs = False
+        apiDeviceID = '<None>' if not config['apiDeviceID'] else config['apiDeviceID']
         print("    " + subbold + "Existing settings:" + dim +
               "\n        API Key=%s \n        Secret=%s\n        DeviceID=%s\n        Region=%s" %
-              (config['apiKey'], config['apiSecret'], config['apiDeviceID'],
+              (config['apiKey'], config['apiSecret'], apiDeviceID,
                config['apiRegion']))
         print('')
         answer = input(subbold + '    Use existing credentials ' +
@@ -111,7 +113,7 @@ def wizard(color=True, retries=None, forcescan=False, nocloud=False):
         config['apiSecret'] = input(subbold + "    Enter " + bold + "API Secret" + subbold +
                                     " from tuya.com: " + normal)
         config['apiDeviceID'] = input(subbold +
-                                      "    Enter " + bold + "any Device ID" + subbold +
+                                      "    (Optional) Enter " + bold + "any Device ID" + subbold +
                                       " currently registered in Tuya App (used to pull full list): " + normal)
         # TO DO - Determine apiRegion based on Device - for now, ask
         print("\n      " + subbold + "Region List" + dim +
@@ -180,6 +182,13 @@ def wizard(color=True, retries=None, forcescan=False, nocloud=False):
     if not nocloud:
         # Save raw TuyaPlatform data to tuya-raw.json
         print(bold + "\n>> " + normal + "Saving raw TuyaPlatform response to " + RAWFILE)
+        json_data['file'] = {
+            'name': RAWFILE,
+            'description': 'Full raw list of Tuya devices.',
+            'account': cloud.apiKey,
+            'date': datetime.now().isoformat(),
+            'tinytuya': tinytuya.version
+        }
         try:
             with open(RAWFILE, "w") as outfile:
                 outfile.write(json.dumps(json_data, indent=4))