infrahub-server 1.7.0b0__py3-none-any.whl → 1.7.0rc0__py3-none-any.whl

infrahub/core/schema/definitions/core/repository.py

@@ -40,12 +40,14 @@ core_repository = NodeSchema(
         Attr(
             name="default_branch",
             kind="Text",
+            description="Default branch name in the Git repository",
             default_value="main",
             order_weight=6000,
         ),
         Attr(
             name="commit",
             kind="Text",
+            description="Current commit hash being tracked",
             optional=True,
             branch=BranchSupportType.LOCAL,
             order_weight=7000,
@@ -75,6 +77,7 @@ core_read_only_repository = NodeSchema(
         Attr(
             name="ref",
             kind="Text",
+            description="Git reference (branch or tag) to track",
             default_value="main",
             branch=BranchSupportType.AWARE,
             order_weight=6000,
@@ -82,6 +85,7 @@ core_read_only_repository = NodeSchema(
         Attr(
             name="commit",
             kind="Text",
+            description="Current commit hash being tracked",
             optional=True,
             branch=BranchSupportType.AWARE,
             order_weight=7000,
@@ -107,6 +111,7 @@ core_generic_repository = GenericSchema(
             name="name",
             regex=r"^[^/]*$",
             kind="Text",
+            description="Unique name identifier for the repository",
             unique=True,
             branch=BranchSupportType.AGNOSTIC,
             order_weight=1000,
@@ -115,6 +120,7 @@ core_generic_repository = GenericSchema(
         Attr(
             name="description",
             kind="Text",
+            description="Description of the repository",
             optional=True,
             branch=BranchSupportType.AGNOSTIC,
             order_weight=2000,
@@ -123,6 +129,7 @@ core_generic_repository = GenericSchema(
         Attr(
             name="location",
             kind="Text",
+            description="URL or path to the Git repository",
             unique=True,
             branch=BranchSupportType.AGNOSTIC,
             order_weight=3000,
@@ -131,6 +138,7 @@ core_generic_repository = GenericSchema(
         Attr(
             name="internal_status",
             kind="Dropdown",
+            description="Internal status of the repository on this branch",
             choices=[
                 DropdownChoice(
                     name=RepositoryInternalStatus.STAGING.value,
@@ -160,6 +168,7 @@ core_generic_repository = GenericSchema(
         Attr(
             name="operational_status",
             kind="Dropdown",
+            description="Connectivity status of the repository",
             choices=[
                 DropdownChoice(
                     name=RepositoryOperationalStatus.UNKNOWN.value,
@@ -200,6 +209,7 @@ core_generic_repository = GenericSchema(
         Attr(
             name="sync_status",
             kind="Dropdown",
+            description="Current synchronization status of the repository",
             choices=[
                 DropdownChoice(
                     name=RepositorySyncStatus.UNKNOWN.value,

infrahub/core/schema/definitions/core/resource_pool.py

@@ -73,12 +73,19 @@ core_ip_prefix_pool = NodeSchema(
         Attr(
             name="default_member_type",
             kind="Text",
+            description="Default member type for allocated prefixes",
             enum=["prefix", "address"],
             default_value="prefix",
             optional=True,
             order_weight=3000,
         ),
-        Attr(name="default_prefix_type", kind="Text", optional=True, order_weight=4000),
+        Attr(
+            name="default_prefix_type",
+            kind="Text",
+            description="Default prefix type schema to use when allocating",
+            optional=True,
+            order_weight=4000,
+        ),
     ],
     relationships=[
         Rel(

infrahub/core/schema/definitions/core/template.py

@@ -11,7 +11,16 @@ core_object_template = GenericSchema(
     display_labels=["template_name__value"],
     default_filter="template_name__value",
     uniqueness_constraints=[["template_name__value"]],
-    attributes=[Attr(name="template_name", kind="Text", optional=False, unique=True, order_weight=1000)],
+    attributes=[
+        Attr(
+            name="template_name",
+            kind="Text",
+            description="Unique name identifier for the template",
+            optional=False,
+            unique=True,
+            order_weight=1000,
+        )
+    ],
 )
 
 core_object_component_template = GenericSchema(
@@ -23,5 +32,13 @@ core_object_component_template = GenericSchema(
     label="Object Component Templates",
     display_labels=["template_name__value"],
     default_filter="template_name__value",
-    attributes=[Attr(name="template_name", kind="Text", optional=False, order_weight=1000)],
+    attributes=[
+        Attr(
+            name="template_name",
+            kind="Text",
+            description="Name identifier for the component template",
+            optional=False,
+            order_weight=1000,
+        )
+    ],
 )

infrahub/core/schema/definitions/core/transform.py

@@ -29,7 +29,7 @@ core_transform = GenericSchema(
         Attr(name="name", kind="Text", unique=True),
         Attr(name="label", kind="Text", optional=True),
         Attr(name="description", kind="Text", optional=True),
-        Attr(name="timeout", kind="Number", default_value=60),
+        Attr(name="timeout", kind="Number", description="Maximum execution time in seconds", default_value=60),
     ],
     relationships=[
         Rel(
@@ -72,7 +72,7 @@ core_transform_jinja2 = NodeSchema(
     branch=BranchSupportType.AWARE,
     documentation="/topics/transformation",
     attributes=[
-        Attr(name="template_path", kind="Text"),
+        Attr(name="template_path", kind="Text", description="Path to the Jinja2 template file in the repository"),
     ],
 )
 
@@ -90,8 +90,14 @@ core_transform_python = NodeSchema(
     branch=BranchSupportType.AWARE,
     documentation="/topics/transformation",
     attributes=[
-        Attr(name="file_path", kind="Text"),
-        Attr(name="class_name", kind="Text"),
-        Attr(name="convert_query_response", kind="Boolean", optional=True, default_value=False),
+        Attr(name="file_path", kind="Text", description="Path to the Python file in the repository"),
+        Attr(name="class_name", kind="Text", description="Name of the Python class implementing the transformation"),
+        Attr(
+            name="convert_query_response",
+            kind="Boolean",
+            description="Whether to convert the GraphQL response to SDK objects",
+            optional=True,
+            default_value=False,
+        ),
     ],
 )

infrahub/core/schema/definitions/core/webhook.py

@@ -37,9 +37,18 @@ core_webhook = GenericSchema(
             order_weight=1500,
             description="The event type that triggers the webhook",
         ),
+        Attr(
+            name="active",
+            kind="Boolean",
+            description="Indicates if this webhook is enabled",
+            optional=False,
+            default_value=True,
+            order_weight=1750,
+        ),
         Attr(
             name="branch_scope",
             kind="Dropdown",
+            description="Which branches should trigger this webhook",
             choices=[
                 DropdownChoice(
                     name="all_branches",
@@ -72,16 +81,12 @@ core_webhook = GenericSchema(
             description="Only send node mutation events for nodes of this kind",
             order_weight=2250,
         ),
-        Attr(
-            name="description",
-            kind="Text",
-            optional=True,
-            order_weight=2500,
-        ),
-        Attr(name="url", kind="URL", order_weight=3000),
+        Attr(name="description", kind="Text", optional=True, order_weight=2500),
+        Attr(name="url", kind="URL", description="Target URL to send webhook requests to", order_weight=3000),
         Attr(
             name="validate_certificates",
             kind="Boolean",
+            description="Whether to validate SSL/TLS certificates",
             default_value=True,
             optional=True,
             order_weight=5000,
@@ -103,7 +108,13 @@ core_standard_webhook = NodeSchema(
     generate_profile=False,
     inherit_from=[InfrahubKind.WEBHOOK, InfrahubKind.TASKTARGET],
     attributes=[
-        Attr(name="shared_key", kind="Password", unique=False, order_weight=4000),
+        Attr(
+            name="shared_key",
+            kind="Password",
+            description="Shared secret key for webhook authentication",
+            unique=False,
+            order_weight=4000,
+        ),
     ],
 )
 
@@ -121,7 +132,14 @@ core_custom_webhook = NodeSchema(
     generate_profile=False,
     inherit_from=[InfrahubKind.WEBHOOK, InfrahubKind.TASKTARGET],
     attributes=[
-        Attr(name="shared_key", kind="Password", unique=False, optional=True, order_weight=4000),
+        Attr(
+            name="shared_key",
+            kind="Password",
+            description="Shared secret key for webhook authentication",
+            unique=False,
+            optional=True,
+            order_weight=4000,
+        ),
     ],
     relationships=[
         Rel(

infrahub/core/schema/schema_branch.py

@@ -54,7 +54,7 @@ from infrahub.core.schema import (
     SchemaRoot,
     TemplateSchema,
 )
-from infrahub.core.schema.attribute_parameters import NumberPoolParameters
+from infrahub.core.schema.attribute_parameters import NumberPoolParameters, TextAttributeParameters
 from infrahub.core.schema.attribute_schema import get_attribute_schema_class_for_kind
 from infrahub.core.schema.definitions.core import core_profile_schema_definition
 from infrahub.core.validators import CONSTRAINT_VALIDATOR_MAP
@@ -93,7 +93,7 @@ class SchemaBranch:
         computed_attributes: ComputedAttributes | None = None,
         display_labels: DisplayLabels | None = None,
         hfids: HFIDs | None = None,
-    ):
+    ) -> None:
         self._cache: dict[str, NodeSchema | GenericSchema] = cache
         self.name: str | None = name
         self.nodes: dict[str, str] = {}
@@ -501,11 +501,76 @@ class SchemaBranch:
 
         return fields or None
 
+    def _text_attr_needs_reconciliation(self, attr: AttributeSchema) -> bool:
+        """Check if a Text attribute needs reconciliation between deprecated fields and parameters."""
+        if not isinstance(attr.parameters, TextAttributeParameters):
+            return False
+        return (
+            attr.regex != attr.parameters.regex
+            or attr.min_length != attr.parameters.min_length
+            or attr.max_length != attr.parameters.max_length
+        )
+
+    def _reconcile_text_attr(self, attr: AttributeSchema) -> None:
+        """Reconcile a single Text attribute's deprecated fields with parameters.
+
+        Parameters take precedence over deprecated top-level fields when both are set.
+        """
+        if not isinstance(attr.parameters, TextAttributeParameters):
+            return
+
+        # Sync regex: parameters takes precedence
+        if attr.parameters.regex is not None:
+            attr.regex = attr.parameters.regex
+        elif attr.regex is not None:
+            attr.parameters.regex = attr.regex
+
+        # Sync min_length: parameters takes precedence
+        if attr.parameters.min_length is not None:
+            attr.min_length = attr.parameters.min_length
+        elif attr.min_length is not None:
+            attr.parameters.min_length = attr.min_length
+
+        # Sync max_length: parameters takes precedence
+        if attr.parameters.max_length is not None:
+            attr.max_length = attr.parameters.max_length
+        elif attr.max_length is not None:
+            attr.parameters.max_length = attr.max_length
+
+    def _reconcile_text_attribute_parameters(self, schema: SchemaRoot | None = None) -> None:
+        """Reconcile regex, min_length, max_length between deprecated fields and parameters for Text attributes.
+
+        Args:
+            schema: If provided, reconcile incoming schema data before merging.
+                   If None, reconcile already-loaded schemas (e.g., from database).
+        """
+        if schema:
+            # Incoming schema: modify in place
+            for item in schema.nodes + schema.generics:
+                for attr in item.attributes:
+                    self._reconcile_text_attr(attr)
+            return
+
+        # Loaded schemas: need to duplicate before modifying
+        for name in self.all_names:
+            node = self.get(name=name, duplicate=False)
+
+            if not any(self._text_attr_needs_reconciliation(attr) for attr in node.attributes):
+                continue
+
+            node = node.duplicate()
+            for attr in node.attributes:
+                self._reconcile_text_attr(attr)
+            self.set(name=name, schema=node)
+
     def load_schema(self, schema: SchemaRoot) -> None:
         """Load a SchemaRoot object and store all NodeSchema or GenericSchema.
 
         In the current implementation, if a schema object present in the SchemaRoot already exist, it will be overwritten.
         """
+        # Reconcile deprecated text attribute parameters before merging
+        self._reconcile_text_attribute_parameters(schema)
+
         for item in schema.nodes + schema.generics:
             try:
                 if item.id:
@@ -545,6 +610,7 @@ class SchemaBranch:
         self.generate_identifiers()
         self.process_default_values()
         self.process_deprecations()
+        self._reconcile_text_attribute_parameters()
         self.process_cardinality_counts()
         self.process_inheritance()
         self.process_hierarchy()

infrahub/core/utils.py

@@ -215,7 +215,7 @@ def props(x: Any) -> dict[str, Any]:
 
 
 class SubclassWithMeta_Meta(type):
-    _meta = None
+    _meta: Any = None
 
     def __str__(cls) -> str:
         if cls._meta:
@@ -229,7 +229,7 @@ class SubclassWithMeta_Meta(type):
 class SubclassWithMeta(metaclass=SubclassWithMeta_Meta):
     """This class improves __init_subclass__ to receive automatically the options from meta"""
 
-    def __init_subclass__(cls, **meta_options: dict[str, Any]) -> None:
+    def __init_subclass__(cls, **meta_options: Any) -> None:
         """This method just terminates the super() chain"""
         _Meta = getattr(cls, "Meta", None)
         _meta_props = {}
@@ -254,5 +254,5 @@ class SubclassWithMeta(metaclass=SubclassWithMeta_Meta):
                 super_class.__init_subclass_with_meta__(**options)
 
     @classmethod
-    def __init_subclass_with_meta__(cls, **meta_options: dict[str, Any]) -> None:
+    def __init_subclass_with_meta__(cls, **meta_options: Any) -> None:
         """This method just terminates the super() chain"""

infrahub/core/validators/aggregated_checker.py

@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 class AggregatedConstraintChecker:
     def __init__(
         self, constraints: list[ConstraintCheckerInterface], db: InfrahubDatabase, branch: Branch | None = None
-    ):
+    ) -> None:
         self.constraints = constraints
         self.db = db
         self.branch = branch

infrahub/core/validators/attribute/choices.py

@@ -84,7 +84,7 @@ class AttributeChoicesUpdateValidatorQuery(AttributeSchemaValidatorQuery):
 class AttributeChoicesChecker(ConstraintCheckerInterface):
     query_classes = [AttributeChoicesUpdateValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/attribute/enum.py

@@ -72,7 +72,7 @@ class AttributeEnumUpdateValidatorQuery(AttributeSchemaValidatorQuery):
 class AttributeEnumChecker(ConstraintCheckerInterface):
     query_classes = [AttributeEnumUpdateValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/attribute/kind.py

@@ -89,7 +89,7 @@ class AttributeKindUpdateValidatorQuery(AttributeSchemaValidatorQuery):
 class AttributeKindChecker(ConstraintCheckerInterface):
     query_classes = [AttributeKindUpdateValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/attribute/length.py

@@ -69,7 +69,7 @@ class AttributeLengthUpdateValidatorQuery(AttributeSchemaValidatorQuery):
 class AttributeLengthChecker(ConstraintCheckerInterface):
     query_classes = [AttributeLengthUpdateValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/attribute/min_max.py

@@ -79,7 +79,7 @@ class AttributeNumberUpdateValidatorQuery(AttributeSchemaValidatorQuery):
 class AttributeNumberChecker(ConstraintCheckerInterface):
     query_classes = [AttributeNumberUpdateValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/attribute/number_pool.py

@@ -74,7 +74,7 @@ class AttributeNumberPoolUpdateValidatorQuery(AttributeSchemaValidatorQuery):
 class AttributeNumberPoolChecker(ConstraintCheckerInterface):
     query_classes = [AttributeNumberPoolUpdateValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/attribute/optional.py

@@ -64,7 +64,7 @@ class AttributeOptionalUpdateValidatorQuery(AttributeSchemaValidatorQuery):
 class AttributeOptionalChecker(ConstraintCheckerInterface):
     query_classes = [AttributeOptionalUpdateValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/attribute/regex.py

@@ -69,7 +69,7 @@ class AttributeRegexUpdateValidatorQuery(AttributeSchemaValidatorQuery):
 class AttributeRegexChecker(ConstraintCheckerInterface):
     query_classes = [AttributeRegexUpdateValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/node/attribute.py

@@ -19,7 +19,7 @@ if TYPE_CHECKING:
 class NodeAttributeAddChecker(ConstraintCheckerInterface):
     query_classes = [NodeNotPresentValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/node/relationship.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 class NodeRelationshipAddChecker(ConstraintCheckerInterface):
     query_classes = [NodeNotPresentValidatorQuery]
 
-    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None):
+    def __init__(self, db: InfrahubDatabase, branch: Branch | None = None) -> None:
         self.db = db
         self.branch = branch
 

infrahub/core/validators/relationship/peer.py

@@ -136,7 +136,7 @@ class RelationshipPeerParentValidatorQuery(RelationshipSchemaValidatorQuery):
         parent_relationship: RelationshipSchema,
         peer_parent_relationship: RelationshipSchema,
         **kwargs: Any,
-    ):
+    ) -> None:
         super().__init__(**kwargs)
 
         self.relationship = relationship

infrahub/database/__init__.py

@@ -152,7 +152,7 @@ class InfrahubDatabase:
         session_mode: InfrahubDatabaseSessionMode = InfrahubDatabaseSessionMode.WRITE,
         transaction: AsyncTransaction | None = None,
         queries_names_to_config: dict[str, QueryConfig] | None = None,
-    ):
+    ) -> None:
         self._mode: InfrahubDatabaseMode = mode
         self._driver: AsyncDriver = driver
         self._session: AsyncSession | None = session

infrahub/git/utils.py

@@ -16,9 +16,9 @@ from infrahub_sdk.types import Order
 from infrahub.core import registry
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
+from infrahub.core.order import OrderModel
 from infrahub.database import InfrahubDatabase
 from infrahub.generators.models import ProposedChangeGeneratorDefinition
-from infrahub.graphql.models import OrderModel
 
 from .. import config
 from .models import RepositoryBranchInfo, RepositoryData

infrahub/graphql/app.py

@@ -172,9 +172,9 @@ class InfrahubGraphQLApp:
 
         response = handler(request)
         if isawaitable(response):
-            return await cast("Awaitable[Response]", response)
+            return await response
 
-        return cast("Response", response)
+        return response
 
     async def _handle_http_request(
         self, request: Request, db: InfrahubDatabase, branch: Branch, account_session: AccountSession

infrahub/graphql/field_extractor.py

@@ -12,7 +12,7 @@ from graphql import (
 class GraphQLFieldExtractor:
     """Class to extract fields from a GraphQL selection set."""
 
-    def __init__(self, info: GraphQLResolveInfo):
+    def __init__(self, info: GraphQLResolveInfo) -> None:
         self.info = info
         self.fragments = info.fragments
 

infrahub/graphql/manager.py

@@ -1005,8 +1005,16 @@ class GraphQLSchemaManager:
         if not top_level:
             filters["isnull"] = graphene.Boolean()
 
+        if schema.display_label:
+            display_label_schema = schema.get_attribute("display_label")
+            filters.update(
+                get_attribute_type(kind=display_label_schema.kind).get_graphql_filters(
+                    name="display_label", include_properties=False, include_isnull=True
+                )
+            )
+
         if schema.human_friendly_id and top_level:
-            # HFID filter limited to top level because we can't filter on HFID for relationships (yet)
+            # NOTE: this can loosen to allow filtering at a non-top level once IFC-2110 is implemented
             filters["hfid"] = graphene.List(graphene.String)
 
         for attr in schema.attributes:

infrahub/graphql/mutations/account.py

@@ -9,13 +9,13 @@ from infrahub.auth import AuthType
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node
+from infrahub.core.order import OrderModel
 from infrahub.core.protocols import CoreAccount, CoreNode, InternalAccountToken
 from infrahub.core.timestamp import Timestamp
 from infrahub.database import InfrahubDatabase, retry_db_transaction
 from infrahub.exceptions import NodeNotFoundError, PermissionDeniedError
 from infrahub.graphql.field_extractor import extract_graphql_fields
 
-from ..models import OrderModel
 from ..types import InfrahubObjectType
 
 if TYPE_CHECKING:

infrahub/graphql/order.py

@@ -0,0 +1,14 @@
+from __future__ import annotations
+
+from typing import Any
+
+from infrahub.core.order import OrderModel
+
+
+def deserialize_order_input(input_data: dict[str, Any] | None) -> OrderModel | None:
+    # Corresponds to infrahub.graphql.manager.OrderInput
+    if not input_data:
+        return None
+
+    order_model = OrderModel(**input_data)
+    return order_model

infrahub/graphql/queries/diff/tree.py

@@ -60,10 +60,10 @@ class ConflictDetails(ObjectType):
 
 
 class DiffSummaryCounts(ObjectType):
-    num_added = Int(required=False)
-    num_updated = Int(required=False)
-    num_removed = Int(required=False)
-    num_conflicts = Int(required=False)
+    num_added = Int(required=True)
+    num_updated = Int(required=True)
+    num_removed = Int(required=True)
+    num_conflicts = Int(required=True)
 
 
 class DiffProperty(ObjectType):
@@ -146,7 +146,7 @@ class DiffTreeSummary(DiffSummaryCounts):
     diff_branch = String(required=True)
     from_time = DateTime(required=True)
     to_time = DateTime(required=True)
-    num_unchanged = Int(required=False)
+    num_unchanged = Int(required=True)
     num_untracked_base_changes = Int(required=False)
     num_untracked_diff_changes = Int(required=False)