infrahub-server 1.7.0__tar.gz → 1.7.0b0__tar.gz

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infrahub-server
-Version: 1.7.0
+Version: 1.7.0b0
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
 Project-URL: Homepage, https://opsmill.com
 Project-URL: Repository, https://github.com/opsmill/infrahub

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/api/exceptions.py

@@ -4,12 +4,12 @@ from infrahub.exceptions import Error
 class QueryValidationError(Error):
     HTTP_CODE = 400
 
-    def __init__(self, message: str) -> None:
+    def __init__(self, message: str):
         self.message = message
 
 
 class SchemaNotValidError(Error):
     HTTP_CODE = 422
 
-    def __init__(self, message: str) -> None:
+    def __init__(self, message: str):
         self.message = message

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/cli/db.py

@@ -65,7 +65,6 @@ def get_timestamp_string() -> str:
 if TYPE_CHECKING:
     from infrahub.cli.context import CliContext
     from infrahub.core.migrations.shared import MigrationTypes
-    from infrahub.core.root import Root
     from infrahub.database import InfrahubDatabase
     from infrahub.database.index import IndexManagerBase
 
@@ -94,40 +93,12 @@ def callback() -> None:
     """
 
 
-async def do_migrate(
-    db: InfrahubDatabase,
-    root_node: Root,
-    check: bool = False,
-    migration_number: int | None = None,
-) -> None:
-    """Core migration logic that can be called independently of CLI.
-
-    Args:
-        db: The database connection.
-        root_node: The root node containing the current graph version.
-        check: If True, only check which migrations need to run without applying them.
-        migration_number: If provided, run only this specific migration.
-    """
-    migrations = await detect_migration_to_run(
-        current_graph_version=root_node.graph_version, migration_number=migration_number
-    )
-
-    if check or not migrations:
-        return
-
-    await migrate_database(
-        db=db, migrations=migrations, initialize=True, update_graph_version=(migration_number is None)
-    )
-
-
 @app.command(name="migrate")
 async def migrate_cmd(
     ctx: typer.Context,
     check: bool = typer.Option(False, help="Check the state of the database without applying the migrations."),
     config_file: str = typer.Argument("infrahub.toml", envvar="INFRAHUB_CONFIG"),
-    migration_number: int | None = typer.Option(
-        None, help="Apply a specific migration by number, regardless of current database version"
-    ),
+    migration_number: int | None = typer.Option(None, help="Apply a specific migration by number"),
 ) -> None:
     """Check the current format of the internal graph and apply the necessary migrations"""
     logging.getLogger("infrahub").setLevel(logging.WARNING)
@@ -140,7 +111,14 @@ async def migrate_cmd(
     dbdriver = await context.init_db(retry=1)
 
     root_node = await get_root_node(db=dbdriver)
-    await do_migrate(db=dbdriver, root_node=root_node, check=check, migration_number=migration_number)
+    migrations = await detect_migration_to_run(
+        current_graph_version=root_node.graph_version, migration_number=migration_number
+    )
+
+    if check or not migrations:
+        return
+
+    await migrate_database(db=dbdriver, migrations=migrations, initialize=True)
 
     await dbdriver.close()
 
@@ -314,17 +292,18 @@ async def detect_migration_to_run(
         migration = get_migration_by_number(migration_number)
         migrations.append(migration)
         if current_graph_version > migration.minimum_version:
-            get_migration_console().log(f"Migration {migration_number} will be re-applied.")
-        else:
             get_migration_console().log(
-                f"Migration {migration_number} needs to be applied. Run `infrahub db migrate` to apply all outstanding migrations."
+                f"Migration {migration_number} already applied. To apply again, run the command without the --check flag."
             )
-            return migrations
-
-    migrations.extend(await get_graph_migrations(current_graph_version=current_graph_version))
-    if not migrations:
-        get_migration_console().log(f"Database up-to-date (v{current_graph_version}), no migration to execute.")
-        return []
+            return []
+        get_migration_console().log(
+            f"Migration {migration_number} needs to be applied. Run `infrahub db migrate` to apply all outstanding migrations."
+        )
+    else:
+        migrations.extend(await get_graph_migrations(current_graph_version=current_graph_version))
+        if not migrations:
+            get_migration_console().log(f"Database up-to-date (v{current_graph_version}), no migration to execute.")
+            return []
 
     get_migration_console().log(
         f"Database needs to be updated (v{current_graph_version} -> v{GRAPH_VERSION}), {len(migrations)} migrations pending"
@@ -333,10 +312,7 @@ async def detect_migration_to_run(
 
 
 async def migrate_database(
-    db: InfrahubDatabase,
-    migrations: Sequence[MigrationTypes],
-    initialize: bool = False,
-    update_graph_version: bool = True,
+    db: InfrahubDatabase, migrations: Sequence[MigrationTypes], initialize: bool = False
 ) -> bool:
     """Apply the latest migrations to the database, this function will print the status directly in the console.
 
