Merge pull request #7417 from opsmill/fac-merge-stable-into-develop

Merge stable into develop

Author: fatih-acar

.github/dependabot.yml

@@ -10,7 +10,7 @@ updates:
       interval: "weekly"
       day: "monday"
       time: "09:00"
-    target-branch: develop
+    target-branch: stable
     labels:
       - "type/housekeeping"
       - "ci/skip-changelog"

.github/workflows/publish-pypi.yml

@@ -44,6 +44,11 @@ jobs:
         with:
           python-version: "3.12"
 
+      - name: "Check out repository code"
+        uses: "actions/checkout@v5"
+        with:
+          submodules: true
+
       - name: "Setup Python environment"
         run: |
           pipx install -f poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
@@ -52,10 +57,6 @@ jobs:
         env:
           PIPX_DEFAULT_PYTHON: ${{ steps.python.outputs.python-path }}
 
-      - name: "Check out repository code"
-        uses: "actions/checkout@v5"
-        with:
-          submodules: true
       - name: "Install Dependencies"
         run: "poetry install"
         working-directory: ${{ matrix.package_dir }}

backend/infrahub/core/changelog/models.py

@@ -560,7 +560,7 @@ def _parse_cardinality_many_relationship(
 
         for peer in relationship.peers:
             if peer.peer_status == DiffAction.ADDED:
-                peer_schema = schema_branch.get(name=peer.peer_kind)
+                peer_schema = schema_branch.get(name=peer.peer_kind, duplicate=False)
                 secondaries.extend(
                     self._process_added_peers(
                         peer_id=peer.peer_id,
@@ -572,7 +572,7 @@ def _parse_cardinality_many_relationship(
                 )
 
             elif peer.peer_status == DiffAction.REMOVED:
-                peer_schema = schema_branch.get(name=peer.peer_kind)
+                peer_schema = schema_branch.get(name=peer.peer_kind, duplicate=False)
                 secondaries.extend(
                     self._process_removed_peers(
                         peer_id=peer.peer_id,

backend/infrahub/core/manager.py

@@ -60,12 +60,15 @@ def identify_node_class(node: NodeToProcess) -> type[Node]:
 
 
 def get_schema(
-    db: InfrahubDatabase, branch: Branch, node_schema: type[SchemaProtocol] | MainSchemaTypes | str
+    db: InfrahubDatabase,
+    branch: Branch,
+    node_schema: type[SchemaProtocol] | MainSchemaTypes | str,
+    duplicate: bool = False,
 ) -> MainSchemaTypes:
     if isinstance(node_schema, str):
-        return db.schema.get(name=node_schema, branch=branch.name)
+        return db.schema.get(name=node_schema, branch=branch.name, duplicate=duplicate)
     if hasattr(node_schema, "_is_runtime_protocol") and node_schema._is_runtime_protocol:
-        return db.schema.get(name=node_schema.__name__, branch=branch.name)
+        return db.schema.get(name=node_schema.__name__, branch=branch.name, duplicate=duplicate)
     if not isinstance(node_schema, (MainSchemaTypes)):
         raise ValueError(f"Invalid schema provided {node_schema}")
 

backend/infrahub/core/node/constraints/attribute_uniqueness.py

@@ -29,7 +29,9 @@ async def check(self, node: Node, at: Timestamp | None = None, filters: list[str
             attr = getattr(node, unique_attr.name)
             if unique_attr.inherited:
                 for generic_parent_schema_name in node_schema.inherit_from:
-                    generic_parent_schema = self.db.schema.get(generic_parent_schema_name, branch=self.branch)
+                    generic_parent_schema = self.db.schema.get(
+                        generic_parent_schema_name, branch=self.branch, duplicate=False
+                    )
                     parent_attr = generic_parent_schema.get_attribute_or_none(unique_attr.name)
                     if parent_attr is None:
                         continue

backend/infrahub/core/relationship/constraints/count.py

@@ -40,7 +40,7 @@ async def check(self, relm: RelationshipManager, node_schema: MainSchemaTypes, n
         # peer_ids_present_database_only:
         #    relationship to be deleted, need to check if the schema on the other side has a min_count defined
         # TODO see how to manage Generic node
-        peer_schema = registry.schema.get(name=relm.schema.peer, branch=branch)
+        peer_schema = registry.schema.get(name=relm.schema.peer, branch=branch, duplicate=False)
         peer_rels = peer_schema.get_relationships_by_identifier(id=relm.schema.get_identifier())
         if not peer_rels:
             return

backend/infrahub/core/relationship/model.py

@@ -459,7 +459,7 @@ async def resolve(self, db: InfrahubDatabase, at: Timestamp | None = None) -> No
                 self.set_peer(value=peer)
 
         if not self.peer_id and self.peer_hfid:
-            peer_schema = db.schema.get(name=self.schema.peer, branch=self.branch)
+            peer_schema = db.schema.get(name=self.schema.peer, branch=self.branch, duplicate=False)
             kind = (
                 self.data["kind"]
                 if isinstance(self.data, dict) and "kind" in self.data and peer_schema.is_generic_schema

backend/infrahub/core/schema/node_schema.py

@@ -130,10 +130,12 @@ def inherit_from_interface(self, interface: GenericSchema) -> None:
                 item_idx = existing_inherited_relationships[relationship.name]
                 self.relationships[item_idx].update_from_generic(other=new_relationship)
 
-    def get_hierarchy_schema(self, db: InfrahubDatabase, branch: Branch | str | None = None) -> GenericSchema:
+    def get_hierarchy_schema(
+        self, db: InfrahubDatabase, branch: Branch | str | None = None, duplicate: bool = False
+    ) -> GenericSchema:
         if not self.hierarchy:
             raise ValueError("The node is not part of a hierarchy")
-        schema = db.schema.get(name=self.hierarchy, branch=branch)
+        schema = db.schema.get(name=self.hierarchy, branch=branch, duplicate=duplicate)
         if not isinstance(schema, GenericSchema):
             raise TypeError
         return schema

backend/infrahub/core/validators/relationship/peer.py

@@ -22,7 +22,7 @@ class RelationshipPeerUpdateValidatorQuery(RelationshipSchemaValidatorQuery):
     name = "relationship_constraints_peer_validator"
 
     async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
-        peer_schema = db.schema.get(name=self.relationship_schema.peer, branch=self.branch)
+        peer_schema = db.schema.get(name=self.relationship_schema.peer, branch=self.branch, duplicate=False)
         allowed_peer_kinds = [peer_schema.kind]
         if isinstance(peer_schema, GenericSchema):
             allowed_peer_kinds += peer_schema.used_by

backend/infrahub/core/validators/tasks.py

@@ -36,7 +36,7 @@ async def schema_validate_migrations(message: SchemaValidateMigrationData) -> li
     log.info(f"{len(message.constraints)} constraint(s) to validate")
     # NOTE this task is a good candidate to add a progress bar
     for constraint in message.constraints:
-        schema = message.schema_branch.get(name=constraint.path.schema_kind)
+        schema = message.schema_branch.get(name=constraint.path.schema_kind, duplicate=False)
         if not isinstance(schema, GenericSchema | NodeSchema):
             continue
         batch.add(