Merge pull request #25 from TransposeData/dev

fix: removes bad default params

Author: Jon-Becker

transpose/src/api/nft/_collections_by_date_created.py

@@ -2,10 +2,14 @@
 
 def _collections_by_date_created(created_after: str or int = '1970-01-01 00:00:00',
                                 created_before: str or int = '2050-01-01 00:00:00',
-                                standard: str or int = 'ERC-721',
+                                standard: str or int = None,
                                 order: str = 'asc',
                                 limit: int = 10) -> str:
+
+    standard_query = ""
+    if standard is not None:
+        standard_query = "&standard={}".format(standard)
 
-    base_url = '{}?created_after={}&created_before={}&standard={}&order={}&limit={}'.format(NFT_API_ENDPOINTS['collections_by_date_created'], created_after, created_before, standard, order, limit)
+    base_url = '{}?created_after={}&created_before={}{}&order={}&limit={}'.format(NFT_API_ENDPOINTS['collections_by_date_created'], created_after, created_before, standard_query, order, limit)
 
     return base_url

transpose/src/api/nft/base.py

@@ -35,7 +35,7 @@ def next(self) -> List[TransposeModel]:
     def collections_by_date_created(self,
                                     created_after: str or int = '1970-01-01 00:00:00',
                                     created_before: str or int = '2050-01-01 00:00:00',
-                                    standard: str or int = 'ERC-721',
+                                    standard: str or int = None,
                                     order: str = 'asc',
                                     limit: int = 10) -> List[Collection]:
         return self.super.perform_authorized_request(Collection, _collections_by_date_created(created_after, created_before, standard, order, limit))

transpose/src/api/token/_tokens_by_date_created.py

@@ -2,10 +2,14 @@
 
 def _tokens_by_date_created(created_after: str or int = '1970-01-01 00:00:00',
                                 created_before: str or int = '2050-01-01 00:00:00',
-                                standard: str or int = 'ERC-20',
+                                standard: str or int = None,
                                 order: str = 'asc',
                                 limit: int = 10) -> str:
+
+    standard_query = ""
+    if standard is not None:
+        standard_query = "&standard={}".format(standard)
 
-    base_url = '{}?created_after={}&created_before={}&standard={}&order={}&limit={}'.format(TOKEN_API_ENDPOINTS['tokens_by_date_created'], created_after, created_before, standard, order, limit)
+    base_url = '{}?created_after={}&created_before={}{}&order={}&limit={}'.format(TOKEN_API_ENDPOINTS['tokens_by_date_created'], created_after, created_before, standard_query, order, limit)
 
     return base_url

transpose/src/api/token/base.py

@@ -33,7 +33,7 @@ def next(self) -> List[TransposeModel]:
     def tokens_by_date_created(self,
                                created_after: str or int = '1970-01-01 00:00:00',
                                created_before: str or int = '2050-01-01 00:00:00',
-                               standard: str or int = 'ERC-20',
+                               standard: str or int = None,
                                order: str = 'asc',
                                limit: int = 10) -> List[TokenModel]:
         return self.super.perform_authorized_request(TokenModel, _tokens_by_date_created(created_after, created_before, standard, order, limit))

transpose/src/base.py

@@ -12,10 +12,11 @@
 
 # base class for the Transpose python SDK
 class Transpose:
-    def __init__(self, api_key: str, verbose: bool=False) -> None:
+    def __init__(self, api_key: str, debug: bool=False, host: str=None) -> None:
         self._next = None
         self._next_class_name = None
-        self.verbose = verbose
+        self.host = host if host else 'https://api.transpose.io'
+        self.verbose = debug
 
         # verifies that the API key is valid
         if self.perform_authorized_request(Block, 'https://api.transpose.io/v0/block/blocks-by-number?block_number_below=1', api_key):
@@ -57,14 +58,14 @@ def perform_authorized_request(self, model: type, endpoint: str, api_key: str=No
             return None
 
         # if in verbose mode, log the endpoint
-        print(endpoint) if self.verbose else None
-        
+        print("\n{}\n  {}\n".format(endpoint.replace("https://api.transpose.io", self.host).split("?")[0], "\n  ".join(endpoint.split("?")[1].split("&")))) if self.verbose else None
+
         # build the request
         request_headers = {
             'x-api-key': api_key if api_key else self.api_key,
             'Accept': 'application/json',
         }
-        request = requests.get(endpoint, headers=request_headers)
+        request = requests.get(endpoint.replace("https://api.transpose.io", self.host), headers=request_headers)
 
         # check for a successful response
         if request.status_code == 200:

transpose/src/util/errors.py

@@ -42,11 +42,13 @@ def __init__(self, packages: list) -> None:
 def raise_custom_error(error_code: int, message: str) -> None:
     if   error_code == 400:
         raise TransposeBadRequest(error_code, message)
-    elif error_code == 403:
+    elif error_code == 403 or error_code == 401:
         raise TransposeInvalidAPIKey(error_code, message)
     elif error_code == 500:
         raise TransposeInternalServerError(error_code, message)
     elif error_code == 404:
         raise TransposeResourceNotFound(error_code, message)
     elif error_code == 429:
-        raise TransposeRateLimit(error_code, message)
+        raise TransposeRateLimit(error_code, message)
+    else:
+        raise Exception('{}: {}'.format(error_code, message))