Black8 + isort

Signed-off-by: Cédric Foellmi <cedric@onekiloparsec.dev>

Author: onekiloparsec

arcsecond/api/endpoint.py

@@ -100,7 +100,7 @@ def _perform_request(self, url, method_name, json=None, data=None, headers=None)
             else:
                 return None, ArcsecondError(response.text, response.status_code)
         else:
-            return None, ArcsecondError('Response is None', -1)
+            return None, ArcsecondError("Response is None", -1)
 
     def _check_and_set_auth_key(self, headers, url):
         # No token header for login and register

arcsecond/cloud/__init__.py

@@ -1,10 +1,10 @@
 from .auth import api, login, me
 from .resources import datasets, telescopes
 from .uploader import (
+    AllSkyCameraImageFileUploader,
+    AllSkyCameraImageUploadContext,
     DatasetFileUploader,
     DatasetUploadContext,
-    AllSkyCameraImageUploadContext,
-    AllSkyCameraImageFileUploader
 )
 from .uploader.constants import Status, Substatus
 from .uploads import (

arcsecond/cloud/uploader/allskycameraimages/uploader.py

@@ -2,6 +2,7 @@
 
 from arcsecond.cloud.uploader.errors import UploadRemoteFileMetadataError
 from arcsecond.cloud.uploader.uploader import BaseFileUploader
+
 from .context import AllSkyCameraImageUploadContext
 
 

arcsecond/cloud/uploader/context.py

@@ -5,6 +5,7 @@
 from arcsecond.api.constants import API_AUTH_PATH_VERIFY_PORTAL
 from arcsecond.api.endpoint import ArcsecondAPIEndpoint
 from arcsecond.api.main import ArcsecondAPI
+
 from .errors import (
     InvalidAstronomerError,
     InvalidOrgMembershipError,

arcsecond/cloud/uploader/datafiles/uploader.py

@@ -2,6 +2,7 @@
 
 from arcsecond.cloud.uploader.errors import UploadRemoteFileMetadataError
 from arcsecond.cloud.uploader.uploader import BaseFileUploader
+
 from .context import DatasetUploadContext
 from .errors import UploadRemoteDatasetPreparationError
 

arcsecond/cloud/uploader/uploader.py

@@ -107,7 +107,7 @@ def _perform_upload(self):
             return
 
         if "already exists in dataset" in str(
-                error
+            error
         ):  # VERY WEAK!!! But solution with HTTP 409 isn't nice either.
             self._status = [Status.SKIPPED, Substatus.ALREADY_SYNCED, None]
         else:
@@ -125,7 +125,9 @@ def _update_metadata(self, **kwargs):
     def _cleanup(self):
         for resource in self._cleanup_resources:
             try:
-                if hasattr(resource, 'close') and not getattr(resource, 'closed', False):
+                if hasattr(resource, "close") and not getattr(
+                    resource, "closed", False
+                ):
                     resource.close()
             except Exception as e:
                 self._logger.error(f"{self.log_prefix} {str(e)}.")

arcsecond/hosting/main.py

@@ -1,10 +1,11 @@
 import sys
 
 import click
-from arcsecond.api import ArcsecondConfig
 
+from arcsecond.api import ArcsecondConfig
 from arcsecond.hosting import docker
 from arcsecond.options import State, basic_options
+
 from .checks import fetch_profile_email, is_user_logged_in
 from .constants import BANNER, PREFIX, PREFIX_SUB, PREFIX_SUB_FAIL
 from .keygen import KeygenClient

tests/cloud/uploader/datafiles/test_uploader_full_process.py

@@ -5,44 +5,54 @@
 from pathlib import Path
 
 import responses
-
 from api.constants import ARCSECOND_API_URL_DEV
-from arcsecond import ArcsecondConfig, DatasetUploadContext, DatasetFileUploader, AllSkyCameraImageUploadContext, \
-    AllSkyCameraImageFileUploader
-from arcsecond.cloud.uploader.constants import Substatus, Status
+
+from arcsecond import (
+    AllSkyCameraImageFileUploader,
+    AllSkyCameraImageUploadContext,
+    ArcsecondConfig,
+    DatasetFileUploader,
+    DatasetUploadContext,
+)
+from arcsecond.cloud.uploader.constants import Status, Substatus
 from arcsecond.options import State
-from tests.utils import prepare_successful_login, prepare_upload_files, prepare_upload_allskyimage
+from tests.utils import (
+    prepare_successful_login,
+    prepare_upload_allskyimage,
+    prepare_upload_files,
+)
 
 
 @responses.activate
 def test_full_upload_process_datafiles():
     dataset_uuid = str(uuid.uuid4())
     telescope_uuid = str(uuid.uuid4())
-    org_subdomain = 'test-portal'
+    org_subdomain = "test-portal"
 
     prepare_successful_login(org_subdomain)
     prepare_upload_files(dataset_uuid, telescope_uuid, org_subdomain)
 
     # file upload
     datafile_id = random.randint(1, 1000)
     responses.post(
-        "/".join([ARCSECOND_API_URL_DEV, org_subdomain, 'datafiles']) + "/",
+        "/".join([ARCSECOND_API_URL_DEV, org_subdomain, "datafiles"]) + "/",
         status=201,
-        json={"status": "success", "id": datafile_id}
+        json={"status": "success", "id": datafile_id},
     )
     # update metadata
     responses.patch(
-        "/".join([ARCSECOND_API_URL_DEV, org_subdomain, 'datafiles', str(datafile_id)]) + "/",
+        "/".join([ARCSECOND_API_URL_DEV, org_subdomain, "datafiles", str(datafile_id)])
+        + "/",
         status=200,
-        json={"id": datafile_id}
+        json={"id": datafile_id},
     )
 
-    state = State(is_using_cli=False, verbose=False, api_name='cloud')
+    state = State(is_using_cli=False, verbose=False, api_name="cloud")
     config = {
-        'cloud': {
-            'username': 'dummy',
-            'upload_key': '1234',
-            'api_server': ARCSECOND_API_URL_DEV
+        "cloud": {
+            "username": "dummy",
+            "upload_key": "1234",
+            "api_server": ARCSECOND_API_URL_DEV,
         }
     }
     config = ArcsecondConfig(state, config)  # it will read your config file.
@@ -52,12 +62,12 @@ def test_full_upload_process_datafiles():
         input_dataset_uuid_or_name=dataset_uuid,
         input_telescope_uuid=telescope_uuid,
         is_raw_data=True,
-        org_subdomain=org_subdomain
+        org_subdomain=org_subdomain,
     )
 
     context.validate()  # important step to perform before uploading.
     fixtures_dir = Path(__file__).parent.parent.parent.parent / "fixtures"
-    fixture_files = list(fixtures_dir.glob('*.fits'))
+    fixture_files = list(fixtures_dir.glob("*.fits"))
 
     for fixture_file in fixture_files:
         # Create a temporary directory and copy the fixture file there
@@ -67,10 +77,7 @@ def test_full_upload_process_datafiles():
 
             # Use the actual file for uploading
             uploader = DatasetFileUploader(
-                context,
-                str(temp_dir),
-                str(temp_path),
-                display_progress=False
+                context, str(temp_dir), str(temp_path), display_progress=False
             )
 
             status, substatus, error = uploader.upload_file()
@@ -82,44 +89,45 @@ def test_full_upload_process_datafiles():
 @responses.activate
 def test_full_upload_process_allskyimages():
     camera_uuid = str(uuid.uuid4())
-    org_subdomain = 'test-portal'
+    org_subdomain = "test-portal"
 
     prepare_successful_login(org_subdomain)
     prepare_upload_allskyimage(camera_uuid, org_subdomain)
 
     # file upload
     image_id = random.randint(1, 1000)
     responses.post(
-        "/".join([ARCSECOND_API_URL_DEV, org_subdomain, 'allskycameraimages']) + "/",
+        "/".join([ARCSECOND_API_URL_DEV, org_subdomain, "allskycameraimages"]) + "/",
         status=201,
-        json={"status": "success", "id": image_id}
+        json={"status": "success", "id": image_id},
     )
     # update metadata
     responses.patch(
-        "/".join([ARCSECOND_API_URL_DEV, org_subdomain, 'allskycameraimages', str(image_id)]) + "/",
+        "/".join(
+            [ARCSECOND_API_URL_DEV, org_subdomain, "allskycameraimages", str(image_id)]
+        )
+        + "/",
         status=200,
-        json={"id": image_id}
+        json={"id": image_id},
     )
 
-    state = State(is_using_cli=False, verbose=False, api_name='cloud')
+    state = State(is_using_cli=False, verbose=False, api_name="cloud")
     config = {
-        'cloud': {
-            'username': 'dummy',
-            'upload_key': '1234',
-            'api_server': ARCSECOND_API_URL_DEV
+        "cloud": {
+            "username": "dummy",
+            "upload_key": "1234",
+            "api_server": ARCSECOND_API_URL_DEV,
         }
     }
     config = ArcsecondConfig(state, config)  # it will read your config file.
 
     context = AllSkyCameraImageUploadContext(
-        config,
-        input_camera_uuid=camera_uuid,
-        org_subdomain=org_subdomain
+        config, input_camera_uuid=camera_uuid, org_subdomain=org_subdomain
     )
 
     context.validate()  # important step to perform before uploading.
     fixtures_dir = Path(__file__).parent.parent.parent.parent / "fixtures"
-    fixture_files = list(fixtures_dir.glob('*.fits'))
+    fixture_files = list(fixtures_dir.glob("*.fits"))
 
     for fixture_file in fixture_files:
         # Create a temporary directory and copy the fixture file there
@@ -129,10 +137,7 @@ def test_full_upload_process_allskyimages():
 
             # Use the actual file for uploading
             uploader = AllSkyCameraImageFileUploader(
-                context,
-                str(temp_dir),
-                str(temp_path),
-                display_progress=False
+                context, str(temp_dir), str(temp_path), display_progress=False
             )
 
             status, substatus, error = uploader.upload_file()

tests/utils.py

@@ -3,7 +3,11 @@
 import responses
 
 from arcsecond import ArcsecondConfig
-from arcsecond.api.constants import API_AUTH_PATH_VERIFY, ARCSECOND_API_URL_DEV, API_AUTH_PATH_VERIFY_PORTAL
+from arcsecond.api.constants import (
+    API_AUTH_PATH_VERIFY,
+    API_AUTH_PATH_VERIFY_PORTAL,
+    ARCSECOND_API_URL_DEV,
+)
 from arcsecond.options import State
 
 TEST_LOGIN_USERNAME = "robot1"
@@ -34,7 +38,7 @@ def make_profile_json(subdomain, role):
     return json.dumps(make_profile(subdomain, role))
 
 
-def prepare_successful_login(org_subdomain=''):
+def prepare_successful_login(org_subdomain=""):
     config = ArcsecondConfig(State(api_name="test"))
     config.api_server = ARCSECOND_API_URL_DEV
     responses.post(
@@ -48,33 +52,70 @@ def prepare_successful_login(org_subdomain=''):
         )
 
 
-def prepare_upload_files(dataset_uuid, telescope_uuid, org_subdomain=''):
+def prepare_upload_files(dataset_uuid, telescope_uuid, org_subdomain=""):
     responses.get(
-        "/".join([part for part in [ARCSECOND_API_URL_DEV, org_subdomain, 'datasets', dataset_uuid] if part]) + "/",
+        "/".join(
+            [
+                part
+                for part in [
+                    ARCSECOND_API_URL_DEV,
+                    org_subdomain,
+                    "datasets",
+                    dataset_uuid,
+                ]
+                if part
+            ]
+        )
+        + "/",
         status=200,
         json={"uuid": dataset_uuid, "name": "dummy dataset"},
     )
     responses.get(
-        "/".join([part for part in [ARCSECOND_API_URL_DEV, org_subdomain, 'telescopes', telescope_uuid] if part]) + "/",
+        "/".join(
+            [
+                part
+                for part in [
+                    ARCSECOND_API_URL_DEV,
+                    org_subdomain,
+                    "telescopes",
+                    telescope_uuid,
+                ]
+                if part
+            ]
+        )
+        + "/",
         status=200,
         json={"uuid": telescope_uuid, "name": "dummy telescope"},
     )
     if org_subdomain:
         responses.get(
-            "/".join([ARCSECOND_API_URL_DEV, 'organisations', org_subdomain]) + "/",
+            "/".join([ARCSECOND_API_URL_DEV, "organisations", org_subdomain]) + "/",
             status=200,
             json={"subdomain": org_subdomain, "name": "dummy org"},
         )
 
-def prepare_upload_allskyimage(camera_uuid, org_subdomain=''):
+
+def prepare_upload_allskyimage(camera_uuid, org_subdomain=""):
     responses.get(
-        "/".join([part for part in [ARCSECOND_API_URL_DEV, org_subdomain, 'allskycameras', camera_uuid] if part]) + "/",
+        "/".join(
+            [
+                part
+                for part in [
+                    ARCSECOND_API_URL_DEV,
+                    org_subdomain,
+                    "allskycameras",
+                    camera_uuid,
+                ]
+                if part
+            ]
+        )
+        + "/",
         status=201,
-        json={"status": "success", "uuid": camera_uuid}
+        json={"status": "success", "uuid": camera_uuid},
     )
     if org_subdomain:
         responses.get(
-            "/".join([ARCSECOND_API_URL_DEV, 'organisations', org_subdomain]) + "/",
+            "/".join([ARCSECOND_API_URL_DEV, "organisations", org_subdomain]) + "/",
             status=200,
             json={"subdomain": org_subdomain, "name": "dummy org"},
         )