Fix and clean-up

Author: jhodges10

examples/project_tree.py

@@ -1,11 +1,10 @@
 import os
 
-import pdb
 from time import time
 from pprint import pprint
 from frameioclient import FrameioClient
 
-def demo_folder_tree(project_id, slim):
+def demo_folder_tree(project_id):
 	TOKEN = os.getenv("FRAMEIO_TOKEN")
 	client = FrameioClient(TOKEN)
 
@@ -17,19 +16,12 @@ def demo_folder_tree(project_id, slim):
 
 	item_count = len(tree)
 	pprint(tree)
-	# pdb.set_trace()
 
 	print(f"Found {item_count} items")
 	print(f"Took {elapsed} second to fetch the slim payload for project: {project_id}")
 	print("\n")
 
 if __name__ == "__main__":
-	# project_id = '2dfb6ce6-90d8-4994-881f-f02cd94b1c81'
-	# project_id='e2845993-7330-54c6-8b77-eafbd5144eac'
-	# project_id = '5d3ff176-ab1f-4c0b-a027-abe3d2a960e3'
-	project_id = 'ba1791e8-bf1e-46cb-bcad-5e4bb6431a08'
-	demo_folder_tree(project_id, slim=True)
-	# demo_folder_tree(project_id, slim=False)
-
-# 445 seconds for slim
-# 509 seconds for non-slim
+	# project_id = 'ba1791e8-bf1e-46cb-bcad-5e4bb6431a08'
+	project_id = '2dfb6ce6-90d8-4994-881f-f02cd94b1c81'
+	demo_folder_tree(project_id)

frameioclient/service/assets.py

@@ -54,7 +54,7 @@ def get_children(self, asset_id, include=[], slim=False, **kwargs):
       if len(include) > 0:
         query_params += '?include={}'.format(include.join(','))
       else:
-        # Include children
+        # Always include children
         query_params += '?' + 'include=children'
 
       # Only fields

frameioclient/service/helpers.py

@@ -42,11 +42,15 @@ def get_updated_assets(self, account_id, project_id, timestamp):
 		return self.client._api_call('post', endpoint, payload=payload)
 
 	def get_assets_recursively(self, asset_id, slim=True):
-		assets = self.client.assets.get_children(asset_id, slim)
+		assets = self.client.assets.get_children(asset_id, slim=slim)
 		print("Number of assets at top level", len(assets))
 
 		for asset in assets:
+			# try:
 			print(f"Type: {asset['_type']}, Name: {asset['name']}, Children: {len(asset['children'])}")
+			# except KeyError:
+			# 	print("No children found")
+
 			total_bytes = 0
 
 			if asset['_type'] == "file":
@@ -55,7 +59,7 @@ def get_assets_recursively(self, asset_id, slim=True):
 
 			if asset['_type'] == "verson_stack":
 				print("Grabbing top item from version stack")
-				versions = self.client.assets.get_children(asset['id'])
+				versions = self.client.assets.get_children(asset['id'], slim=True)
 				asset = versions[0] # re-assign on purpose
 				continue
 
@@ -64,10 +68,7 @@ def get_assets_recursively(self, asset_id, slim=True):
 				# try:
 				if asset['item_count'] > 3:
 					# Recursively fetch the contents of the folder because we have to
-					# asset = deepcopy(asset)
-					# asset.pop('children')
 					asset['children'] = self.get_assets_recursively(asset['id'], slim)
-					# asset.update({'children': self.get_assets_recursively(asset['id'], slim)})
 					print("Grabbed more items for this sub dir")
 
 				else:
@@ -83,7 +84,7 @@ def get_assets_recursively(self, asset_id, slim=True):
 
 		return assets
 
-	def build_project_tree(self, project_id, slim=False):
+	def build_project_tree(self, project_id, slim=True):
 		# if slim == True:
 		# 	self.client.assets.get_children()
 
@@ -97,7 +98,7 @@ def build_project_tree(self, project_id, slim=False):
 
 	def download_project(self, project_id, destination):
 		project = self.client.projects.get(project_id)
-		initial_tree = self.get_assets_recursively(project['root_asset_id'], slim=True)
+		initial_tree = self.get_assets_recursively(project['root_asset_id'])
 		self.recursive_downloader(destination, initial_tree)
 		# pprint(initial_tree)
 		# print(f"Downloading {Utils.format_bytes(total_bytes, type='size')}")