Introduce logging, telemetry, progress bars, transport layers, improved doc strings

frameioclient/__init__.py

@@ -1,9 +1,3 @@
 from .lib import *
 from .services import *
 from .client import FrameioClient
-<<<<<<<
-
-=======
-from .service import *
-from .lib import *
->>>>>>>

frameioclient/client.py

@@ -1,15 +1,13 @@
 from .lib import (
-  Utils,
   APIClient,
-  AWSClient,
   Telemetry,
   ClientVersion,
   ClientVersion,
   FrameioDownloader
 )
 
 class FrameioClient(APIClient, object):
-  def __init__(self, token, host):
+  def __init__(self, token, host='https://api.frame.io'):
     super().__init__(token, host)
 
   @property
@@ -41,7 +39,6 @@ def users(self):
   def assets(self):
     from .services import Asset
     return Asset(self)
-        total=3,
 
   @property
   def comments(self):

frameioclient/lib/download.py

@@ -42,7 +42,7 @@ def __init__(self, asset, download_folder, prefix, multi_part=False, concurrency
     self.in_progress = 0
     self.filename = Utils.normalize_filename(asset["name"])
     self.request_logs = list()
-    self.session = AWSClient()._get_session(auth=None)
+    self.session = AWSClient()._get_session()
 
     self._evaluate_asset()
 
@@ -135,7 +135,7 @@ def single_part_download(self, url):
     print("Beginning download -- {} -- {}".format(self.asset["name"], Utils.format_bytes(self.file_size, type="size")))
 
     # Downloading
-    r = requests.get(url)
+    r = self.session.get(url)
     open(self.destination, "wb").write(r.content)
 
     download_time = time.time() - start_time

frameioclient/lib/transport.py

@@ -1,9 +1,7 @@
-import os
 import logging
 import enlighten
 import requests
 import threading
-import concurrent.futures
 
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
@@ -34,7 +32,7 @@ def __init__(self):
     def _initialize_thread(self):
         self.thread_local = threading.local()
 
-    def _get_session(self, auth=True):
+    def _get_session(self):
         if not hasattr(self.thread_local, "session"):
             http = requests.Session()
             adapter = HTTPAdapter(max_retries=self.retry_strategy)
@@ -46,24 +44,23 @@ def _get_session(self, auth=True):
 
 
 class APIClient(HTTPClient, object):
-    def __init__(self, token, host='https://api.frame.io'):
+    def __init__(self, token, host):
         super().__init__()
         self.host = host
         self.token = token
         self._initialize_thread()
-        self.session = self._get_session(auth=token)
+        self.session = self._get_session()
         self.auth_header = {
             'Authorization': 'Bearer {}'.format(self.token),
         }
+
+    def _format_api_call(self, endpoint):
+        return '{}/v2{}'.format(self.host, endpoint)
 
     def _api_call(self, method, endpoint, payload={}, limit=None):
-        url = '{}/v2{}'.format(self.host, endpoint)
-
-        headers = {**self.shared_headers, **self.auth_header}
-
         r = self.session.request(
             method,
-            url,
+            url=self._format_api_call(endpoint),
             headers=self.auth_header,
             json=payload
         )
@@ -97,14 +94,14 @@ def get_specific_page(self, method, endpoint, payload, page):
         Gets a specific page for that endpoint, used by Pagination Class
 
         :Args:
-        method (string): 'get', 'post'
-        endpoint (string): endpoint ('/accounts/<ACCOUNT_ID>/teams')
-        payload (dict): Request payload
-        page (int): What page to get
+            method (string): 'get', 'post'
+            endpoint (string): endpoint ('/accounts/<ACCOUNT_ID>/teams')
+            payload (dict): Request payload
+            page (int): What page to get
         """
         if method == 'get':
             endpoint = '{}?page={}'.format(endpoint, page)
-        return self._api_call(method, endpoint)
+            return self._api_call(method, endpoint)
 
         if method == 'post':
             payload['page'] = page

frameioclient/service/assets.py

@@ -229,7 +229,7 @@ def upload(self, destination_id, filepath, asset=None):
 
     return asset
 
-  def download(self, asset, download_folder, prefix=None, multi_part=False, concurrency=5):
+  def download(self, asset, download_folder, prefix=None, multi_part=False, concurrency=5, stats=False):
     """
     Download an asset. The method will exit once the file is downloaded.
 
@@ -241,5 +241,14 @@ def download(self, asset, download_folder, prefix=None, multi_part=False, concur
 
         client.assets.download(asset, "~./Downloads")
     """
-    downloader = FrameioDownloader(asset, download_folder, prefix, multi_part, concurrency)
+    downloader = FrameioDownloader(
+      asset, 
+      download_folder, 
+      prefix, 
+      multi_part, 
+      concurrency, 
+      user_id=self.client.me['id'],
+      stats=stats
+    )
+
     return downloader.download_handler()