add file existence checking for python script; simplify pipenv option

Author: sanfilip

paperspace/jobs.py

@@ -419,6 +419,19 @@ def run(params={}, no_logging=False):
     if 'command' not in params:
          params['command'] = 'python' + python_ver + ' ' + src_file
 
+    if not os.path.exists(src_path):
+        message = format('error: file not found: %s' % src_path)
+        print(message)
+        if 'no_logging' in params:
+            return { 'error': True, 'message': message }
+        sys.exit(1)
+    elif os.path.isdir(src_path):
+        message = format('error: specified file is a directory: %s' % src_path)
+        print(message)
+        if 'no_logging' in params:
+            return { 'error': True, 'message': message }
+        sys.exit(1)
+
     params['extraFiles'] = []
     if 'workspace' not in params:
         params['workspace'] = src_path
@@ -439,19 +452,15 @@ def run(params={}, no_logging=False):
 
     pipenv = params.pop('pipenv', None)
     if pipenv:
-        if isinstance(pipenv, str):
-            pipenv = pipenv.split(',')
-        elif isinstance(pipenv, bool):
-            pipenv = ['Pipfile', 'Pipfile.lock']
-        for pipfile in pipenv:
+        for pipfile in ['Pipfile', 'Pipfile.lock']:
             if os.path.exists(pipfile):
                 params['extraFiles'].append(pipfile)
         uses_python_ver = ''
         if python_ver.startswith('3'):
             uses_python_ver == '--three '
         elif python_ver.startswith('2'):
             uses_python_ver == '--two '
-        params['command'] = 'pipenv ' + uses_python_ver + 'install\npipenv graph\n' + params['command']
+        params['command'] = 'pipenv ' + uses_python_ver + 'install\n' + params['command']
 
     conda = params.pop('conda', None)
     if conda:

paperspace/main.py

@@ -79,12 +79,14 @@ def main():
                         print('error: missing argument for %s' % opt)
                         print('usage: %s' % run_usage(prog))
                         sys.exit(1)
-                elif param in ['init', 'pipenv', 'req']:
+                elif param in ['init', 'req']:
                     params[param] = True
                     if args and not args[0].startswith('--') and not args[0].endswith('.py'):
                         params[param] = args.pop(0)
                 elif param in ['no_logging', 'nologging', 'noLogging', 'json']:
                     params['no_logging'] = True
+                elif param == 'pipenv':
+                    params[param] = True
                 else:
                     print('error: invalid option: %s' % opt)
                     print('usage: %s' % run_usage(prog))
@@ -122,7 +124,7 @@ def apikey_usage(prog):
 
 
 def run_usage(prog):
-    return format('%s run <python_script.py> [--python 2 | 3] [--init [<init.sh>]] [--conda <env>] [--pipenv [Pipfile,Pipfile.lock]] [--req [<requirements.txt>] |' % prog)
+    return format('%s run <python_script.py> [--python 2 | 3] [--init [<init.sh>]] [--conda <env>] [--pipenv] [--req [<requirements.txt>]' % prog)
 
 
 def usage(prog):