Skip to content

Commit 87960ca

Browse files
authored
Switch to Ruff for Python linting and formatting. (#898)
* Remove old linting code. Add Terraform to tool versions file for asdf / mise users. * Update quality checks pipeline. * Update dist included files. * Remove unnecessary pipeline step and template. * Reinstate .terraform-version while we're still using APIM pipelines. * Switch to Ruff for Python linting and formatting. * Auto apply safe fixes on commit. * Attempt to fix first-party import detection. * Revert failed attempt. Specify target Python version and apply automatic fixes.
1 parent d9e1f60 commit 87960ca

File tree

249 files changed

+882
-1101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+882
-1101
lines changed

backend/src/authorisation/authoriser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import json
44

55
from authorisation.api_operation_code import ApiOperationCode
6-
from clients import redis_client, logger
6+
from clients import logger, redis_client
77
from constants import SUPPLIER_PERMISSIONS_HASH_KEY
88

99

backend/src/controller/aws_apig_event_utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from typing import Optional
44

55
from aws_lambda_typing.events import APIGatewayProxyEventV1
6-
76
from controller.constants import SUPPLIER_SYSTEM_HEADER_NAME
87
from models.errors import UnauthorizedError
98
from utils import dict_utils

backend/src/controller/fhir_api_exception_handler.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
from constants import GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE
99
from controller.aws_apig_response_utils import create_response
1010
from models.errors import (
11-
UnauthorizedVaxError,
12-
UnauthorizedError,
11+
Code,
1312
ResourceNotFoundError,
14-
create_operation_outcome,
1513
Severity,
16-
Code,
14+
UnauthorizedError,
15+
UnauthorizedVaxError,
16+
create_operation_outcome,
1717
)
1818

1919
_CUSTOM_EXCEPTION_TO_STATUS_MAP: dict[Type[Exception], int] = {

backend/src/controller/fhir_controller.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,27 @@
88
from typing import Optional
99

1010
from aws_lambda_typing.events import APIGatewayProxyEventV1
11-
1211
from controller.aws_apig_event_utils import (
13-
get_supplier_system_header,
1412
get_path_parameter,
13+
get_supplier_system_header,
1514
)
1615
from controller.aws_apig_response_utils import create_response
1716
from controller.constants import E_TAG_HEADER_NAME
1817
from controller.fhir_api_exception_handler import fhir_api_exception_handler
1918
from models.errors import (
20-
Severity,
2119
Code,
22-
create_operation_outcome,
23-
UnauthorizedError,
24-
ResourceNotFoundError,
25-
UnhandledResponseError,
26-
ValidationError,
2720
IdentifierDuplicationError,
2821
ParameterException,
22+
ResourceNotFoundError,
23+
Severity,
24+
UnauthorizedError,
2925
UnauthorizedVaxError,
26+
UnhandledResponseError,
27+
ValidationError,
28+
create_operation_outcome,
3029
)
3130
from models.utils.generic_utils import check_keys_in_sources
32-
from parameter_parser import process_params, process_search_params, create_query_string
31+
from parameter_parser import create_query_string, process_params, process_search_params
3332
from repository.fhir_repository import ImmunizationRepository, create_table
3433
from service.fhir_service import FhirService, UpdateOutcome, get_service_url
3534

backend/src/create_imms_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from controller.fhir_controller import FhirController, make_controller
99
from local_lambda import load_string
1010
from log_structure import function_info
11-
from models.errors import Severity, Code, create_operation_outcome
11+
from models.errors import Code, Severity, create_operation_outcome
1212

1313
logging.basicConfig(level="INFO")
1414
logger = logging.getLogger()

backend/src/delete_imms_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from controller.aws_apig_response_utils import create_response
88
from controller.fhir_controller import FhirController, make_controller
99
from log_structure import function_info
10-
from models.errors import Severity, Code, create_operation_outcome
10+
from models.errors import Code, Severity, create_operation_outcome
1111

1212
logging.basicConfig(level="INFO")
1313
logger = logging.getLogger()

backend/src/filter.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
from constants import Urls
44
from models.utils.generic_utils import (
5-
is_actor_referencing_contained_resource,
6-
get_contained_practitioner,
75
get_contained_patient,
6+
get_contained_practitioner,
7+
is_actor_referencing_contained_resource,
88
)
99

1010

@@ -63,7 +63,6 @@ def replace_organization_values(imms: dict) -> dict:
6363
"""
6464
for performer in imms.get("performer", [{}]):
6565
if performer.get("actor", {}).get("type") == "Organization":
66-
6766
# Obfuscate or set the identifier value and system.
6867
identifier = performer["actor"].get("identifier", {})
6968
if identifier.get("value") is not None:

backend/src/forwarding_batch_lambda.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@
77
from datetime import datetime
88

99
import simplejson as json
10-
1110
from batch.batch_filename_to_events_mapper import BatchFilenameToEventsMapper
1211
from clients import sqs_client
1312
from controller.fhir_batch_controller import (
1413
ImmunizationBatchController,
1514
make_batch_controller,
1615
)
1716
from models.errors import (
18-
MessageNotSuccessfulError,
19-
RecordProcessorError,
2017
CustomValidationError,
2118
IdentifierDuplicationError,
22-
ResourceNotFoundError,
19+
MessageNotSuccessfulError,
20+
RecordProcessorError,
2321
ResourceFoundError,
22+
ResourceNotFoundError,
2423
)
2524
from repository.fhir_batch_repository import create_table
2625

backend/src/models/fhir_immunization.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Immunization FHIR R4B validator"""
22

33
from fhir.resources.R4B.immunization import Immunization
4-
54
from models.fhir_immunization_post_validators import PostValidators
65
from models.fhir_immunization_pre_validators import PreValidators
76
from models.utils.validation_utils import get_vaccine_type

backend/src/models/fhir_immunization_post_validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from models.field_locations import FieldLocations
55
from models.field_names import FieldNames
66
from models.mandation_functions import MandationFunctions
7-
from models.utils.base_utils import obtain_field_value, obtain_field_location
7+
from models.utils.base_utils import obtain_field_location, obtain_field_value
88
from models.validation_sets import ValidationSets
99

1010

0 commit comments

Comments
 (0)