diff --git a/backend/infrahub/api/diff/diff.py b/backend/infrahub/api/diff/diff.py index 3deaedb91d..79d653df1d 100644 --- a/backend/infrahub/api/diff/diff.py +++ b/backend/infrahub/api/diff/diff.py @@ -195,7 +195,7 @@ async def get_diff_artifacts( if not target: continue definition_id = node.elements["definition"].peer.new.id - artifacts_in_main[(target.id, definition_id)] = node + artifacts_in_main[target.id, definition_id] = node for node in payload[branch.name]: if "storage_id" not in node.elements or "checksum" not in node.elements: @@ -231,7 +231,7 @@ async def get_diff_artifacts( and (target.id, node.elements["definition"].peer.new.id) in artifacts_in_main ): diff_artifact.action = DiffAction.UPDATED - node_in_main = artifacts_in_main[(target.id, node.elements["definition"].peer.new.id)] + node_in_main = artifacts_in_main[target.id, node.elements["definition"].peer.new.id] diff_artifact.item_previous = BranchDiffArtifactStorage( storage_id=node_in_main.elements["storage_id"].value.value.new, checksum=node_in_main.elements["checksum"].value.value.new, diff --git a/backend/infrahub/core/diff/combiner.py b/backend/infrahub/core/diff/combiner.py index 5c1da1fa64..4ddcf01078 100644 --- a/backend/infrahub/core/diff/combiner.py +++ b/backend/infrahub/core/diff/combiner.py @@ -107,7 +107,7 @@ def _combine_actions(self, earlier: DiffAction, later: DiffAction) -> DiffAction (DiffAction.REMOVED, DiffAction.ADDED): DiffAction.UPDATED, (DiffAction.REMOVED, DiffAction.UPDATED): DiffAction.UPDATED, } - return actions_map[(earlier, later)] + return actions_map[earlier, later] @staticmethod def combine_conflicts( diff --git a/backend/infrahub/core/models.py b/backend/infrahub/core/models.py index 6adafdd250..43bbf3e432 100644 --- a/backend/infrahub/core/models.py +++ b/backend/infrahub/core/models.py @@ -417,7 +417,7 @@ def _organize_sub_items(items: list[HashableModel], shared_ids: set[str]) -> dic sub_items = {} for item in items: if item.id and item.id in shared_ids: - sub_items[(item.id,)] = item + sub_items[item.id,] = item continue sub_items[item._sorting_id] = item diff --git a/backend/infrahub/core/query/node.py b/backend/infrahub/core/query/node.py index 4ff19f5620..f7a1689593 100644 --- a/backend/infrahub/core/query/node.py +++ b/backend/infrahub/core/query/node.py @@ -1108,7 +1108,7 @@ def _get_field_requirements(self) -> list[FieldAttributeRequirement]: continue field = self.schema.get_field(field_name, raise_on_error=False) for field_attr_name, field_attr_value in attr_filters.items(): - field_requirements_map[(field_name, field_attr_name)] = FieldAttributeRequirement( + field_requirements_map[field_name, field_attr_name] = FieldAttributeRequirement( field_name=field_name, field=field, field_attr_name=field_attr_name, @@ -1138,7 +1138,7 @@ def _get_field_requirements(self) -> list[FieldAttributeRequirement]: ), ) field_req.types.append(FieldAttributeRequirementType.ORDER) - field_requirements_map[(order_by_field_name, order_by_attr_property_name)] = field_req + field_requirements_map[order_by_field_name, order_by_attr_property_name] = field_req index += 1 return list(field_requirements_map.values()) diff --git a/pyproject.toml b/pyproject.toml index e8104bc1c6..05dab88b9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -537,7 +537,6 @@ ignore = [ "RUF021", # Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear "RUF027", # Possible f-string without an `f` prefix "RUF029", # Function is declared `async`, but doesn't `await` or use `async` features. - "RUF031", # [*] Avoid parentheses for tuples in subscripts. "S101", # Use of `assert` detected "S105", # Possible hardcoded password assigned to: "REGEX_PASSWORD" "S108", # Probable insecure usage of temporary file or directory