Merge pull request #757 from opsmill/pog-avoid-nested-if

Avoid nested chained if statements

Author: ogenstad

infrahub_sdk/graphql/plugin.py

@@ -14,9 +14,12 @@ class FutureAnnotationPlugin(Plugin):
     def insert_future_annotation(module: ast.Module) -> ast.Module:
         # First check if the future annotation is already present
         for item in module.body:
-            if isinstance(item, ast.ImportFrom) and item.module == "__future__":
-                if any(alias.name == "annotations" for alias in item.names):
-                    return module
+            if (
+                isinstance(item, ast.ImportFrom)
+                and item.module == "__future__"
+                and any(alias.name == "annotations" for alias in item.names)
+            ):
+                return module
 
         module.body.insert(0, ast.ImportFrom(module="__future__", names=[ast.alias(name="annotations")], level=0))
         return module

infrahub_sdk/node/node.py

@@ -313,9 +313,12 @@ def _strip_unmodified_dict(data: dict, original_data: dict, variables: dict, ite
         if item in original_data and isinstance(original_data[item], dict) and isinstance(data_item, dict):
             for item_key in original_data[item]:
                 for property_name in PROPERTIES_OBJECT:
-                    if item_key == property_name and isinstance(original_data[item][property_name], dict):
-                        if original_data[item][property_name].get("id"):
-                            original_data[item][property_name] = original_data[item][property_name]["id"]
+                    if (
+                        item_key == property_name
+                        and isinstance(original_data[item][property_name], dict)
+                        and original_data[item][property_name].get("id")
+                    ):
+                        original_data[item][property_name] = original_data[item][property_name]["id"]
                 if item_key in data[item]:
                     if item_key == "id" and len(data[item].keys()) > 1:
                         # Related nodes typically require an ID. So the ID is only
@@ -365,9 +368,12 @@ def _strip_unmodified(self, data: dict, variables: dict) -> tuple[dict, dict]:
         for item in original_data:
             if item in data:
                 if data[item] == original_data[item]:
-                    if attr := getattr(self, item, None):  # this should never be None, just a safety default value
-                        if not isinstance(attr, Attribute) or not attr.value_has_been_mutated:
-                            data.pop(item)
+                    if (
+                        attr := getattr(self, item, None)
+                    ) and (  # this should never be None, just a safety default value
+                        not isinstance(attr, Attribute) or not attr.value_has_been_mutated
+                    ):
+                        data.pop(item)
                     continue
                 if isinstance(original_data[item], dict):
                     self._strip_unmodified_dict(data=data, original_data=original_data, variables=variables, item=item)

infrahub_sdk/spec/object.py

@@ -281,14 +281,13 @@ async def validate_object(
                     )
                 )
 
-            if key in schema.attribute_names:
-                if not isinstance(value, (str, int, float, bool, list, dict)):
-                    errors.append(
-                        ObjectValidationError(
-                            position=position + [key],
-                            message=f"{key} must be a string, int, float, bool, list, or dict",
-                        )
+            if key in schema.attribute_names and not isinstance(value, (str, int, float, bool, list, dict)):
+                errors.append(
+                    ObjectValidationError(
+                        position=position + [key],
+                        message=f"{key} must be a string, int, float, bool, list, or dict",
                     )
+                )
 
             if key in schema.relationship_names:
                 rel_info = await get_relationship_info(

infrahub_sdk/transfer/importer/json.py

@@ -115,10 +115,9 @@ async def remove_and_store_optional_relationships(self) -> None:
                     if relationship_value.peer_ids:
                         self.optional_relationships_by_node[node.id][relationship_name] = relationship_value
                         setattr(node, relationship_name, None)
-                elif isinstance(relationship_value, RelatedNode):
-                    if relationship_value.id:
-                        self.optional_relationships_by_node[node.id][relationship_name] = relationship_value
-                        setattr(node, relationship_name, None)
+                elif isinstance(relationship_value, RelatedNode) and relationship_value.id:
+                    self.optional_relationships_by_node[node.id][relationship_name] = relationship_value
+                    setattr(node, relationship_name, None)
 
     async def update_optional_relationships(self) -> None:
         update_batch = await self.client.create_batch(return_exceptions=True)

pyproject.toml

@@ -258,7 +258,6 @@ ignore = [
     "RUF029",  # Function is declared `async`, but doesn't `await` or use `async` features.
     "S311",    # Standard pseudo-random generators are not suitable for cryptographic purposes
     "S701",    # By default, jinja2 sets `autoescape` to `False`. Consider using `autoescape=True`
-    "SIM102",  # Use a single `if` statement instead of nested `if` statements
     "SIM105",  # Use `contextlib.suppress(KeyError)` instead of `try`-`except`-`pass`
     "SIM108",  # Use ternary operator `key_str = f"{value[ALIAS_KEY]}: {key}" if ALIAS_KEY in value and value[ALIAS_KEY] else key` instead of `if`-`else`-block
     "SIM110",  # Use `return any(getattr(item, resource_field) == resource_id for item in getattr(self, RESOURCE_MAP[resource_type]))` instead of `for` loop