fix cyclic import and other clean

Author: nathanthorpe

pubweb/auth/iam.py

@@ -3,7 +3,7 @@
 from requests_aws4auth import AWS4Auth
 
 from pubweb import config
-from pubweb.auth import AuthInfo
+from pubweb.auth.base import AuthInfo
 from pubweb.models.auth import Creds
 
 

pubweb/auth/username.py

@@ -2,8 +2,8 @@
 from pycognito import AWSSRP
 from requests.auth import AuthBase
 
-from pubweb import config
-from pubweb.auth import AuthInfo
+from pubweb.auth.base import AuthInfo
+from pubweb.config import config
 
 
 class UsernameAndPasswordAuth(AuthInfo):

pubweb/cli/interactive/workflow_args.py

@@ -307,7 +307,7 @@ def _prompt_repository_version(repo: Repository) -> Union[GitRelease, Branch]:
     if version_type == 'release':
 
         # Get the releases which are available
-        version_list = [x for x in repo.get_releases()]
+        version_list = repo.get_releases()
         pretty_version_list = [f"{x.tag_name} ({x.title})" for x in version_list]
 
         version = ask(

pubweb/clients/s3.py

@@ -28,7 +28,7 @@ def build_client(creds: Creds):
                         aws_session_token=creds['SessionToken'])
 
 
-class ProgressPercentage(object):
+class ProgressPercentage:
     def __init__(self, progress: tqdm):
         self._lock = threading.Lock()
         self.progress = progress

pubweb/models/form_specification.py

@@ -40,7 +40,7 @@ def validate_params(self, params: Dict):
         try:
             jsonschema.validate(instance=params, schema=self._form_spec_raw)
         except jsonschema.ValidationError as e:
-            raise RuntimeError(f'Parameter at {e.json_path} error: {e.message}')
+            raise RuntimeError(f'Parameter at {e.json_path} error: {e.message}') from e
 
     def print(self):
         """

pubweb/models/process.py

@@ -97,8 +97,8 @@ class RunAnalysisCommand(NamedTuple):
     def to_json(self):
         try:
             param_json = json.dumps(self.params)
-        except TypeError:
-            raise RuntimeError('Params invalid')
+        except TypeError as e:
+            raise RuntimeError('Params invalid') from e
 
         return {
             'name': self.name,

pubweb/services/file.py

@@ -2,7 +2,7 @@
 from functools import partial
 from typing import List
 
-from pubweb.auth import IAMAuth
+from pubweb.auth.iam import IAMAuth
 from pubweb.clients import ApiClient, S3Client
 from pubweb.file_utils import upload_directory, download_directory
 from pubweb.models.auth import Creds
@@ -75,5 +75,5 @@ class FileEnabledService(BaseService):
     _file_service: FileService
 
     def __init__(self, api_client: ApiClient, file_service: FileService):
-        super(FileEnabledService, self).__init__(api_client)
+        super().__init__(api_client)
         self._file_service = file_service

pubweb/utils.py

@@ -21,11 +21,11 @@ def parse_json_date(json_date: str) -> Optional[datetime]:
 
 
 def safe_load_json(json_str: Optional[str]):
-    if json_str is not None:
-        return json.loads(json_str)
-    else:
+    if json_str is None:
         return {}
 
+    return json.loads(json_str)
+
 
 def format_date(date: Union[str, datetime]) -> str:
     if isinstance(date, str):