infrahub-server 1.2.3__py3-none-any.whl → 1.2.5__py3-none-any.whl

infrahub_sdk/generator.py

@@ -40,6 +40,7 @@ class InfrahubGenerator:
         self.generator_instance = generator_instance
         self._init_client = client.clone()
         self._init_client.config.default_branch = self._init_client.default_branch = self.branch_name
+        self._init_client.store._default_branch = self.branch_name
         self._client: InfrahubClient | None = None
         self._nodes: list[InfrahubNode] = []
         self._related_nodes: list[InfrahubNode] = []

infrahub_sdk/node.py

@@ -82,17 +82,18 @@ class Attribute:
 
         self.id: str | None = data.get("id", None)
 
-        self.value: Any | None = data.get("value", None)
+        self._value: Any | None = data.get("value", None)
+        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)
 
-        if self.value:
+        if self._value:
             value_mapper: dict[str, Callable] = {
                 "IPHost": ipaddress.ip_interface,
                 "IPNetwork": ipaddress.ip_network,
             }
             mapper = value_mapper.get(schema.kind, lambda value: value)
-            self.value = mapper(data.get("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)
@@ -107,6 +108,15 @@ class Attribute:
             if data.get(prop_name):
                 setattr(self, prop_name, NodeProperty(data=data.get(prop_name)))  # type: ignore[arg-type]
 
+    @property
+    def value(self) -> Any:
+        return self._value
+
+    @value.setter
+    def value(self, value: Any) -> None:
+        self._value = value
+        self.value_has_been_mutated = True
+
     def _generate_input_data(self) -> dict | None:
         data: dict[str, Any] = {}
         variables: dict[str, Any] = {}
@@ -975,7 +985,9 @@ class InfrahubNodeBase:
         for item in original_data.keys():
             if item in data.keys():
                 if data[item] == original_data[item]:
-                    data.pop(item)
+                    if attr := getattr(self, item, None):  # this should never be None, just a safety default value
+                        if not isinstance(attr, Attribute) or not attr.value_has_been_mutated:
+                            data.pop(item)
                     continue
                 if isinstance(original_data[item], dict):
                     self._strip_unmodified_dict(data=data, original_data=original_data, variables=variables, item=item)

infrahub_sdk/schema/__init__.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import json
 from collections.abc import MutableMapping
 from enum import Enum
 from time import sleep
@@ -13,6 +14,7 @@ from typing_extensions import TypeAlias
 
 from ..exceptions import (
     InvalidResponseError,
+    JsonDecodeError,
     SchemaNotFoundError,
     ValidationError,
 )
@@ -420,7 +422,14 @@ class InfrahubSchema(InfrahubSchemaBase):
         response = await self.client._get(url=url, timeout=timeout)
         response.raise_for_status()
 
-        data: MutableMapping[str, Any] = response.json()
+        try:
+            data: MutableMapping[str, Any] = response.json()
+        except json.decoder.JSONDecodeError as exc:
+            raise JsonDecodeError(
+                message=f"Invalid Schema response received from the server at {response.url}: {response.text} [{response.status_code}] ",
+                content=response.text,
+                url=response.url,
+            ) from exc
 
         nodes: MutableMapping[str, MainSchemaTypesAPI] = {}
         for node_schema in data.get("nodes", []):

{infrahub_server-1.2.3.dist-info → infrahub_server-1.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: infrahub-server
-Version: 1.2.3
+Version: 1.2.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.
 Home-page: https://opsmill.com
 License: AGPL-3.0-only
@@ -39,7 +39,7 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (==1.28.1)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (==1.28.1)
 Requires-Dist: opentelemetry-instrumentation-aio-pika (==0.49b1)
 Requires-Dist: opentelemetry-instrumentation-fastapi (==0.49b1)
-Requires-Dist: prefect (==3.2.11)
+Requires-Dist: prefect (==3.3.4)
 Requires-Dist: prefect-redis (==0.2.2)
 Requires-Dist: pyarrow (>=14,<15)
 Requires-Dist: pydantic (>=2.10,<2.11)

{infrahub_server-1.2.3.dist-info → infrahub_server-1.2.5.dist-info}/RECORD

@@ -27,9 +27,9 @@ infrahub/auth.py,sha256=g4pQX4kI1k-iWIQNduXODhpeZXIjY3XqLslh7QFRBq4,9194
 infrahub/cli/__init__.py,sha256=zQjE9zMrwAmk_4qb5mbUgNi06g3HKvrPwQvJLQmv9JY,1814
 infrahub/cli/constants.py,sha256=CoCeTMnfsA3j7ArdLKLZK4VPxOM7ls17qpxGJmND0m8,129
 infrahub/cli/context.py,sha256=20CJj_D1VhigR9uhTDPHiVHnV7vzsgK8v-uLKs06kzA,398
-infrahub/cli/db.py,sha256=SGS2Gk69waX3Z0abmT0qpth2vvSPA9U0iSBLLML6ePw,15108
+infrahub/cli/db.py,sha256=14ptdk1mvsa5WdatEY5NTqOETHyIWV1GLvUow2ob0dE,27851
 infrahub/cli/events.py,sha256=nJmowQgTxRs6qaT41A71Ei9jm6qtYaL2amAT5TA1H_k,1726
-infrahub/cli/git_agent.py,sha256=O2DQvDlR72HZ2Ft7RLTh5_6hCFG0rzwSACWjMpr3MUw,5511
+infrahub/cli/git_agent.py,sha256=ajT9-kdd3xLIysOPe8GqZyCDMkpNyhqfWjBg9HPWVcg,5240
 infrahub/cli/server.py,sha256=zeKgJE9V0usSMVBwye0sRNNh6Ctj-nSZHqHbNskqyz4,2248
 infrahub/cli/tasks.py,sha256=uVtMuUbcXwb6H3hnunUl9JJh99XShpWn2pwryVrR7hg,1952
 infrahub/cli/upgrade.py,sha256=GQWzga8AFTvfS_VY6s1Nmf_J1UJb533IUVQiF_FC9r0,5031
@@ -40,26 +40,25 @@ infrahub/computed_attribute/gather.py,sha256=TSv6_CWZH1DYRv430jzyJpFJWKzwPGka5wF
 infrahub/computed_attribute/models.py,sha256=-jS47FBYfbZptd0knzSm_m4GFFnQGMC09QNey1MQt04,12804
 infrahub/computed_attribute/tasks.py,sha256=2MYjXHOTyn3geFPXszvJ8MChlawlGDZ030L9bcMGuGg,17350
 infrahub/computed_attribute/triggers.py,sha256=ve1cUj0CZ7dU1VtZkxET9LD8StszKIL9mCkTZpCeUaI,2304
-infrahub/config.py,sha256=_N1Xqws1jYiwC0NeHSakkLKkwp4br5ok0sWzcdtIi6w,34202
+infrahub/config.py,sha256=J3R-k2I5WHNAHZaCJWRFSNOhCn_T4Is1E8WeQqDaPYI,35222
 infrahub/context.py,sha256=8SZRKSECkkcsNNzDaKEUJ7Nyr0EzUfToAy969LXjQVk,1554
 infrahub/core/__init__.py,sha256=z6EJBZyCYCBqinoBtX9li6BTBbbGV8WCkE_4CrEsmDA,104
 infrahub/core/account.py,sha256=_RL8QTRsA7XmaTfWSfE6GGy8Z1BEPK5BWoc_LUjDfyE,26507
 infrahub/core/attribute.py,sha256=TUw_yTUo8eJyy0_iD0p1CdI6xfyNvIPdTb3f7ZZS2sA,43003
 infrahub/core/branch/__init__.py,sha256=h0oIj0gHp1xI-N1cYW8_N6VZ81CBOmLuiUt5cS5nKuk,49
-infrahub/core/branch/flow_models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/branch/models.py,sha256=pu597Oe2N33cNdXDR59EgCFVHQOy1-hkl3UZnqSu-Vs,19471
-infrahub/core/branch/tasks.py,sha256=8qtq4KFcflzoUkhCn64mRKvaD8hFbjVQSOz2WEvedbA,19237
+infrahub/core/branch/tasks.py,sha256=Q9dJtKbEieeQZJQ4FI5qlLvoQKnKmDHl1BcF_iaguUo,20984
 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=UgfJdOFUkMmjeUKe1mPCO7WE3jNENw0UJU3LWFf20HQ,29920
-infrahub/core/constants/__init__.py,sha256=5i9X29s-F-Qv2hO8CfmH_FTsFOe6GAR2iftMQF1NSdo,8539
+infrahub/core/constants/__init__.py,sha256=0yESCw_I7KQzalo3gJ8Wjz0puLJH-DKsEQkhH7eyvG4,8578
 infrahub/core/constants/database.py,sha256=lxesWX2z6SZgGok1bAY6_pCBm5rFfu7k4ayMBr6w_Vo,336
 infrahub/core/constants/infrahubkind.py,sha256=08iJTK_RMMHbyF67bZLAIZFYiWaDv_IxU6Al53LPE6s,2492
 infrahub/core/constants/relationship_label.py,sha256=AWbWghu5MoAKg2DBE-ysdzSOXnWoWdBn98zpIHzn_co,87
 infrahub/core/constants/schema.py,sha256=uuddQniyGlSlvKjM5mQ_V2VhgZmQ8fUCAHysbZLvTEU,2006
 infrahub/core/constraint/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/constraint/node/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-infrahub/core/constraint/node/runner.py,sha256=oWtU0rqtp3i10S8WFCoatVU6Kq7sQeISeVaLklMSpt4,1970
+infrahub/core/constraint/node/runner.py,sha256=l60GfQxqn6OaLUvfVYddsWor9qy2NiMY_0avnIb_Heg,1848
 infrahub/core/diff/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/diff/artifacts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/diff/artifacts/calculator.py,sha256=qk1DspB3bkKeWJFesLbmziCALVnbRadjrez1kn_IZWU,4435
@@ -115,7 +114,7 @@ infrahub/core/diff/repository/deserializer.py,sha256=9CMYN17uQtDkp4w3PlCOnPIhE8R
 infrahub/core/diff/repository/repository.py,sha256=xgTzmd_fdc-n7iX8E83sd3fOz25O4P3CEDQFpRMZjpI,24946
 infrahub/core/diff/tasks.py,sha256=kHapEy7isn9zGsThYFauDkDnG-dIODanBaa-TaFD9EY,3278
 infrahub/core/enums.py,sha256=qGbhRVoH43Xi0iDkUfWdQiKapJbLT9UKsCobFk_paIk,491
-infrahub/core/graph/__init__.py,sha256=YGBgVRuiGOItsMOBdR7dp3NBq-JysiqLfU2lTFyyPmI,19
+infrahub/core/graph/__init__.py,sha256=vg81QN-hmdl7ziUJird8wna034Z7HFur47608DfljDY,19
 infrahub/core/graph/constraints.py,sha256=lmuzrKDFoeSKRiLtycB9PXi6zhMYghczKrPYvfWyy90,10396
 infrahub/core/graph/index.py,sha256=oR6wyYpJbq2IVVzUdiuGyWA511hw2AvgklFoBmQk-bM,1619
 infrahub/core/graph/schema.py,sha256=FmEPPb1XOFv3nnS_XJCuUqlp8HsStX5A2frHjlhoqvE,10105
@@ -134,7 +133,7 @@ infrahub/core/ipam/utilization.py,sha256=d-zpXCaWsHgJxBLopCDd7y4sJYvHcIzzpYhbTMI
 infrahub/core/manager.py,sha256=nE5IL3Hk1ro_4seIbofEdIer3kbVVBtdvmVTbQFAyek,46169
 infrahub/core/merge.py,sha256=bZvToLKyphJlWMbQAzGuSHcrG2DfeqL69KSfqb1wWdc,10430
 infrahub/core/migrations/__init__.py,sha256=syPb3-Irf11dXCHgbT0UdmTnEBbpf4wXJ3m8ADYXDpk,1175
-infrahub/core/migrations/graph/__init__.py,sha256=aQao4LVtSO7xRSKIPRfiO7ek9TUrXYgG72uS2RL9288,2477
+infrahub/core/migrations/graph/__init__.py,sha256=CB4j35V5VRpJxnSJN_HOYzUv_cPMVCHwpFGYjWjhoaA,2608
 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
 infrahub/core/migrations/graph/m003_relationship_parent_optional.py,sha256=fRMmcOmBdHgOEjlf-5TaWsZ1Rzs6op1s75-r_jE_tZ0,2345
@@ -152,13 +151,15 @@ infrahub/core/migrations/graph/m014_remove_index_attr_value.py,sha256=UVTDnF00W0
 infrahub/core/migrations/graph/m015_diff_format_update.py,sha256=DETKst0UNXmuE0aQJep1SJxukajZSK8avF9Z-c0W4ME,1267
 infrahub/core/migrations/graph/m016_diff_delete_bug_fix.py,sha256=hcnJN3dOoDfbKcEzlRPew2XbJ-hqsEsjkDSGEnjwbFs,1275
 infrahub/core/migrations/graph/m017_add_core_profile.py,sha256=Z_--D73C8aUtmZPh1okxhY3ipf66vsLcvuIi6LphDTo,1361
-infrahub/core/migrations/graph/m018_uniqueness_nulls.py,sha256=rYHGk_Jt08H5bXtBiS5ousxHSv4HqEPk2RpIlZzz798,4851
+infrahub/core/migrations/graph/m018_uniqueness_nulls.py,sha256=uo_le3UmKw-BmLZa9OgxGfpVtKHoe7SxFj-eZNvFDWg,4677
 infrahub/core/migrations/graph/m019_restore_rels_to_time.py,sha256=bDV-HcttkI9spZINMeJmooACgcque7nvDACDitLRhbk,11782
 infrahub/core/migrations/graph/m020_duplicate_edges.py,sha256=I5lEO3dz-5Yi8vMTu6xGqkejaHUEPe0GmEVd8A8_gQ4,6770
 infrahub/core/migrations/graph/m021_missing_hierarchy_merge.py,sha256=5SMcIoZITEUrmW20PTpp3fm5jU548xoRhviTJoUz5NI,1638
 infrahub/core/migrations/graph/m022_add_generate_template_attr.py,sha256=CmSxcXoWdjNXk4UxbUUeR7X49qiyNIIJuvigV9pOqNA,1748
 infrahub/core/migrations/graph/m023_deduplicate_cardinality_one_relationships.py,sha256=tW-su33h0K1zZk6GsOxqZcqpAsTNCmKo7kN88Te7jAA,3930
 infrahub/core/migrations/graph/m024_missing_hierarchy_backfill.py,sha256=NQm51OmkS4D6gCczo4OB1RlOtIU1SaV3qusu1kEF4_k,2502
+infrahub/core/migrations/graph/m025_uniqueness_nulls.py,sha256=n_g09PDLs1yo3dMYL00HH2VtmYkjV1sVnxFL0KL4hOg,863
+infrahub/core/migrations/graph/m026_0000_prefix_fix.py,sha256=7sP6nQZrqgzFyRUHKf5fKSX2LrzKEAAsiDsRSu9noJM,1944
 infrahub/core/migrations/query/__init__.py,sha256=JoWOUWlV6IzwxWxObsfCnAAKUOHJkE7dZlOsfB64ZEo,876
 infrahub/core/migrations/query/attribute_add.py,sha256=zvOwd9afCtfBpR-rEWePEAnbpoeQorzkcSmD4t8myYA,3510
 infrahub/core/migrations/query/attribute_rename.py,sha256=-p3AInP1dWRO-v-i8MSajDeK5_2LcJwYr2jqLQ_vbgs,6971
@@ -170,18 +171,18 @@ infrahub/core/migrations/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 infrahub/core/migrations/schema/attribute_name_update.py,sha256=gebaeQX1MLmOxupTPcCzLJdeEQlUzs3XIl7T15-RdXY,1595
 infrahub/core/migrations/schema/models.py,sha256=F1yp0GM-HutGdzhE0uPFq9JCTH9iHM3V4iDm2e2c4YU,1357
 infrahub/core/migrations/schema/node_attribute_add.py,sha256=4_g1W1wqfN3MT9GSAHAUEAZiLeAmvbUp88vauexTzdk,1085
-infrahub/core/migrations/schema/node_attribute_remove.py,sha256=x8C20cuUBstLj_l8xG6zW0EzqQqLL4nXA3sKDCQSp8A,4525
+infrahub/core/migrations/schema/node_attribute_remove.py,sha256=pWja69aFjxblOf8x2KWqJ4cEko-MR6ihA0jTq7OOunM,5350
 infrahub/core/migrations/schema/node_kind_update.py,sha256=scVJz4FhiI2meIVSDTbc9Q6KfGksMDLMwnuxsaZX1aU,1454
 infrahub/core/migrations/schema/node_remove.py,sha256=uQZ6VwDyB2SkcICyvJIjy7H4LG5OiYImh-DvalzJc5k,6858
 infrahub/core/migrations/schema/placeholder_dummy.py,sha256=3T3dBwC_ZyehOJr2KRKFD6CXaq8QIjVk0N-nWAMvFYw,308
 infrahub/core/migrations/schema/tasks.py,sha256=x6c_5N0pcQ_lTH5Vaqg2_MwlQ08I35BdX-8NhRDozBE,4165
 infrahub/core/migrations/shared.py,sha256=e7HEBijWhG46UN8ODjSmxvGeK8KAQ3Twnj2q1dvb2m0,6983
-infrahub/core/models.py,sha256=-zATUEecIoNoTVFpDfVBlPmJQ6_yMkhH_tyKm3SwqGQ,24831
-infrahub/core/node/__init__.py,sha256=SnP6_KQebb0A2PG4Lryyp3YIvbV2ktAW3F98adyX2jw,36689
+infrahub/core/models.py,sha256=43iDtUwlsJ5G_F8IP4XoxLeoilfgjudhN3ZfS7esyh8,24840
+infrahub/core/node/__init__.py,sha256=MahMw4Bs4KQCqWTPVoOvSd7K0rP_Ez7JVy57ZHR65xs,36755
 infrahub/core/node/base.py,sha256=5HfcA2d3GPjEDqJAEHGF_eHh6RV3-QlNpAsTr499ZmI,2578
 infrahub/core/node/constraints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/node/constraints/attribute_uniqueness.py,sha256=9MThTmuqZ7RgK71ZZARlw1k1x3ARn1U67g2_Gatd6rE,2099
-infrahub/core/node/constraints/grouped_uniqueness.py,sha256=lLXZWJU8GvJEfZlU6JrE7yDAZ-p3HubNjeSUV1Dqlv8,11757
+infrahub/core/node/constraints/grouped_uniqueness.py,sha256=GQ1-l4ZoZR6FoklHAdqCaNwX3TmW6qrvKYJEVtdPOfc,12056
 infrahub/core/node/constraints/interface.py,sha256=fwB32pRLxteQyKRArqekQ0RXlrDkyzp7Vmq03vSpUEo,291
 infrahub/core/node/delete_validator.py,sha256=mj_HQXkTeP_A3po65-R5bCJnDM9CmFFmcUQIxwPlofc,10559
 infrahub/core/node/ipam.py,sha256=NWb3TUlVQOGAzq1VvDwISLh61HML0jnalsJ7QojqGwQ,2669
@@ -189,7 +190,7 @@ infrahub/core/node/permissions.py,sha256=uQzQ62IHcSly6fzPre0nQzlrkCIKzH4HyQkODKB
 infrahub/core/node/resource_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/node/resource_manager/ip_address_pool.py,sha256=M5Kgx56VvT61TTQaYf4NLSF1z6UGUxvKMhRYDhVkapU,4678
 infrahub/core/node/resource_manager/ip_prefix_pool.py,sha256=L7Psmcto5kHRd3AVt6JGUK-3-tQoG1gnAK3UUDi_dCs,4895
-infrahub/core/node/resource_manager/number_pool.py,sha256=GRteqDHToBCwuUfNgy_If3HLAzXuHh2jaRWz9vimqgE,2482
+infrahub/core/node/resource_manager/number_pool.py,sha256=6mczrHTNd8jbXoW8Q6xHpBWi-JOSk5QSlwOegkMbNEQ,2479
 infrahub/core/node/standard.py,sha256=Niyc7mNxEGn6K7a1MXHkiLJhyTNR3uvTWLLbHvm6-Bo,7113
 infrahub/core/path.py,sha256=qHoC5cJwb3nwh-kUiuWqrCgkN2Dleatygn3KNid70sg,5844
 infrahub/core/property.py,sha256=rwsqeaIvCMkHfJYl4WfsNPAS7KS0POo5rAN7vAprXGA,5102
@@ -209,7 +210,7 @@ infrahub/core/query/subquery.py,sha256=40MEDGSFPeXG6M4DpwfQfJMVqB_ET6WTMwhgueKV-
 infrahub/core/query/task.py,sha256=tLgn8S_KaLYLuOB66D1YM155teHZIHNThkt2iUiKKD4,3137
 infrahub/core/query/task_log.py,sha256=2RdthOAQrmpKZU8uhV_dJCPqwdsSA_1CYSKpL_eZ_yk,1120
 infrahub/core/query/utils.py,sha256=t9LMvZWdmi10c3E0HAU_5m7x5zMHhYXsUjX7ZBl2RpU,1091
-infrahub/core/registry.py,sha256=a0z8yBAZY1ooYjLAYpxpwXXcvMDEhy3tLXdLjWyYcvg,7700
+infrahub/core/registry.py,sha256=LJfLiqw1fUrPWTI8k-hL0KYTLnK2nBCkKJYX5PZtduY,8570
 infrahub/core/relationship/__init__.py,sha256=broUBD0iwpSSGKJbUdG66uau67TQ_DRhqT_PFhuk1ag,154
 infrahub/core/relationship/constraints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/relationship/constraints/count.py,sha256=4wSjiJtRd4fQ5qYNzGyWrt1WLV7x5Go2ZatMTtK79QQ,4157
@@ -220,7 +221,7 @@ infrahub/core/relationship/model.py,sha256=uLJ9HA5esUvwYO0MuTc1bb7mSBGYuD2EqTNK4
 infrahub/core/root.py,sha256=8ZLSOtnmjQcrjqX2vxNO-AGopEUArmBPo_X5NeZBdP0,416
 infrahub/core/schema/__init__.py,sha256=nzRFXRM2vlzS6HhRmEk2-HaZkOV6nOvLTPvt-ShMCvU,3978
 infrahub/core/schema/attribute_schema.py,sha256=e4HXS6Q3dU2V-RRvklmCTZKMSeYWkI6-ok7dyG23h5I,5260
-infrahub/core/schema/basenode_schema.py,sha256=M1mRfVS0SzHzVzSb9SGEvbWy7NLVlfOJbYB6ZUQcMFc,21667
+infrahub/core/schema/basenode_schema.py,sha256=4px_CJjhjT7m5eGVDXRT0VVLhJ9m3M85Z1_j1yPgZ64,22189
 infrahub/core/schema/computed_attribute.py,sha256=9rznZJpGqX8fxLx0EguPmww8LoHsadMtQQUKaMoJPcI,1809
 infrahub/core/schema/constants.py,sha256=KtFrvwNckyKZSGIMD4XfxI5eFTZqBRiw54R7BE5h39Q,374
 infrahub/core/schema/definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -247,21 +248,21 @@ infrahub/core/schema/definitions/core/template.py,sha256=rgYhpimxW0vhTmpo5cv_QA2
 infrahub/core/schema/definitions/core/transform.py,sha256=Gh4OdUoQnVrHCep2V171dEPLQv7iMq2fW85v2WS173s,2964
 infrahub/core/schema/definitions/core/webhook.py,sha256=YHeFMdsQDoG804iO6beozkfzln5cZnXKAsjB0Twlqw0,4224
 infrahub/core/schema/definitions/deprecated.py,sha256=PUXfRupaxNT3R_a6eFnvAcvXKOZenVb7VnuLAskZfT0,829
-infrahub/core/schema/definitions/internal.py,sha256=VXylbCHFiH33M1n76U5kyks649XzEuF4bXIBTLXt0c4,32815
+infrahub/core/schema/definitions/internal.py,sha256=O1kchtswTl9SO35ph3zKBWQ6WrbDuawiPse4QV_E3_w,32849
 infrahub/core/schema/dropdown.py,sha256=Vj4eGg9q3OLy3RZm7rjORifURntIMY9GHM7G4t-0Rcs,605
 infrahub/core/schema/generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/schema/generated/attribute_schema.py,sha256=rSAlf5EM2JQzV3NB59OBi1wzJ6WLPINS9l5pxoR-2bo,4949
-infrahub/core/schema/generated/base_node_schema.py,sha256=XTKt_L6R6SQDQLyiYR8scM6uplYci5328PdoerR44ZY,4428
+infrahub/core/schema/generated/base_node_schema.py,sha256=YR4FxbXd_K6Z0qim5oBQ4EsKSBJMf5DVCuoXZ8LnmMg,4428
 infrahub/core/schema/generated/genericnode_schema.py,sha256=FvfeYfld9YeKHOzyH6G3zFkZP_ETrWfvvOpggLT8waY,1059
 infrahub/core/schema/generated/node_schema.py,sha256=PMgbQX1PC5ixQsjOFw_bcEfa4txGNUI6BV6OkFDG3wQ,1631
 infrahub/core/schema/generated/relationship_schema.py,sha256=LZIEAPlF9vfYscGYbQ8xgdRvSlVKgow7DQUZ2QC-yKs,5350
 infrahub/core/schema/generic_schema.py,sha256=4qXhCm4G_MgDqxZOut_AJwatU4onXBECKeS1UZcusr8,1340
-infrahub/core/schema/manager.py,sha256=LWkxZbl5Okey4Egqrydcy7JvwRwqr9Im4vKvBCJKs6Y,31845
+infrahub/core/schema/manager.py,sha256=4lPjjtE_MtJ0acJdYAJEkuK4jap3NnTdxB5esEB71Hs,32688
 infrahub/core/schema/node_schema.py,sha256=ld_Wrqf-RsoEUVz_lKE0tcSf5n_oYZYtRI0lTqtd63o,6150
 infrahub/core/schema/profile_schema.py,sha256=cOPSOt5KLgQ0nbqrAN_o33hY_pUtrKmiwSbY_YpVolI,1092
 infrahub/core/schema/relationship_schema.py,sha256=lVbyQKMP2jPZZwZGK6DBvXdXfEQEsQGMbZ2WYxOZKTw,8261
-infrahub/core/schema/schema_branch.py,sha256=cQh09-RUfjNT6PVtpK7tCwIN-iVaNmQ12Fdhw7g_zxE,97587
-infrahub/core/schema/schema_branch_computed.py,sha256=HoBubn2UBQkEJO3LQCsxZQMnfVAgTZl5cHIEMDTBPsE,10038
+infrahub/core/schema/schema_branch.py,sha256=WcQlPi_UWspPMZ801b4biZcX8iOBSdEJEckIW_TiH9Y,97799
+infrahub/core/schema/schema_branch_computed.py,sha256=14UUsQJDLMHkYhg7QMqeLiTF3PO8c8rGa90ul3F2ZZo,10629
 infrahub/core/schema/template_schema.py,sha256=O-PBS9IRM4JX6PxeoyZKwqZ0u0SdQ2zxWMc01PJ2_EA,1084
 infrahub/core/task/__init__.py,sha256=Ied1NvKGJUDmff27z_-yWW8ArenHxGvSvQTaQyx1iHs,128
 infrahub/core/task/task.py,sha256=WKU59GbSq5F_qJatiC4J76GGMYhw-BfpWwxMlvqr8WQ,3800
@@ -304,7 +305,7 @@ infrahub/core/validators/uniqueness/checker.py,sha256=RpiLpIjbdkwwjivry-vjEkVim6
 infrahub/core/validators/uniqueness/index.py,sha256=Jw1o-UVinQquNduZ5vCCzt8GUfIEdVzBo-1XyRti8F8,5068
 infrahub/core/validators/uniqueness/model.py,sha256=V2aejcuHPhgC5nTrS7xX0JFMzprVu90QAau-rUzruCY,5135
 infrahub/core/validators/uniqueness/query.py,sha256=em_DKmzv0kiKl6VhD9G4-LkrtuQj4mTxT5kc5ZgFv7M,10150
-infrahub/database/__init__.py,sha256=xyGxQDjIKPBcOFIsNzV5aPuziEOOzDNAlkJyeDZKBls,20556
+infrahub/database/__init__.py,sha256=m8Rkw7byTaz6eoYp3N9QlyJIxHQW8x2KXfn16sSAgwI,20982
 infrahub/database/constants.py,sha256=WmV1iuOk4xulxZHOVvO3sS_VF1eTf7fKh0TPe_RnfV4,507
 infrahub/database/index.py,sha256=y0sWXO3tdIr1wL1XC9O6iNRV-Elu2KAXFOiYXRIIhN4,1659
 infrahub/database/manager.py,sha256=BDXNw1RNBeSFV-EZd0aGFbPNuoqlKwrkDqmYB7sy4tU,317
@@ -370,12 +371,12 @@ infrahub/dependencies/interface.py,sha256=pVNdGYVeGlJgmBBlnv-3UYPXeZqZT8mx9Sg4Ss
 infrahub/dependencies/registry.py,sha256=WPUJ_5MlGY1W1yrgHDhT343Vp8GtUM6UriMmBDmWeVw,4127
 infrahub/events/__init__.py,sha256=MB4xQU5HyUrK5nOdEE31csO3KC0ARJv0m9FtcjdbbXQ,974
 infrahub/events/artifact_action.py,sha256=05R-idXAA_JMWi4KrICKyyLTfIVANHg5WZ9uxsivbt8,2632
-infrahub/events/branch_action.py,sha256=QJ1Zk2kBzKoCllic36_00KjPgCbGVvAO4FKtk8wWNA0,4595
+infrahub/events/branch_action.py,sha256=73j9oWwSLg65WAjpq_d2QcOKfcy8Y9kAjP8A2YrOOIM,4692
 infrahub/events/constants.py,sha256=B6sv4eWA_A0I6IKjVG6A4sn0xdV-rHSztlTwoe2kphY,29
 infrahub/events/generator.py,sha256=reEO-TefCvt5E9mayLXQJXfsKFc7sSIYg4P5g63kAsU,2716
-infrahub/events/group_action.py,sha256=IxAOFhyir3Z5ebEx8qZuqr8QhEhw4J1MXpIHpzppK4s,3678
+infrahub/events/group_action.py,sha256=-svK6o9gZcoq_wjW_5WsUqX2G7vbahViTEN54y6FxXA,3893
 infrahub/events/models.py,sha256=IbYAeaL-wLFhv0WyTnh7EM0wSuRm1gnMl7ewvtzchm4,7244
-infrahub/events/node_action.py,sha256=P3S96swbHlQ5Uoe14bbUt6katdceScyYg9ySzLC5jTM,6879
+infrahub/events/node_action.py,sha256=UagMAcK9gfCJYCnkGEAPuVHLpFzNvlqW1glXcKSn8dk,7093
 infrahub/events/repository_action.py,sha256=5x0boObzGipVb_QGQfNOXBrtENs-SNAjruttBzG4HZg,919
 infrahub/events/schema_action.py,sha256=IvsCvEWsnl7CArJT5DqBn7nF7xmE8JdOHdcVqjeLWGk,1429
 infrahub/events/utils.py,sha256=JmyKKKDjyD3LS9LlY9_AetL8hBb8EdEfRlreUihskTs,649
@@ -388,7 +389,7 @@ infrahub/git/__init__.py,sha256=KeQ9U8UI5jDj6KB6j00Oal7MZmtOD9vKqVgiezG_EQA,281
 infrahub/git/base.py,sha256=WTYJ_LqiUhlaMs9QGt1X6pZrsCwmfUZ3eeZYOfZ9mts,38717
 infrahub/git/constants.py,sha256=XpzcAkXbsgXZgrXey74id1sXV8Q6EHb_4FNw7BndxyY,106
 infrahub/git/directory.py,sha256=fozxLXXJPweHG95yQwQkR5yy3sfTdmHiczCAJnsUX54,861
-infrahub/git/integrator.py,sha256=0PffNDW_qZNZ5PVzd6asTOJaKSWmd7HiCLE0zivSyjU,57606
+infrahub/git/integrator.py,sha256=PkchhobfFdZKkS6vLkQEBuartLqSiT2Puj43fz-2fZk,57612
 infrahub/git/models.py,sha256=TwiJnknL3nRaFybttLIoVGC9Pqd5smxM4Lh7zTxaqmE,11961
 infrahub/git/repository.py,sha256=mjYeH3pKWRM3UuvcwRCWeE793FuPbSdY8VF1IYK-BxA,11603
 infrahub/git/tasks.py,sha256=EvquEalnUbZHvtFBZBt2BNsHILXCxzBWBKIbR7pgyGk,37102
@@ -435,7 +436,7 @@ infrahub/graphql/mutations/diff_conflict.py,sha256=JngQfyKXCVlmtlqQ_VyabmrOEDOEK
 infrahub/graphql/mutations/generator.py,sha256=Ulw4whZm8Gc8lJjwfUFoFSsR0cOUliFKl87Oca4B9O0,3579
 infrahub/graphql/mutations/graphql_query.py,sha256=mp_O2byChneCihUrEAFEiIAgJ1gW9WrgtwPetUQmkJw,3562
 infrahub/graphql/mutations/ipam.py,sha256=wIN8OcTNCHVy32YgatWZi2Of-snFYBd4wlxOAJvE-AY,15961
-infrahub/graphql/mutations/main.py,sha256=t6ElO2pG5tC15w__cKxWkvU3Adb_MeWVKFSVLBQ7TqM,26763
+infrahub/graphql/mutations/main.py,sha256=QpB_iV4VFWYkUpk5tcSe0eFJXAn1YcwFruzNjyccvUY,26618
 infrahub/graphql/mutations/menu.py,sha256=u2UbOA-TFDRcZRGFkgYTmpGxN2IAUgOvJXd7SnsufyI,3708
 infrahub/graphql/mutations/models.py,sha256=ilkSLr8OxVO9v3Ra_uDyUTJT9qPOmdPMqQbuWIydJMo,264
 infrahub/graphql/mutations/node_getter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -504,10 +505,8 @@ infrahub/menu/models.py,sha256=qh0W-Lut6DtszRABx9Xa1QG1q7SYQsBcNT21QuUBFYM,9839
 infrahub/menu/repository.py,sha256=IQpEbQ1u9WiCl7cWCoElEVH_E9qhcLTaTsrf8BWmges,5044
 infrahub/menu/utils.py,sha256=tkTAeVCTUWgLNvL9QiPwJwys6os1Q92nhigHXxMwyQo,272
 infrahub/message_bus/__init__.py,sha256=MkDavdkUxCAJ_RCohO7cLBAzYTqftcXAI6hVj5FaoiE,3669
-infrahub/message_bus/messages/__init__.py,sha256=nxBbsM65wLKzALrsiekCm__6ZImj_jm_YAooVaUY-8c,2708
+infrahub/message_bus/messages/__init__.py,sha256=Cr8sU-SeidNzB1pnEMFQ-P_xY4_IH87GNmpYb1dR_-c,2488
 infrahub/message_bus/messages/check_generator_run.py,sha256=l-3YmXbjFHSKfw53gVTa7SO7AYftGL25gdF0QJhhp4A,1535
-infrahub/message_bus/messages/event_branch_merge.py,sha256=c4sdKh6Fhq-zXcLdetYpQa7wOI4bVBq8ZS3V9yp7W2c,433
-infrahub/message_bus/messages/event_worker_newprimaryapi.py,sha256=qnlxlBaot2JKEWGbnLt4RGKxKqq-7Gt3dnHswwe1VgA,278
 infrahub/message_bus/messages/finalize_validator_execution.py,sha256=7Q6Qjjk2tVXaIE7j2IwSfcTzJpPw_h_fE5LsBRtoofk,815
 infrahub/message_bus/messages/git_file_get.py,sha256=YoLJzkpNOIInhfVdTUCPEA_xf5LUZ09BRXDTDy8ZiVE,967
 infrahub/message_bus/messages/git_repository_connectivity.py,sha256=O_x2EOXI9fhVQtz4nuQrRC3VB8FE6HOuAxcltImSF38,813
@@ -518,14 +517,11 @@ infrahub/message_bus/messages/refresh_git_fetch.py,sha256=LlxUse_N6HdoCbFEfnTETx
 infrahub/message_bus/messages/refresh_registry_branches.py,sha256=_48LCqM_IWoRRbIDDTfls89kTr4E0wlXDzQdCIvSxfo,192
 infrahub/message_bus/messages/refresh_registry_rebasedbranch.py,sha256=ozCj3kmNL8jFIW0sTrG02eYYvHaLU7kI31dUd3B5EMQ,275
 infrahub/message_bus/messages/request_generatordefinition_check.py,sha256=-gkRdM91CRlzTWcEF_NTBd1zHuQQqmafVADT0RchFoI,1115
-infrahub/message_bus/messages/request_proposedchange_pipeline.py,sha256=oF8SA-NWVCT5WUhJYXID-5t1DoXnlQRE8zAXB-QD3hE,936
+infrahub/message_bus/messages/request_proposedchange_pipeline.py,sha256=ePuAw2qvSmFYV66Xq3gVMiLhBVerAxw9E-9iq3_Btq4,1089
 infrahub/message_bus/messages/send_echo_request.py,sha256=Z9agbdXj1N8LdKFLKJzNnw3artk3b8WwQ-eA_MO1eAw,575
-infrahub/message_bus/operations/__init__.py,sha256=Yl6QI0IZF1VkAyknTTFCrC2OGxo47yEjJMErHyFF0dA,2356
+infrahub/message_bus/operations/__init__.py,sha256=AAi0Bd-wWlGONMuypGvZpqAsVoniLC6M_BUQ8qZ15Bk,2233
 infrahub/message_bus/operations/check/__init__.py,sha256=o8-DkZSNc3FQllWcvOK8nUqEknZ1Ef0WaQpxnqgEFz4,49
 infrahub/message_bus/operations/check/generator.py,sha256=YMDF7tjvUR6figkw2VXr3PB1L8F4CuF7J944lcbP4qw,6757
-infrahub/message_bus/operations/event/__init__.py,sha256=EBDiXN0j8Iv8G9KUYwuYbj-XRn_ckiUAh7T_4VNZHvE,61
-infrahub/message_bus/operations/event/branch.py,sha256=x4T_Ff9s5bFCrLwLzER51heAgzEdlXhAcykJf7XcOQw,2593
-infrahub/message_bus/operations/event/worker.py,sha256=v_lfqSx6e9mdc1nGQLj1QINhPQ9eXpwPKK9CAU1C8UM,349
 infrahub/message_bus/operations/finalize/__init__.py,sha256=5wo4BS6O_54Srh2249jRYzuLhJ42GjMJ7nuYaAbMCfo,49
 infrahub/message_bus/operations/finalize/validator.py,sha256=6SvWxyr5FSr0bGiCRGAoMdfgVsdyJah8l4KUbjG7EYM,5537
 infrahub/message_bus/operations/git/__init__.py,sha256=0Fbz1AnU8lWKdX7PS_b0BvjiKOPFqTcUXImTRYe6NLM,65
@@ -535,10 +531,10 @@ infrahub/message_bus/operations/refresh/__init__.py,sha256=vBuvTL4zRRpOMXATmckQ3
 infrahub/message_bus/operations/refresh/registry.py,sha256=AWyIVoh7DvwqD_ihPAa6zbPogUGBZcz8tzTJpySoiUY,1301
 infrahub/message_bus/operations/requests/__init__.py,sha256=7BWa2wc4XSNk13zySOEUdFfcaldSIZT6WXdR6eDxk-U,131
 infrahub/message_bus/operations/requests/generator_definition.py,sha256=AE2x0NiGoyqD5PYp7XmmjzD23SqNCTyzI8KwcTcVurg,6093
-infrahub/message_bus/operations/requests/proposed_change.py,sha256=gJmiEWhVPP1cW2GSpC7rFTKaY6Gd-1fZBwoMhZN9Q3U,22090
+infrahub/message_bus/operations/requests/proposed_change.py,sha256=BepHKycBn6kXCAOHgwmOu7gVluuJ5LvchZnZ55Rt138,22800
 infrahub/message_bus/operations/send/__init__.py,sha256=ivuUTAknLiWfArR44SxA40l0UKVkdHjtDIx0mg06IcE,39
 infrahub/message_bus/operations/send/echo.py,sha256=m2z_ij7Bucl8u1E1rLAfL3fsrhKZhk_vNIvLqNErIEI,652
-infrahub/message_bus/types.py,sha256=1DSHACKsFT-6tXgmSnWdLVjNFRiG7PL1tCWv-M6fDgQ,5575
+infrahub/message_bus/types.py,sha256=suudCrwuYXqoRVN6J9dbshRtK22BPxk0cdaCG8QKaxM,4258
 infrahub/middleware.py,sha256=g6lPpXewWNcLjyzRsr7FjdTIbdc5H2HitGQX-L7itgI,657
 infrahub/models.py,sha256=QmwJwo3hNCta8BXM7eLsD9qv1S73Rj0cC_crLpadHTc,715
 infrahub/permissions/__init__.py,sha256=WAtFhyaQj8dFkZJGnIbBaVbSMttGZGgK18V-QbMNVNU,538
@@ -559,31 +555,32 @@ infrahub/prefect_server/database.py,sha256=v-uti6O__lK51zG_ICq8Drj8j7XlrkRZNZouR
 infrahub/prefect_server/events.py,sha256=My0DSsjTENx7-L7_NxxKsBakoOElp95is4-yanS_SkI,869
 infrahub/prefect_server/models.py,sha256=J3xNH-Y5IE-4zBErdkHvJR-cmuaVojhyjn1Ia7A5uBk,1991
 infrahub/proposed_change/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+infrahub/proposed_change/branch_diff.py,sha256=Oerw3cHo51XPKwBsAmpO0T470Fg9mkpWViHVY51hToY,2303
 infrahub/proposed_change/constants.py,sha256=w8fPxKWJM1DzeClRd7Vr53hxkzl2Bq-rnXWfE2y3Bz0,1296
 infrahub/proposed_change/models.py,sha256=fAXs7k9xI6vdq02RqKrorzWmkQdtZ7u-J1NQAi4hPcg,2208
-infrahub/proposed_change/tasks.py,sha256=qUHmAN9dT9xx_oYBBsPstfwOEbCncL3n1FctK61F1bY,28274
+infrahub/proposed_change/tasks.py,sha256=8jRavixDyQwVWtrQ5P6ON_vc2r2oAlVvlWXkhl-dO_A,28642
 infrahub/pytest_plugin.py,sha256=u3t0WgLMo9XmuQYeb28mccQ3xbnyv2Fv173YWl1zBiM,6678
 infrahub/serve/__init__.py,sha256=cWzvEH-Zwr1nQsoNJO9q1pef5KLuSK3VQLOumlnsQxk,73
 infrahub/serve/gunicorn_config.py,sha256=BkClF6yjz-sIhZ-oDizXUmGSEE-FQSmy21JfVnRI5tA,102
 infrahub/serve/log.py,sha256=qUidwbtE5AlyLHnWKVoEggOoHKhfMMjYlUH1d-iGwqg,953
 infrahub/serve/worker.py,sha256=nNGQORkUM474UiFNfb0GBHo2vx-NuAuZCcscwoKnGwE,1371
-infrahub/server.py,sha256=O0v884rwEQVWMZzX5_wIcyawB8HO9b24vC-fzCJcI4s,8389
+infrahub/server.py,sha256=ruKMBwoYUDY3-7GuV6qYbsq-VkasCY6t9EZU-J9VkG4,8117
 infrahub/services/__init__.py,sha256=WQ9s6y0YFNrP8rRndKqQAB7iJa4-Q-5KvHxUXS4xlQA,7036
 infrahub/services/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-infrahub/services/adapters/cache/__init__.py,sha256=j0y_NqC6p1ysGgUxhw5_R3_yFZVS3DipG5ExccPs-3k,1139
+infrahub/services/adapters/cache/__init__.py,sha256=QPHboyYJU3TkNQRGnXR8e12ktVj1tCoyEEVQr2cW05E,1816
 infrahub/services/adapters/cache/nats.py,sha256=J1-7xB7hmnYB45NpiH15eoi-7nbtSpOpKEtzSCLpvkA,5646
-infrahub/services/adapters/cache/redis.py,sha256=jON7tMKeSkDzi9wFsYb4B1zLSs8PwJn6-hM4DfXbaX4,1859
+infrahub/services/adapters/cache/redis.py,sha256=v2Am9T-toFQW0Xyrt7HO_Wa2uLJE6T7w5V9cHt-trDA,2029
 infrahub/services/adapters/event/__init__.py,sha256=KUA6mW-9JF1haFu4D0G8CTETcR7y_yvpTg7avbQ0wgM,1372
 infrahub/services/adapters/http/__init__.py,sha256=SyMHID_aqH6bGLVZgDxQFqhJB7v_5l1RbeQee0XCbhc,554
 infrahub/services/adapters/http/httpx.py,sha256=jUPbxnjYZzWxk7fnFt2D4eSbd4JmiAGZFPk0Tz-Eyo0,3652
-infrahub/services/adapters/message_bus/__init__.py,sha256=e8w8qWsTU8CP-GhKsFEi8cJZdWp22toch3MYvtJdhbU,2297
+infrahub/services/adapters/message_bus/__init__.py,sha256=259um9F05MXukfbDvEyxY_iDDbPUmpkcYR8LWP_W_vY,3261
 infrahub/services/adapters/message_bus/local.py,sha256=wG4i-Bp6gW2bDaP0x6eMPtmmJYGbM5pavuaYrPNCBvI,2403
 infrahub/services/adapters/message_bus/nats.py,sha256=SPjwPZQHSdUbMoap0H38Ulbe1V58wP0W1TcHM7Ud9hI,12009
 infrahub/services/adapters/message_bus/rabbitmq.py,sha256=OHEnQlZiY58S-5OksaxxvpltOZ-VJ-HXmY7fzdCDWKM,10975
 infrahub/services/adapters/workflow/__init__.py,sha256=NvZnbwK2Gp5CYaMEiiQVClNa5u_4QWVN4G2KDtfNZBI,1642
 infrahub/services/adapters/workflow/local.py,sha256=4W-WIrq2LSsn35K0ITmaJXCi_RAI4qsMp0iuQBBR26I,1850
-infrahub/services/adapters/workflow/worker.py,sha256=71Nd0rHGvgqPQKSjbVHy9czyxkKCwnCZkycTw4SpiAk,3140
-infrahub/services/component.py,sha256=X-frmFgCMg6-nPi22NDE26bduJcodx25byYKZrtk5zY,5704
+infrahub/services/adapters/workflow/worker.py,sha256=T3TaqvdG8dZtf1oQOgrTgRCaC6ycKAMeHieu0WQalp0,3097
+infrahub/services/component.py,sha256=uQvmhDtvPTfxYAdDkaQulbdIWh_kxrFAuhJooKufaac,5634
 infrahub/services/protocols.py,sha256=Ci4cnWK6L_R_5V2qAPnQpHtKXYS0hktp7CoJWIbcbc0,754
 infrahub/services/scheduler.py,sha256=LbuIyLsyYa5E8eWA6aXidGyhIIninGJ8ue5tO5qmiCA,3113
 infrahub/storage.py,sha256=bpK8m7GNlp5LHI0yXuFNZhhBVQpU7RZr7MeWCaAAPLk,1812
@@ -598,7 +595,7 @@ infrahub/tasks/check.py,sha256=WEdktFP1XzahHtF6N782OnNFzkg5uX3KIeNFRy3NEUM,730
 infrahub/tasks/dummy.py,sha256=6SxlQqQXZqgTuwLaAsK-p1O1TYNKfdGmUYjNJFNHe9s,1209
 infrahub/tasks/keepalive.py,sha256=D6yh3Vmlr1WCEpZibk2YLc2n0dCcX6tM62HCSxyGEu8,783
 infrahub/tasks/recurring.py,sha256=RJO2zdzCU-38Kb81lmCUbFQOBhGui8qn2QizTV4vj9I,447
-infrahub/tasks/registry.py,sha256=eqQ7ddbw_a9nDL8LynjoQH0bytIProNrksfNWAq5tS8,3137
+infrahub/tasks/registry.py,sha256=wox2lo8JoW8abirN0LFF3Qeerspthviq8yFVe-LDu2g,3017
 infrahub/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/telemetry/constants.py,sha256=_5mJAZaT_wTCaF7Yzsd---Zn1N6GZkoP_954GK8K4-c,184
 infrahub/telemetry/database.py,sha256=0yqrfotO3lF-ij15v-tG1nxtoUJppXzHaKubN0Jw9CQ,3097
@@ -630,10 +627,10 @@ infrahub/webhook/tasks.py,sha256=kQz0BzOOKUGogHKN2X_tSKYk-7rpHMQ1FKjmGugzEc0,723
 infrahub/webhook/triggers.py,sha256=v1dzFV4wX0GO2n5hft_qzp-oJOA2P_9Q2eTcSP-i0pk,1574
 infrahub/worker.py,sha256=JtTM-temURUbpEy-bkKJuTt-GKoiHFDrOe9SyVTIXEM,49
 infrahub/workers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-infrahub/workers/infrahub_async.py,sha256=eVgWPQUDw86pi1moXfparrvfBaa4Lst2yyTVrvoA7rs,9593
+infrahub/workers/infrahub_async.py,sha256=NQ2HLmRFWW1_M9NZmmdkEctFCPgqGKFmweGlNkjdgyU,9207
 infrahub/workers/utils.py,sha256=m6FOKrYo53Aoj-JcEyQ7-J4Dc20R9JtHMDzTcqXiRpg,2407
 infrahub/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-infrahub/workflows/catalogue.py,sha256=2HgFnrhwQYmV_AVNrsS69QTZEtJ4rUI8A9Tc2SkTgqE,14387
+infrahub/workflows/catalogue.py,sha256=fn1oNCreKCGPsThZBPZfzOvvyuz5nivFcTpSfI7xd2c,14659
 infrahub/workflows/constants.py,sha256=7je2FF7tJH6x_ZNqHKZfQX91X7I5gmD8OECN3dE_eqI,651
 infrahub/workflows/initialization.py,sha256=BJjSt9uz7fuNr2aahGbLdy1RUKw8AjxKrZ81cJswbxY,3219
 infrahub/workflows/models.py,sha256=uGBNla2xJqKnqARdq21vhXGHxM2ozDqioeBvT7zg3Jo,3439
@@ -674,11 +671,11 @@ infrahub_sdk/ctl/validate.py,sha256=dknc4kMBIdysZNtEBYyvhlFPyUYyLmc2a4OI4cjGj2c,
 infrahub_sdk/data.py,sha256=4d8Fd1s7lTeOu8JWXsK2m2BM8t_5HG0Z73fnCZGc7Pc,841
 infrahub_sdk/diff.py,sha256=Ms-3YyXo-DoF1feV9qP7GKakBYUNFsULZdy-yMEG71w,4258
 infrahub_sdk/exceptions.py,sha256=MX8zsxJUYD0vSiArG2sHWveWNAUoJfkN-R2ehtGmeQs,5052
-infrahub_sdk/generator.py,sha256=7dJxn0-r-uMt4vngmPQD4O66rKfWQt7_FH0CQHFwxrg,5525
+infrahub_sdk/generator.py,sha256=9Je9mCfS6madP2WMD6gp9l8IkWhW_eIl5elnt9h7rvc,5592
 infrahub_sdk/graphql.py,sha256=zrxRveg8-t0FbLtOEMDiiW0vqtBHc2qaFRkiHF9Bp6g,7019
 infrahub_sdk/groups.py,sha256=GL14ByW4GHrkqOLJ-_vGhu6bkYDxljqPtkErcQVehv0,711
 infrahub_sdk/jinja2.py,sha256=lTfV9E_P5gApaX6RW9M8U8oixQi-0H3U8wcs8fdGVaU,1150
-infrahub_sdk/node.py,sha256=CjQ7oezsXOhZH7m21UnprRHl7sABSVDj_5vhsu3FOMQ,90684
+infrahub_sdk/node.py,sha256=isR3SVSFLfb_c524fGTgaPo0E_ac08P-8MJPOsu7CrM,91151
 infrahub_sdk/object_store.py,sha256=d-EDnxPpw_7BsbjbGbH50rjt-1-Ojj2zNrhFansP5hA,4299
 infrahub_sdk/playback.py,sha256=ubkY1LiW_wFwm4auerdQ0zFJcFJZ1SYQT6-d4bxzaLg,1906
 infrahub_sdk/protocols.py,sha256=LyiZcUvcT-ibgWYyYELjAPyAv42kxdhAPyFfac-RIZo,21569
@@ -699,7 +696,7 @@ infrahub_sdk/queries.py,sha256=s4gnx67e-MNg-3jP4Vx1jreO9uiW3uYPllFQgaTODdQ,2308
 infrahub_sdk/query_groups.py,sha256=vcN67jWvDcVacXbgITOMt-UI_6T5eGrG4WJfb8LqUi4,10069
 infrahub_sdk/recorder.py,sha256=G134AfAwE5efSqArVJneurF2JIEuhvSJWWI3woPczgI,2194
 infrahub_sdk/repository.py,sha256=PbSHHl6ajIeZu1t4pH1j7qzR-DPOkGuzubcNM02NuV0,1011
-infrahub_sdk/schema/__init__.py,sha256=BXdJ7-d8vqFVXcwUkYocKUKYYYbZ4IQOVzP74sYHMXo,27572
+infrahub_sdk/schema/__init__.py,sha256=CKCgXTnnSVgrg1Tjz2oi2PqgkA6WpfjH9xUlfb-HqZc,27943
 infrahub_sdk/schema/main.py,sha256=_24hapeJ7mXI_rfN2b9ariwsilQ1W-LVIfk8DXdtjbw,11087
 infrahub_sdk/schema/repository.py,sha256=AAITXGprCPb2WptJSRhj9gEbRrW1HHM-yEPYAgsztcU,11299
 infrahub_sdk/spec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -740,18 +737,18 @@ infrahub_sdk/uuidt.py,sha256=Tz-4nHkJwbi39UT3gaIe2wJeZNAoBqf6tm3sw7LZbXc,2155
 infrahub_sdk/yaml.py,sha256=L_sj5ds-0_uKe3aIfZu86kDLq8tffKzle9dcyDUTaEc,2937
 infrahub_testcontainers/__init__.py,sha256=oPpmesGgYBSdKTg1L37FGwYBeao1EHury5SJGul-CT8,216
 infrahub_testcontainers/constants.py,sha256=mZ4hLvcf4rKk9wC7EId4MQxAY0sk4V99deB04N0J2bg,85
-infrahub_testcontainers/container.py,sha256=jQ0du9E_xg5oNk8YSsDzbJqBI1W7_J6jJpuo1OeoG1M,10488
+infrahub_testcontainers/container.py,sha256=FUkEVkPwUtYGfjHd6brLkI_3D4-qYmH5BGAOlyJrFU4,10652
 infrahub_testcontainers/docker-compose.test.yml,sha256=MqN8TPIAWNOZg93m_P2HH5etyYvtgYmwR92SyHR_GDQ,7017
 infrahub_testcontainers/haproxy.cfg,sha256=QUkG2Xu-hKoknPOeYKAkBT_xJH6U9CfIS0DTMFZJsnk,1305
-infrahub_testcontainers/helpers.py,sha256=RdKnBP7Mg-EVnXlSelj6INmoDLDRWabt9bOZcGjH7wM,3535
+infrahub_testcontainers/helpers.py,sha256=zsvBOql5qM2OX1ybPcklqF-nzWYHkZI3Gk3KZhxWOtU,3578
 infrahub_testcontainers/host.py,sha256=Z4_gGoGKKeM_HGVS7SdYL1FTNGyLBk8wzicdSKHpfmM,1486
 infrahub_testcontainers/measurements.py,sha256=gR-uTasSIFCXrwvnNpIpfsQIopKftT7pBiarCgIShaQ,2214
-infrahub_testcontainers/models.py,sha256=R735sO9i6D1TTtwlB0rweN3rWmZMYoSFfk1zt5XgT-Y,909
-infrahub_testcontainers/performance_test.py,sha256=82g4hfDuEesV7T8U12UjMV7ujZQMy_q30CSNQCdDVlQ,5993
+infrahub_testcontainers/models.py,sha256=ASYyvl7d_WQz_i7y8-3iab9hwwmCl3OCJavqVbe8nXU,954
+infrahub_testcontainers/performance_test.py,sha256=PSE03jevzv63n-v5rxNIzuQsbtCR-pVqLVpJddjCHhs,6025
 infrahub_testcontainers/plugin.py,sha256=vk33oG44MA2zxZwqMsS8_CkScm5LwuwwFmSOtmeAdMU,5357
 infrahub_testcontainers/prometheus.yml,sha256=610xQEyj3xuVJMzPkC4m1fRnCrjGpiRBrXA2ytCLa54,599
-infrahub_server-1.2.3.dist-info/LICENSE.txt,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
-infrahub_server-1.2.3.dist-info/METADATA,sha256=Sh17vgP7MjLW08fSumGBTKkkSyiwzDLdLcS1BdY5HQU,8190
-infrahub_server-1.2.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-infrahub_server-1.2.3.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
-infrahub_server-1.2.3.dist-info/RECORD,,
+infrahub_server-1.2.5.dist-info/LICENSE.txt,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
+infrahub_server-1.2.5.dist-info/METADATA,sha256=wnu7F6hrzd7PmzNKsQt9gNeSVanc9mj2Yyd-ZBGEtlo,8189
+infrahub_server-1.2.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+infrahub_server-1.2.5.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
+infrahub_server-1.2.5.dist-info/RECORD,,

infrahub_testcontainers/container.py

@@ -57,6 +57,7 @@ PROJECT_ENV_VARIABLES: dict[str, str] = {
     "INFRAHUB_TESTING_API_SERVER_COUNT": "2",
     "INFRAHUB_TESTING_TASK_WORKER_COUNT": "2",
     "INFRAHUB_TESTING_PREFECT_UI_ENABLED": "true",
+    "INFRAHUB_TESTING_DOCKER_PULL": "true",
 }
 
 
@@ -173,6 +174,9 @@ class InfrahubDockerCompose(DockerCompose):
 
         up_cmd = [*base_cmd, "up"]
 
+        if self.get_env_var("INFRAHUB_TESTING_DOCKER_PULL") == "false":
+            up_cmd.extend(["--pull", "never"])
+
         # build means modifying the up command
         if self.wait:
             up_cmd.append("--wait")

infrahub_testcontainers/helpers.py

@@ -12,7 +12,7 @@ from .container import PROJECT_ENV_VARIABLES, InfrahubDockerCompose
 class TestInfrahubDocker:
     @pytest.fixture(scope="class")
     def infrahub_version(self) -> str:
-        return infrahub_version
+        return os.getenv("INFRAHUB_TESTING_IMAGE_VER") or infrahub_version
 
     @staticmethod
     def execute_ctl_run(address: str, script: str) -> str:

infrahub_testcontainers/models.py

@@ -1,4 +1,4 @@
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Any
 
@@ -27,7 +27,7 @@ class InfrahubResultContext(BaseModel):
 
 class InfrahubActiveMeasurementItem(BaseModel):
     definition: MeasurementDefinition
-    start_time: datetime = datetime.now(UTC)
+    start_time: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     context: dict[str, Any] = Field(default_factory=dict)
 
 

infrahub_testcontainers/performance_test.py

@@ -1,6 +1,6 @@
 import hashlib
 import json
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from types import TracebackType
 from typing import Any
 
@@ -35,7 +35,7 @@ class InfrahubPerformanceTest:
         self.env_vars = {}
         self.project_name = ""
         self.test_info = {}
-        self.start_time = datetime.now(UTC)
+        self.start_time = datetime.now(timezone.utc)
         self.end_time: datetime | None = None
         self.results_url = results_url
         self.scraper_endpoint = ""
@@ -57,7 +57,7 @@ class InfrahubPerformanceTest:
 
     def finalize(self, session: pytest.Session) -> None:
         if self.initialized:
-            self.end_time = datetime.now(UTC)
+            self.end_time = datetime.now(timezone.utc)
             self.extract_test_session_information(session)
             self.send_results()
 
@@ -129,7 +129,7 @@ class InfrahubPerformanceTest:
         if not exc_type and self.active_measurements:
             self.add_measurement(
                 definition=self.active_measurements.definition,
-                value=(datetime.now(UTC) - self.active_measurements.start_time).total_seconds() * 1000,
+                value=(datetime.now(timezone.utc) - self.active_measurements.start_time).total_seconds() * 1000,
                 context=self.active_measurements.context,
             )
 

infrahub/message_bus/messages/event_branch_merge.py

@@ -1,13 +0,0 @@
-from pydantic import Field
-
-from infrahub.context import InfrahubContext
-from infrahub.message_bus import InfrahubMessage
-
-
-class EventBranchMerge(InfrahubMessage):
-    """Sent when a branch has been merged."""
-
-    source_branch: str = Field(..., description="The source branch")
-    target_branch: str = Field(..., description="The target branch")
-
-    context: InfrahubContext = Field(..., description="The context of the event")

infrahub/message_bus/messages/event_worker_newprimaryapi.py

@@ -1,9 +0,0 @@
-from pydantic import Field
-
-from infrahub.message_bus import InfrahubMessage
-
-
-class EventWorkerNewPrimaryAPI(InfrahubMessage):
-    """Sent on startup or when a new primary API worker is elected."""
-
-    worker_id: str = Field(..., description="The worker ID that got elected")

infrahub/message_bus/operations/event/__init__.py

@@ -1,3 +0,0 @@
-from . import branch, worker
-
-__all__ = ["branch", "worker"]