@@ -346,7 +322,6 @@ async def migrate_database(
         db: The database object.
         migrations: Sequence of migrations to apply.
         initialize: Whether to initialize the registry before running migrations.
-        update_graph_version: Whether to update the graph version after each migration.
     """
     if not migrations:
         return True
@@ -364,9 +339,8 @@ async def migrate_database(
             validation_result = await migration.validate_migration(db=db)
             if validation_result.success:
                 get_migration_console().log(f"Migration: {migration.name} {SUCCESS_BADGE}")
-                if update_graph_version:
-                    root_node.graph_version = migration.minimum_version + 1
-                    await root_node.save(db=db)
+                root_node.graph_version = migration.minimum_version + 1
+                await root_node.save(db=db)
 
         if not execution_result.success or (validation_result and not validation_result.success):
             get_migration_console().log(f"Migration: {migration.name} {FAILED_BADGE}")

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/account.py

@@ -54,15 +54,11 @@ class AccountGlobalPermissionQuery(Query):
     name: str = "account_global_permissions"
     type: QueryType = QueryType.READ
 
-    def __init__(
-        self,
-        account_id: str,
-        branch: Branch | None = None,
-        branch_agnostic: bool = False,
-    ) -> None:
-        super().__init__(branch=branch, branch_agnostic=branch_agnostic)
+    def __init__(self, account_id: str, **kwargs: Any):
         self.account_id = account_id
+        super().__init__(**kwargs)
 
+    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
         self.params["account_id"] = self.account_id
 
         branch_filter, branch_params = self.branch.get_query_filter_path(
@@ -70,6 +66,7 @@ class AccountGlobalPermissionQuery(Query):
         )
         self.params.update(branch_params)
 
+        # ruff: noqa: E501
         query = """
         MATCH (account:%(generic_account_node)s)
         WHERE account.uuid = $account_id
@@ -167,7 +164,7 @@ class AccountObjectPermissionQuery(Query):
     name: str = "account_object_permissions"
     type: QueryType = QueryType.READ
 
-    def __init__(self, account_id: str, **kwargs: Any) -> None:
+    def __init__(self, account_id: str, **kwargs: Any):
         self.account_id = account_id
         super().__init__(**kwargs)
 
@@ -296,7 +293,7 @@ class AccountObjectPermissionQuery(Query):
 
 
 async def fetch_permissions(account_id: str, db: InfrahubDatabase, branch: Branch) -> AssignedPermissions:
-    query1 = AccountGlobalPermissionQuery(branch=branch, account_id=account_id, branch_agnostic=True)
+    query1 = await AccountGlobalPermissionQuery.init(db=db, branch=branch, account_id=account_id, branch_agnostic=True)
     await query1.execute(db=db)
     global_permissions = query1.get_permissions()
 
@@ -311,7 +308,7 @@ class AccountRoleGlobalPermissionQuery(Query):
     name: str = "account_role_global_permissions"
     type: QueryType = QueryType.READ
 
-    def __init__(self, role_id: str, **kwargs: Any) -> None:
+    def __init__(self, role_id: str, **kwargs: Any):
         self.role_id = role_id
         super().__init__(**kwargs)
 
@@ -397,7 +394,7 @@ class AccountRoleObjectPermissionQuery(Query):
     name: str = "account_role_object_permissions"
     type: QueryType = QueryType.READ
 
-    def __init__(self, role_id: str, **kwargs: Any) -> None:
+    def __init__(self, role_id: str, **kwargs: Any):
         self.role_id = role_id
         super().__init__(**kwargs)
 
@@ -518,7 +515,7 @@ class AccountTokenValidateQuery(Query):
     name: str = "account_token_validate"
     type: QueryType = QueryType.READ
 
-    def __init__(self, token: str, **kwargs: Any) -> None:
+    def __init__(self, token: str, **kwargs: Any):
         self.token = token
         super().__init__(**kwargs)
 

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/diff/branch_differ.py

@@ -41,7 +41,7 @@ class BranchDiffer:
         diff_to: str | Timestamp | None = None,
         db: InfrahubDatabase | None = None,
         service: InfrahubServices | None = None,
-    ) -> None:
+    ):
         """_summary_
 
         Args:

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/diff/conflict_transferer.py

@@ -9,7 +9,7 @@ from .model.path import (
 
 
 class DiffConflictTransferer:
-    def __init__(self, diff_combiner: DiffCombiner) -> None:
+    def __init__(self, diff_combiner: DiffCombiner):
         self.diff_combiner = diff_combiner
 
     async def transfer(self, earlier: EnrichedDiffRoot, later: EnrichedDiffRoot) -> None:

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/diff/data_check_synchronizer.py

@@ -29,7 +29,7 @@ class DiffDataCheckSynchronizer:
         conflicts_extractor: DiffConflictsExtractor,
         conflict_recorder: ObjectConflictValidatorRecorder,
         diff_repository: DiffRepository,
-    ) -> None:
+    ):
         self.db = db
         self.conflicts_extractor = conflicts_extractor
         self.conflict_recorder = conflict_recorder

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/diff/enricher/cardinality_one.py

@@ -31,7 +31,7 @@ class DiffCardinalityOneEnricher(DiffEnricherInterface):
      - changes to properties (IS_PROTECTED, etc) of a cardinality=one relationship are consolidated as well
     """
 
-    def __init__(self, db: InfrahubDatabase) -> None:
+    def __init__(self, db: InfrahubDatabase):
         self.db = db
         self._node_schema_map: dict[str, MainSchemaTypes] = {}
 

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/diff/enricher/hierarchy.py

@@ -24,7 +24,7 @@ log = get_logger()
 class DiffHierarchyEnricher(DiffEnricherInterface):
     """Add hierarchy and parent/component nodes to diff even if the higher-level nodes are unchanged"""
 
-    def __init__(self, db: InfrahubDatabase, parent_adder: DiffParentNodeAdder) -> None:
+    def __init__(self, db: InfrahubDatabase, parent_adder: DiffParentNodeAdder):
         self.db = db
         self.parent_adder = parent_adder
 

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/diff/enricher/labels.py

@@ -35,7 +35,7 @@ class DisplayLabelRequest:
 class DiffLabelsEnricher(DiffEnricherInterface):
     """Add display labels for nodes and labels for relationships"""
 
-    def __init__(self, db: InfrahubDatabase) -> None:
+    def __init__(self, db: InfrahubDatabase):
         self.db = db
         self._base_branch_name: str | None = None
         self._diff_branch_name: str | None = None

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/diff/merger/merger.py

@@ -36,7 +36,7 @@ class DiffMerger:
         destination_branch: Branch,
         diff_repository: DiffRepository,
         serializer: DiffMergeSerializer,
-    ) -> None:
+    ):
         self.source_branch = source_branch
         self.destination_branch = destination_branch
         self.db = db

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/diff/repository/repository.py

@@ -49,9 +49,7 @@ log = get_logger()
 
 
 class DiffRepository:
-    def __init__(
-        self, db: InfrahubDatabase, deserializer: EnrichedDiffDeserializer, max_save_batch_size: int = 1000
-    ) -> None:
+    def __init__(self, db: InfrahubDatabase, deserializer: EnrichedDiffDeserializer, max_save_batch_size: int = 1000):
         self.db = db
         self.deserializer = deserializer
         self.max_save_batch_size = max_save_batch_size

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/graph/constraints.py

