infrahub-server 1.3.7__py3-none-any.whl → 1.4.0__py3-none-any.whl

infrahub/graphql/queries/event.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from graphene import Argument, Boolean, DateTime, Field, Int, List, NonNull, ObjectType, String
-from infrahub_sdk.utils import extract_fields_first_node
+from graphene import Argument, Boolean, DateTime, Enum, Field, Int, List, NonNull, ObjectType, String
 
+from infrahub.events.constants import EventSortOrder
 from infrahub.exceptions import ValidationError
+from infrahub.graphql.field_extractor import extract_graphql_fields
 from infrahub.graphql.types.event import EventNodes, EventTypeFilter
 from infrahub.task_manager.event import PrefectEvent
 from infrahub.task_manager.models import InfrahubEventFilter
@@ -15,6 +16,8 @@ if TYPE_CHECKING:
 
     from graphql import GraphQLResolveInfo
 
+InfrahubEventSortOrder = Enum.from_enum(EventSortOrder)
+
 
 class Events(ObjectType):
     edges = List(NonNull(EventNodes), required=True)
@@ -24,6 +27,7 @@ class Events(ObjectType):
     async def resolve(
         root: dict,  # noqa: ARG004
         info: GraphQLResolveInfo,
+        order: EventSortOrder,
         limit: int = 10,
         has_children: bool | None = None,
         level: int | None = None,
@@ -57,6 +61,7 @@ class Events(ObjectType):
             since=since,
             until=until,
             level=level,
+            order=order,
         )
 
         return await Events.query(
@@ -74,7 +79,7 @@ class Events(ObjectType):
         limit: int,
         offset: int | None = None,
     ) -> dict[str, Any]:
-        fields = await extract_fields_first_node(info)
+        fields = extract_graphql_fields(info)
 
         prefect_tasks = await PrefectEvent.query(
             fields=fields,
@@ -110,6 +115,11 @@ Event = Field(
     branches=List(NonNull(String), required=False, description="Filter the query to specific branches"),
     account__ids=List(NonNull(String), required=False, description="Filter the query to specific accounts"),
     ids=List(NonNull(String)),
+    order=InfrahubEventSortOrder(
+        required=False,
+        default_value=EventSortOrder.DESC,
+        description="Sort order of the events, defaults to descending order",
+    ),
     resolver=Events.resolve,
     required=True,
 )

infrahub/graphql/queries/ipam.py

@@ -74,7 +74,7 @@ class IPPrefixGetNextAvailable(ObjectType):
         root: dict,  # noqa: ARG004
         info: GraphQLResolveInfo,
         prefix_id: str,
-        prefix_length: int,
+        prefix_length: int | None = None,
     ) -> dict[str, str]:
         graphql_context: GraphqlContext = info.context
 
@@ -119,3 +119,25 @@ InfrahubIPPrefixGetNextAvailable = Field(
     resolver=IPPrefixGetNextAvailable.resolve,
     required=True,
 )
+
+# The following two query fields must be removed once we are sure that people are not using the old queries anymore. Those fields only exist to
+# expose a deprecation message.
+
+DeprecatedIPAddressGetNextAvailable = Field(
+    IPAddressGetNextAvailable,
+    prefix_id=String(required=True),
+    prefix_length=Int(required=False),
+    resolver=IPAddressGetNextAvailable.resolve,
+    required=True,
+    deprecation_reason="This query has been renamed to 'InfrahubIPAddressGetNextAvailable'. It will be removed in the next version of Infrahub.",
+)
+
+
+DeprecatedIPPrefixGetNextAvailable = Field(
+    IPPrefixGetNextAvailable,
+    prefix_id=String(required=True),
+    prefix_length=Int(required=False),
+    resolver=IPPrefixGetNextAvailable.resolve,
+    required=True,
+    deprecation_reason="This query has been renamed to 'InfrahubIPPrefixGetNextAvailable'. It will be removed in the next version of Infrahub.",
+)

infrahub/graphql/queries/proposed_change.py

@@ -0,0 +1,84 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from graphene import Boolean, Field, Int, List, NonNull, ObjectType, String
+from infrahub_sdk.utils import extract_fields_first_node
+
+from infrahub.core.manager import NodeManager
+from infrahub.core.protocols import CoreGenericAccount, CoreProposedChange
+from infrahub.proposed_change.action_checker import ACTION_RULES, ActionRulesEvaluator
+
+if TYPE_CHECKING:
+    from graphql import GraphQLResolveInfo
+
+    from infrahub.graphql.initialization import GraphqlContext
+
+
+class ActionAvailability(ObjectType):
+    action = Field(String, required=True, description="The action that a user may want to take on a proposed change")
+    available = Field(Boolean, required=True, description="Tells if the action is available")
+    unavailability_reason = Field(String, required=False, description="The reason why an action may be unavailable")
+
+
+class ActionAvailabilityEdge(ObjectType):
+    node = Field(ActionAvailability, required=True)
+
+
+class AvailableActions(ObjectType):
+    count = Field(Int, required=True, description="The number of available actions for the proposed change.")
+    edges = Field(List(of_type=NonNull(ActionAvailabilityEdge), required=True), required=True)
+
+    @staticmethod
+    async def resolve(
+        root: dict,  # noqa: ARG004
+        info: GraphQLResolveInfo,
+        proposed_change_id: str,
+    ) -> dict:
+        graphql_context: GraphqlContext = info.context
+        proposed_change = await NodeManager.get_one(
+            kind=CoreProposedChange,
+            id=proposed_change_id,
+            db=graphql_context.db,
+            branch=graphql_context.branch,
+            raise_on_error=True,
+        )
+        proposed_change_author = await proposed_change.created_by.get_peer(
+            db=graphql_context.db, peer_type=CoreGenericAccount, raise_on_error=True
+        )
+        actions = await ActionRulesEvaluator(rules=ACTION_RULES).evaluate(
+            proposed_change=proposed_change,
+            graphql_context=graphql_context,
+            proposed_change_author=proposed_change_author,
+        )
+
+        fields = await extract_fields_first_node(info=info)
+        response: dict[str, Any] = {}
+
+        if "count" in fields:
+            response["count"] = len(actions)
+
+        if edges := fields.get("edges"):
+            node_fields = edges.get("node", {})
+
+            nodes = []
+            for action in actions:
+                node = {}
+
+                if "action" in node_fields:
+                    node["action"] = action["action"]
+                if "available" in node_fields:
+                    node["available"] = action["available"]
+                if "unavailability_reason" in node_fields:
+                    node["unavailability_reason"] = action["unavailability_reason"]
+
+                nodes.append({"node": node})
+
+            response["edges"] = nodes
+
+        return response
+
+
+ProposedChangeAvailableActions = Field(
+    AvailableActions, proposed_change_id=String(required=True), resolver=AvailableActions.resolve, required=True
+)

