infrahub-server 1.5.1__py3-none-any.whl → 1.5.2__py3-none-any.whl

infrahub/core/branch/models.py

@@ -141,8 +141,9 @@ class Branch(StandardNode):
         """
 
         params: dict[str, Any] = {"name": name}
+        params["ignore_statuses"] = []
         if ignore_deleting:
-            params["ignore_statuses"] = [BranchStatus.DELETING.value]
+            params["ignore_statuses"].append(BranchStatus.DELETING.value)
 
         results = await db.execute_query(query=query, params=params, name="branch_get_by_name", type=QueryType.READ)
 

infrahub/core/branch/tasks.py

@@ -502,9 +502,13 @@ async def post_process_branch_merge(source_branch: str, target_branch: str, cont
             parameters={"branch": target_branch, "source": GeneratorDefinitionRunSource.MERGE},
         )
 
+        active_branches = await Branch.get_list(db=db)
+        active_branch_names = {branch.name for branch in active_branches}
+
         for diff_root in branch_diff_roots:
             if (
                 diff_root.base_branch_name != diff_root.diff_branch_name
+                and diff_root.diff_branch_name in active_branch_names
                 and diff_root.tracking_id
                 and isinstance(diff_root.tracking_id, BranchTrackingId)
             ):

infrahub/core/diff/tasks.py

@@ -8,6 +8,7 @@ from infrahub.core.diff.coordinator import DiffCoordinator
 from infrahub.core.diff.models import RequestDiffUpdate  # noqa: TC001  needed for prefect flow
 from infrahub.core.diff.repository.repository import DiffRepository
 from infrahub.dependencies.registry import get_component_registry
+from infrahub.exceptions import BranchNotFoundError
 from infrahub.log import get_logger
 from infrahub.workers.dependencies import get_database, get_workflow
 from infrahub.workflows.catalogue import DIFF_REFRESH
@@ -24,7 +25,11 @@ async def update_diff(model: RequestDiffUpdate) -> None:
     async with database.start_session(read_only=False) as db:
         component_registry = get_component_registry()
         base_branch = await registry.get_branch(db=db, branch=registry.default_branch)
-        diff_branch = await registry.get_branch(db=db, branch=model.branch_name)
+        try:
+            diff_branch = await registry.get_branch(db=db, branch=model.branch_name)
+        except BranchNotFoundError:
+            log.warn(f"Branch {model.branch_name} not found, skipping diff update")
+            return
 
         diff_coordinator = await component_registry.get_component(DiffCoordinator, db=db, branch=diff_branch)
 

infrahub/core/graph/__init__.py

@@ -1 +1 @@
-GRAPH_VERSION = 44
+GRAPH_VERSION = 45

infrahub/core/migrations/graph/__init__.py

@@ -46,6 +46,7 @@ from .m041_deleted_dup_edges import Migration041
 from .m042_profile_attrs_in_db import Migration042
 from .m043_create_hfid_display_label_in_db import Migration043
 from .m044_backfill_hfid_display_label_in_db import Migration044
+from .m045_backfill_hfid_display_label_in_db_profile_template import Migration045
 
 if TYPE_CHECKING:
     from ..shared import MigrationTypes
@@ -96,6 +97,7 @@ MIGRATIONS: list[type[MigrationTypes]] = [
     Migration042,
     Migration043,
     Migration044,
+    Migration045,
 ]
 
 

infrahub/core/migrations/graph/m044_backfill_hfid_display_label_in_db.py

@@ -13,13 +13,15 @@ from infrahub.core.constants import GLOBAL_BRANCH_NAME, BranchSupportType, Relat
 from infrahub.core.initialization import get_root_node
 from infrahub.core.migrations.shared import MigrationResult, get_migration_console
 from infrahub.core.query import Query, QueryType
+from infrahub.core.schema import NodeSchema
+from infrahub.exceptions import SchemaNotFoundError
 from infrahub.types import is_large_attribute_type
 
 from ..shared import MigrationRequiringRebase
 from .load_schema_branch import get_or_load_schema_branch
 
 if TYPE_CHECKING:
-    from infrahub.core.schema import AttributeSchema, NodeSchema
+    from infrahub.core.schema import AttributeSchema, NodeSchema, ProfileSchema, TemplateSchema
     from infrahub.core.schema.basenode_schema import SchemaAttributePath
     from infrahub.core.schema.schema_branch import SchemaBranch
     from infrahub.database import InfrahubDatabase
@@ -621,7 +623,7 @@ class Migration044(MigrationRequiringRebase):
         self,
         db: InfrahubDatabase,
         branch: Branch,
-        schema: NodeSchema,
+        schema: NodeSchema | ProfileSchema | TemplateSchema,
         schema_branch: SchemaBranch,
         attribute_schema_map: dict[AttributeSchema, AttributeSchema],
         progress: Progress | None = None,
@@ -755,7 +757,7 @@ class Migration044(MigrationRequiringRebase):
         self,
         db: InfrahubDatabase,
         branch: Branch,
-        schema: NodeSchema,
+        schema: NodeSchema | ProfileSchema | TemplateSchema,
         schema_branch: SchemaBranch,
         source_attribute_schema: AttributeSchema,
         destination_attribute_schema: AttributeSchema,
@@ -824,18 +826,30 @@ class Migration044(MigrationRequiringRebase):
                     continue
 
                 node_schema = schema_branch.get_node(name=node_schema_name, duplicate=False)
-                default_node_schema = main_schema_branch.get_node(name=node_schema_name, duplicate=False)
+                try:
+                    default_node_schema = main_schema_branch.get_node(name=node_schema_name, duplicate=False)
+                except SchemaNotFoundError:
+                    default_node_schema = None
                 schemas_for_universal_update_map = {}
                 schemas_for_targeted_update_map = {}
-                if default_node_schema.display_label != node_schema.display_label:
-                    schemas_for_universal_update_map[display_labels_attribute_schema] = display_label_attribute_schema
-                elif node_schema.display_labels:
-                    schemas_for_targeted_update_map[display_labels_attribute_schema] = display_label_attribute_schema
-
-                if default_node_schema.human_friendly_id != node_schema.human_friendly_id:
-                    schemas_for_universal_update_map[hfid_attribute_schema] = hfid_attribute_schema
-                elif node_schema.human_friendly_id:
-                    schemas_for_targeted_update_map[hfid_attribute_schema] = hfid_attribute_schema
+                if node_schema.display_label:
+                    if default_node_schema is None or default_node_schema.display_label != node_schema.display_label:
+                        schemas_for_universal_update_map[display_labels_attribute_schema] = (
+                            display_label_attribute_schema
+                        )
+                    else:
+                        schemas_for_targeted_update_map[display_labels_attribute_schema] = (
+                            display_label_attribute_schema
+                        )
+
+                if node_schema.human_friendly_id:
+                    if (
+                        default_node_schema is None
+                        or default_node_schema.human_friendly_id != node_schema.human_friendly_id
+                    ):
+                        schemas_for_universal_update_map[hfid_attribute_schema] = hfid_attribute_schema
+                    else:
+                        schemas_for_targeted_update_map[hfid_attribute_schema] = hfid_attribute_schema
 
                 if schemas_for_universal_update_map:
                     await self._do_one_schema_all(

infrahub/core/migrations/graph/m045_backfill_hfid_display_label_in_db_profile_template.py

@@ -0,0 +1,163 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from rich.progress import Progress
+
+from infrahub.core import registry
+from infrahub.core.branch import Branch
+from infrahub.core.initialization import get_root_node
+from infrahub.core.migrations.graph.m044_backfill_hfid_display_label_in_db import DefaultBranchNodeCount, Migration044
+from infrahub.core.migrations.shared import MigrationResult, get_migration_console
+from infrahub.exceptions import SchemaNotFoundError
+
+from .load_schema_branch import get_or_load_schema_branch
+
+if TYPE_CHECKING:
+    from infrahub.core.schema import ProfileSchema, TemplateSchema
+    from infrahub.database import InfrahubDatabase
+
+
+console = get_migration_console()
+
+
+class Migration045(Migration044):
+    """
+    Backfill `human_friendly_id` and `display_label` attributes for profile and template nodes with schemas that define them.
+    """
+
+    name: str = "045_backfill_hfid_display_label_in_db_profile_template"
+    minimum_version: int = 44
+    update_batch_size: int = 1000
+
+    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+        root_node = await get_root_node(db=db, initialize=False)
+        default_branch_name = root_node.default_branch
+        default_branch = await Branch.get_by_name(db=db, name=default_branch_name)
+
+        main_schema_branch = await get_or_load_schema_branch(db=db, branch=default_branch)
+        kinds_to_skip = self.kinds_to_skip + main_schema_branch.node_names
+
+        total_nodes_query = await DefaultBranchNodeCount.init(db=db, kinds_to_skip=kinds_to_skip)
+        await total_nodes_query.execute(db=db)
+        total_nodes_count = total_nodes_query.get_num_nodes()
+
+        base_node_schema = main_schema_branch.get("SchemaNode", duplicate=False)
+        display_label_attribute_schema = base_node_schema.get_attribute("display_label")
+        display_labels_attribute_schema = base_node_schema.get_attribute("display_labels")
+        hfid_attribute_schema = base_node_schema.get_attribute("human_friendly_id")
+
+        try:
+            with Progress(console=console) as progress:
+                update_task = progress.add_task(
+                    f"Set display_label and human_friendly_id for {total_nodes_count} nodes on default branch",
+                    total=total_nodes_count,
+                )
+                for node_schema_name in main_schema_branch.profile_names + main_schema_branch.template_names:
+                    if node_schema_name in self.kinds_to_skip:
+                        continue
+
+                    node_schema: ProfileSchema | TemplateSchema
+                    if node_schema_name in main_schema_branch.profile_names:
+                        node_schema = main_schema_branch.get_profile(name=node_schema_name, duplicate=False)
+                    else:
+                        node_schema = main_schema_branch.get_template(name=node_schema_name, duplicate=False)
+
+                    attribute_schema_map = {}
+                    if node_schema.display_labels:
+                        attribute_schema_map[display_labels_attribute_schema] = display_label_attribute_schema
+                    if node_schema.human_friendly_id:
+                        attribute_schema_map[hfid_attribute_schema] = hfid_attribute_schema
+                    if not attribute_schema_map:
+                        continue
+
+                    await self._do_one_schema_all(
+                        db=db,
+                        branch=default_branch,
+                        schema=node_schema,
+                        schema_branch=main_schema_branch,
+                        attribute_schema_map=attribute_schema_map,
+                        progress=progress,
+                        update_task=update_task,
+                    )
+
+        except Exception as exc:
+            return MigrationResult(errors=[str(exc)])
+        return MigrationResult()
+
+    async def execute_against_branch(self, db: InfrahubDatabase, branch: Branch) -> MigrationResult:
+        default_branch = await Branch.get_by_name(db=db, name=registry.default_branch)
+        main_schema_branch = await get_or_load_schema_branch(db=db, branch=default_branch)
+        schema_branch = await get_or_load_schema_branch(db=db, branch=branch)
+
+        base_node_schema = schema_branch.get("SchemaNode", duplicate=False)
+        display_label_attribute_schema = base_node_schema.get_attribute("display_label")
+        display_labels_attribute_schema = base_node_schema.get_attribute("display_labels")
+        hfid_attribute_schema = base_node_schema.get_attribute("human_friendly_id")
+
+        try:
+            for node_schema_name in schema_branch.profile_names + schema_branch.template_names:
+                if node_schema_name in self.kinds_to_skip:
+                    continue
+
+                node_schema: ProfileSchema | TemplateSchema
+                default_node_schema: ProfileSchema | TemplateSchema | None
+                if node_schema_name in schema_branch.profile_names:
+                    node_schema = schema_branch.get_profile(name=node_schema_name, duplicate=False)
+                    try:
+                        default_node_schema = main_schema_branch.get_profile(name=node_schema_name, duplicate=False)
+                    except SchemaNotFoundError:
+                        default_node_schema = None
+                else:
+                    node_schema = schema_branch.get_template(name=node_schema_name, duplicate=False)
+                    try:
+                        default_node_schema = main_schema_branch.get_template(name=node_schema_name, duplicate=False)
+                    except SchemaNotFoundError:
+                        default_node_schema = None
+
+                schemas_for_universal_update_map = {}
+                schemas_for_targeted_update_map = {}
+                if node_schema.display_labels:
+                    if default_node_schema is None or default_node_schema.display_label != node_schema.display_label:
+                        schemas_for_universal_update_map[display_labels_attribute_schema] = (
+                            display_label_attribute_schema
+                        )
+                    else:
+                        schemas_for_targeted_update_map[display_labels_attribute_schema] = (
+                            display_label_attribute_schema
+                        )
+
+                if node_schema.human_friendly_id:
+                    if (
+                        default_node_schema is None
+                        or default_node_schema.human_friendly_id != node_schema.human_friendly_id
+                    ):
+                        schemas_for_universal_update_map[hfid_attribute_schema] = hfid_attribute_schema
+                    else:
+                        schemas_for_targeted_update_map[hfid_attribute_schema] = hfid_attribute_schema
+
+                if schemas_for_universal_update_map:
+                    await self._do_one_schema_all(
+                        db=db,
+                        branch=branch,
+                        schema=node_schema,
+                        schema_branch=schema_branch,
+                        attribute_schema_map=schemas_for_universal_update_map,
+                    )
+
+                if not schemas_for_targeted_update_map:
+                    continue
+
+                for source_attribute_schema, destination_attribute_schema in schemas_for_targeted_update_map.items():
+                    await self._do_one_schema_branch(
+                        db=db,
+                        branch=branch,
+                        schema=node_schema,
+                        schema_branch=schema_branch,
+                        source_attribute_schema=source_attribute_schema,
+                        destination_attribute_schema=destination_attribute_schema,
+                    )
+
+        except Exception as exc:
+            return MigrationResult(errors=[str(exc)])
+        return MigrationResult()

{infrahub_server-1.5.1.dist-info → infrahub_server-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.5.1
+Version: 1.5.2
 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.5.1.dist-info → infrahub_server-1.5.2.dist-info}/RECORD

@@ -67,9 +67,9 @@ infrahub/core/account.py,sha256=6f1cIDWvL-HsbzL0UwWoCbDTzx55wzd_SkpQXiKDjcE,2747
 infrahub/core/attribute.py,sha256=4_FvQI5EgCmOGKb8_N0c7k2kV1EbXwLqRgFsvOtQbVw,44907
 infrahub/core/branch/__init__.py,sha256=h0oIj0gHp1xI-N1cYW8_N6VZ81CBOmLuiUt5cS5nKuk,49
 infrahub/core/branch/enums.py,sha256=wE_TvKxd-r3zeHgLOMuZhsyKRwDWWC8BMxAEC_aX7A8,212
-infrahub/core/branch/models.py,sha256=jNKf0C0hy9OnEVUm3D4kRpuxbBQze45sVQ8Caruzbgs,20574
+infrahub/core/branch/models.py,sha256=wgTeFJCcrgW7soZrfJWhGaJg2jDmTnsAjabpjf0-KWI,20617
 infrahub/core/branch/needs_rebase_status.py,sha256=purrg93k9zWcV9NONjIdMF8cWLXEKHq6YjO0ayC3C04,407
-infrahub/core/branch/tasks.py,sha256=WxIdAuvfCRLctLABEsQCpjhWKe6naI84HCR3qwP1MSI,23358
+infrahub/core/branch/tasks.py,sha256=RnQlWdFmAj3VIALb4WNaMiL7ZuvtGcW1zgdbnemjE-Q,23558
 infrahub/core/changelog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/changelog/diff.py,sha256=0BxCpsgJ-38x5BBz5XDtAvc9FPy82M0NlzXl8nQ-c70,13752
 infrahub/core/changelog/models.py,sha256=oVy-j4pWXs9PAuQgaRohFYsmdPBPNc7FZU3FzxS_klc,29828
@@ -141,9 +141,9 @@ infrahub/core/diff/query_parser.py,sha256=ywb5ZH9O7fZ9G8XWHxEcCJNjwRAKNWJCvSoqcL
 infrahub/core/diff/repository/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/diff/repository/deserializer.py,sha256=bhN9ao8HxqKyRz273QGLNV9z9_SS4EQnM9JoY5ptx78,21337
 infrahub/core/diff/repository/repository.py,sha256=u0QTMY1e2dknG_DuRAwzFt-Lp1_mdj5lqF2ymt77k9E,25581
-infrahub/core/diff/tasks.py,sha256=jSXlenTJ5Fc189Xvm971e3-gBDRnfN19cxNaWvEFwAE,3306
+infrahub/core/diff/tasks.py,sha256=lQMTcqvVC1p5hc3KmwR2ONA1M6qffDUl62vKOktTs5c,3514
 infrahub/core/enums.py,sha256=qGbhRVoH43Xi0iDkUfWdQiKapJbLT9UKsCobFk_paIk,491
-infrahub/core/graph/__init__.py,sha256=hC8X6p8rzSzwhe-sqICejw_qkEOt3Bd0yWcTKMwGKRw,19
+infrahub/core/graph/__init__.py,sha256=KNVHBhDx3HVtzNMVi-7A8m-Cp_rbi61MeY-Ag62bZ78,19
 infrahub/core/graph/constraints.py,sha256=lmuzrKDFoeSKRiLtycB9PXi6zhMYghczKrPYvfWyy90,10396
 infrahub/core/graph/index.py,sha256=A9jzEE_wldBJsEsflODeMt4GM8sPmmbHAJRNdFioR1k,1736
 infrahub/core/graph/schema.py,sha256=o50Jcy6GBRk55RkDJSMIDDwHhLD7y_RWOirI9rCex4A,10776
@@ -163,7 +163,7 @@ infrahub/core/manager.py,sha256=IU5VfkHLCN4WhvqzI6DOEyCXo9fBT_st5BmN__A4vas,4418
 infrahub/core/merge.py,sha256=TNZpxjNYcl3dnvE8eYXaWSXFDYeEa8DDsS9XbR2XKlA,11217
 infrahub/core/migrations/__init__.py,sha256=ttA1YkKhiG9Zc0fwIIcMLIDCrIhN5xVOIh6ojFoy58o,1541
 infrahub/core/migrations/exceptions.py,sha256=gEAkWzjvN-IXr0YPqUrEqnu_GsR-uqucsu1QUaWhEmM,147
-infrahub/core/migrations/graph/__init__.py,sha256=P99qPwV4_sKPG6lNH33PUBckqZadRpBMVjMbxTPVvqc,4375
+infrahub/core/migrations/graph/__init__.py,sha256=epa6L0I-ZMzHS2NkpTusTl_1LEDjGNRq7q_S_HukqqQ,4475
 infrahub/core/migrations/graph/load_schema_branch.py,sha256=OvjowaeDnx4djD1aGPjE7Rqyh1p843LSodOf_Frdt9U,1008
 infrahub/core/migrations/graph/m001_add_version_to_graph.py,sha256=YcLN6cFjE6IGheXR4Ujb6CcyY8bJ7WE289hcKJaENOc,1515
 infrahub/core/migrations/graph/m002_attribute_is_default.py,sha256=wB6f2N_ChTvGajqHD-OWCG5ahRMDhhXZuwo79ieq_II,1036
@@ -208,7 +208,8 @@ infrahub/core/migrations/graph/m040_duplicated_attributes.py,sha256=2LxsG-CfcZnB
 infrahub/core/migrations/graph/m041_deleted_dup_edges.py,sha256=eP2BqUfvwkjACJrKI5fVyBBmXxEDwxtAD9O_CcbwBMw,5409
 infrahub/core/migrations/graph/m042_profile_attrs_in_db.py,sha256=KdEaNPHovJxxiNL3CFRjWBnNzaMdidj1nmW5Jbhrt-4,6431
 infrahub/core/migrations/graph/m043_create_hfid_display_label_in_db.py,sha256=x7OgI5ZoX8yslg329VNFHXbZ2eDFwcdFhBeC-UWqVdk,7072
-infrahub/core/migrations/graph/m044_backfill_hfid_display_label_in_db.py,sha256=ZvQZQtd5P0C3Xd8_54_OGq5q1pc-gFBoZ3UUg3hMQbQ,38470
+infrahub/core/migrations/graph/m044_backfill_hfid_display_label_in_db.py,sha256=mzw_sitDDDNQRMurvMo3mprUqhXNLJVh6Dgabh67cTw,39096
+infrahub/core/migrations/graph/m045_backfill_hfid_display_label_in_db_profile_template.py,sha256=mnND7TIdPSVcN9uJeYMmRpVjlAU6QBqfu7e1CS31D9Q,7934
 infrahub/core/migrations/query/__init__.py,sha256=nUbKk8bX6Ei4RkLe0VNNAm7c-d2zDoAMgdFGkYW0Czw,850
 infrahub/core/migrations/query/attribute_add.py,sha256=wKChMnqcd8hb8YCTIU3rUrtVqwHFSI5bdvXAPUcnRIA,4969
 infrahub/core/migrations/query/attribute_remove.py,sha256=IhAPlv9jyZTWMf8f8HZJ8G0ImWebt-ER78NrP3vIWhU,5307
@@ -887,8 +888,8 @@ infrahub_testcontainers/models.py,sha256=hT7WEX2o7gxTFPE9uhtP5yigKgP5YSsy2c3tFB-
 infrahub_testcontainers/performance_test.py,sha256=_nf7Uk15mHwqpN4y7XUfI4JI54-UaXW-Yu4uwMIx21w,6185
 infrahub_testcontainers/plugin.py,sha256=I3RuZQ0dARyKHuqCf0y1Yj731P2Mwf3BJUehRJKeWrs,5645
 infrahub_testcontainers/prometheus.yml,sha256=610xQEyj3xuVJMzPkC4m1fRnCrjGpiRBrXA2ytCLa54,599
-infrahub_server-1.5.1.dist-info/LICENSE.txt,sha256=7GQO7kxVoQYnZtFrjZBKLRXbrGwwwimHPPOJtqXsozQ,11340
-infrahub_server-1.5.1.dist-info/METADATA,sha256=Ci9Q7X9kIG5Irx9yGBYFmcu63aWKr5I80qx1wblacYc,6127
-infrahub_server-1.5.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-infrahub_server-1.5.1.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
-infrahub_server-1.5.1.dist-info/RECORD,,
+infrahub_server-1.5.2.dist-info/LICENSE.txt,sha256=7GQO7kxVoQYnZtFrjZBKLRXbrGwwwimHPPOJtqXsozQ,11340
+infrahub_server-1.5.2.dist-info/METADATA,sha256=FI3l6-MziBYaFBQiDqElU0MK6XgH67S3iQsq6jiJ4_8,6127
+infrahub_server-1.5.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+infrahub_server-1.5.2.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
+infrahub_server-1.5.2.dist-info/RECORD,,