infrahub-server 1.2.11__py3-none-any.whl → 1.3.0b1__py3-none-any.whl

infrahub/core/node/__init__.py

@@ -22,7 +22,15 @@ from infrahub.core.constants import (
 from infrahub.core.constants.schema import SchemaElementPathType
 from infrahub.core.protocols import CoreNumberPool, CoreObjectTemplate
 from infrahub.core.query.node import NodeCheckIDQuery, NodeCreateAllQuery, NodeDeleteQuery, NodeGetListQuery
-from infrahub.core.schema import AttributeSchema, NodeSchema, ProfileSchema, RelationshipSchema, TemplateSchema
+from infrahub.core.schema import (
+    AttributeSchema,
+    NodeSchema,
+    NonGenericSchemaTypes,
+    ProfileSchema,
+    RelationshipSchema,
+    TemplateSchema,
+)
+from infrahub.core.schema.attribute_parameters import NumberPoolParameters
 from infrahub.core.timestamp import Timestamp
 from infrahub.exceptions import InitializationError, NodeNotFoundError, PoolExhaustedError, ValidationError
 from infrahub.types import ATTRIBUTE_TYPES
@@ -66,7 +74,7 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
         _meta.default_filter = default_filter
         super().__init_subclass_with_meta__(_meta=_meta, **options)
 
-    def get_schema(self) -> NodeSchema | ProfileSchema | TemplateSchema:
+    def get_schema(self) -> NonGenericSchemaTypes:
         return self._schema
 
     def get_kind(self) -> str:
@@ -247,6 +255,12 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
         within the create code.
         """
 
+        number_pool_parameters: NumberPoolParameters | None = None
+        if attribute.schema.kind == "NumberPool" and isinstance(attribute.schema.parameters, NumberPoolParameters):
+            attribute.from_pool = {"id": attribute.schema.parameters.number_pool_id}
+            attribute.is_default = False
+            number_pool_parameters = attribute.schema.parameters
+
         if not attribute.from_pool:
             return
 
@@ -255,19 +269,25 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
                 db=db, id=attribute.from_pool["id"], kind=CoreNumberPool
             )
         except NodeNotFoundError:
-            errors.append(
-                ValidationError(
-                    {f"{attribute.name}.from_pool": f"The pool requested {attribute.from_pool} was not found."}
+            if number_pool_parameters:
+                number_pool = await self._create_number_pool(
+                    db=db, attribute=attribute, number_pool_parameters=number_pool_parameters
                 )
-            )
-            return
+
+            else:
+                errors.append(
+                    ValidationError(
+                        {f"{attribute.name}.from_pool": f"The pool requested {attribute.from_pool} was not found."}
+                    )
+                )
+                return
 
         if (
             number_pool.node.value in [self._schema.kind] + self._schema.inherit_from
             and number_pool.node_attribute.value == attribute.name
         ):
             try:
-                next_free = await number_pool.get_resource(db=db, branch=self._branch, node=self)
+                next_free = await number_pool.get_resource(db=db, branch=self._branch, node=self, attribute=attribute)
             except PoolExhaustedError:
                 errors.append(
                     ValidationError({f"{attribute.name}.from_pool": f"The pool {number_pool.node.value} is exhausted."})
@@ -285,6 +305,35 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
                 )
             )
 
+    async def _create_number_pool(
+        self, db: InfrahubDatabase, attribute: BaseAttribute, number_pool_parameters: NumberPoolParameters
+    ) -> CoreNumberPool:
+        schema = db.schema.get_node_schema(name="CoreNumberPool", duplicate=False)
+
+        pool_node = self._schema.kind
+        schema_attribute = self._schema.get_attribute(attribute.schema.name)
+        if schema_attribute.inherited:
+            for generic_name in self._schema.inherit_from:
+                generic_node = db.schema.get_generic_schema(name=generic_name, duplicate=False)
+                if attribute.schema.name in generic_node.attribute_names:
+                    pool_node = generic_node.kind
+                    break
+
+        number_pool = await Node.init(db=db, schema=schema, branch=self._branch)
+        await number_pool.new(
+            db=db,
+            id=number_pool_parameters.number_pool_id,
+            name=f"{pool_node}.{attribute.schema.name} [{number_pool_parameters.number_pool_id}]",
+            node=pool_node,
+            node_attribute=attribute.schema.name,
+            start_range=number_pool_parameters.start_range,
+            end_range=number_pool_parameters.end_range,
+        )
+        await number_pool.save(db=db)
+        # Do a lookup of the number pool to get the correct mapped type from the registry
+        # without this we don't get access to the .get_resource() method.
+        return await registry.manager.get_one_by_id_or_default_filter(db=db, id=number_pool.id, kind=CoreNumberPool)
+
     async def handle_object_template(self, fields: dict, db: InfrahubDatabase, errors: list) -> None:
         """Fill the `fields` parameters with values from an object template if one is in use."""
         object_template_field = fields.get(OBJECT_TEMPLATE_RELATIONSHIP_NAME)
@@ -369,6 +418,9 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
                             self._computed_jinja2_attributes.append(mandatory_attr)
                             continue
 
+                        if mandatory_attribute.kind == "NumberPool":
+                            continue
+
                     errors.append(
                         ValidationError({mandatory_attr: f"{mandatory_attr} is mandatory for {self.get_kind()}"})
                     )
@@ -385,6 +437,21 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
         # -------------------------------------------
         # Generate Attribute and Relationship and assign them
         # -------------------------------------------
+        errors.extend(await self._process_fields_relationships(fields=fields, db=db))
+        errors.extend(await self._process_fields_attributes(fields=fields, db=db))
+
+        if errors:
+            raise ValidationError(errors)
+
+        # Check if any post processor have been defined
+        # A processor can be used for example to assigne a default value
+        for name in self._attributes + self._relationships:
+            if hasattr(self, f"process_{name}"):
+                await getattr(self, f"process_{name}")(db=db)
+
+    async def _process_fields_relationships(self, fields: dict, db: InfrahubDatabase) -> list[ValidationError]:
+        errors: list[ValidationError] = []
+
         for rel_schema in self._schema.relationships:
             self._relationships.append(rel_schema.name)
 
@@ -406,6 +473,11 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
             except ValidationError as exc:
                 errors.append(exc)
 
+        return errors
+
+    async def _process_fields_attributes(self, fields: dict, db: InfrahubDatabase) -> list[ValidationError]:
+        errors: list[ValidationError] = []
+
         for attr_schema in self._schema.attributes:
             self._attributes.append(attr_schema.name)
             if not self._existing and attr_schema.name in self._computed_jinja2_attributes:
@@ -434,14 +506,7 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
             except ValidationError as exc:
                 errors.append(exc)
 
-        if errors:
-            raise ValidationError(errors)
-
-        # Check if any post processor have been defined
-        # A processor can be used for example to assigne a default value
-        for name in self._attributes + self._relationships:
-            if hasattr(self, f"process_{name}"):
-                await getattr(self, f"process_{name}")(db=db)
+        return errors
 
     async def _process_macros(self, db: InfrahubDatabase) -> None:
         schema_branch = db.schema.get_schema_branch(self._branch.name)
@@ -872,9 +937,11 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
             if relationship.kind == RelationshipKind.PARENT:
                 return relationship.name
 
-    async def get_object_template(self, db: InfrahubDatabase) -> Node | None:
+    async def get_object_template(self, db: InfrahubDatabase) -> CoreObjectTemplate | None:
         object_template: RelationshipManager = getattr(self, OBJECT_TEMPLATE_RELATIONSHIP_NAME, None)
-        return await object_template.get_peer(db=db) if object_template is not None else None
+        return (
+            await object_template.get_peer(db=db, peer_type=CoreObjectTemplate) if object_template is not None else None
+        )
 
     def get_relationships(
         self, kind: RelationshipKind, exclude: Sequence[str] | None = None
@@ -888,3 +955,8 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
             for relationship in self.get_schema().relationships
             if relationship.name not in exclude and relationship.kind == kind
         ]
+
+    def validate_relationships(self) -> None:
+        for name in self._relationships:
+            relm: RelationshipManager = getattr(self, name)
+            relm.validate()

infrahub/core/node/create.py

@@ -0,0 +1,211 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Mapping
+
+from infrahub.core import registry
+from infrahub.core.constants import RelationshipCardinality, RelationshipKind
+from infrahub.core.constraint.node.runner import NodeConstraintRunner
+from infrahub.core.manager import NodeManager
+from infrahub.core.node import Node
+from infrahub.core.protocols import CoreObjectTemplate
+from infrahub.dependencies.registry import get_component_registry
+
+if TYPE_CHECKING:
+    from infrahub.core.branch import Branch
+    from infrahub.core.relationship.model import RelationshipManager
+    from infrahub.core.schema import MainSchemaTypes, NonGenericSchemaTypes, RelationshipSchema
+    from infrahub.database import InfrahubDatabase
+
+
+async def get_template_relationship_peers(
+    db: InfrahubDatabase, template: CoreObjectTemplate, relationship: RelationshipSchema
+) -> Mapping[str, CoreObjectTemplate]:
+    """For a given relationship on the template, fetch the related peers."""
+    template_relationship_manager: RelationshipManager = getattr(template, relationship.name)
+    if relationship.cardinality == RelationshipCardinality.MANY:
+        return await template_relationship_manager.get_peers(db=db, peer_type=CoreObjectTemplate)
+
+    peers: dict[str, CoreObjectTemplate] = {}
+    template_relationship_peer = await template_relationship_manager.get_peer(db=db, peer_type=CoreObjectTemplate)
+    if template_relationship_peer:
+        peers[template_relationship_peer.id] = template_relationship_peer
+    return peers
+
+
+async def extract_peer_data(
+    db: InfrahubDatabase,
+    template_peer: CoreObjectTemplate,
+    obj_peer_schema: MainSchemaTypes,
+    parent_obj: Node,
+    current_template: CoreObjectTemplate,
+) -> Mapping[str, Any]:
+    obj_peer_data: dict[str, Any] = {}
+
+    for attr in template_peer.get_schema().attribute_names:
+        if attr not in obj_peer_schema.attribute_names:
+            continue
+        obj_peer_data[attr] = {"value": getattr(template_peer, attr).value, "source": template_peer.id}
+
+    for rel in template_peer.get_schema().relationship_names:
+        rel_manager: RelationshipManager = getattr(template_peer, rel)
+        if (
+            rel_manager.schema.kind not in [RelationshipKind.COMPONENT, RelationshipKind.PARENT]
+            or rel_manager.schema.name not in obj_peer_schema.relationship_names
+        ):
+            continue
+
+        if list(await rel_manager.get_peers(db=db)) == [current_template.id]:
+            obj_peer_data[rel] = {"id": parent_obj.id}
+
+    return obj_peer_data
+
+
+async def handle_template_relationships(
+    db: InfrahubDatabase,
+    branch: Branch,
+    obj: Node,
+    template: CoreObjectTemplate,
+    fields: list,
+    constraint_runner: NodeConstraintRunner | None = None,
+) -> None:
+    if constraint_runner is None:
+        component_registry = get_component_registry()
+        constraint_runner = await component_registry.get_component(NodeConstraintRunner, db=db, branch=branch)
+
+    for relationship in obj.get_relationships(kind=RelationshipKind.COMPONENT, exclude=fields):
+        template_relationship_peers = await get_template_relationship_peers(
+            db=db, template=template, relationship=relationship
+        )
+        if not template_relationship_peers:
+            continue
+
+        for template_relationship_peer in template_relationship_peers.values():
+            # We retrieve peer schema for each peer in case we are processing a relationship which is based on a generic
+            obj_peer_schema = registry.schema.get_node_schema(
+                name=template_relationship_peer.get_schema().kind.removeprefix("Template"),
+                branch=branch,
+                duplicate=False,
+            )
+            obj_peer_data = await extract_peer_data(
+                db=db,
+                template_peer=template_relationship_peer,
+                obj_peer_schema=obj_peer_schema,
+                parent_obj=obj,
+                current_template=template,
+            )
+
+            obj_peer = await Node.init(schema=obj_peer_schema, db=db, branch=branch)
+            await obj_peer.new(db=db, **obj_peer_data)
+            await constraint_runner.check(node=obj_peer, field_filters=list(obj_peer_data))
+            await obj_peer.save(db=db)
+
+            await handle_template_relationships(
+                db=db,
+                branch=branch,
+                constraint_runner=constraint_runner,
+                obj=obj_peer,
+                template=template_relationship_peer,
+                fields=fields,
+            )
+
+
+async def get_profile_ids(db: InfrahubDatabase, obj: Node) -> set[str]:
+    if not hasattr(obj, "profiles"):
+        return set()
+    profile_rels = await obj.profiles.get_relationships(db=db)
+    return {pr.peer_id for pr in profile_rels}
+
+
+async def refresh_for_profile_update(
+    db: InfrahubDatabase,
+    branch: Branch,
+    obj: Node,
+    schema: NonGenericSchemaTypes,
+    previous_profile_ids: set[str] | None = None,
+) -> Node:
+    if not hasattr(obj, "profiles"):
+        return obj
+    current_profile_ids = await get_profile_ids(db=db, obj=obj)
+    if previous_profile_ids is None or previous_profile_ids != current_profile_ids:
+        refreshed_node = await NodeManager.get_one_by_id_or_default_filter(
+            db=db,
+            kind=schema.kind,
+            id=obj.get_id(),
+            branch=branch,
+            include_owner=True,
+            include_source=True,
+        )
+        refreshed_node._node_changelog = obj.node_changelog
+        return refreshed_node
+    return obj
+
+
+async def _do_create_node(
+    node_class: type[Node],
+    db: InfrahubDatabase,
+    data: dict,
+    schema: NonGenericSchemaTypes,
+    fields_to_validate: list,
+    branch: Branch,
+    node_constraint_runner: NodeConstraintRunner,
+) -> Node:
+    obj = await node_class.init(db=db, schema=schema, branch=branch)
+    await obj.new(db=db, **data)
+    await node_constraint_runner.check(node=obj, field_filters=fields_to_validate)
+    await obj.save(db=db)
+
+    object_template = await obj.get_object_template(db=db)
+    if object_template:
+        await handle_template_relationships(
+            db=db,
+            branch=branch,
+            template=object_template,
+            obj=obj,
+            fields=fields_to_validate,
+        )
+    return obj
+
+
+async def create_node(
+    data: dict,
+    db: InfrahubDatabase,
+    branch: Branch,
+    schema: NonGenericSchemaTypes,
+) -> Node:
+    """Create a node in the database if constraint checks succeed."""
+
+    component_registry = get_component_registry()
+    node_constraint_runner = await component_registry.get_component(
+        NodeConstraintRunner, db=db.start_session() if not db.is_transaction else db, branch=branch
+    )
+    node_class = Node
+    if schema.kind in registry.node:
+        node_class = registry.node[schema.kind]
+
+    fields_to_validate = list(data)
+    if db.is_transaction:
+        obj = await _do_create_node(
+            node_class=node_class,
+            node_constraint_runner=node_constraint_runner,
+            db=db,
+            schema=schema,
+            branch=branch,
+            fields_to_validate=fields_to_validate,
+            data=data,
+        )
+    else:
+        async with db.start_transaction() as dbt:
+            obj = await _do_create_node(
+                node_class=node_class,
+                node_constraint_runner=node_constraint_runner,
+                db=dbt,
+                schema=schema,
+                branch=branch,
+                fields_to_validate=fields_to_validate,
+                data=data,
+            )
+
+    if await get_profile_ids(db=db, obj=obj):
+        obj = await refresh_for_profile_update(db=db, branch=branch, schema=schema, obj=obj)
+
+    return obj

infrahub/core/node/resource_manager/number_pool.py

@@ -2,22 +2,44 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from infrahub.core import registry
 from infrahub.core.query.resource_manager import NumberPoolGetReserved, NumberPoolGetUsed, NumberPoolSetReserved
+from infrahub.core.schema.attribute_parameters import NumberAttributeParameters
 from infrahub.exceptions import PoolExhaustedError
 
 from .. import Node
 
 if TYPE_CHECKING:
+    from infrahub.core.attribute import BaseAttribute
     from infrahub.core.branch import Branch
     from infrahub.database import InfrahubDatabase
 
 
 class CoreNumberPool(Node):
+    def get_attribute_nb_excluded_values(self) -> int:
+        """
+        Returns the number of excluded values for the attribute of the number pool.
+        """
+
+        pool_node = registry.schema.get(name=self.node.value)  # type: ignore [attr-defined]
+        attribute = [attribute for attribute in pool_node.attributes if attribute.name == self.node_attribute.value][0]  # type: ignore [attr-defined]
+        if not isinstance(attribute.parameters, NumberAttributeParameters):
+            return 0
+
+        sum_excluded_values = 0
+        excluded_ranges = attribute.parameters.get_excluded_ranges()
+        for start_range, end_range in excluded_ranges:
+            sum_excluded_values += end_range - start_range + 1
+
+        res = len(attribute.parameters.get_excluded_single_values()) + sum_excluded_values
+        return res
+
     async def get_resource(
         self,
         db: InfrahubDatabase,
         branch: Branch,
         node: Node,
+        attribute: BaseAttribute,
         identifier: str | None = None,
     ) -> int:
         identifier = identifier or node.get_id()
@@ -31,23 +53,24 @@ class CoreNumberPool(Node):
             return reservation
 
         # If we have not returned a value we need to find one if avaiable
-        number = await self.get_next(db=db, branch=branch)
+        number = await self.get_next(db=db, branch=branch, attribute=attribute)
 
         query_set = await NumberPoolSetReserved.init(
             db=db, pool_id=self.get_id(), identifier=identifier, reserved=number
         )
         await query_set.execute(db=db)
-
         return number
 
-    async def get_next(self, db: InfrahubDatabase, branch: Branch) -> int:
+    async def get_next(self, db: InfrahubDatabase, branch: Branch, attribute: BaseAttribute) -> int:
         query = await NumberPoolGetUsed.init(db=db, branch=branch, pool=self, branch_agnostic=True)
         await query.execute(db=db)
         taken = [result.get_as_optional_type("av.value", return_type=int) for result in query.results]
+        parameters = attribute.schema.parameters
         next_number = find_next_free(
             start=self.start_range.value,  # type: ignore[attr-defined]
             end=self.end_range.value,  # type: ignore[attr-defined]
             taken=taken,
+            parameters=parameters if isinstance(parameters, NumberAttributeParameters) else None,
         )
         if next_number is None:
             raise PoolExhaustedError("There are no more values available in this pool.")
@@ -55,12 +78,15 @@ class CoreNumberPool(Node):
         return next_number
 
 
-def find_next_free(start: int, end: int, taken: list[int | None]) -> int | None:
+def find_next_free(
+    start: int, end: int, taken: list[int | None], parameters: NumberAttributeParameters | None
+) -> int | None:
     used_numbers = [number for number in taken if number is not None]
     used_set = set(used_numbers)
 
     for num in range(start, end + 1):
         if num not in used_set:
-            return num
+            if parameters is None or parameters.is_valid_value(num):
+                return num
 
     return None

infrahub/core/node/standard.py

@@ -210,7 +210,12 @@ class StandardNode(BaseModel):
 
     @classmethod
     async def get_list(
-        cls, db: InfrahubDatabase, limit: int = 1000, ids: list[str] | None = None, name: str | None = None, **kwargs
+        cls,
+        db: InfrahubDatabase,
+        limit: int = 1000,
+        ids: list[str] | None = None,
+        name: str | None = None,
+        **kwargs: dict[str, Any],
     ) -> list[Self]:
         query: Query = await StandardNodeGetListQuery.init(
             db=db, node_class=cls, ids=ids, node_name=name, limit=limit, **kwargs

infrahub/core/protocols.py

@@ -62,6 +62,12 @@ class BuiltinIPPrefix(CoreNode):
     children: RelationshipManager
 
 
+class CoreAction(CoreNode):
+    name: String
+    description: StringOptional
+    triggers: RelationshipManager
+
+
 class CoreArtifactTarget(CoreNode):
     artifacts: RelationshipManager
 
@@ -148,6 +154,10 @@ class CoreMenu(CoreNode):
     children: RelationshipManager
 
 
+class CoreNodeTriggerMatch(CoreNode):
+    trigger: RelationshipManager
+
+
 class CoreObjectComponentTemplate(CoreNode):
     template_name: String
 
@@ -189,6 +199,14 @@ class CoreTransformation(CoreNode):
     tags: RelationshipManager
 
 
+class CoreTriggerRule(CoreNode):
+    name: String
+    description: StringOptional
+    active: Boolean
+    branch_scope: Dropdown
+    action: RelationshipManager
+
+
 class CoreValidator(CoreNode):
     label: StringOptional
     state: Enum
@@ -326,6 +344,10 @@ class CoreFileThread(CoreThread):
     repository: RelationshipManager
 
 
+class CoreGeneratorAction(CoreAction):
+    generator: RelationshipManager
+
+
 class CoreGeneratorCheck(CoreCheck):
     instance: String
 
@@ -380,6 +402,16 @@ class CoreGraphQLQueryGroup(CoreGroup):
     query: RelationshipManager
 
 
+class CoreGroupAction(CoreAction):
+    add_members: Boolean
+    group: RelationshipManager
+
+
+class CoreGroupTriggerRule(CoreTriggerRule):
+    members_added: Boolean
+    group: RelationshipManager
+
+
 class CoreIPAddressPool(CoreResourcePool, LineageSource):
     default_address_type: String
     default_prefix_length: IntegerOptional
@@ -399,6 +431,25 @@ class CoreMenuItem(CoreMenu):
     pass
 
 
+class CoreNodeTriggerAttributeMatch(CoreNodeTriggerMatch):
+    attribute_name: String
+    value: StringOptional
+    value_previous: StringOptional
+    value_match: Dropdown
+
+
+class CoreNodeTriggerRelationshipMatch(CoreNodeTriggerMatch):
+    relationship_name: String
+    added: Boolean
+    peer: StringOptional
+
+
+class CoreNodeTriggerRule(CoreTriggerRule):
+    node_kind: String
+    mutation_action: Enum
+    matches: RelationshipManager
+
+
 class CoreNumberPool(CoreResourcePool, LineageSource):
     node: String
     node_attribute: String
@@ -446,6 +497,11 @@ class CoreRepository(LineageOwner, LineageSource, CoreGenericRepository, CoreTas
     commit: StringOptional
 
 
+class CoreRepositoryGroup(CoreGroup):
+    content: Dropdown
+    repository: RelationshipManager
+
+
 class CoreRepositoryValidator(CoreValidator):
     repository: RelationshipManager
 

infrahub/core/protocols_base.py

@@ -7,6 +7,7 @@ from typing_extensions import Self
 if TYPE_CHECKING:
     from neo4j import AsyncResult, AsyncSession, AsyncTransaction, Record
 
+    from infrahub.core.schema import NonGenericSchemaTypes
     from infrahub.core.schema.schema_branch import SchemaBranch
 
 
@@ -70,6 +71,8 @@ class CoreNode(Protocol):
 
     def get_id(self) -> str: ...
     def get_kind(self) -> str: ...
+    def get_schema(self) -> NonGenericSchemaTypes: ...
+
     @classmethod
     async def init(
         cls,

infrahub/core/query/__init__.py

@@ -424,8 +424,8 @@ class Query(ABC):
         else:
             self.query_lines.extend([line.strip() for line in query.split("\n") if line.strip()])
 
-    def add_subquery(self, subquery: str, with_clause: str | None = None) -> None:
-        self.add_to_query("CALL {")
+    def add_subquery(self, subquery: str, node_alias: str, with_clause: str | None = None) -> None:
+        self.add_to_query(f"CALL ({node_alias}) {{")
         self.add_to_query(subquery)
         self.add_to_query("}")
         if with_clause: