Fix all linting issues in care

.github/workflows/linter.yml

@@ -7,27 +7,14 @@ on:
       - staging
   merge_group:
 
-permissions: { }
-
 jobs:
   lint:
-    name: Lint Code Base
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Ruff check
-        uses: chartboost/ruff-action@491342200cdd1cf4d5132a30ddc546b3b5bc531b
+      - uses: actions/checkout@v4
         with:
-          version: 0.6.7
-          args: "check"
-          changed-files: "true"
-
-      - name: Ruff format
-        uses: chartboost/ruff-action@491342200cdd1cf4d5132a30ddc546b3b5bc531b
+          fetch-depth: 0
+      - uses: actions/setup-python@v3
+      - uses: pre-commit/action@v3.0.1
         with:
-          version: 0.6.7
-          args: "format"
-          changed-files: "true"
+          extra_args: --color=always --from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }}

Pipfile

@@ -44,7 +44,6 @@ sentry-sdk = "==2.14.0"
 whitenoise = "==6.7.0"
 
 [dev-packages]
-black = "==24.8.0"
 boto3-stubs = { extras = ["s3", "boto3"], version = "==1.35.25" }
 coverage = "==7.6.1"
 debugpy = "==1.8.5"
@@ -53,10 +52,8 @@ django-extensions = "==3.2.3"
 django-silk = "==5.2.0"
 djangorestframework-stubs = "==3.15.1"
 factory-boy = "==3.3.1"
-flake8 = "==7.1.1"
 freezegun = "==1.5.1"
 ipython = "==8.27.0"
-isort = "==5.13.2"
 mypy = "==1.11.2"
 pre-commit = "==3.8.0"
 requests-mock = "==1.12.1"

care/abdm/api/serializers/abha_number.py

@@ -4,7 +4,7 @@
 from care.abdm.models import AbhaNumber
 from care.facility.api.serializers.patient import PatientDetailSerializer
 from care.facility.models import PatientRegistration
-from care.utils.serializer.external_id_field import ExternalIdSerializerField
+from care.utils.serializers.fields import ExternalIdSerializerField
 
 
 class AbhaNumberSerializer(serializers.ModelSerializer):

care/audit_log/helpers.py

@@ -1,3 +1,4 @@
+# ruff: noqa: SLF001
 import re
 from fnmatch import fnmatch
 from functools import lru_cache
@@ -14,7 +15,7 @@
 def instance_finder(v):
     return isinstance(
         v,
-        (list, dict, set),
+        list | dict | set,
     )
 
 
@@ -41,10 +42,9 @@
 
 def _make_search(item):
     splits = item.split(":")
-    if len(splits) == 2:
+    if len(splits) == 2:  # noqa: PLR2004
         return Search(type=splits[0], value=splits[1])
-    else:
-        return Search(type="plain", value=splits[0])
+    return Search(type="plain", value=splits[0])
 
 
 def candidate_in_scope(
@@ -62,7 +62,7 @@
     search_candidate = candidate
     if is_application:
         splits = candidate.split(".")
-        if len(splits) == 2:
+        if len(splits) == 2:  # noqa: PLR2004
             app_label, model_name = splits
             search_candidate = app_label
 
@@ -91,12 +91,11 @@
     ):
         return True
 
-    if candidate_in_scope(
-        model_name, settings.AUDIT_LOG["models"]["exclude"]["models"]
-    ):
-        return True
-
-    return False
+    return bool(
+        candidate_in_scope(
+            model_name, settings.AUDIT_LOG["models"]["exclude"]["models"]
+        )
+    )
 
 
 class MetaDataContainer(dict):

care/audit_log/middleware.py

@@ -15,6 +15,7 @@
     response: HttpResponse | None
     exception: Exception | None
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -50,7 +51,7 @@
         if not dal_request_id:
             dal_request_id = (
                 f"{request.method.lower()}::"
-                f"{md5(request.path.lower().encode('utf-8')).hexdigest()}::"
+                f"{md5(request.path.lower().encode('utf-8')).hexdigest()}::"  # noqa: S324
                 f"{uuid.uuid4().hex}"
             )
             request.dal_request_id = dal_request_id
@@ -69,8 +70,7 @@
         environ = RequestInformation(*AuditLogMiddleware.thread.__dal__)
         if isinstance(environ.request.user, AnonymousUser):
             return None
-        else:
-            return environ.request.user
+        return environ.request.user
 
     @staticmethod
     def get_current_request():
@@ -85,14 +85,14 @@
         response: HttpResponse = self.get_response(request)
         self.save(request, response)
 
-        if request.user:
-            current_user_str = f"{request.user.id}|{request.user}"
-        else:
-            current_user_str = None
+        current_user_str = f"{request.user.id}|{request.user}" if request.user else None
 
         logger.info(
-            f"{request.method} {request.path} {response.status_code} "
-            f"User:[{current_user_str}]"
+            "%s %s %s User:[%s]",
+            request.method,
+            request.path,
+            response.status_code,
+            current_user_str,
         )
         return response
 

care/audit_log/receivers.py

@@ -1,3 +1,4 @@
+# ruff: noqa: SLF001
 import json
 import logging
 from typing import NamedTuple
@@ -22,6 +23,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 class Event(NamedTuple):
     model: str
     actor: AbstractUser
@@ -42,7 +44,7 @@
 
     model_name = get_model_name(instance)
     if exclude_model(model_name):
-        logger.debug(f"{model_name} ignored as per settings")
+        logger.debug("%s ignored as per settings", model_name)
         return
 
     get_or_create_meta(instance)
@@ -61,8 +63,9 @@
     changes = {}
 
     if operation not in {Operation.INSERT, Operation.DELETE}:
-        old, new = remove_non_member_fields(pre.__dict__), remove_non_member_fields(
-            instance.__dict__
+        old, new = (
+            remove_non_member_fields(pre.__dict__),
+            remove_non_member_fields(instance.__dict__),
         )
 
         try:
@@ -107,7 +110,7 @@
     model_name = get_model_name(instance)
 
     if not event and operation != Operation.DELETE:
-        logger.debug(f"Event not received for {operation}. Ignoring.")
+        logger.debug("Event not received for %s. Ignoring.", operation)
         return
 
     try:
@@ -118,11 +121,17 @@
         else:
             changes = json.dumps(event.changes if event else {}, cls=LogJsonEncoder)
     except Exception:
-        logger.warning(f"Failed to log {event}", exc_info=True)
+        logger.warning("Failed to log %s", event, exc_info=True)
         return
 
     logger.info(
-        f"AUDIT_LOG::{request_id}|{actor}|{operation.value}|{model_name}|ID:{instance.pk}|{changes}"
+        "AUDIT_LOG::%s|%s|%s|%s|ID:%s|%s",
+        request_id,
+        actor,
+        operation.value,
+        model_name,
+        instance.pk,
+        changes,
     )
 
 
@@ -137,7 +146,7 @@
 
     model_name = get_model_name(instance)
     if exclude_model(model_name):
-        logger.debug(f"Ignoring {model_name}.")
+        logger.debug("Ignoring %s.", model_name)
         return
 
     operation = Operation.INSERT if created else Operation.UPDATE
@@ -158,7 +167,7 @@
 
     model_name = get_model_name(instance)
     if exclude_model(model_name):
-        logger.debug(f"Ignoring {model_name}.")
+        logger.debug("Ignoring %s.", model_name)
         return
 
     event = instance._meta.dal.event

care/facility/admin.py

@@ -55,30 +55,14 @@
 
     def lookups(self, request, model_admin):
         district = Facility.objects.values_list("district__name", flat=True)
-        return list(map(lambda x: (x, x), set(district)))
+        return [(x, x) for x in set(district)]
 
     def queryset(self, request, queryset):
         if self.value() is None:
             return queryset
         return queryset.filter(district__name=self.value())
 
 
-# class LocalBodyFilter(SimpleListFilter):
-#     """Local body filter"""
-
-#     title = "Local body"
-#     parameter_name = "local_body"
-
-#     def lookups(self, request, model_admin):
-#         local_body = Facility.objects.values_list("local_body__name", flat=True)
-#         return list(map(lambda x: (x, x), set(local_body)))
-
-#     def queryset(self, request, queryset):
-#         if self.value() is None:
-#             return queryset
-#         return queryset.filter(local_body__name=self.value())
-
-
 class StateFilter(SimpleListFilter):
     """State filter"""
 
@@ -87,7 +71,7 @@
 
     def lookups(self, request, model_admin):
         state = Facility.objects.values_list("state__name", flat=True)
-        return list(map(lambda x: (x, x), set(state)))
+        return [(x, x) for x in set(state)]
 
     def queryset(self, request, queryset):
         if self.value() is None:
@@ -222,7 +206,7 @@
         )
 
         class Meta:
-            fields = "__all__"
+            fields = ("flag", "facility")
             model = FacilityFlag
 
     form = FacilityFeatureFlagForm

care/facility/api/serializers/ambulance.py

@@ -10,7 +10,7 @@
 class AmbulanceDriverSerializer(serializers.ModelSerializer):
     class Meta:
         model = AmbulanceDriver
-        exclude = TIMESTAMP_FIELDS + ("ambulance",)
+        exclude = (*TIMESTAMP_FIELDS, "ambulance")
 
 
 class AmbulanceSerializer(serializers.ModelSerializer):
@@ -36,17 +36,16 @@ class Meta:
     def validate(self, obj):
         validated = super().validate(obj)
         if not validated.get("price_per_km") and not validated.get("has_free_service"):
-            raise ValidationError(
-                "The ambulance must provide a price or be marked as free"
-            )
+            msg = "The ambulance must provide a price or be marked as free"
+            raise ValidationError(msg)
         return validated
 
     def create(self, validated_data):
         with transaction.atomic():
             drivers = validated_data.pop("drivers", [])
             validated_data.pop("created_by", None)
 
-            ambulance = super(AmbulanceSerializer, self).create(validated_data)
+            ambulance = super().create(validated_data)
 
             for d in drivers:
                 d["ambulance"] = ambulance
@@ -55,8 +54,7 @@ def create(self, validated_data):
 
     def update(self, instance, validated_data):
         validated_data.pop("drivers", [])
-        ambulance = super(AmbulanceSerializer, self).update(instance, validated_data)
-        return ambulance
+        return super().update(instance, validated_data)
 
 
 class DeleteDriverSerializer(serializers.Serializer):