[chores] More fixes and small improvements suggested by @coderabbitai

Author: nemesifier

openwisp_controller/config/base/whois.py

@@ -81,7 +81,7 @@ def clean(self):
             except ValueError as e:
                 raise ValidationError(
                     {"cidr": _("Invalid CIDR format: %(error)s") % {"error": str(e)}}
-                )
+                ) from e
         if self.coordinates:
             if not (-90 <= self.coordinates.y <= 90):
                 raise ValidationError(
@@ -153,8 +153,13 @@ def _location_name(self):
         if address:
             parts = [part.strip() for part in address.split(",")[:2] if part.strip()]
             location = ", ".join(parts)
-            return _("{} ~Estimated Location: {}~".format(location, self.ip_address))
-        return _("Estimated Location: {}".format(self.ip_address))
+            # Use named placeholders so translators receive the template
+            return _("%(location)s ~Estimated Location: %(ip)s~") % {
+                "location": location,
+                "ip": self.ip_address,
+            }
+        # Use named placeholder for consistency
+        return _("Estimated Location: %(ip)s") % {"ip": self.ip_address}
 
     def _get_defaults_for_estimated_location(self):
         """

openwisp_controller/config/management/commands/clear_last_ip.py

@@ -36,9 +36,12 @@ def handle(self, *_args, **options):
                 raise CommandError("Operation cancelled by user.")
 
         devices = (
-            Device.objects.filter(_is_deactivated=False)
-            .select_related("organization__config_settings")
-            .only("last_ip", "organization__config_settings", "key")
+            Device.objects.filter(_is_deactivated=False).select_related(
+                "organization__config_settings"
+            )
+            # include the FK field 'organization' in .only() so the related
+            # `organization__config_settings` traversal is not deferred
+            .only("last_ip", "organization", "key")
         )
         # Filter out devices that have WHOIS information for their last IP
         devices = devices.exclude(last_ip=None).exclude(

openwisp_controller/config/whois/service.py

@@ -71,6 +71,7 @@ def is_valid_public_ip_address(ip):
         try:
             return ip and ip_addr(ip).is_global
         except ValueError:
+            # ip_address() from the stdlib raises ValueError for malformed strings
             return False
 
     @staticmethod

openwisp_controller/geo/base/models.py

@@ -1,4 +1,5 @@
 import re
+from typing import ClassVar
 
 from django.contrib.gis.db import models
 from django.core.exceptions import ValidationError
@@ -15,7 +16,11 @@
 
 
 class BaseLocation(OrgMixin, AbstractLocation):
-    _changed_checked_fields = ["is_estimated", "address", "geometry"]
+    _changed_checked_fields: ClassVar[list[str]] = [
+        "is_estimated",
+        "address",
+        "geometry",
+    ]
 
     is_estimated = models.BooleanField(
         default=False,
@@ -87,8 +92,8 @@ def save(self, *args, _set_estimated=False, **kwargs):
             if not _set_estimated and (address_changed or geometry_changed):
                 self.is_estimated = False
                 if self.name:
-                    # remove estimated status between '~'
-                    self.name = re.sub(r"~[^~]*~", "", self.name)
+                    # remove estimated status between '~' and trim extra spaces
+                    self.name = re.sub(r"~[^~]*~", "", self.name).strip()
                 changed_fields = {"is_estimated", "name"}
         # Manual changes to is_estimated discarded if feature not enabled
         elif self._initial_is_estimated is not models.DEFERRED: