infrahub-server 1.4.3__tar.gz → 1.4.5__tar.gz

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.4.3
+Version: 1.4.5
 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.
 License: Apache-2.0
 Author: OpsMill

infrahub_server-1.4.5/backend/infrahub/cli/__init__.py

@@ -0,0 +1,127 @@
+import typer
+from infrahub_sdk.async_typer import AsyncTyper
+
+from infrahub import config
+from infrahub.core.initialization import initialization
+
+from ..workers.dependencies import get_database
+from .context import CliContext
+from .db import app as db_app
+from .events import app as events_app
+from .git_agent import app as git_app
+from .server import app as server_app
+from .tasks import app as tasks_app
+from .upgrade import upgrade_cmd
+
+app = AsyncTyper(name="Infrahub CLI", pretty_exceptions_enable=False)
+
+
+@app.callback()
+def common(ctx: typer.Context) -> None:
+    """Infrahub CLI"""
+    ctx.obj = CliContext()
+
+
+app.add_typer(server_app, name="server")
+app.add_typer(git_app, name="git-agent", hidden=True)
+app.add_typer(db_app, name="db")
+app.add_typer(events_app, name="events", help="Interact with the events system.", hidden=True)
+app.add_typer(tasks_app, name="tasks", hidden=True)
+app.command(name="upgrade")(upgrade_cmd)
+
+
+async def _init_shell(config_file: str) -> None:
+    """Launch a Python Interactive shell."""
+    config.load_and_exit(config_file_name=config_file)
+
+    db = await get_database()
+
+    async with db.start_session() as db:
+        await initialization(db=db)
+
+
+@app.command()
+def shell() -> None:
+    """Start a python shell within Infrahub context (requires IPython)."""
+    from infrahub_sdk import InfrahubClient
+    from IPython import start_ipython
+    from traitlets.config import Config
+
+    from infrahub import config
+    from infrahub.components import ComponentType
+    from infrahub.core.branch import Branch
+    from infrahub.core.initialization import initialization
+    from infrahub.core.manager import NodeManager
+    from infrahub.core.registry import registry
+    from infrahub.dependencies.registry import build_component_registry
+    from infrahub.lock import initialize_lock
+    from infrahub.services import InfrahubServices
+    from infrahub.workers.dependencies import (
+        get_cache,
+        get_component,
+        get_database,
+        get_workflow,
+        set_component_type,
+    )
+
+    async def initialize_service() -> InfrahubServices:
+        config.load_and_exit()
+        client = InfrahubClient()
+
+        component_type = ComponentType.GIT_AGENT
+        set_component_type(component_type=component_type)
+
+        database = await get_database()
+
+        build_component_registry()
+
+        workflow = get_workflow()
+        cache = await get_cache()
+        component = await get_component()
+        service = await InfrahubServices.new(
+            cache=cache,
+            client=client,
+            database=database,
+            workflow=workflow,
+            component=component,
+            component_type=component_type,
+        )
+        initialize_lock(service=service)
+
+        async with service.database as db:
+            await initialization(db=db)
+        await service.component.refresh_schema_hash()
+
+        return service
+
+    def welcome() -> None:
+        print("--------------------------------------")
+        print("infrahub interactive shell initialized")
+        print("--------------------------------------")
+        print("Available objects:")
+        print("* db: InfrahubDatabase")
+        print("* Branch: Branch")
+        print("* NodeManager: NodeManager")
+        print("* registry: Registry")
+        print("* service: InfrahubServices")
+        print()
+        print("Example use:")
+        print("In [1] tags = await NodeManager.query(schema='BuiltinTag', db=db)")
+
+    c = Config()
+    c.InteractiveShellApp.exec_lines = [
+        "service = await initialize_service()",
+        "db = service.database",
+        "welcome()",
+    ]
+    c.TerminalInteractiveShell.colors = "Neutral"
+
+    user_ns = {
+        "initialize_service": initialize_service,
+        "welcome": welcome,
+        "NodeManager": NodeManager,
+        "Branch": Branch,
+        "registry": registry,
+    }
+
+    start_ipython(argv=[], config=c, user_ns=user_ns)

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/backend/infrahub/core/account.py

@@ -5,9 +5,10 @@ from typing import TYPE_CHECKING, Any
 
 from typing_extensions import Self
 
-from infrahub.core.constants import InfrahubKind, PermissionDecision
+from infrahub.core.constants import NULL_VALUE, InfrahubKind, PermissionDecision
 from infrahub.core.query import Query, QueryType
 from infrahub.core.registry import registry
+from infrahub.core.timestamp import Timestamp
 
 if TYPE_CHECKING:
     from infrahub.core.branch import Branch
@@ -519,47 +520,72 @@ class AccountTokenValidateQuery(Query):
         super().__init__(**kwargs)
 
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        token_filter_perms, token_params = self.branch.get_query_filter_relationships(
-            rel_labels=["r1", "r2"], at=self.at, include_outside_parentheses=True
+        branch_filter, branch_params = self.branch.get_query_filter_path(
+            at=self.at.to_string(), branch_agnostic=self.branch_agnostic, is_isolated=False
         )
-        self.params.update(token_params)
-
-        account_filter_perms, account_params = self.branch.get_query_filter_relationships(
-            rel_labels=["r31", "r41", "r5", "r6"], at=self.at, include_outside_parentheses=True
+        self.params.update(branch_params)
+        self.params.update(
+            {
+                "token_attr_name": "token",
+                "token_relationship_name": "account__token",
+                "token_value": self.token,
+                "null_value": NULL_VALUE,
+            }
         )
-        self.params.update(account_params)
 
-        self.params["token_value"] = self.token
-
-        # ruff: noqa: E501
         query = """
-        MATCH (at:InternalAccountToken)-[r1:HAS_ATTRIBUTE]-(a:Attribute {name: "token"})-[r2:HAS_VALUE]-(av:AttributeValue { value: $token_value })
-        WHERE %s
-        WITH at
-        MATCH (at)-[r31]-(:Relationship)-[r41]-(acc:CoreGenericAccount)-[r5:HAS_ATTRIBUTE]-(an:Attribute {name: "name"})-[r6:HAS_VALUE]-(av:AttributeValue)
-        WHERE %s
-        """ % (
-            "\n AND ".join(token_filter_perms),
-            "\n AND ".join(account_filter_perms),
-        )
-
+// --------------
+// get the active token node for this token value, if it exists
+// --------------
+MATCH (token_node:%(token_node_kind)s)-[r1:HAS_ATTRIBUTE]->(:Attribute {name: $token_attr_name})
+    -[r2:HAS_VALUE]->(av:AttributeValueIndexed { value: $token_value })
+WHERE all(r in [r1, r2] WHERE (%(branch_filter)s))
+ORDER BY r1.branch_level DESC, r1.from DESC, r1.status ASC, r2.branch_level DESC, r2.from DESC, r2.status ASC
+LIMIT 1
+WITH token_node
+WHERE r1.status = "active" AND r2.status = "active"
+// --------------
+// get the expiration time
+// --------------
+OPTIONAL MATCH (token_node)-[r1:HAS_ATTRIBUTE]->(:Attribute {name: "expiration"})
+    -[r2:HAS_VALUE]->(av)
+WHERE all(r in [r1, r2] WHERE (%(branch_filter)s))
+ORDER BY r1.branch_level DESC, r1.from DESC, r1.status ASC, r2.branch_level DESC, r2.from DESC, r2.status ASC
+LIMIT 1
+WITH token_node, CASE
+    WHEN r1.status = "active" AND r2.status = "active" AND av.value <> $null_value THEN av.value
+    ELSE NULL
+END AS expiration
+// --------------
+// get the linked account node from the token node
+// --------------
+MATCH (token_node)-[r1:IS_RELATED]-(:Relationship {name: $token_relationship_name})-[r2:IS_RELATED]-(account_node:%(account_node_kind)s)
+WHERE all(r in [r1, r2] WHERE (%(branch_filter)s))
+ORDER BY r1.branch_level DESC, r1.from DESC, r1.status ASC, r2.branch_level DESC, r2.from DESC, r2.status ASC
+LIMIT 1
+WITH expiration, account_node
+WHERE r1.status = "active" AND r2.status = "active"
+        """ % {
+            "branch_filter": branch_filter,
+            "token_node_kind": InfrahubKind.ACCOUNTTOKEN,
+            "account_node_kind": InfrahubKind.GENERICACCOUNT,
+        }
         self.add_to_query(query)
-
-        self.return_labels = ["at", "av", "acc"]
-
-    def get_account_name(self) -> str | None:
-        """Return the account name that matched the query or None."""
-        if result := self.get_result():
-            return result.get("av").get("value")
-
-        return None
+        self.return_labels = ["account_node.uuid AS account_uuid", "expiration"]
 
     def get_account_id(self) -> str | None:
         """Return the account id that matched the query or a None."""
-        if result := self.get_result():
-            return result.get("acc").get("uuid")
-
-        return None
+        result = self.get_result()
+        if not result:
+            return None
+        account_uuid = result.get_as_str(label="account_uuid")
+        expiration_with_tz = result.get_as_str(label="expiration")
+        if expiration_with_tz is None:
+            return account_uuid
+        expiration = Timestamp(expiration_with_tz)
+        if expiration < Timestamp():
+            return None
+        return account_uuid
 
 
 async def validate_token(token: str, db: InfrahubDatabase, branch: Branch | str | None = None) -> str | None:

infrahub_server-1.4.5/backend/infrahub/core/graph/__init__.py

@@ -0,0 +1 @@
+GRAPH_VERSION = 38

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/backend/infrahub/core/migrations/graph/__init__.py

@@ -39,6 +39,7 @@ from .m034_find_orphaned_schema_fields import Migration034
 from .m035_orphan_relationships import Migration035
 from .m036_drop_attr_value_index import Migration036
 from .m037_index_attr_vals import Migration037
+from .m038_redo_0000_prefix_fix import Migration038
 
 if TYPE_CHECKING:
     from infrahub.core.root import Root
@@ -83,6 +84,7 @@ MIGRATIONS: list[type[GraphMigration | InternalSchemaMigration | ArbitraryMigrat
     Migration035,
     Migration036,
     Migration037,
+    Migration038,
 ]
 
 

infrahub_server-1.4.5/backend/infrahub/core/migrations/graph/m038_redo_0000_prefix_fix.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+import ipaddress
+from typing import TYPE_CHECKING, Sequence
+
+from infrahub.core.branch.models import Branch
+from infrahub.core.initialization import initialization
+from infrahub.core.ipam.reconciler import IpamReconciler
+from infrahub.core.manager import NodeManager
+from infrahub.core.migrations.shared import MigrationResult
+from infrahub.core.timestamp import Timestamp
+from infrahub.lock import initialize_lock
+from infrahub.log import get_logger
+
+from ..shared import InternalSchemaMigration, SchemaMigration
+
+if TYPE_CHECKING:
+    from infrahub.database import InfrahubDatabase
+
+log = get_logger()
+
+
+class Migration038(InternalSchemaMigration):
+    """
+    Re-run migration 026 after Migration037 updates AttributeValueIndexed vertices correctly so that the call to
+    NodeManager.query will work
+
+    If someone is upgrading from 1.2.4 (release before migration 026) or earlier to 1.4.x or later, then migration 026
+    fail to find any 0.0.0.0 prefix nodes even if they exist. So we run it again here after migration 037 makes the
+    AttributeValueIndexed changes to be sure it completes correctly.
+    """
+
+    name: str = "038_prefix_0000_fix"
+    minimum_version: int = 37
+    migrations: Sequence[SchemaMigration] = []
+
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
+        return MigrationResult()
+
+    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+        # load schemas from database into registry
+        initialize_lock()
+        await initialization(db=db)
+
+        at = Timestamp()
+        for branch in await Branch.get_list(db=db):
+            prefix_0000s = await NodeManager.query(
+                db=db, schema="BuiltinIPPrefix", branch=branch, filters={"prefix__values": ["0.0.0.0/0", "::/0"]}
+            )
+            if not prefix_0000s:
+                continue
+            ipam_reconciler = IpamReconciler(db=db, branch=branch)
+            for prefix in prefix_0000s:
+                ip_namespace = await prefix.ip_namespace.get_peer(db=db)
+                ip_network = ipaddress.ip_network(prefix.prefix.value)
+                await ipam_reconciler.reconcile(
+                    ip_value=ip_network,
+                    namespace=ip_namespace,
+                    node_uuid=prefix.get_id(),
+                    at=at,
+                )
+
+        return MigrationResult()

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/backend/infrahub/generators/tasks.py

@@ -168,6 +168,15 @@ async def request_generator_definition_run(
 
     client = get_client()
 
+    # Needs to be fetched before fetching group members otherwise `object` relationship would override
+    # existing node in client store without the `name` attribute due to #521
+    existing_instances = await client.filters(
+        kind=InfrahubKind.GENERATORINSTANCE,
+        definition__ids=[model.generator_definition.definition_id],
+        include=["object"],
+        branch=model.branch,
+    )
+
     group = await client.get(
         kind=InfrahubKind.GENERICGROUP,
         prefetch_relationships=True,
@@ -177,12 +186,6 @@ async def request_generator_definition_run(
     )
     await group.members.fetch()
 
-    existing_instances = await client.filters(
-        kind=InfrahubKind.GENERATORINSTANCE,
-        definition__ids=[model.generator_definition.definition_id],
-        include=["object"],
-        branch=model.branch,
-    )
     instance_by_member = {}
     for instance in existing_instances:
         instance_by_member[instance.object.peer.id] = instance.id

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/backend/infrahub/git/tasks.py

@@ -310,6 +310,15 @@ async def generate_request_artifact_definition(
 
     client = get_client()
 
+    # Needs to be fetched before fetching group members otherwise `object` relationship would override
+    # existing node in client store without the `name` attribute due to #521
+    existing_artifacts = await client.filters(
+        kind=CoreArtifact,
+        definition__ids=[model.artifact_definition_id],
+        include=["object"],
+        branch=model.branch,
+    )
+
     artifact_definition = await client.get(
         kind=CoreArtifactDefinition, id=model.artifact_definition_id, branch=model.branch
     )
@@ -319,12 +328,6 @@ async def generate_request_artifact_definition(
     await group.members.fetch()
     current_members = [member.id for member in group.members.peers]
 
-    existing_artifacts = await client.filters(
-        kind=CoreArtifact,
-        definition__ids=[model.artifact_definition_id],
-        include=["object"],
-        branch=model.branch,
-    )
     artifacts_by_member = {}
     for artifact in existing_artifacts:
         if artifact.object.id in current_members:

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/backend/infrahub/graphql/auth/query_permission_checker/object_permission_checker.py

@@ -7,7 +7,7 @@ from infrahub.core.constants import GLOBAL_BRANCH_NAME, GlobalPermissions, Infra
 from infrahub.core.manager import get_schema
 from infrahub.core.schema.node_schema import NodeSchema
 from infrahub.database import InfrahubDatabase
-from infrahub.graphql.analyzer import InfrahubGraphQLQueryAnalyzer
+from infrahub.graphql.analyzer import GraphQLOperation, InfrahubGraphQLQueryAnalyzer
 from infrahub.graphql.initialization import GraphqlParams
 from infrahub.permissions.constants import PermissionDecisionFlag
 from infrahub.utils import extract_camelcase_words
@@ -119,34 +119,46 @@ class PermissionManagerPermissionChecker(GraphQLQueryPermissionCheckerInterface)
     permission_required = GlobalPermission(
         action=GlobalPermissions.MANAGE_PERMISSIONS.value, decision=PermissionDecision.ALLOW_ALL.value
     )
+    # Map kinds and the relationship to protect from being read
+    kind_relationship_to_check = {
+        InfrahubKind.ACCOUNTROLE: "permissions",
+        InfrahubKind.BASEPERMISSION: "roles",
+        InfrahubKind.GLOBALPERMISSION: "roles",
+        InfrahubKind.OBJECTPERMISSION: "roles",
+    }
 
     async def supports(self, db: InfrahubDatabase, account_session: AccountSession, branch: Branch) -> bool:  # noqa: ARG002
         return config.SETTINGS.main.allow_anonymous_access or account_session.authenticated
 
     async def check(
         self,
-        db: InfrahubDatabase,
+        db: InfrahubDatabase,  # noqa: ARG002
         account_session: AccountSession,  # noqa: ARG002
         analyzed_query: InfrahubGraphQLQueryAnalyzer,
         query_parameters: GraphqlParams,
-        branch: Branch,
+        branch: Branch,  # noqa: ARG002
     ) -> CheckerResolution:
-        is_permission_operation = False
-        kinds = analyzed_query.query_report.impacted_models
-
-        for kind in kinds:
-            schema = get_schema(db=db, branch=branch, node_schema=kind)
-            if is_permission_operation := kind in (
-                InfrahubKind.BASEPERMISSION,
-                InfrahubKind.GLOBALPERMISSION,
-                InfrahubKind.OBJECTPERMISSION,
-            ) or (isinstance(schema, NodeSchema) and InfrahubKind.BASEPERMISSION in schema.inherit_from):
-                break
-
-        if not is_permission_operation:
-            return CheckerResolution.NEXT_CHECKER
-
-        query_parameters.context.active_permissions.raise_for_permission(permission=self.permission_required)
+        for kind, relationship in self.kind_relationship_to_check.items():
+            if (
+                kind in analyzed_query.query_report.requested_read
+                and relationship in analyzed_query.query_report.requested_read[kind].relationships
+            ):
+                query_parameters.context.active_permissions.raise_for_permission(permission=self.permission_required)
+
+        for query in analyzed_query.query_report.queries:
+            if not query.infrahub_model:
+                continue
+
+            # Prevent mutations on permissions and account roles
+            if (
+                query.operation == GraphQLOperation.MUTATION
+                and isinstance(query.infrahub_model, NodeSchema)
+                and (
+                    InfrahubKind.BASEPERMISSION in query.infrahub_model.inherit_from
+                    or query.infrahub_model.kind == InfrahubKind.ACCOUNTROLE
+                )
+            ):
+                query_parameters.context.active_permissions.raise_for_permission(permission=self.permission_required)
 
         return CheckerResolution.NEXT_CHECKER
 

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/backend/infrahub/lock.py

@@ -13,6 +13,7 @@ from redis.asyncio.lock import Lock as GlobalLock
 
 from infrahub import config
 from infrahub.core.timestamp import current_timestamp
+from infrahub.worker import WORKER_IDENTITY
 
 if TYPE_CHECKING:
     from types import TracebackType
@@ -92,7 +93,7 @@ class NATSLock:
         await self.release()
 
     async def acquire(self) -> None:
-        token = current_timestamp()
+        token = f"{current_timestamp()}::{WORKER_IDENTITY}"
         while True:
             if await self.do_acquire(token):
                 self.token = token
@@ -138,9 +139,9 @@ class InfrahubLock:
         if self.use_local:
             self.local = LocalLock()
         elif config.SETTINGS.cache.driver == config.CacheDriver.Redis:
-            self.remote = GlobalLock(redis=self.connection, name=self.name)
+            self.remote = GlobalLock(redis=self.connection, name=f"lock.{self.name}")
         else:
-            self.remote = NATSLock(service=self.connection, name=self.name)
+            self.remote = NATSLock(service=self.connection, name=f"lock.{self.name}")
 
     async def __aenter__(self):
         await self.acquire()
@@ -156,7 +157,7 @@ class InfrahubLock:
     async def acquire(self) -> None:
         with LOCK_ACQUIRE_TIME_METRICS.labels(self.name, self.lock_type).time():
             if not self.use_local:
-                await self.remote.acquire(token=current_timestamp())
+                await self.remote.acquire(token=f"{current_timestamp()}::{WORKER_IDENTITY}")
             else:
                 await self.local.acquire()
         self.acquire_time = time.time_ns()

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/backend/infrahub/proposed_change/tasks.py

@@ -646,16 +646,19 @@ async def validate_artifacts_generation(model: RequestArtifactDefinitionCheck, c
         context=context,
     )
 
-    await artifact_definition.targets.fetch()
-    group = artifact_definition.targets.peer
-    await group.members.fetch()
-
+    # Needs to be fetched before fetching group members otherwise `object` relationship would override
+    # existing node in client store without the `name` attribute due to #521
     existing_artifacts = await client.filters(
         kind=InfrahubKind.ARTIFACT,
         definition__ids=[model.artifact_definition.definition_id],
         include=["object"],
         branch=model.source_branch,
     )
+
+    await artifact_definition.targets.fetch()
+    group = artifact_definition.targets.peer
+    await group.members.fetch()
+
     artifacts_by_member = {}
     for artifact in existing_artifacts:
         artifacts_by_member[artifact.object.peer.id] = artifact.id
@@ -907,6 +910,15 @@ async def request_generator_definition_check(model: RequestGeneratorDefinitionCh
         context=context,
     )
 
+    # Needs to be fetched before fetching group members otherwise `object` relationship would override
+    # existing node in client store without the `name` attribute due to #521
+    existing_instances = await client.filters(
+        kind=InfrahubKind.GENERATORINSTANCE,
+        definition__ids=[model.generator_definition.definition_id],
+        include=["object"],
+        branch=model.source_branch,
+    )
+
     group = await client.get(
         kind=InfrahubKind.GENERICGROUP,
         prefetch_relationships=True,
@@ -916,12 +928,6 @@ async def request_generator_definition_check(model: RequestGeneratorDefinitionCh
     )
     await group.members.fetch()
 
-    existing_instances = await client.filters(
-        kind=InfrahubKind.GENERATORINSTANCE,
-        definition__ids=[model.generator_definition.definition_id],
-        include=["object"],
-        branch=model.source_branch,
-    )
     instance_by_member = {}
     for instance in existing_instances:
         instance_by_member[instance.object.peer.id] = instance.id

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/backend/infrahub/tasks/registry.py

@@ -42,7 +42,7 @@ async def create_branch_registry(db: InfrahubDatabase, branch: Branch) -> None:
 
 
 async def update_branch_registry(db: InfrahubDatabase, branch: Branch) -> None:
-    """Update the registry for a branch if the schema hash has changed."""
+    """Update the registry for a branch if the schema hash has changed or the branch was rebased."""
 
     existing_branch: Branch = registry.branch[branch.name]
 
@@ -50,13 +50,23 @@ async def update_branch_registry(db: InfrahubDatabase, branch: Branch) -> None:
         log.warning("Branch schema hash is not set, cannot update branch registry")
         return
 
-    if existing_branch.schema_hash and existing_branch.schema_hash.main == branch.active_schema_hash.main:
+    if existing_branch.schema_hash.main == branch.active_schema_hash.main:
         log.debug(
-            "Branch schema hash is the same, no need to update branch registry",
+            "Branch schema hash is the same, no need to refresh the GraphQL schema within the registry",
             branch=branch.name,
             hash=existing_branch.schema_hash.main,
             worker=WORKER_IDENTITY,
         )
+        if existing_branch.branched_from != branch.branched_from:
+            # If the hash is the same but the branched_from timestamp differs it means
+            # that the branch has been rebased and these timestamps need to be refreshed
+            # in the registry even though the schema doesn't need to be reloaded.
+            log.info(
+                "Updating branched_from property in registry for rebased branch",
+                branch=branch.name,
+                worker=WORKER_IDENTITY,
+            )
+            registry.branch[branch.name] = branch
         return
 
     log.info(

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "infrahub-server"
-version = "1.4.3"
+version = "1.4.5"
 description = "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."
 authors = ["OpsMill <info@opsmill.com>"]
 readme = "README.md"
@@ -94,7 +94,7 @@ ruff = "0.11.9"
 invoke = "2.2.0"
 pytest-benchmark = "^4.0.0"
 pytest-codspeed = "^2.2.0"
-deepdiff = "^6.2"
+deepdiff = "8.6.1"
 polyfactory = "^2.16.2"
 towncrier = "^24.8"
 pytest-env = "^1.1.3"

{infrahub_server-1.4.3 → infrahub_server-1.4.5}/python_sdk/infrahub_sdk/branch.py

@@ -292,13 +292,14 @@ class InfrahubBranchManagerSync(InfraHubBranchManagerBase):
             },
         }
 
-        query = Mutation(mutation="BranchCreate", input_data=input_data, query=MUTATION_QUERY_DATA)
+        mutation_query = MUTATION_QUERY_TASK if background_execution else MUTATION_QUERY_DATA
+        query = Mutation(mutation="BranchCreate", input_data=input_data, query=mutation_query)
         response = self.client.execute_graphql(query=query.render(), tracker="mutation-branch-create")
 
         # Make sure server version is recent enough to support background execution, as previously
         # using background_execution=True had no effect.
         if background_execution and "task" in response["BranchCreate"]:
-            return BranchData(**response["BranchCreate"]["task"]["id"])
+            return response["BranchCreate"]["task"]["id"]
         return BranchData(**response["BranchCreate"]["object"])
 
     def delete(self, branch_name: str) -> bool: