infrahub-server 1.2.0b1__py3-none-any.whl → 1.2.1__py3-none-any.whl

infrahub/core/schema/generic_schema.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from .generated.genericnode_schema import GeneratedGenericSchema
 
@@ -28,7 +28,7 @@ class GenericSchema(GeneratedGenericSchema):
     def is_template_schema(self) -> bool:
         return False
 
-    def get_hierarchy_schema(self, db: InfrahubDatabase, branch: Optional[Union[Branch, str]] = None) -> GenericSchema:  # noqa: ARG002
+    def get_hierarchy_schema(self, db: InfrahubDatabase, branch: Branch | str | None = None) -> GenericSchema:  # noqa: ARG002
         if self.hierarchical:
             return self
 

infrahub/core/schema/manager.py

@@ -251,7 +251,7 @@ class SchemaManager(NodeManager):
 
         branch = await registry.get_branch(branch=branch, db=db)
 
-        for item_kind in schema.node_names + schema.generic_names:
+        for item_kind in schema.node_names + schema.generic_names_without_templates:
             if limit and item_kind not in limit:
                 continue
             item = schema.get(name=item_kind, duplicate=False)
@@ -295,15 +295,21 @@ class SchemaManager(NodeManager):
             new_node.attributes = []
 
             for item in node.attributes:
-                new_attr = await self.create_attribute_in_db(
-                    schema=attribute_schema, item=item, parent=obj, branch=branch, db=db
-                )
+                if item.inherited is False:
+                    new_attr = await self.create_attribute_in_db(
+                        schema=attribute_schema, item=item, parent=obj, branch=branch, db=db
+                    )
+                else:
+                    new_attr = item.duplicate()
                 new_node.attributes.append(new_attr)
 
             for item in node.relationships:
-                new_rel = await self.create_relationship_in_db(
-                    schema=relationship_schema, item=item, parent=obj, branch=branch, db=db
-                )
+                if item.inherited is False:
+                    new_rel = await self.create_relationship_in_db(
+                        schema=relationship_schema, item=item, parent=obj, branch=branch, db=db
+                    )
+                else:
+                    new_rel = item.duplicate()
                 new_node.relationships.append(new_rel)
 
         # Save back the node with the newly created IDs in the SchemaManager
@@ -465,7 +471,8 @@ class SchemaManager(NodeManager):
 
         if diff_attributes:
             for item in node.local_attributes:
-                if item.name in diff_attributes.added:
+                # if item is in changed and has no ID, then it is being overridden from a generic and must be added
+                if item.name in diff_attributes.added or item.name in diff_attributes.changed and item.id is None:
                     created_item = await self.create_attribute_in_db(
                         schema=attribute_schema, item=item, branch=branch, db=db, parent=obj
                     )
@@ -484,7 +491,8 @@ class SchemaManager(NodeManager):
 
         if diff_relationships:
             for item in node.local_relationships:
-                if item.name in diff_relationships.added:
+                # if item is in changed and has no ID, then it is being overridden from a generic and must be added
+                if item.name in diff_relationships.added or item.name in diff_relationships.changed and item.id is None:
                     created_rel = await self.create_relationship_in_db(
                         schema=relationship_schema, item=item, branch=branch, db=db, parent=obj
                     )
@@ -715,6 +723,9 @@ class SchemaManager(NodeManager):
             for rel in await rm.get(db=db):
                 item = await rel.get_peer(db=db)
                 item_data = {"id": item.id}
+                inherited_attr = getattr(item, "inherited", None)
+                if inherited_attr and getattr(inherited_attr, "value", False) is True:
+                    continue
                 for item_name in item._attributes:
                     item_attr = getattr(item, item_name)
                     item_data[item_name] = item_attr.get_value()

infrahub/core/schema/node_schema.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from infrahub.core.constants import AllowOverrideType, InfrahubKind
 
@@ -98,6 +98,7 @@ class NodeSchema(GeneratedNodeSchema):
                 continue
 
             new_attribute = attribute.duplicate()
+            new_attribute.id = None
             new_attribute.inherited = True
 
             if attribute.name not in existing_inherited_fields:
@@ -111,6 +112,7 @@ class NodeSchema(GeneratedNodeSchema):
                 continue
 
             new_relationship = relationship.duplicate()
+            new_relationship.id = None
             new_relationship.inherited = True
 
             if relationship.name not in existing_inherited_fields:
@@ -119,7 +121,7 @@ class NodeSchema(GeneratedNodeSchema):
                 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: Optional[Union[Branch, str]] = None) -> GenericSchema:
+    def get_hierarchy_schema(self, db: InfrahubDatabase, branch: Branch | str | None = None) -> GenericSchema:
         if not self.hierarchy:
             raise ValueError("The node is not part of a hierarchy")
         schema = db.schema.get(name=self.hierarchy, branch=branch)

infrahub/core/schema/relationship_schema.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel
 
@@ -36,7 +36,7 @@ class RelationshipSchema(GeneratedRelationshipSchema):
         return bool(self.deprecation)
 
     def to_dict(self) -> dict:
-        data = self.model_dump(exclude_unset=True, exclude_none=True, exclude_defaults=True)
+        data = self.model_dump(exclude_unset=True, exclude_none=True)
         for field_name, value in data.items():
             if isinstance(value, Enum):
                 data[field_name] = value.value
@@ -45,7 +45,7 @@ class RelationshipSchema(GeneratedRelationshipSchema):
     def get_class(self) -> type[Relationship]:
         return Relationship
 
-    def get_peer_schema(self, db: InfrahubDatabase, branch: Optional[Union[Branch, str]] = None) -> MainSchemaTypes:
+    def get_peer_schema(self, db: InfrahubDatabase, branch: Branch | str | None = None) -> MainSchemaTypes:
         return db.schema.get(name=self.peer, branch=branch, duplicate=False)
 
     @property
@@ -79,11 +79,11 @@ class RelationshipSchema(GeneratedRelationshipSchema):
         self,
         db: InfrahubDatabase,
         filter_name: str,
-        filter_value: Optional[Union[str, int, bool]] = None,
-        name: Optional[str] = None,  # noqa: ARG002
-        branch: Optional[Branch] = None,
+        filter_value: str | int | bool | None = None,
+        name: str | None = None,  # noqa: ARG002
+        branch: Branch | None = None,
         include_match: bool = True,
-        param_prefix: Optional[str] = None,
+        param_prefix: str | None = None,
         partial_match: bool = False,
         support_profiles: bool = False,  # noqa: ARG002
     ) -> tuple[list[QueryElement], dict[str, Any], list[str]]: