WIP

Author: joaomariolago

.hooks/pre-push

@@ -95,15 +95,14 @@ dirname $(git ls-files "$repository_path/*/setup.py") | xargs -I {} isort --src-
 python_files=$(git ls-files '*.py')
 
 echo "Running black.."
-echo $python_files
 black ${black_extra_args} $python_files
 
 # do not run the rest of the script if running for fixing
 [ "$fixing" = true ] && exit 0
 
 # Faster than pylint to check for issues
 echo "Running ruff.."
-ruff $python_files
+ruff check $python_files
 
 echo "Running pylint.."
 pylint $python_files

core/libs/commonwealth/src/commonwealth/settings/bases/pydantic_base.py

@@ -82,7 +82,7 @@ def load(self, file_path: pathlib.Path) -> None:
 
             # Copy new content to settings class
             try:
-                new = self.parse_obj(result)
+                new = self.model_validate(result)
                 self.__dict__.update(new.__dict__)
             except ValidationError as e:
                 raise BadSettingsFile(f"Settings file contains invalid data: {e}") from e

core/pyproject.toml

@@ -106,14 +106,15 @@ disable_error_code = [
 ]
 
 [tool.ruff]
-ignore = [
-  "A003", # BuiltinAttributeShadowing: Unnecessary restriction (not a source of confusion)
-  "E501", # LineTooLong: Let black take care of
-  "F401", # UnusedImport: We are using pylint 'ignore' comments for it
-  "F821", # UndefinedName: We are using pylint 'ignore' comments for it
-  "F841", # UnusedVariable: We are using pylint 'ignore' comments for it
-  "E402", # ModuleImportNotAtTopOfFile: noqa doesn't work and this is required at some places
-]
+  [tool.ruff.lint]
+  ignore = [
+    "A003", # BuiltinAttributeShadowing: Unnecessary restriction (not a source of confusion)
+    "E501", # LineTooLong: Let black take care of
+    "F401", # UnusedImport: We are using pylint 'ignore' comments for it
+    "F821", # UndefinedName: We are using pylint 'ignore' comments for it
+    "F841", # UnusedVariable: We are using pylint 'ignore' comments for it
+    "E402", # ModuleImportNotAtTopOfFile: noqa doesn't work and this is required at some places
+  ]
 
 [tool.pylint]
   [tool.pylint.master]

core/services/ardupilot_manager/api/__init__.py

@@ -1,4 +1,2 @@
-# pylint: disable=W0406
+# pylint: disable=import-self
 from .app import application
-
-__all__ = ["application"]

core/services/ardupilot_manager/api/v1/routers/__init__.py

@@ -1,5 +1,3 @@
-# pylint: disable=W0406
+# pylint: disable=import-self
 from .endpoints import endpoints_router_v1
 from .index import index_router_v1
-
-__all__ = ["endpoints_router_v1", "index_router_v1"]

core/services/ardupilot_manager/api/v2/routers/__init__.py

@@ -1,4 +1,3 @@
-# pylint: disable=W0406
 from .index import index_router_v2
 
 __all__ = ["index_router_v2"]

core/services/ardupilot_manager/mavlink_proxy/Endpoint.py

@@ -2,7 +2,7 @@
 from typing import Any, Dict, Iterable, Optional, Type
 
 import validators
-from pydantic import constr, root_validator
+from pydantic import constr, model_validator
 from pydantic.dataclasses import dataclass
 
 
@@ -32,10 +32,17 @@ class Endpoint:
     enabled: Optional[bool] = True
     overwrite_settings: Optional[bool] = False
 
-    @root_validator
+    @model_validator(mode="before")
     @classmethod
     def is_mavlink_endpoint(cls: Type["Endpoint"], values: Any) -> Any:
-        connection_type, place, argument = (values.get("connection_type"), values.get("place"), values.get("argument"))
+        if isinstance(values, dict):
+            connection_type, place, argument = (
+                values.get("connection_type"),
+                values.get("place"),
+                values.get("argument"),
+            )
+        else:
+            return values
 
         if connection_type in [
             EndpointType.UDPServer,

core/services/cable_guy/api/manager.py

@@ -3,7 +3,7 @@
 import re
 import subprocess
 import time
-from ipaddress import ip_network, IPv4Address
+from ipaddress import ip_network, IPv4Address, IPv6Address
 from socket import AddressFamily
 from typing import Any, Dict, List, Optional, Set, Tuple, cast
 
@@ -685,11 +685,14 @@ def _parse_route(
             net = "0.0.0.0/0" if raw_route["family"] == AddressFamily.AF_INET else "::/0"
         else:
             net = f"{raw_destination}/{raw_prefixlen}"
-        destination = IPvAnyNetwork(ip_network(net))
+        destination = ip_network(net)
 
         # Parse gateway
         gateway = (
-            self.__class__._normalize_gateway(destination, IPvAnyAddress(raw_gateway))
+            self.__class__._normalize_gateway(
+                destination,
+                IPv4Address(raw_gateway) if raw_route["family"] == AddressFamily.AF_INET else IPv6Address(raw_gateway),
+            )
             if raw_gateway is not None
             else None
         )

core/services/cable_guy/config.py

@@ -1,7 +1,7 @@
 # This file is used to define general configurations for the app
 
+from ipaddress import ip_network
 from typedefs import AddressMode, InterfaceAddress, NetworkInterface, Route
-from pydantic import IPvAnyNetwork
 
 SERVICE_NAME = "cable-guy"
 
@@ -15,7 +15,7 @@
         ],
         routes=[
             Route(
-                destination=str(IPvAnyNetwork("224.0.0.0/4")),
+                destination=str(ip_network("224.0.0.0/4")),
                 gateway=None,
                 priority=None,
                 managed=True,

core/services/cable_guy/typedefs.py

@@ -1,8 +1,7 @@
 from enum import Enum
-from ipaddress import ip_network
-from typing import List, Optional
-
-from pydantic import BaseModel, IPvAnyAddress, IPvAnyNetwork
+from ipaddress import ip_network, ip_address, IPv4Network, IPv6Network, IPv4Address, IPv6Address
+from typing import List, Optional, Union
+from pydantic import BaseModel
 
 
 class AddressMode(str, Enum):
@@ -53,24 +52,24 @@ def __hash__(self) -> int:
 
     # TODO: Remove this once we update self.destination type
     @property
-    def destination_parsed(self) -> IPvAnyNetwork:
-        return IPvAnyNetwork(self.destination)
+    def destination_parsed(self) -> Union[IPv4Network, IPv6Network]:
+        return ip_network(self.destination)
 
     # TODO: Remove this once we update self.destination type
     @destination_parsed.setter
-    def destination_parsed(self, ip: IPvAnyNetwork) -> None:
+    def destination_parsed(self, ip: Union[IPv4Network, IPv6Network]) -> None:
         self.destination = str(ip)
 
     # TODO: Remove this once we update self.next_hop type
     @property
-    def next_hop_parsed(self) -> Optional[IPvAnyAddress]:
+    def next_hop_parsed(self) -> Optional[Union[IPv4Address, IPv6Address]]:
         if self.gateway is None:
             return None
-        return IPvAnyAddress(self.gateway)
+        return ip_address(self.gateway)
 
     # TODO: Remove this once we update self.next_hop type
     @next_hop_parsed.setter
-    def next_hop_parsed(self, ip: Optional[IPvAnyAddress]) -> None:
+    def next_hop_parsed(self, ip: Optional[Union[IPv4Address, IPv6Address]]) -> None:
         self.gateway = str(ip) if ip else None
 
     @property