@@ -165,7 +165,7 @@ class ConstraintManagerBase:
     constraint_node_class: Optional[type[ConstraintItem]] = ConstraintItem
     constraint_rel_class: Optional[type[ConstraintItem]] = ConstraintItem
 
-    def __init__(self, db: InfrahubDatabase) -> None:
+    def __init__(self, db: InfrahubDatabase):
         self.db = db
 
         self.nodes: list[ConstraintItem] = []

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/ipam/reconciler.py

@@ -101,18 +101,16 @@ class IpamReconciler:
         )
         await query.execute(db=self.db)
 
-        data = query.get_data()
-        if not data or not data.ip_node_uuid:
+        ip_node_uuid = query.get_ip_node_uuid()
+        if not ip_node_uuid:
             node_type = InfrahubKind.IPPREFIX
             if isinstance(ip_value, ipaddress.IPv6Interface | ipaddress.IPv4Interface):
                 node_type = InfrahubKind.IPADDRESS
             raise NodeNotFoundError(node_type=node_type, identifier=str(ip_value))
-
-        ip_node_uuid = data.ip_node_uuid
-        current_parent_uuid = data.current_parent_uuid
-        calculated_parent_uuid = data.calculated_parent_uuid
-        current_children_uuids = set(data.current_children_uuids)
-        calculated_children_uuids = set(data.calculated_children_uuids)
+        current_parent_uuid = query.get_current_parent_uuid()
+        calculated_parent_uuid = query.get_calculated_parent_uuid()
+        current_children_uuids = set(query.get_current_children_uuids())
+        calculated_children_uuids = set(query.get_calculated_children_uuids())
 
         all_uuids: set[str] = set()
         all_uuids = (all_uuids | {ip_node_uuid}) if ip_node_uuid else all_uuids

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/ipam/utilization.py

@@ -40,18 +40,25 @@ class PrefixUtilizationGetter:
         )
         await query.execute(db=self.db)
 
-        for item in query.get_data():
-            if InfrahubKind.IPADDRESS in item.child_labels:
+        for result in query.get_results():
+            prefix_node = result.get_node("pfx")
+            prefix_id = str(prefix_node.get("uuid"))
+            branch_name = str(result.get("branch"))
+            child_node = result.get_node("child")
+            if InfrahubKind.IPADDRESS in child_node.labels:
                 child_type = PrefixMemberType.ADDRESS
             else:
                 child_type = PrefixMemberType.PREFIX
+            child_value_node = result.get_node("av")
+            child_prefixlen = child_value_node.get("prefixlen")
+            child_ip_value = child_value_node.get("value")
 
