move apikey function

Author: exdx

paperspace/login.py

@@ -6,8 +6,8 @@
 import requests
 from six.moves import input
 
-from . import config
-from .method import *
+from .config import *
+from .method import requests_exception_to_error_obj, response_error_check, status_code_to_error_obj
 
 
 def is_error_or_missing_keys_print(res, *required_keys):

paperspace/method.py

@@ -9,8 +9,7 @@
 import requests
 import subprocess
 
-from . import config
-from . import login
+from .config import *
 
 def zip_to_tmp(files, ignore_files=[]):
     file = files[0]
@@ -48,7 +47,7 @@ def method(category, method, params):
     if 'apiKey' in params:
         config.PAPERSPACE_API_KEY = params.pop('apiKey')
     elif not config.PAPERSPACE_API_KEY:
-        config.PAPERSPACE_API_KEY = login.apikey()
+        config.PAPERSPACE_API_KEY = get_apikey()
     params.pop('tail', None)
     no_logging = params.pop('no_logging', None)
     workspace_files = params.pop('extraFiles', [])
@@ -168,3 +167,13 @@ def status_code_to_error_obj(status_code):
     if status_code in requests.status_codes._codes:
         message = requests.status_codes._codes[status_code][0]
     return { 'error': True, 'message': message, 'status': status_code }
+
+
+def get_apikey():
+    paperspace_dir = os.path.expanduser('~/.paperspace')
+    config_path = os.path.join(paperspace_dir, 'config.json')
+    if os.path.exists(config_path):
+        config_data = json.load(open(config_path))
+        if config_data and 'apiKey' in config_data:
+            return config_data['apiKey']
+    return ''