[MISC] Use ruff for formatting

lib/charms/data_platform_libs/v0/upgrade.py

@@ -285,7 +285,7 @@ def restart(self, event) -> None:
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 15
+LIBPATCH = 16
 
 PYDEPS = ["pydantic>=1.10,<2", "poetry-core"]
 
@@ -501,7 +501,7 @@ class DataUpgrade(Object, ABC):
 
     STATES = ["recovery", "failed", "idle", "ready", "upgrading", "completed"]
 
-    on = UpgradeEvents()  # pyright: ignore [reportGeneralTypeIssues]
+    on = UpgradeEvents()  # pyright: ignore [reportAssignmentType]
 
     def __init__(
         self,
@@ -606,6 +606,21 @@ def upgrade_stack(self, stack: List[int]) -> None:
         self.peer_relation.data[self.charm.app].update({"upgrade-stack": json.dumps(stack)})
         self._upgrade_stack = stack
 
+    @property
+    def other_unit_states(self) -> list:
+        """Current upgrade state for other units.
+
+        Returns:
+            Unsorted list of upgrade states for other units.
+        """
+        if not self.peer_relation:
+            return []
+
+        return [
+            self.peer_relation.data[unit].get("state", "")
+            for unit in list(self.peer_relation.units)
+        ]
+
     @property
     def unit_states(self) -> list:
         """Current upgrade state for all units.
@@ -926,11 +941,8 @@ def on_upgrade_changed(self, event: EventBase) -> None:
             return
 
         if self.substrate == "vm" and self.cluster_state == "recovery":
-            # Only defer for vm, that will set unit states to "ready" on upgrade-charm
-            # on k8s only the upgrading unit will receive the upgrade-charm event
-            # and deferring will prevent the upgrade stack from being popped
-            logger.debug("Cluster in recovery, deferring...")
-            event.defer()
+            # skip run while in recovery. The event will be retrigged when the cluster is ready
+            logger.debug("Cluster in recovery, skip...")
             return
 
         # if all units completed, mark as complete
@@ -981,6 +993,7 @@ def on_upgrade_changed(self, event: EventBase) -> None:
             self.charm.unit == top_unit
             and top_state in ["ready", "upgrading"]
             and self.cluster_state == "ready"
+            and "upgrading" not in self.other_unit_states
         ):
             logger.debug(
                 f"{top_unit.name} is next to upgrade, emitting `upgrade_granted` event and upgrading..."

pyproject.toml

@@ -40,8 +40,7 @@ cosl = "*"
 optional = true
 
 [tool.poetry.group.format.dependencies]
-black = "^24.2.0"
-ruff = "^0.3.1"
+ruff = "^0.3.2"
 
 [tool.poetry.group.lint]
 optional = true

src/charm.py

@@ -4,7 +4,6 @@
 
 """Charmed PgBouncer connection pooler."""
 
-
 import json
 import logging
 import math
@@ -352,13 +351,11 @@ def _pgbouncer_layer(self) -> Layer:
                 "startup": "enabled",
                 "override": "replace",
             }
-        return Layer(
-            {
-                "summary": "pgbouncer layer",
-                "description": "pebble config layer for pgbouncer",
-                "services": pebble_services,
-            }
-        )
+        return Layer({
+            "summary": "pgbouncer layer",
+            "description": "pebble config layer for pgbouncer",
+            "services": pebble_services,
+        })
 
     def _on_update_status(self, _) -> None:
         """Update Status hook.
@@ -445,9 +442,9 @@ def _generate_monitoring_service(self, enabled: bool = True) -> Dict[str, str]:
 
     def toggle_monitoring_layer(self, enabled: bool) -> None:
         """Starts or stops the monitoring service."""
-        pebble_layer = Layer(
-            {"services": {self._metrics_service: self._generate_monitoring_service(enabled)}}
-        )
+        pebble_layer = Layer({
+            "services": {self._metrics_service: self._generate_monitoring_service(enabled)}
+        })
         pgb_container = self.unit.get_container(PGB)
         pgb_container.add_layer(PGB, pebble_layer, combine=True)
         if enabled:

src/relations/backend_database.py

@@ -305,9 +305,9 @@ def _on_relation_departed(self, event: RelationDepartedEvent):
 
         if event.departing_unit == self.charm.unit:
             # This should only occur when the relation is being removed, not on scale-down
-            self.charm.peers.unit_databag.update(
-                {f"{BACKEND_RELATION_NAME}_{event.relation.id}_departing": "true"}
-            )
+            self.charm.peers.unit_databag.update({
+                f"{BACKEND_RELATION_NAME}_{event.relation.id}_departing": "true"
+            })
             logger.warning("added relation-departing flag to peer databag")
             return
 

src/relations/db.py

@@ -370,9 +370,9 @@ def _on_relation_departed(self, departed_event: RelationDepartedEvent):
         # Neither peer relation data nor stored state are good solutions,
         # just a temporary solution.
         if departed_event.departing_unit == self.charm.unit:
-            self.charm.peers.unit_databag.update(
-                {self._depart_flag(departed_event.relation): "True"}
-            )
+            self.charm.peers.unit_databag.update({
+                self._depart_flag(departed_event.relation): "True"
+            })
             # Just run the rest of the logic for departing of remote units.
             return
 
@@ -493,13 +493,11 @@ def _comma_split(string) -> Iterable[str]:
     def get_allowed_units(self, relation: Relation) -> str:
         """Gets the external units from this relation that can be allowed into the network."""
         return ",".join(
-            sorted(
-                [
-                    unit.name
-                    for unit in relation.data
-                    if isinstance(unit, Unit) and unit.app != self.charm.app
-                ]
-            )
+            sorted([
+                unit.name
+                for unit in relation.data
+                if isinstance(unit, Unit) and unit.app != self.charm.app
+            ])
         )
 
     def get_external_app(self, relation):

src/relations/pgbouncer_provider.py

@@ -30,7 +30,6 @@
 └──────────────────┴───────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────┘
 """  # noqa: W505
 
-
 import logging
 
 from charms.data_platform_libs.v0.data_interfaces import (

tests/integration/relations/pgbouncer_provider/test_pgbouncer_provider.py

@@ -354,7 +354,7 @@ async def test_an_application_can_request_multiple_databases(ops_test: OpsTest):
 @pytest.mark.group(1)
 async def test_legacy_relation_compatibility(ops_test: OpsTest):
     finos = "finos-waltz-k8s"
-    await ops_test.model.deploy(finos, application_name=finos, channel="edge"),
+    (await ops_test.model.deploy(finos, application_name=finos, channel="edge"),)
     finos_relation = await ops_test.model.add_relation(f"{PGB}:db", f"{finos}:db")
     wait_for_relation_joined_between(ops_test, PGB, finos)
     async with ops_test.fast_forward():
@@ -388,7 +388,7 @@ async def test_multiple_pgb_can_connect_to_one_backend(ops_test: OpsTest, pgb_ch
         series=CHARM_SERIES,
     )
     async with ops_test.fast_forward():
-        await ops_test.model.wait_for_idle(apps=[pgb_secondary], status="blocked"),
+        (await ops_test.model.wait_for_idle(apps=[pgb_secondary], status="blocked"),)
 
     await ops_test.model.add_relation(f"{pgb_secondary}:{BACKEND_RELATION_NAME}", f"{PG}:database")
     wait_for_relation_joined_between(ops_test, PG, pgb_secondary)