-            if item.prefix_uuid not in self._results_by_prefix_id:
-                self._results_by_prefix_id[item.prefix_uuid] = {}
-            if item.branch not in self._results_by_prefix_id[item.prefix_uuid]:
-                self._results_by_prefix_id[item.prefix_uuid][item.branch] = []
-            self._results_by_prefix_id[item.prefix_uuid][item.branch].append(
-                PrefixChildDetails(child_type=child_type, prefixlen=item.prefixlen, ip_value=item.ip_value)
+            if prefix_id not in self._results_by_prefix_id:
+                self._results_by_prefix_id[prefix_id] = {}
+            if branch_name not in self._results_by_prefix_id[prefix_id]:
+                self._results_by_prefix_id[prefix_id][branch_name] = []
+            self._results_by_prefix_id[prefix_id][branch_name].append(
+                PrefixChildDetails(child_type=child_type, prefixlen=child_prefixlen, ip_value=child_ip_value)
             )
 
     async def get_children(

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/manager.py

@@ -15,7 +15,6 @@ from infrahub.core.constants import (
 from infrahub.core.metadata.model import MetadataQueryOptions
 from infrahub.core.node import Node
 from infrahub.core.node.delete_validator import NodeDeleteValidator
-from infrahub.core.order import OrderModel
 from infrahub.core.query.node import (
     AttributeFromDB,
     GroupedPeerNodes,
@@ -40,6 +39,7 @@ from infrahub.core.schema import (
 )
 from infrahub.core.timestamp import Timestamp
 from infrahub.exceptions import NodeNotFoundError, ProcessingError, SchemaNotFoundError
+from infrahub.graphql.models import OrderModel
 
 if TYPE_CHECKING:
     from infrahub.core.branch import Branch
@@ -98,6 +98,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         partial_match: bool = ...,
         branch_agnostic: bool = ...,
         order: OrderModel | None = ...,
@@ -117,6 +118,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         partial_match: bool = ...,
         branch_agnostic: bool = ...,
         order: OrderModel | None = ...,
@@ -135,6 +137,7 @@ class NodeManager:
         branch: Branch | str | None = None,
         include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
+        account=None,
         partial_match: bool = False,
         branch_agnostic: bool = False,
         order: OrderModel | None = None,
@@ -168,6 +171,7 @@ class NodeManager:
                 branch=branch,
                 include_metadata=include_metadata,
                 prefetch_relationships=prefetch_relationships,
+                account=account,
                 branch_agnostic=branch_agnostic,
             )
             return [node] if node else []
@@ -226,6 +230,7 @@ class NodeManager:
         filters: dict | None = None,
         at: Timestamp | str | None = None,
         branch: Branch | str | None = None,
+        account=None,  # noqa: ARG003
         partial_match: bool = False,
         branch_agnostic: bool = False,
     ) -> int:
@@ -529,6 +534,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol | None: ...
 
@@ -545,6 +551,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
@@ -561,6 +568,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol | None: ...
 
@@ -577,6 +585,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -593,6 +602,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> Node: ...
 
@@ -609,6 +619,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -624,6 +635,7 @@ class NodeManager:
         branch: Branch | str | None = None,
         include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
+        account=None,
         branch_agnostic: bool = False,
     ) -> Node | SchemaProtocol | None:
         branch = await registry.get_branch(branch=branch, db=db)
@@ -645,6 +657,7 @@ class NodeManager:
             at=at,
             include_metadata=include_metadata,
             prefetch_relationships=prefetch_relationships,
+            account=account,
             branch_agnostic=branch_agnostic,
             order=OrderModel(disable=True),
         )
@@ -681,6 +694,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
     ) -> SchemaProtocol | None: ...
 
     @overload
@@ -696,6 +710,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
@@ -712,6 +727,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol | None: ...
 
@@ -728,6 +744,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> Node: ...
 
@@ -744,6 +761,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -760,6 +778,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -775,6 +794,7 @@ class NodeManager:
         branch: Branch | str | None = None,
         include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
+        account=None,
         branch_agnostic: bool = False,
     ) -> Node | SchemaProtocol | None:
         branch = await registry.get_branch(branch=branch, db=db)
@@ -824,6 +844,7 @@ class NodeManager:
             at=at,
             include_metadata=include_metadata,
             prefetch_relationships=prefetch_relationships,
+            account=account,
             branch_agnostic=branch_agnostic,
             order=OrderModel(disable=True),
         )
@@ -855,6 +876,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
@@ -870,6 +892,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
+        account=...,
         branch_agnostic: bool = ...,
     ) -> Any: ...
 
@@ -884,6 +907,7 @@ class NodeManager:
         branch: Branch | str | None = None,
         include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
+        account=None,
         branch_agnostic: bool = False,
     ) -> Any:
         branch = await registry.get_branch(branch=branch, db=db)
@@ -911,6 +935,7 @@ class NodeManager:
             branch=branch,
             include_metadata=include_metadata,
             prefetch_relationships=prefetch_relationships,
+            account=account,
             branch_agnostic=branch_agnostic,
         )
         if not node:

{infrahub_server-1.7.0 → infrahub_server-1.7.0b0}/backend/infrahub/core/merge.py

@@ -43,7 +43,7 @@ class BranchMerger:
         diff_locker: DiffLocker,
         destination_branch: Branch | None = None,
         workflow: InfrahubWorkflow | None = None,
-    ) -> None:
+    ):
         self.source_branch = source_branch
         self.destination_branch: Branch = destination_branch or registry.get_branch_from_registry()
         self.db = db