infrahub-server 1.3.2__py3-none-any.whl → 1.3.4__py3-none-any.whl

infrahub/core/schema/schema_branch.py

@@ -1588,7 +1588,8 @@ class SchemaBranch:
 
             self.set(name=name, schema=node)
 
-    def generate_weight(self) -> None:
+    def _generate_weight_generics(self) -> None:
+        """Generate order_weight for all generic schemas."""
         for name in self.generic_names:
             node = self.get(name=name, duplicate=False)
 
@@ -1606,6 +1607,8 @@ class SchemaBranch:
 
             self.set(name=name, schema=node)
 
+    def _generate_weight_nodes_profiles(self) -> None:
+        """Generate order_weight for all nodes and profiles."""
         for name in self.node_names + self.profile_names:
             node = self.get(name=name, duplicate=False)
 
@@ -1630,6 +1633,33 @@ class SchemaBranch:
 
             self.set(name=name, schema=node)
 
+    def _generate_weight_templates(self) -> None:
+        """Generate order_weight for all templates.
+
+        The order of the fields for the template must respect the order of the node.
+        """
+        for name in self.template_names:
+            template = self.get(name=name, duplicate=True)
+            node = self.get(name=template.name, duplicate=False)
+
+            node_weights = {
+                item.name: item.order_weight
+                for item in node.attributes + node.relationships
+                if item.order_weight is not None
+            }
+
+            for item in template.attributes + template.relationships:
+                if item.order_weight:
+                    continue
+                item.order_weight = node_weights[item.name] + 10000 if item.name in node_weights else None
+
+            self.set(name=name, schema=template)
+
+    def generate_weight(self) -> None:
+        self._generate_weight_generics()
+        self._generate_weight_nodes_profiles()
+        self._generate_weight_templates()
+
     def cleanup_inherited_elements(self) -> None:
         for name in self.node_names:
             node = self.get_node(name=name, duplicate=False)
@@ -2038,25 +2068,34 @@ class SchemaBranch:
                 if relationship.kind not in [RelationshipKind.ATTRIBUTE, RelationshipKind.GENERIC]
                 else relationship.peer
             )
+
+            is_optional = (
+                relationship.optional if is_autogenerated_subtemplate else relationship.kind != RelationshipKind.PARENT
+            )
+            identifier = (
+                f"template_{relationship.identifier}"
+                if relationship.identifier
+                else self._generate_identifier_string(template_schema.kind, rel_template_peer)
+            )
+            label = (
+                f"{relationship.name} template".title()
+                if relationship.kind in [RelationshipKind.COMPONENT, RelationshipKind.PARENT]
+                else relationship.name.title()
+            )
+
             template_schema.relationships.append(
                 RelationshipSchema(
                     name=relationship.name,
                     peer=rel_template_peer,
                     kind=relationship.kind,
-                    optional=relationship.optional
-                    if is_autogenerated_subtemplate
-                    else relationship.kind != RelationshipKind.PARENT,
+                    optional=is_optional,
                     cardinality=relationship.cardinality,
                     direction=relationship.direction,
                     branch=relationship.branch,
-                    identifier=f"template_{relationship.identifier}"
-                    if relationship.identifier
-                    else self._generate_identifier_string(template_schema.kind, rel_template_peer),
+                    identifier=identifier,
                     min_count=relationship.min_count,
                     max_count=relationship.max_count,
-                    label=f"{relationship.name} template".title()
-                    if relationship.kind in [RelationshipKind.COMPONENT, RelationshipKind.PARENT]
-                    else relationship.name.title(),
+                    label=label,
                     inherited=relationship.inherited,
                 )
             )
@@ -2144,7 +2183,7 @@ class SchemaBranch:
             attr_schema_class = get_attribute_schema_class_for_kind(kind=node_attr.kind)
             attr = attr_schema_class(
                 optional=node_attr.optional if is_autogenerated_subtemplate else True,
-                **node_attr.model_dump(exclude=["id", "unique", "optional", "read_only"]),
+                **node_attr.model_dump(exclude=["id", "unique", "optional", "read_only", "order_weight"]),
             )
             template.attributes.append(attr)
 

infrahub/core/validators/node/attribute.py

@@ -2,6 +2,9 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from infrahub.core import registry
+from infrahub.core.schema.attribute_parameters import NumberPoolParameters
+
 from ..interface import ConstraintCheckerInterface
 from ..query import NodeNotPresentValidatorQuery
 
@@ -31,10 +34,22 @@ class NodeAttributeAddChecker(ConstraintCheckerInterface):
         grouped_data_paths_list: list[GroupedDataPaths] = []
         if not request.schema_path.field_name:
             raise ValueError("field_name is not defined")
+
         attribute_schema = request.node_schema.get_attribute(name=request.schema_path.field_name)
         if attribute_schema.optional is True or attribute_schema.default_value is not None:
             return grouped_data_paths_list
 
+        # If the attribute is a NumberPool, we need to ensure that the pool is big enough for all existing nodes
+        if attribute_schema.kind == "NumberPool" and isinstance(attribute_schema.parameters, NumberPoolParameters):
+            nbr_nodes = await registry.manager.count(db=self.db, branch=self.branch, schema=request.node_schema)
+            pool_size = attribute_schema.parameters.get_pool_size()
+
+            if pool_size < nbr_nodes:
+                raise ValueError(
+                    f"The size of the NumberPool is smaller than the number of existing nodes {pool_size} < {nbr_nodes}."
+                )
+            return grouped_data_paths_list
+
         for query_class in self.query_classes:
             # TODO add exception handling
             query = await query_class.init(

infrahub/core/validators/tasks.py

@@ -11,9 +11,7 @@ from infrahub.core.branch import Branch  # noqa: TC001
 from infrahub.core.path import SchemaPath  # noqa: TC001
 from infrahub.core.schema import GenericSchema, NodeSchema
 from infrahub.core.validators.aggregated_checker import AggregatedConstraintChecker
-from infrahub.core.validators.model import (
-    SchemaConstraintValidatorRequest,
-)
+from infrahub.core.validators.model import SchemaConstraintValidatorRequest, SchemaViolation
 from infrahub.dependencies.registry import get_component_registry
 from infrahub.services import InfrahubServices  # noqa: TC001  needed for prefect flow
 from infrahub.workflows.utils import add_tags
@@ -84,7 +82,17 @@ async def schema_path_validate(
         aggregated_constraint_checker = await component_registry.get_component(
             AggregatedConstraintChecker, db=db, branch=branch
         )
-        violations = await aggregated_constraint_checker.run_constraints(constraint_request)
+        try:
+            violations = await aggregated_constraint_checker.run_constraints(constraint_request)
+        except Exception as exc:
+            violation = SchemaViolation(
+                node_id="unknown",
+                node_kind=node_schema.kind,
+                display_label=f"Error validating {constraint_name} on {node_schema.kind}",
+                full_display_label=f"Error validating {constraint_name} on {node_schema.kind}",
+                message=str(exc),
+            )
+            violations = [violation]
 
         return SchemaValidatorPathResponseData(
             violations=violations, constraint_name=constraint_name, schema_path=schema_path

infrahub/dependencies/builder/diff/coordinator.py

@@ -1,4 +1,5 @@
 from infrahub.core.diff.coordinator import DiffCoordinator
+from infrahub.dependencies.builder.diff.locker import DiffLockerDependency
 from infrahub.dependencies.interface import DependencyBuilder, DependencyBuilderContext
 
 from .calculator import DiffCalculatorDependency
@@ -15,6 +16,7 @@ class DiffCoordinatorDependency(DependencyBuilder[DiffCoordinator]):
     @classmethod
     def build(cls, context: DependencyBuilderContext) -> DiffCoordinator:
         return DiffCoordinator(
+            db=context.db,
             diff_repo=DiffRepositoryDependency.build(context=context),
             diff_calculator=DiffCalculatorDependency.build(context=context),
             diff_combiner=DiffCombinerDependency.build(context=context),
@@ -23,4 +25,5 @@ class DiffCoordinatorDependency(DependencyBuilder[DiffCoordinator]):
             labels_enricher=DiffLabelsEnricherDependency.build(context=context),
             data_check_synchronizer=DiffDataCheckSynchronizerDependency.build(context=context),
             conflict_transferer=DiffConflictTransfererDependency.build(context=context),
+            diff_locker=DiffLockerDependency.build(context=context),
         )

infrahub/dependencies/builder/diff/locker.py

@@ -0,0 +1,8 @@
+from infrahub.core.diff.diff_locker import DiffLocker
+from infrahub.dependencies.interface import DependencyBuilder, DependencyBuilderContext
+
+
+class DiffLockerDependency(DependencyBuilder[DiffLocker]):
+    @classmethod
+    def build(cls, context: DependencyBuilderContext) -> DiffLocker:  # noqa: ARG003
+        return DiffLocker()

infrahub/graphql/mutations/main.py

@@ -376,8 +376,13 @@ class InfrahubMutationMixin:
             return updated_obj, mutation, False
 
         try:
-            dict_data.pop("hfid", "unused")  # `hfid` is invalid for creation.
-            created_obj, mutation = await cls.mutate_create(info=info, data=dict_data, branch=branch)
+            # This is a hack to avoid sitatuions where a node has an attribute or relationship called "pop"
+            # which would have overridden the `pop` method of the InputObjectType object and as such would have
+            # caused an error when trying to call `data.pop("hfid", None)`.
+            # TypeError: 'NoneType' object is not callable
+            data._pop = dict.pop.__get__(data, dict)
+            data._pop("hfid", None)  # `hfid` is invalid for creation.
+            created_obj, mutation = await cls.mutate_create(info=info, data=data, branch=branch)
             return created_obj, mutation, True
         except HFIDViolatedError as exc:
             # Only the HFID constraint has been violated, it means the node exists and we can update without rerunning constraints

infrahub/graphql/mutations/tasks.py

@@ -6,6 +6,7 @@ from infrahub.context import InfrahubContext  # noqa: TC001  needed for prefect
 from infrahub.core import registry
 from infrahub.core.branch import Branch
 from infrahub.core.diff.coordinator import DiffCoordinator
+from infrahub.core.diff.diff_locker import DiffLocker
 from infrahub.core.diff.merger.merger import DiffMerger
 from infrahub.core.diff.repository.repository import DiffRepository
 from infrahub.core.merge import BranchMerger
@@ -50,6 +51,7 @@ async def merge_branch_mutation(branch: str, context: InfrahubContext, service:
             diff_merger=diff_merger,
             diff_repository=diff_repository,
             source_branch=obj,
+            diff_locker=DiffLocker(),
             service=service,
         )
         candidate_schema = merger.get_candidate_schema()

infrahub/graphql/queries/resource_manager.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from graphene import Field, Float, Int, List, NonNull, ObjectType, String
+from graphene import BigInt, Field, Float, Int, List, NonNull, ObjectType, String
 from infrahub_sdk.utils import extract_fields_first_node
 
 from infrahub.core import registry
@@ -33,7 +33,7 @@ class IPPoolUtilizationResource(ObjectType):
     id = Field(String, required=True, description="The ID of the current resource")
     display_label = Field(String, required=True, description="The common name of the resource")
     kind = Field(String, required=True, description="The resource kind")
-    weight = Field(Int, required=True, description="The relative weight of this resource.")
+    weight = Field(BigInt, required=True, description="The relative weight of this resource.")
     utilization = Field(Float, required=True, description="The overall utilization of the resource.")
     utilization_branches = Field(
         Float, required=True, description="The utilization of the resource on all non default branches."
@@ -70,7 +70,7 @@ def _validate_pool_type(pool_id: str, pool: CoreNode | None = None) -> CoreNode:
 
 
 class PoolAllocated(ObjectType):
-    count = Field(Int, required=True, description="The number of allocations within the selected pool.")
+    count = Field(BigInt, required=True, description="The number of allocations within the selected pool.")
     edges = Field(List(of_type=NonNull(PoolAllocatedEdge), required=True), required=True)
 
     @staticmethod
@@ -174,7 +174,7 @@ class PoolAllocated(ObjectType):
 
 
 class PoolUtilization(ObjectType):
-    count = Field(Int, required=True, description="The number of resources within the selected pool.")
+    count = Field(BigInt, required=True, description="The number of resources within the selected pool.")
     utilization = Field(Float, required=True, description="The overall utilization of the pool.")
     utilization_branches = Field(Float, required=True, description="The utilization in all non default branches.")
     utilization_default_branch = Field(

infrahub/tasks/registry.py

@@ -1,17 +1,77 @@
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 from infrahub import lock
 from infrahub.core import registry
-from infrahub.database import InfrahubDatabase
 from infrahub.log import get_logger
 from infrahub.worker import WORKER_IDENTITY
 
 if TYPE_CHECKING:
     from infrahub.core.branch import Branch
+    from infrahub.core.schema.schema_branch import SchemaBranch
+    from infrahub.database import InfrahubDatabase
 
 log = get_logger()
 
 
+def update_graphql_schema(branch: Branch, schema_branch: SchemaBranch) -> None:
+    """
+    Update the GraphQL schema for the given branch.
+    """
+    from infrahub.graphql.manager import GraphQLSchemaManager
+
+    gqlm = GraphQLSchemaManager.get_manager_for_branch(branch=branch, schema_branch=schema_branch)
+    gqlm.get_graphql_schema(
+        include_query=True,
+        include_mutation=True,
+        include_subscription=True,
+        include_types=True,
+    )
+
+
+async def create_branch_registry(db: InfrahubDatabase, branch: Branch) -> None:
+    """Create a new entry in the registry for a given branch."""
+
+    log.info("New branch detected, pulling schema", branch=branch.name, worker=WORKER_IDENTITY)
+    await registry.schema.load_schema(db=db, branch=branch)
+    registry.branch[branch.name] = branch
+    schema_branch = registry.schema.get_schema_branch(name=branch.name)
+    update_graphql_schema(branch=branch, schema_branch=schema_branch)
+
+
+async def update_branch_registry(db: InfrahubDatabase, branch: Branch) -> None:
+    """Update the registry for a branch if the schema hash has changed."""
+
+    existing_branch: Branch = registry.branch[branch.name]
+
+    if not existing_branch.schema_hash:
+        log.warning("Branch schema hash is not set, cannot update branch registry")
+        return
+
+    if existing_branch.schema_hash and existing_branch.schema_hash.main == branch.active_schema_hash.main:
+        log.debug(
+            "Branch schema hash is the same, no need to update branch registry",
+            branch=branch.name,
+            hash=existing_branch.schema_hash.main,
+            worker=WORKER_IDENTITY,
+        )
+        return
+
+    log.info(
+        "New hash detected",
+        branch=branch.name,
+        hash_current=existing_branch.schema_hash.main,
+        hash_new=branch.active_schema_hash.main,
+        worker=WORKER_IDENTITY,
+    )
+    await registry.schema.load_schema(db=db, branch=branch)
+    registry.branch[branch.name] = branch
+    schema_branch = registry.schema.get_schema_branch(name=branch.name)
+
+    update_graphql_schema(branch=branch, schema_branch=schema_branch)
+
+
 async def refresh_branches(db: InfrahubDatabase) -> None:
     """Pull all the branches from the database and update the registry.
 
@@ -24,41 +84,9 @@ async def refresh_branches(db: InfrahubDatabase) -> None:
         branches = await registry.branch_object.get_list(db=db)
         for new_branch in branches:
             if new_branch.name in registry.branch:
-                branch_registry: Branch = registry.branch[new_branch.name]
-                if (
-                    branch_registry.schema_hash
-                    and branch_registry.schema_hash.main != new_branch.active_schema_hash.main
-                ):
-                    log.info(
-                        "New hash detected",
-                        branch=new_branch.name,
-                        hash_current=branch_registry.schema_hash.main,
-                        hash_new=new_branch.active_schema_hash.main,
-                        worker=WORKER_IDENTITY,
-                    )
-                    await registry.schema.load_schema(db=db, branch=new_branch)
-                    registry.branch[new_branch.name] = new_branch
-                    schema_branch = registry.schema.get_schema_branch(name=new_branch.name)
-                    gqlm = GraphQLSchemaManager.get_manager_for_branch(branch=new_branch, schema_branch=schema_branch)
-                    gqlm.get_graphql_schema(
-                        include_query=True,
-                        include_mutation=True,
-                        include_subscription=True,
-                        include_types=True,
-                    )
-
+                await update_branch_registry(db=db, branch=new_branch)
             else:
-                log.info("New branch detected, pulling schema", branch=new_branch.name, worker=WORKER_IDENTITY)
-                await registry.schema.load_schema(db=db, branch=new_branch)
-                registry.branch[new_branch.name] = new_branch
-                schema_branch = registry.schema.get_schema_branch(name=new_branch.name)
-                gqlm = GraphQLSchemaManager.get_manager_for_branch(branch=new_branch, schema_branch=schema_branch)
-                gqlm.get_graphql_schema(
-                    include_query=True,
-                    include_mutation=True,
-                    include_subscription=True,
-                    include_types=True,
-                )
+                await create_branch_registry(db=db, branch=new_branch)
 
         purged_branches = await registry.purge_inactive_branches(db=db, active_branches=branches)
         purged_branches.update(

infrahub_sdk/client.py

@@ -784,7 +784,6 @@ class InfrahubClient(BaseClient):
         if at:
             at = Timestamp(at)
 
-        node = InfrahubNode(client=self, schema=schema, branch=branch)
         filters = kwargs
         pagination_size = self.pagination_size
 
@@ -825,12 +824,12 @@ class InfrahubClient(BaseClient):
             nodes = []
             related_nodes = []
             batch_process = await self.create_batch()
-            count = await self.count(kind=schema.kind, partial_match=partial_match, **filters)
+            count = await self.count(kind=schema.kind, branch=branch, partial_match=partial_match, **filters)
             total_pages = (count + pagination_size - 1) // pagination_size
 
             for page_number in range(1, total_pages + 1):
                 page_offset = (page_number - 1) * pagination_size
-                batch_process.add(task=process_page, node=node, page_offset=page_offset, page_number=page_number)
+                batch_process.add(task=process_page, page_offset=page_offset, page_number=page_number)
 
             async for _, response in batch_process.execute():
                 nodes.extend(response[1]["nodes"])
@@ -847,7 +846,7 @@ class InfrahubClient(BaseClient):
 
             while has_remaining_items:
                 page_offset = (page_number - 1) * pagination_size
-                response, process_result = await process_page(page_offset, page_number)
+                response, process_result = await process_page(page_offset=page_offset, page_number=page_number)
 
                 nodes.extend(process_result["nodes"])
                 related_nodes.extend(process_result["related_nodes"])
@@ -1946,9 +1945,9 @@ class InfrahubClientSync(BaseClient):
         """
         branch = branch or self.default_branch
         schema = self.schema.get(kind=kind, branch=branch)
-        node = InfrahubNodeSync(client=self, schema=schema, branch=branch)
         if at:
             at = Timestamp(at)
+
         filters = kwargs
         pagination_size = self.pagination_size
 
@@ -1990,12 +1989,12 @@ class InfrahubClientSync(BaseClient):
             related_nodes = []
             batch_process = self.create_batch()
 
-            count = self.count(kind=schema.kind, partial_match=partial_match, **filters)
+            count = self.count(kind=schema.kind, branch=branch, partial_match=partial_match, **filters)
             total_pages = (count + pagination_size - 1) // pagination_size
 
             for page_number in range(1, total_pages + 1):
                 page_offset = (page_number - 1) * pagination_size
-                batch_process.add(task=process_page, node=node, page_offset=page_offset, page_number=page_number)
+                batch_process.add(task=process_page, page_offset=page_offset, page_number=page_number)
 
             for _, response in batch_process.execute():
                 nodes.extend(response[1]["nodes"])
@@ -2012,7 +2011,7 @@ class InfrahubClientSync(BaseClient):
 
             while has_remaining_items:
                 page_offset = (page_number - 1) * pagination_size
-                response, process_result = process_page(page_offset, page_number)
+                response, process_result = process_page(page_offset=page_offset, page_number=page_number)
 
                 nodes.extend(process_result["nodes"])
                 related_nodes.extend(process_result["related_nodes"])

infrahub_sdk/ctl/utils.py

@@ -187,6 +187,9 @@ def load_yamlfile_from_disk_and_exit(
     has_error = False
     try:
         data_files = file_type.load_from_disk(paths=paths)
+        if not data_files:
+            console.print("[red]No valid files found to load.")
+            raise typer.Exit(1)
     except FileNotValidError as exc:
         console.print(f"[red]{exc.message}")
         raise typer.Exit(1) from exc

infrahub_sdk/node/node.py

@@ -402,10 +402,10 @@ class InfrahubNodeBase:
         if order:
             data["@filters"]["order"] = order
 
-        if offset:
+        if offset is not None:
             data["@filters"]["offset"] = offset
 
-        if limit:
+        if limit is not None:
             data["@filters"]["limit"] = limit
 
         if include and exclude:
@@ -1493,15 +1493,15 @@ class InfrahubNodeSync(InfrahubNodeBase):
         for rel_name in self._relationships:
             rel = getattr(self, rel_name)
             if rel and isinstance(rel, RelatedNodeSync):
-                relation = node_data["node"].get(rel_name)
-                if relation.get("node", None):
+                relation = node_data["node"].get(rel_name, None)
+                if relation and relation.get("node", None):
                     related_node = InfrahubNodeSync.from_graphql(
                         client=self._client, branch=branch, data=relation, timeout=timeout
                     )
                     related_nodes.append(related_node)
             elif rel and isinstance(rel, RelationshipManagerSync):
-                peers = node_data["node"].get(rel_name)
-                if peers:
+                peers = node_data["node"].get(rel_name, None)
+                if peers and peers["edges"]:
                     for peer in peers["edges"]:
                         related_node = InfrahubNodeSync.from_graphql(
                             client=self._client, branch=branch, data=peer, timeout=timeout

infrahub_sdk/node/relationship.py

@@ -1,11 +1,15 @@
 from __future__ import annotations
 
+from collections import defaultdict
 from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any
 
+from ..batch import InfrahubBatch
 from ..exceptions import (
+    Error,
     UninitializedError,
 )
+from ..types import Order
 from .constants import PROPERTIES_FLAG, PROPERTIES_OBJECT
 from .related_node import RelatedNode, RelatedNodeSync
 
@@ -156,8 +160,26 @@ class RelationshipManager(RelationshipManagerBase):
             self.peers = rm.peers
             self.initialized = True
 
+        ids_per_kind_map = defaultdict(list)
         for peer in self.peers:
-            await peer.fetch()  # type: ignore[misc]
+            if not peer.id or not peer.typename:
+                raise Error("Unable to fetch the peer, id and/or typename are not defined")
+            ids_per_kind_map[peer.typename].append(peer.id)
+
+        batch = InfrahubBatch(max_concurrent_execution=self.client.max_concurrent_execution)
+        for kind, ids in ids_per_kind_map.items():
+            batch.add(
+                task=self.client.filters,
+                kind=kind,
+                ids=ids,
+                populate_store=True,
+                branch=self.branch,
+                parallel=True,
+                order=Order(disable=True),
+            )
+
+        async for _ in batch.execute():
+            pass
 
     def add(self, data: str | RelatedNode | dict) -> None:
         """Add a new peer to this relationship."""
@@ -261,8 +283,27 @@ class RelationshipManagerSync(RelationshipManagerBase):
             self.peers = rm.peers
             self.initialized = True
 
+        ids_per_kind_map = defaultdict(list)
         for peer in self.peers:
-            peer.fetch()
+            if not peer.id or not peer.typename:
+                raise Error("Unable to fetch the peer, id and/or typename are not defined")
+            ids_per_kind_map[peer.typename].append(peer.id)
+
+        # Unlike Async, no need to create a new batch from scratch because we are not using a semaphore
+        batch = self.client.create_batch()
+        for kind, ids in ids_per_kind_map.items():
+            batch.add(
+                task=self.client.filters,
+                kind=kind,
+                ids=ids,
+                populate_store=True,
+                branch=self.branch,
+                parallel=True,
+                order=Order(disable=True),
+            )
+
+        for _ in batch.execute():
+            pass
 
     def add(self, data: str | RelatedNodeSync | dict) -> None:
         """Add a new peer to this relationship."""

infrahub_sdk/yaml.py

@@ -120,16 +120,22 @@ class YamlFile(LocalFile):
     @classmethod
     def load_from_disk(cls, paths: list[Path]) -> list[Self]:
         yaml_files: list[Self] = []
+        file_extensions = {".yaml", ".yml", ".json"}  # FIXME: .json is not a YAML file, should be removed
+
         for file_path in paths:
-            if file_path.is_file() and file_path.suffix in [".yaml", ".yml", ".json"]:
-                yaml_files.extend(cls.load_file_from_disk(path=file_path))
+            if not file_path.exists():
+                # Check if the provided path exists, relevant for the first call coming from the user
+                raise FileNotValidError(name=str(file_path), message=f"{file_path} does not exist!")
+            if file_path.is_file():
+                if file_path.suffix in file_extensions:
+                    yaml_files.extend(cls.load_file_from_disk(path=file_path))
+                # else: silently skip files with unrelevant extensions (e.g. .md, .py...)
             elif file_path.is_dir():
+                # Introduce recursion to handle sub-folders
                 sub_paths = [Path(sub_file_path) for sub_file_path in file_path.glob("*")]
-                sub_files = cls.load_from_disk(paths=sub_paths)
-                sorted_sub_files = sorted(sub_files, key=lambda x: x.location)
-                yaml_files.extend(sorted_sub_files)
-            else:
-                raise FileNotValidError(name=str(file_path), message=f"{file_path} does not exist!")
+                sub_paths = sorted(sub_paths, key=lambda p: p.name)
+                yaml_files.extend(cls.load_from_disk(paths=sub_paths))
+            # else: skip non-file, non-dir (e.g., symlink...)
 
         return yaml_files