infrahub/graphql/queries/relationship.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from graphene import Field, Int, List, NonNull, ObjectType, String
-from infrahub_sdk.utils import extract_fields_first_node
 
 from infrahub.core.query.relationship import RelationshipGetByIdentifierQuery
+from infrahub.graphql.field_extractor import extract_graphql_fields
 from infrahub.graphql.types import RelationshipNode
 
 if TYPE_CHECKING:
@@ -29,7 +29,7 @@ class Relationships(ObjectType):
     ) -> dict[str, Any]:
         graphql_context: GraphqlContext = info.context
 
-        fields = await extract_fields_first_node(info)
+        fields = extract_graphql_fields(info)
         excluded_namespaces = excluded_namespaces or []
 
         response: dict[str, Any] = {"edges": [], "count": None}

infrahub/graphql/queries/resource_manager.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 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
 from infrahub.core.constants import InfrahubKind
@@ -16,6 +15,7 @@ from infrahub.core.query.resource_manager import (
     PrefixPoolGetIdentifiers,
 )
 from infrahub.exceptions import NodeNotFoundError, SchemaNotFoundError, ValidationError
+from infrahub.graphql.field_extractor import extract_graphql_fields
 from infrahub.pools.number import NumberUtilizationGetter
 
 if TYPE_CHECKING:
@@ -87,7 +87,7 @@ class PoolAllocated(ObjectType):
             id=pool_id, db=graphql_context.db, branch=graphql_context.branch
         )
 
-        fields = await extract_fields_first_node(info=info)
+        fields = extract_graphql_fields(info=info)
 
         allocated_kinds: list[str] = []
         pool = _validate_pool_type(pool_id=pool_id, pool=pool)
@@ -207,7 +207,7 @@ class PoolUtilization(ObjectType):
         utilization_getter = PrefixUtilizationGetter(
             db=db, ip_prefixes=list(resources_map.values()), at=graphql_context.at
         )
-        fields = await extract_fields_first_node(info=info)
+        fields = extract_graphql_fields(info=info)
         response: dict[str, Any] = {}
         total_utilization = None
         default_branch_utilization = None

infrahub/graphql/queries/search.py

@@ -4,10 +4,11 @@ import ipaddress
 from typing import TYPE_CHECKING, Any
 
 from graphene import Boolean, Field, Int, List, NonNull, ObjectType, String
-from infrahub_sdk.utils import extract_fields_first_node, is_valid_uuid
+from infrahub_sdk.utils import is_valid_uuid
 
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
+from infrahub.graphql.field_extractor import extract_graphql_fields
 
 if TYPE_CHECKING:
     from graphql import GraphQLResolveInfo
@@ -107,7 +108,7 @@ async def search_resolver(
     response: dict[str, Any] = {}
     results: list[CoreNode] = []
 
-    fields = await extract_fields_first_node(info)
+    fields = extract_graphql_fields(info=info)
 
     if is_valid_uuid(q):
         matching: CoreNode | None = await NodeManager.get_one(

infrahub/graphql/queries/status.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from graphene import Boolean, Field, List, NonNull, ObjectType, String
-from infrahub_sdk.utils import extract_fields_first_node
+
+from infrahub.graphql.field_extractor import extract_graphql_fields
 
 if TYPE_CHECKING:
     from graphql import GraphQLResolveInfo
@@ -45,7 +46,7 @@ async def resolve_status(
     if service is None:
         raise ValueError("GraphqlContext.service is None")
 
-    fields = await extract_fields_first_node(info)
+    fields = extract_graphql_fields(info=info)
     response: dict[str, Any] = {}
     workers = await service.component.list_workers(
         branch=str(graphql_context.branch.uuid) or graphql_context.branch.name, schema_hash=True

infrahub/graphql/queries/task.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from graphene import Field, Int, List, NonNull, ObjectType, String
-from infrahub_sdk.utils import extract_fields_first_node
 from prefect.client.schemas.objects import StateType
 
+from infrahub.graphql.field_extractor import extract_graphql_fields
 from infrahub.graphql.types.task import TaskNodes, TaskState
 from infrahub.task_manager.task import PrefectTask
 from infrahub.workflows.constants import WorkflowTag
@@ -79,7 +79,7 @@ class Tasks(ObjectType):
         log_offset: int | None = None,
     ) -> dict[str, Any]:
         graphql_context: GraphqlContext = info.context
-        fields = await extract_fields_first_node(info)
+        fields = extract_graphql_fields(info=info)
 
         prefect_tasks = await PrefectTask.query(
             db=graphql_context.db,