infrahub-server 1.5.4__py3-none-any.whl → 1.6.0__py3-none-any.whl

infrahub_sdk/ctl/task.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import typer
 from rich.console import Console
 from rich.table import Table
@@ -75,8 +73,8 @@ async def list_tasks(
     state: list[str] = typer.Option(
         None, "--state", "-s", help="Filter by task state. Can be provided multiple times."
     ),
-    limit: Optional[int] = typer.Option(None, help="Maximum number of tasks to retrieve."),
-    offset: Optional[int] = typer.Option(None, help="Offset for pagination."),
+    limit: int | None = typer.Option(None, help="Maximum number of tasks to retrieve."),
+    offset: int | None = typer.Option(None, help="Offset for pagination."),
     include_related_nodes: bool = typer.Option(False, help="Include related nodes in the output."),
     include_logs: bool = typer.Option(False, help="Include task logs in the output."),
     json_output: bool = typer.Option(False, "--json", help="Output the result as JSON."),

infrahub_sdk/ctl/utils.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import asyncio
 import logging
 import traceback
-from collections.abc import Coroutine
+from collections.abc import Callable, Coroutine
 from functools import wraps
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, NoReturn, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, NoReturn, TypeVar
 
 import typer
 from click.exceptions import Exit
@@ -46,7 +46,7 @@ def init_logging(debug: bool = False) -> None:
 
     log_level = "DEBUG" if debug else "INFO"
     FORMAT = "%(message)s"
-    logging.basicConfig(level=log_level, format=FORMAT, datefmt="[%X]", handlers=[RichHandler()])
+    logging.basicConfig(level=log_level, format=FORMAT, datefmt="[%X]", handlers=[RichHandler(show_path=debug)])
     logging.getLogger("infrahubctl")
 
 
@@ -149,7 +149,7 @@ def print_graphql_errors(console: Console, errors: list) -> None:
             console.print(f"[red]{escape(str(error))}")
 
 
-def parse_cli_vars(variables: Optional[list[str]]) -> dict[str, str]:
+def parse_cli_vars(variables: list[str] | None) -> dict[str, str]:
     if not variables:
         return {}
 

infrahub_sdk/ctl/validate.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import sys
 from pathlib import Path
-from typing import Optional
 
 import typer
 import ujson
@@ -58,7 +57,7 @@ async def validate_schema(schema: Path, _: str = CONFIG_PARAM) -> None:
 @catch_exception(console=console)
 def validate_graphql(
     query: str,
-    variables: Optional[list[str]] = typer.Argument(
+    variables: list[str] | None = typer.Argument(
         None, help="Variables to pass along with the query. Format key=value key=value."
     ),
     debug: bool = typer.Option(False, help="Display more troubleshooting information."),

infrahub_sdk/diff.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
-from typing import (
-    Any,
-)
+from datetime import datetime
+from typing import Any
 
 from typing_extensions import NotRequired, TypedDict
 
+from infrahub_sdk.graphql.query import Query
+
 
 class NodeDiff(TypedDict):
     branch: str
@@ -35,6 +36,19 @@ class NodeDiffPeer(TypedDict):
     summary: NodeDiffSummary
 
 
+class DiffTreeData(TypedDict):
+    num_added: int
+    num_updated: int
+    num_removed: int
+    num_conflicts: int
+    to_time: str
+    from_time: str
+    base_branch: str
+    diff_branch: str
+    name: NotRequired[str | None]
+    nodes: list[NodeDiff]
+
+
 def get_diff_summary_query() -> str:
     return """
         query GetDiffTree($branch_name: String!, $name: String, $from_time: DateTime, $to_time: DateTime) {
@@ -125,3 +139,66 @@ def diff_tree_node_to_node_diff(node_dict: dict[str, Any], branch_name: str) ->
         display_label=str(node_dict.get("label")),
         elements=element_diffs,
     )
+
+
+def get_diff_tree_query() -> Query:
+    node_structure = {
+        "uuid": None,
+        "kind": None,
+        "status": None,
+        "label": None,
+        "num_added": None,
+        "num_updated": None,
+        "num_removed": None,
+        "attributes": {
+            "name": None,
+            "status": None,
+            "num_added": None,
+            "num_updated": None,
+            "num_removed": None,
+        },
+        "relationships": {
+            "name": None,
+            "status": None,
+            "cardinality": None,
+            "num_added": None,
+            "num_updated": None,
+            "num_removed": None,
+            "elements": {
+                "status": None,
+                "num_added": None,
+                "num_updated": None,
+                "num_removed": None,
+            },
+        },
+    }
+
+    return Query(
+        name="GetDiffTree",
+        query={
+            "DiffTree": {
+                "@filters": {
+                    "branch": "$branch_name",
+                    "name": "$name",
+                    "from_time": "$from_time",
+                    "to_time": "$to_time",
+                },
+                "name": None,
+                "to_time": None,
+                "from_time": None,
+                "base_branch": None,
+                "diff_branch": None,
+                "num_added": None,
+                "num_updated": None,
+                "num_removed": None,
+                "num_conflicts": None,
+                "nodes": node_structure,
+            },
+        },
+        variables={
+            "branch_name": str,
+            "name": str | None,
+            "from_time": datetime | None,
+            "to_time": datetime | None,
+        },
+    )

infrahub_sdk/graphql/constants.py

@@ -1 +1,14 @@
-VARIABLE_TYPE_MAPPING = ((str, "String!"), (int, "Int!"), (float, "Float!"), (bool, "Boolean!"))
+from datetime import datetime
+
+VARIABLE_TYPE_MAPPING = (
+    (str, "String!"),
+    (str | None, "String"),
+    (int, "Int!"),
+    (int | None, "Int"),
+    (float, "Float!"),
+    (float | None, "Float"),
+    (bool, "Boolean!"),
+    (bool | None, "Boolean"),
+    (datetime, "DateTime!"),
+    (datetime | None, "DateTime"),
+)

infrahub_sdk/graphql/renderers.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+from datetime import datetime
 from enum import Enum
 from typing import Any
 
@@ -66,7 +67,10 @@ def convert_to_graphql_as_string(value: Any, convert_enum: bool = False) -> str:
     return str(value)
 
 
-def render_variables_to_string(data: dict[str, type[str | int | float | bool]]) -> str:
+GRAPHQL_VARIABLE_TYPES = type[str | int | float | bool | datetime | None]
+
+
+def render_variables_to_string(data: dict[str, GRAPHQL_VARIABLE_TYPES]) -> str:
     """Render a dict into a variable string that will be used in a GraphQL Query.
 
     The $ sign will be automatically added to the name of the query.

infrahub_sdk/node/attribute.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import ipaddress
-from typing import TYPE_CHECKING, Any, Callable, get_args
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, get_args
 
 from ..protocols_base import CoreNodeBase
 from ..uuidt import UUIDT
@@ -25,7 +26,7 @@ class Attribute:
         self.name = name
         self._schema = schema
 
-        if not isinstance(data, dict) or "value" not in data.keys():
+        if not isinstance(data, dict) or "value" not in data:
             data = {"value": data}
 
         self._properties_flag = PROPERTIES_FLAG
@@ -34,12 +35,12 @@ class Attribute:
 
         self._read_only = ["updated_at", "is_inherited"]
 
-        self.id: str | None = data.get("id", None)
+        self.id: str | None = data.get("id")
 
-        self._value: Any | None = data.get("value", None)
+        self._value: Any | None = data.get("value")
         self.value_has_been_mutated = False
-        self.is_default: bool | None = data.get("is_default", None)
-        self.is_from_profile: bool | None = data.get("is_from_profile", None)
+        self.is_default: bool | None = data.get("is_default")
+        self.is_from_profile: bool | None = data.get("is_from_profile")
 
         if self._value:
             value_mapper: dict[str, Callable] = {
@@ -49,11 +50,10 @@ class Attribute:
             mapper = value_mapper.get(schema.kind, lambda value: value)
             self._value = mapper(data.get("value"))
 
-        self.is_inherited: bool | None = data.get("is_inherited", None)
-        self.updated_at: str | None = data.get("updated_at", None)
+        self.is_inherited: bool | None = data.get("is_inherited")
+        self.updated_at: str | None = data.get("updated_at")
 
-        self.is_visible: bool | None = data.get("is_visible", None)
-        self.is_protected: bool | None = data.get("is_protected", None)
+        self.is_protected: bool | None = data.get("is_protected")
 
         self.source: NodeProperty | None = None
         self.owner: NodeProperty | None = None

infrahub_sdk/node/constants.py

@@ -1,12 +1,11 @@
 import ipaddress
 import re
-from typing import Union
 
-PROPERTIES_FLAG = ["is_visible", "is_protected"]
+PROPERTIES_FLAG = ["is_protected", "updated_at"]
 PROPERTIES_OBJECT = ["source", "owner"]
 SAFE_VALUE = re.compile(r"(^[\. /:a-zA-Z0-9_-]+$)|(^$)")
 
-IP_TYPES = Union[ipaddress.IPv4Interface, ipaddress.IPv6Interface, ipaddress.IPv4Network, ipaddress.IPv6Network]
+IP_TYPES = ipaddress.IPv4Interface | ipaddress.IPv6Interface | ipaddress.IPv4Network | ipaddress.IPv6Network
 
 ARTIFACT_FETCH_FEATURE_NOT_SUPPORTED_MESSAGE = (
     "calling artifact_fetch is only supported for nodes that are Artifact Definition target"

infrahub_sdk/node/node.py

@@ -284,12 +284,12 @@ class InfrahubNodeBase:
     def _strip_unmodified_dict(data: dict, original_data: dict, variables: dict, item: str) -> None:
         data_item = data.get(item)
         if item in original_data and isinstance(original_data[item], dict) and isinstance(data_item, dict):
-            for item_key in original_data[item].keys():
+            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 in data[item].keys():
+                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
                         # removed if it's the last key in the current context
@@ -335,8 +335,8 @@ class InfrahubNodeBase:
             elif isinstance(relationship_property, RelationshipManagerBase) and not relationship_property.has_update:
                 data.pop(relationship)
 
-        for item in original_data.keys():
-            if item in data.keys():
+        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:
@@ -741,7 +741,7 @@ class InfrahubNode(InfrahubNodeBase):
 
             if (
                 rel_schema.cardinality == RelationshipCardinality.MANY  # type: ignore[union-attr]
-                and rel_schema.kind not in [RelationshipKind.ATTRIBUTE, RelationshipKind.PARENT]  # type: ignore[union-attr]
+                and rel_schema.kind not in {RelationshipKind.ATTRIBUTE, RelationshipKind.PARENT}  # type: ignore[union-attr]
                 and not (include and rel_name in include)
             ):
                 continue
@@ -895,6 +895,7 @@ class InfrahubNode(InfrahubNodeBase):
         branch: str,
         related_nodes: list[InfrahubNode],
         timeout: int | None = None,
+        recursive: bool = False,
     ) -> None:
         """Processes the Relationships of a InfrahubNode and add Related Nodes to a list.
 
@@ -903,6 +904,7 @@ class InfrahubNode(InfrahubNodeBase):
             branch (str): The branch name.
             related_nodes (list[InfrahubNode]): The list to which related nodes will be appended.
             timeout (int, optional): Overrides default timeout used when querying the graphql API. Specified in seconds.
+            recursive:(bool): Whether to recursively process relationships of related nodes.
         """
         for rel_name in self._relationships:
             rel = getattr(self, rel_name)
@@ -910,17 +912,37 @@ class InfrahubNode(InfrahubNodeBase):
                 relation = node_data["node"].get(rel_name, None)
                 if relation and relation.get("node", None):
                     related_node = await InfrahubNode.from_graphql(
-                        client=self._client, branch=branch, data=relation, timeout=timeout
+                        client=self._client,
+                        branch=branch,
+                        data=relation,
+                        timeout=timeout,
                     )
                     related_nodes.append(related_node)
+                    if recursive:
+                        await related_node._process_relationships(
+                            node_data=relation,
+                            branch=branch,
+                            related_nodes=related_nodes,
+                            recursive=recursive,
+                        )
             elif rel and isinstance(rel, RelationshipManager):
                 peers = node_data["node"].get(rel_name, None)
                 if peers and peers["edges"]:
                     for peer in peers["edges"]:
                         related_node = await InfrahubNode.from_graphql(
-                            client=self._client, branch=branch, data=peer, timeout=timeout
+                            client=self._client,
+                            branch=branch,
+                            data=peer,
+                            timeout=timeout,
                         )
                         related_nodes.append(related_node)
+                        if recursive:
+                            await related_node._process_relationships(
+                                node_data=peer,
+                                branch=branch,
+                                related_nodes=related_nodes,
+                                recursive=recursive,
+                            )
 
     async def get_pool_allocated_resources(self, resource: InfrahubNode) -> list[InfrahubNode]:
         """Fetch all nodes that were allocated for the pool and a given resource.
@@ -1364,7 +1386,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
 
             if (
                 rel_schema.cardinality == RelationshipCardinality.MANY  # type: ignore[union-attr]
-                and rel_schema.kind not in [RelationshipKind.ATTRIBUTE, RelationshipKind.PARENT]  # type: ignore[union-attr]
+                and rel_schema.kind not in {RelationshipKind.ATTRIBUTE, RelationshipKind.PARENT}  # type: ignore[union-attr]
                 and not (include and rel_name in include)
             ):
                 continue
@@ -1520,6 +1542,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
         branch: str,
         related_nodes: list[InfrahubNodeSync],
         timeout: int | None = None,
+        recursive: bool = False,
     ) -> None:
         """Processes the Relationships of a InfrahubNodeSync and add Related Nodes to a list.
 
@@ -1528,7 +1551,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
             branch (str): The branch name.
             related_nodes (list[InfrahubNodeSync]): The list to which related nodes will be appended.
             timeout (int, optional): Overrides default timeout used when querying the graphql API. Specified in seconds.
-
+            recursive:(bool): Whether to recursively process relationships of related nodes.
         """
         for rel_name in self._relationships:
             rel = getattr(self, rel_name)
@@ -1536,17 +1559,37 @@ class InfrahubNodeSync(InfrahubNodeBase):
                 relation = node_data["node"].get(rel_name, None)
                 if relation and relation.get("node", None):
                     related_node = InfrahubNodeSync.from_graphql(
-                        client=self._client, branch=branch, data=relation, timeout=timeout
+                        client=self._client,
+                        branch=branch,
+                        data=relation,
+                        timeout=timeout,
                     )
                     related_nodes.append(related_node)
+                    if recursive:
+                        related_node._process_relationships(
+                            node_data=relation,
+                            branch=branch,
+                            related_nodes=related_nodes,
+                            recursive=recursive,
+                        )
             elif rel and isinstance(rel, RelationshipManagerSync):
                 peers = node_data["node"].get(rel_name, None)
                 if peers and peers["edges"]:
                     for peer in peers["edges"]:
                         related_node = InfrahubNodeSync.from_graphql(
-                            client=self._client, branch=branch, data=peer, timeout=timeout
+                            client=self._client,
+                            branch=branch,
+                            data=peer,
+                            timeout=timeout,
                         )
                         related_nodes.append(related_node)
+                        if recursive:
+                            related_node._process_relationships(
+                                node_data=peer,
+                                branch=branch,
+                                related_nodes=related_nodes,
+                                recursive=recursive,
+                            )
 
     def get_pool_allocated_resources(self, resource: InfrahubNodeSync) -> list[InfrahubNodeSync]:
         """Fetch all nodes that were allocated for the pool and a given resource.

infrahub_sdk/node/related_node.py

@@ -64,7 +64,7 @@ class RelatedNodeBase:
                 self._display_label = node_data.get("display_label", None)
                 self._typename = node_data.get("__typename", None)
 
-            self.updated_at: str | None = data.get("updated_at", data.get("_relation__updated_at", None))
+            self.updated_at: str | None = data.get("updated_at", properties_data.get("updated_at", None))
 
             # FIXME, we won't need that once we are only supporting paginated results
             if self._typename and self._typename.startswith("Related"):
@@ -171,7 +171,6 @@ class RelatedNodeBase:
             for prop_name in PROPERTIES_OBJECT:
                 properties[prop_name] = {"id": None, "display_label": None, "__typename": None}
 
-        if properties:
             data["properties"] = properties
         if peer_data:
             data["node"].update(peer_data)

infrahub_sdk/node/relationship.py

@@ -87,9 +87,8 @@ class RelationshipManagerBase:
                 properties[prop_name] = None
             for prop_name in PROPERTIES_OBJECT:
                 properties[prop_name] = {"id": None, "display_label": None, "__typename": None}
-
-        if properties:
             data["edges"]["properties"] = properties
+
         if peer_data:
             data["edges"]["node"].update(peer_data)
 

infrahub_sdk/object_store.py

@@ -33,7 +33,7 @@ class ObjectStore(ObjectStoreBase):
             self.client.log.error(f"Unable to connect to {self.client.address} .. ")
             raise
         except httpx.HTTPStatusError as exc:
-            if exc.response.status_code in [401, 403]:
+            if exc.response.status_code in {401, 403}:
                 response = exc.response.json()
                 errors = response.get("errors")
                 messages = [error.get("message") for error in errors]
@@ -54,7 +54,7 @@ class ObjectStore(ObjectStoreBase):
             self.client.log.error(f"Unable to connect to {self.client.address} .. ")
             raise
         except httpx.HTTPStatusError as exc:
-            if exc.response.status_code in [401, 403]:
+            if exc.response.status_code in {401, 403}:
                 response = exc.response.json()
                 errors = response.get("errors")
                 messages = [error.get("message") for error in errors]
@@ -81,7 +81,7 @@ class ObjectStoreSync(ObjectStoreBase):
             self.client.log.error(f"Unable to connect to {self.client.address} .. ")
             raise
         except httpx.HTTPStatusError as exc:
-            if exc.response.status_code in [401, 403]:
+            if exc.response.status_code in {401, 403}:
                 response = exc.response.json()
                 errors = response.get("errors")
                 messages = [error.get("message") for error in errors]
@@ -102,7 +102,7 @@ class ObjectStoreSync(ObjectStoreBase):
             self.client.log.error(f"Unable to connect to {self.client.address} .. ")
             raise
         except httpx.HTTPStatusError as exc:
-            if exc.response.status_code in [401, 403]:
+            if exc.response.status_code in {401, 403}:
                 response = exc.response.json()
                 errors = response.get("errors")
                 messages = [error.get("message") for error in errors]

infrahub_sdk/operation.py

@@ -65,14 +65,14 @@ class InfrahubOperation:
         await self._init_client.schema.all(branch=self.branch_name)
 
         for kind in data:
-            if kind in self._init_client.schema.cache[self.branch_name].nodes.keys():
+            if kind in self._init_client.schema.cache[self.branch_name].nodes:
                 for result in data[kind].get("edges", []):
                     node = await self.infrahub_node.from_graphql(
                         client=self._init_client, branch=self.branch_name, data=result
                     )
                     self._nodes.append(node)
                     await node._process_relationships(
-                        node_data=result, branch=self.branch_name, related_nodes=self._related_nodes
+                        node_data=result, branch=self.branch_name, related_nodes=self._related_nodes, recursive=True
                     )
 
         for node in self._nodes + self._related_nodes:

infrahub_sdk/protocols_base.py

@@ -56,7 +56,6 @@ class Attribute(Protocol):
     is_from_profile: bool | None
     is_inherited: bool | None
     updated_at: str | None
-    is_visible: bool | None
     is_protected: bool | None
 
 

infrahub_sdk/protocols_generator/generator.py

@@ -56,7 +56,7 @@ class CodeGenerator:
             if not e.startswith("__")
             and not e.endswith("__")
             and e
-            not in ("TYPE_CHECKING", "CoreNode", "Optional", "Protocol", "Union", "annotations", "runtime_checkable")
+            not in {"TYPE_CHECKING", "CoreNode", "Optional", "Protocol", "Union", "annotations", "runtime_checkable"}
         ]
 
         self.sorted_generics = self._sort_and_filter_models(self.generics, filters=["CoreNode"] + self.base_protocols)

infrahub_sdk/pytest_plugin/items/jinja2_transform.py

@@ -83,7 +83,7 @@ class InfrahubJinja2Item(InfrahubItem):
 class InfrahubJinja2TransformSmokeItem(InfrahubJinja2Item):
     def runtest(self) -> None:
         file_path: Path = self.session.infrahub_config_path.parent / self.resource_config.template_path  # type: ignore[attr-defined]
-        self.get_jinja2_environment().parse(file_path.read_text(), filename=file_path.name)
+        self.get_jinja2_environment().parse(file_path.read_text(encoding="utf-8"), filename=file_path.name)
 
 
 class InfrahubJinja2TransformUnitRenderItem(InfrahubJinja2Item):

infrahub_sdk/pytest_plugin/models.py

@@ -55,7 +55,7 @@ class InfrahubInputOutputTest(InfrahubBaseTest):
 
         if suffix and suffix == "json":
             return ujson.loads(text)
-        if suffix in ("yml", "yaml"):
+        if suffix in {"yml", "yaml"}:
             return yaml.safe_load(text)
 
         return text

infrahub_sdk/pytest_plugin/plugin.py

@@ -90,7 +90,7 @@ def pytest_sessionstart(session: Session) -> None:
 
 
 def pytest_collect_file(parent: Collector | Item, file_path: Path) -> InfrahubYamlFile | None:
-    if file_path.suffix in [".yml", ".yaml"] and file_path.name.startswith("test_"):
+    if file_path.suffix in {".yml", ".yaml"} and file_path.name.startswith("test_"):
         return InfrahubYamlFile.from_parent(parent, path=file_path)
     return None
 

infrahub_sdk/query_groups.py

@@ -168,7 +168,7 @@ class InfrahubGroupContext(InfrahubGroupContextBase):
             return
 
         # Calculate how many nodes should be deleted
-        self.unused_member_ids = set(existing_group.members.peer_ids) - set(members)  # type: ignore
+        self.unused_member_ids = list(set(existing_group.members.peer_ids) - set(members))  # type: ignore[union-attr]
 
         if not self.delete_unused_nodes:
             return
@@ -262,7 +262,7 @@ class InfrahubGroupContextSync(InfrahubGroupContextBase):
             return
 
         # Calculate how many nodes should be deleted
-        self.unused_member_ids = set(existing_group.members.peer_ids) - set(members)  # type: ignore
+        self.unused_member_ids = list(set(existing_group.members.peer_ids) - set(members))  # type: ignore[union-attr]
 
         if not self.delete_unused_nodes:
             return

infrahub_sdk/schema/__init__.py

@@ -7,12 +7,11 @@ import warnings
 from collections.abc import MutableMapping
 from enum import Enum
 from time import sleep
-from typing import TYPE_CHECKING, Any, TypedDict, Union
+from typing import TYPE_CHECKING, Any, TypeAlias, TypedDict
 from urllib.parse import urlencode
 
 import httpx
 from pydantic import BaseModel, Field
-from typing_extensions import TypeAlias
 
 from ..exceptions import (
     BranchNotFoundError,
@@ -46,7 +45,7 @@ if TYPE_CHECKING:
     from ..client import InfrahubClient, InfrahubClientSync, SchemaType, SchemaTypeSync
     from ..node import InfrahubNode, InfrahubNodeSync
 
-    InfrahubNodeTypes = Union[InfrahubNode, InfrahubNodeSync]
+    InfrahubNodeTypes: TypeAlias = InfrahubNode | InfrahubNodeSync
 
 
 __all__ = [
@@ -84,11 +83,11 @@ class EnumMutation(str, Enum):
     remove = "SchemaEnumRemove"
 
 
-MainSchemaTypes: TypeAlias = Union[NodeSchema, GenericSchema]
-MainSchemaTypesAPI: TypeAlias = Union[NodeSchemaAPI, GenericSchemaAPI, ProfileSchemaAPI, TemplateSchemaAPI]
-MainSchemaTypesAll: TypeAlias = Union[
-    NodeSchema, GenericSchema, NodeSchemaAPI, GenericSchemaAPI, ProfileSchemaAPI, TemplateSchemaAPI
-]
+MainSchemaTypes: TypeAlias = NodeSchema | GenericSchema
+MainSchemaTypesAPI: TypeAlias = NodeSchemaAPI | GenericSchemaAPI | ProfileSchemaAPI | TemplateSchemaAPI
+MainSchemaTypesAll: TypeAlias = (
+    NodeSchema | GenericSchema | NodeSchemaAPI | GenericSchemaAPI | ProfileSchemaAPI | TemplateSchemaAPI
+)
 
 
 class SchemaWarningType(Enum):
@@ -123,7 +122,7 @@ class InfrahubSchemaBase:
         SchemaRoot(**data)
 
     def validate_data_against_schema(self, schema: MainSchemaTypesAPI, data: dict) -> None:
-        for key in data.keys():
+        for key in data:
             if key not in schema.relationship_names + schema.attribute_names:
                 identifier = f"{schema.kind}"
                 raise ValidationError(
@@ -155,7 +154,6 @@ class InfrahubSchemaBase:
         source: str | None = None,
         owner: str | None = None,
         is_protected: bool | None = None,
-        is_visible: bool | None = None,
     ) -> dict[str, Any]:
         obj_data: dict[str, Any] = {}
         item_metadata: dict[str, Any] = {}
@@ -165,8 +163,6 @@ class InfrahubSchemaBase:
             item_metadata["owner"] = str(owner)
         if is_protected is not None:
             item_metadata["is_protected"] = is_protected
-        if is_visible is not None:
-            item_metadata["is_visible"] = is_visible
 
         for key, value in data.items():
             obj_data[key] = {}
@@ -194,12 +190,12 @@ class InfrahubSchemaBase:
                 hash=status["hash"], previous_hash=status["previous_hash"], warnings=status.get("warnings") or []
             )
 
-        if response.status_code in [
+        if response.status_code in {
             httpx.codes.BAD_REQUEST,
             httpx.codes.UNPROCESSABLE_ENTITY,
             httpx.codes.UNAUTHORIZED,
             httpx.codes.FORBIDDEN,
-        ]:
+        }:
             return SchemaLoadResponse(errors=response.json())
 
         response.raise_for_status()