infrahub-server 1.6.0__py3-none-any.whl → 1.6.1__py3-none-any.whl

infrahub/core/relationship/model.py

@@ -1072,7 +1072,12 @@ class RelationshipManager:
 
         return self._relationships.as_list()
 
-    async def update(self, data: list[str | Node] | dict[str, Any] | str | Node | None, db: InfrahubDatabase) -> bool:
+    async def update(
+        self,
+        data: list[str | Node] | dict[str, Any] | str | Node | None,
+        db: InfrahubDatabase,
+        process_delete: bool = True,
+    ) -> bool:
         """Replace and Update the list of relationships with this one."""
         if not isinstance(data, list):
             list_data: Sequence[str | Node | dict[str, Any] | None] = [data]
@@ -1098,8 +1103,9 @@ class RelationshipManager:
 
             if item is None:
                 if previous_relationships:
-                    for rel in previous_relationships.values():
-                        await rel.delete(db=db)
+                    if process_delete:
+                        for rel in previous_relationships.values():
+                            await rel.delete(db=db)
                     changed = True
                 continue
 

infrahub/core/schema/manager.py

@@ -774,10 +774,15 @@ class SchemaManager(NodeManager):
         """Return non active branches that were purged."""
 
         hashes_to_keep: set[str] = set()
+        branch_processed: set[str] = set()
         for active_branch in active_branches:
-            if branch := self._branches.get(active_branch):
-                nodes = branch.get_all(include_internal=True, duplicate=False)
-                hashes_to_keep.update([node.get_hash() for node in nodes.values()])
+            branch_hash = self._branch_hash_by_name.get(active_branch)
+            if not branch_hash or branch_hash not in branch_processed:
+                if branch_hash:
+                    branch_processed.add(branch_hash)
+                if branch := self._branches.get(active_branch):
+                    nodes = branch.get_all(include_internal=True, duplicate=False)
+                    hashes_to_keep.update([node.get_hash() for node in nodes.values()])
 
         removed_branches: list[str] = []
         for branch_name in list(self._branches.keys()):

infrahub/core/validators/attribute/choices.py

@@ -4,13 +4,13 @@ from typing import TYPE_CHECKING, Any, cast
 
 from infrahub.core.constants import NULL_VALUE, PathType
 from infrahub.core.path import DataPath, GroupedDataPaths
-from infrahub.core.schema.generic_schema import GenericSchema
 
 from ..interface import ConstraintCheckerInterface
 from ..shared import AttributeSchemaValidatorQuery
 
 if TYPE_CHECKING:
     from infrahub.core.branch import Branch
+    from infrahub.core.schema.generic_schema import GenericSchema
     from infrahub.database import InfrahubDatabase
 
     from ..model import SchemaConstraintValidatorRequest
@@ -106,7 +106,7 @@ class AttributeChoicesChecker(ConstraintCheckerInterface):
         # skip inheriting schemas that override the attribute being checked
         excluded_kinds: list[str] = []
         if request.node_schema.is_generic_schema:
-            request.node_schema = cast(GenericSchema, request.node_schema)
+            request.node_schema = cast("GenericSchema", request.node_schema)
             for inheriting_kind in request.node_schema.used_by:
                 inheriting_schema = request.schema_branch.get_node(name=inheriting_kind, duplicate=False)
                 inheriting_schema_attribute = inheriting_schema.get_attribute(name=request.schema_path.field_name)

infrahub/git/models.py

@@ -1,6 +1,8 @@
 from pydantic import BaseModel, ConfigDict, Field
 
 from infrahub.context import InfrahubContext
+from infrahub.core.node import Node
+from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository
 from infrahub.message_bus.types import ProposedChangeBranchDiff
 
 
@@ -201,11 +203,22 @@ class RepositoryBranchInfo(BaseModel):
 
 
 class RepositoryData(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     repository_id: str = Field(..., description="Id of the repository")
     repository_name: str = Field(..., description="Name of the repository")
+    repository: CoreRepository | CoreReadOnlyRepository | Node = Field(
+        ..., description="InfrahubNode representing a Repository"
+    )
     branches: dict[str, str] = Field(
         ...,
         description="Dictionary with the name of the branch as the key and the active commit id as the value",
     )
 
     branch_info: dict[str, RepositoryBranchInfo] = Field(default_factory=dict)
+
+    def get_staging_branch(self) -> str | None:
+        for branch, info in self.branch_info.items():
+            if info.internal_status == "staging":
+                return branch
+        return None

infrahub/git/tasks.py

@@ -60,7 +60,7 @@ from .models import (
     UserCheckDefinitionData,
 )
 from .repository import InfrahubReadOnlyRepository, InfrahubRepository, get_initialized_repo
-from .utils import fetch_artifact_definition_targets, fetch_check_definition_targets
+from .utils import fetch_artifact_definition_targets, fetch_check_definition_targets, get_repositories_commit_per_branch
 
 
 @flow(
@@ -195,13 +195,17 @@ async def sync_git_repo_with_origin_and_tag_on_failure(
 @flow(name="git_repositories_sync", flow_run_name="Sync Git Repositories")
 async def sync_remote_repositories() -> None:
     log = get_run_logger()
+    db = await get_database()
 
     client = get_client()
 
     branches = await client.branch.all()
-    repositories = await client.get_list_repositories(branches=branches, kind=InfrahubKind.REPOSITORY)
+    async with db.start_session() as dbs:
+        repositories = await get_repositories_commit_per_branch(db=dbs, kind=InfrahubKind.REPOSITORY)
 
     for repo_name, repository_data in repositories.items():
+        repository: CoreRepository = repository_data.repository
+
         active_internal_status = RepositoryInternalStatus.ACTIVE.value
         default_internal_status = repository_data.branch_info[registry.default_branch].internal_status
         staging_branch = None
@@ -215,12 +219,12 @@ async def sync_remote_repositories() -> None:
             init_failed = False
             try:
                 repo = await InfrahubRepository.init(
-                    id=repository_data.repository.id,
-                    name=repository_data.repository.name.value,
-                    location=repository_data.repository.location.value,
+                    id=repository.id,
+                    name=repository.name.value,
+                    location=repository.location.value,
                     client=client,
                     internal_status=active_internal_status,
-                    default_branch_name=repository_data.repository.default_branch.value,
+                    default_branch_name=repository.default_branch.value,
                 )
             except RepositoryError as exc:
                 get_logger().error(str(exc))
@@ -229,12 +233,12 @@ async def sync_remote_repositories() -> None:
             if init_failed:
                 try:
                     repo = await InfrahubRepository.new(
-                        id=repository_data.repository.id,
-                        name=repository_data.repository.name.value,
-                        location=repository_data.repository.location.value,
+                        id=repository.id,
+                        name=repository.name.value,
+                        location=repository.location.value,
                         client=client,
                         internal_status=active_internal_status,
-                        default_branch_name=repository_data.repository.default_branch.value,
+                        default_branch_name=repository.default_branch.value,
                     )
                     await repo.import_objects_from_files(  # type: ignore[call-overload]
                         git_branch_name=registry.default_branch, infrahub_branch_name=infrahub_branch
@@ -246,22 +250,22 @@ async def sync_remote_repositories() -> None:
             try:
                 await sync_git_repo_with_origin_and_tag_on_failure(
                     client=client,
-                    repository_id=repository_data.repository.id,
-                    repository_name=repository_data.repository.name.value,
-                    repository_location=repository_data.repository.location.value,
+                    repository_id=repository.id,
+                    repository_name=repository.name.value,
+                    repository_location=repository.location.value,
                     internal_status=active_internal_status,
-                    default_branch_name=repository_data.repository.default_branch.value,
-                    operational_status=repository_data.repository.operational_status.value,
+                    default_branch_name=repository.default_branch.value,
+                    operational_status=repository.operational_status.value,
                     staging_branch=staging_branch,
                     infrahub_branch=infrahub_branch,
                 )
                 # Tell workers to fetch to stay in sync
                 message = messages.RefreshGitFetch(
                     meta=Meta(initiator_id=WORKER_IDENTITY, request_id=get_log_data().get("request_id", "")),
-                    location=repository_data.repository.location.value,
-                    repository_id=repository_data.repository.id,
-                    repository_name=repository_data.repository.name.value,
-                    repository_kind=repository_data.repository.get_kind(),
+                    location=repository.location.value,
+                    repository_id=repository.id,
+                    repository_name=repository.name.value,
+                    repository_kind=repository.get_kind(),
                     infrahub_branch_name=infrahub_branch,
                     infrahub_branch_id=branches[infrahub_branch].id,
                 )

infrahub/git/utils.py

@@ -1,10 +1,16 @@
 import re
 from collections import defaultdict
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from infrahub_sdk import InfrahubClient
 from infrahub_sdk.node import RelationshipManager
-from infrahub_sdk.protocols import CoreArtifactDefinition, CoreCheckDefinition, CoreGroup
+from infrahub_sdk.protocols import (
+    CoreArtifactDefinition,
+    CoreCheckDefinition,
+    CoreGroup,
+    CoreReadOnlyRepository,
+    CoreRepository,
+)
 from infrahub_sdk.types import Order
 
 from infrahub.core import registry
@@ -12,16 +18,15 @@ from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
 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
 
-if TYPE_CHECKING:
-    from infrahub.core.protocols import CoreGenericRepository
-
 
 async def get_repositories_commit_per_branch(
     db: InfrahubDatabase,
+    kind: str = InfrahubKind.GENERICREPOSITORY,
 ) -> dict[str, RepositoryData]:
     """Get a list of all repositories and their commit on each branches.
 
@@ -33,11 +38,12 @@ async def get_repositories_commit_per_branch(
     repositories: dict[str, RepositoryData] = {}
 
     for branch in list(registry.branch.values()):
-        repos: list[CoreGenericRepository] = await NodeManager.query(
+        repos: list[CoreRepository | CoreReadOnlyRepository] = await NodeManager.query(
             db=db,
             branch=branch,
-            fields={"id": None, "name": None, "commit": None, "internal_status": None},
-            schema=InfrahubKind.GENERICREPOSITORY,
+            fields={"id": None, "name": None, "commit": None, "internal_status": None, "location": None, "ref": None},
+            schema=kind,
+            order=OrderModel(disable=True),
         )
 
         for repository in repos:
@@ -46,10 +52,11 @@ async def get_repositories_commit_per_branch(
                 repositories[repo_name] = RepositoryData(
                     repository_id=repository.get_id(),
                     repository_name=repo_name,
+                    repository=repository,
                     branches={},
                 )
 
-            repositories[repo_name].branches[branch.name] = repository.commit.value  # type: ignore[attr-defined]
+            repositories[repo_name].branches[branch.name] = repository.commit.value
             repositories[repo_name].branch_info[branch.name] = RepositoryBranchInfo(
                 internal_status=repository.internal_status.value
             )

infrahub/graphql/app.py

@@ -172,9 +172,9 @@ class InfrahubGraphQLApp:
 
         response = handler(request)
         if isawaitable(response):
-            return await cast(Awaitable[Response], response)
+            return await cast("Awaitable[Response]", response)
 
-        return cast(Response, response)
+        return cast("Response", response)
 
     async def _handle_http_request(
         self, request: Request, db: InfrahubDatabase, branch: Branch, account_session: AccountSession
@@ -350,8 +350,8 @@ class InfrahubGraphQLApp:
         websocket: WebSocket,
         subscriptions: dict[str, AsyncGenerator[Any, None]],
     ) -> None:
-        operation_id = cast(str, message.get("id"))
-        message_type = cast(str, message.get("type"))
+        operation_id = cast("str", message.get("id"))
+        message_type = cast("str", message.get("type"))
 
         if message_type == GQL_CONNECTION_INIT:
             websocket.scope["connection_params"] = message.get("payload")
@@ -445,7 +445,7 @@ class InfrahubGraphQLApp:
         if isinstance(result, ExecutionResult) and result.errors:
             return result.errors
 
-        asyncgen = cast(AsyncGenerator[Any, None], result)
+        asyncgen = cast("AsyncGenerator[Any, None]", result)
         subscriptions[operation_id] = asyncgen
         task = asyncio.create_task(self._observe_subscription(asyncgen, operation_id, websocket))
         subscription_tasks.add(task)
@@ -479,7 +479,7 @@ async def _get_operation_from_request(request: Request) -> dict[str, Any] | list
     content_type = request.headers.get("Content-Type", "").split(";")[0]
     if content_type == "application/json":
         try:
-            return cast(dict[str, Any] | list[Any], await request.json())
+            return cast("dict[str, Any] | list[Any]", await request.json())
         except (TypeError, ValueError) as err:
             raise ValueError("Request body is not a valid JSON") from err
     elif content_type == "multipart/form-data":

infrahub/graphql/mutations/action.py

@@ -5,7 +5,6 @@ from typing import TYPE_CHECKING, Any, cast
 from graphene import InputObjectType, Mutation
 from typing_extensions import Self
 
-from infrahub.core.protocols import CoreNodeTriggerAttributeMatch, CoreNodeTriggerRelationshipMatch, CoreNodeTriggerRule
 from infrahub.exceptions import SchemaNotFoundError, ValidationError
 from infrahub.log import get_logger
 
@@ -16,6 +15,11 @@ if TYPE_CHECKING:
 
     from infrahub.core.branch import Branch
     from infrahub.core.node import Node
+    from infrahub.core.protocols import (
+        CoreNodeTriggerAttributeMatch,
+        CoreNodeTriggerRelationshipMatch,
+        CoreNodeTriggerRule,
+    )
     from infrahub.core.schema import NodeSchema
     from infrahub.database import InfrahubDatabase
 
@@ -104,9 +108,11 @@ class InfrahubTriggerRuleMatchMutation(InfrahubMutationMixin, Mutation):
             trigger_match, result = await super().mutate_create(
                 info=info, data=data, branch=branch, database=dbt, override_data=override_data
             )
-            trigger_match_model = cast(CoreNodeTriggerAttributeMatch | CoreNodeTriggerRelationshipMatch, trigger_match)
+            trigger_match_model = cast(
+                "CoreNodeTriggerAttributeMatch | CoreNodeTriggerRelationshipMatch", trigger_match
+            )
             node_trigger_rule = await trigger_match_model.trigger.get_peer(db=dbt, raise_on_error=True)
-            node_trigger_rule_model = cast(CoreNodeTriggerRule, node_trigger_rule)
+            node_trigger_rule_model = cast("CoreNodeTriggerRule", node_trigger_rule)
             node_schema = dbt.schema.get_node_schema(name=node_trigger_rule_model.node_kind.value, duplicate=False)
             _validate_node_kind_field(data=data, node_schema=node_schema)
 
@@ -124,9 +130,11 @@ class InfrahubTriggerRuleMatchMutation(InfrahubMutationMixin, Mutation):
         graphql_context: GraphqlContext = info.context
         async with graphql_context.db.start_transaction() as dbt:
             trigger_match, result = await super().mutate_update(info=info, data=data, branch=branch, database=dbt)
-            trigger_match_model = cast(CoreNodeTriggerAttributeMatch | CoreNodeTriggerRelationshipMatch, trigger_match)
+            trigger_match_model = cast(
+                "CoreNodeTriggerAttributeMatch | CoreNodeTriggerRelationshipMatch", trigger_match
+            )
             node_trigger_rule = await trigger_match_model.trigger.get_peer(db=dbt, raise_on_error=True)
-            node_trigger_rule_model = cast(CoreNodeTriggerRule, node_trigger_rule)
+            node_trigger_rule_model = cast("CoreNodeTriggerRule", node_trigger_rule)
             node_schema = dbt.schema.get_node_schema(name=node_trigger_rule_model.node_kind.value, duplicate=False)
             _validate_node_kind_field(data=data, node_schema=node_schema)
 
@@ -134,7 +142,7 @@ class InfrahubTriggerRuleMatchMutation(InfrahubMutationMixin, Mutation):
 
 
 def _validate_node_kind(data: InputObjectType, db: InfrahubDatabase) -> None:
-    input_data = cast(dict[str, dict[str, Any]], data)
+    input_data = cast("dict[str, dict[str, Any]]", data)
     if node_kind := input_data.get("node_kind"):
         value = node_kind.get("value")
         if isinstance(value, str):
@@ -149,7 +157,7 @@ def _validate_node_kind(data: InputObjectType, db: InfrahubDatabase) -> None:
 
 
 def _validate_node_kind_field(data: InputObjectType, node_schema: NodeSchema) -> None:
-    input_data = cast(dict[str, dict[str, Any]], data)
+    input_data = cast("dict[str, dict[str, Any]]", data)
     if attribute_name := input_data.get("attribute_name"):
         value = attribute_name.get("value")
         if isinstance(value, str):

infrahub/graphql/mutations/hfid.py

@@ -55,7 +55,7 @@ class UpdateHFID(Mutation):
                 input_value=f"{node_schema.kind}.human_friendly_id has not been defined for this kind."
             )
 
-        updated_hfid = cast(list[str], data.value)
+        updated_hfid = cast("list[str]", data.value)
 
         if len(node_schema.human_friendly_id) != len(updated_hfid):
             raise ValidationError(

infrahub/graphql/mutations/repository.py

@@ -9,7 +9,6 @@ from graphene import Boolean, Field, InputObjectType, Mutation, String
 from infrahub import config
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
-from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository
 from infrahub.core.schema import NodeSchema
 from infrahub.git.models import (
     GitRepositoryImportObjects,
@@ -34,6 +33,7 @@ if TYPE_CHECKING:
 
     from infrahub.core.branch import Branch
     from infrahub.core.node import Node
+    from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository
     from infrahub.database import InfrahubDatabase
     from infrahub.graphql.initialization import GraphqlContext
 
@@ -107,7 +107,7 @@ class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
         if node.get_kind() != InfrahubKind.READONLYREPOSITORY:
             return await super().mutate_update(info, data, branch, database=graphql_context.db, node=node)
 
-        node = cast(CoreReadOnlyRepository, node)
+        node = cast("CoreReadOnlyRepository", node)
         current_commit = node.commit.value
         current_ref = node.ref.value
         new_commit = None
@@ -118,7 +118,7 @@ class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
             new_ref = data.ref.value
 
         obj, result = await super().mutate_update(info, data, branch, database=graphql_context.db, node=node)
-        obj = cast(CoreReadOnlyRepository, obj)
+        obj = cast("CoreReadOnlyRepository", obj)
 
         send_update_message = (new_commit and new_commit != current_commit) or (new_ref and new_ref != current_ref)
         if not send_update_message:

infrahub/graphql/mutations/schema.py

@@ -81,7 +81,7 @@ class SchemaDropdownAdd(Mutation):
         _validate_schema_permission(graphql_context=graphql_context)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=True)
         attribute = str(data.attribute)
         validate_kind_dropdown(kind=kind, attribute=attribute)
         dropdown = str(data.dropdown)
@@ -141,7 +141,7 @@ class SchemaDropdownRemove(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=True)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
@@ -197,7 +197,7 @@ class SchemaEnumAdd(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=True)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
@@ -243,7 +243,7 @@ class SchemaEnumRemove(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=True)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)

infrahub/graphql/mutations/webhook.py

@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Any, Self, cast
 from graphene import InputObjectType, Mutation
 
 from infrahub.core.manager import NodeManager
-from infrahub.core.protocols import CoreWebhook
 from infrahub.core.schema import NodeSchema
 from infrahub.database import retry_db_transaction
 from infrahub.events.utils import get_all_infrahub_node_kind_events
@@ -20,6 +19,7 @@ if TYPE_CHECKING:
 
     from infrahub.core.branch import Branch
     from infrahub.core.node import Node
+    from infrahub.core.protocols import CoreWebhook
     from infrahub.database import InfrahubDatabase
     from infrahub.graphql.initialization import GraphqlContext
 
@@ -107,7 +107,7 @@ class InfrahubWebhookMutation(InfrahubMutationMixin, Mutation):
             branch=branch,
         )
 
-        webhook = cast(CoreWebhook, obj)
+        webhook = cast("CoreWebhook", obj)
 
         event_type = input_data.event_type.value if input_data.event_type else webhook.event_type.value.value
         node_kind = input_data.node_kind.value if input_data.node_kind else webhook.node_kind.value

infrahub/proposed_change/branch_diff.py

@@ -64,4 +64,4 @@ async def get_diff_summary_cache(pipeline_id: UUID) -> list[NodeDiff]:
     if not summary_payload:
         raise ResourceNotFoundError(message=f"Diff summary for pipeline {pipeline_id} was not found in the cache")
 
-    return cast(list["NodeDiff"], json.loads(summary_payload))
+    return cast("list[NodeDiff]", json.loads(summary_payload))

infrahub/repositories/create_repository.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, cast
 
 from infrahub.core.constants import RepositoryInternalStatus
 from infrahub.core.constants.infrahubkind import READONLYREPOSITORY, REPOSITORY
-from infrahub.core.protocols import CoreGenericRepository, CoreReadOnlyRepository, CoreRepository
 from infrahub.exceptions import ValidationError
 from infrahub.git.models import GitRepositoryAdd, GitRepositoryAddReadOnly
 from infrahub.log import get_logger
@@ -16,6 +15,7 @@ if TYPE_CHECKING:
     from infrahub.auth import AccountSession
     from infrahub.context import InfrahubContext
     from infrahub.core.branch import Branch
+    from infrahub.core.protocols import CoreGenericRepository, CoreReadOnlyRepository, CoreRepository
     from infrahub.database import InfrahubDatabase
     from infrahub.services import InfrahubServices
 
@@ -74,7 +74,7 @@ class RepositoryFinalizer:
             authenticated_user = self.account_session.account_id
 
         if obj.get_kind() == READONLYREPOSITORY:
-            obj = cast(CoreReadOnlyRepository, obj)
+            obj = cast("CoreReadOnlyRepository", obj)
             model = GitRepositoryAddReadOnly(
                 repository_id=obj.id,
                 repository_name=obj.name.value,
@@ -92,7 +92,7 @@ class RepositoryFinalizer:
             )
 
         elif obj.get_kind() == REPOSITORY:
-            obj = cast(CoreRepository, obj)
+            obj = cast("CoreRepository", obj)
             git_repo_add_model = GitRepositoryAdd(
                 repository_id=obj.id,
                 repository_name=obj.name.value,

infrahub/task_manager/models.py

@@ -74,7 +74,7 @@ class FlowLogs(BaseModel):
                 "node": {
                     "message": log.message,
                     "severity": LOG_LEVEL_MAPPING.get(log.level, "error"),
-                    "timestamp": log.timestamp.to_iso8601_string(),
+                    "timestamp": log.timestamp.isoformat(),
                 }
             }
             for log in self.logs[flow_id]

infrahub/task_manager/task.py

@@ -329,9 +329,9 @@ class PrefectTask:
                                 "related_node": related_node.id if related_node else None,
                                 "related_node_kind": related_node.kind if related_node else None,
                                 "related_nodes": related_nodes_info.get_related_nodes_as_dict(flow_id=flow.id),
-                                "created_at": flow.created.to_iso8601_string(),  # type: ignore
-                                "updated_at": flow.updated.to_iso8601_string(),  # type: ignore
-                                "start_time": flow.start_time.to_iso8601_string() if flow.start_time else None,
+                                "created_at": flow.created.isoformat() if flow.created else None,
+                                "updated_at": flow.updated.isoformat() if flow.updated else None,
+                                "start_time": flow.start_time.isoformat() if flow.start_time else None,
                                 "id": flow.id,
                                 "logs": {"edges": logs, "count": len(logs)},
                             }

infrahub/validators/tasks.py

@@ -26,7 +26,7 @@ async def start_validator[ValidatorType: CoreValidator](
         validator.started_at.value = ""
         validator.completed_at.value = ""
         await validator.save()
-        validator = cast(ValidatorType, validator)
+        validator = cast("ValidatorType", validator)
     else:
         data["proposed_change"] = proposed_change
         validator = await client.create(kind=validator_type, data=data)

infrahub_sdk/ctl/AGENTS.md

@@ -0,0 +1,67 @@
+# infrahub_sdk/ctl/AGENTS.md
+
+CLI tool (`infrahubctl`) built with Typer/AsyncTyper.
+
+## Command Pattern
+
+```python
+from rich.console import Console
+from ..async_typer import AsyncTyper
+from ..ctl.client import initialize_client
+from ..ctl.utils import catch_exception
+from .parameters import CONFIG_PARAM
+
+console = Console()
+app = AsyncTyper()
+
+@app.command(name="my-command")
+@catch_exception(console=console)
+async def my_command(
+    path: str = typer.Option(".", help="Path to file"),
+    branch: Optional[str] = None,
+    _: str = CONFIG_PARAM,  # Always include, even if unused
+):
+    client = initialize_client(branch=branch)
+    # implementation using Rich for output
+    console.print(Panel("Result", title="Success"))
+```
+
+## File Organization
+
+```text
+infrahub_sdk/ctl/
+├── cli_commands.py    # Entry point, registers subcommands
+├── client.py          # initialize_client(), initialize_client_sync()
+├── utils.py           # catch_exception decorator, parse_cli_vars
+├── parameters.py      # CONFIG_PARAM and shared parameters
+├── branch.py          # Branch subcommands
+├── schema.py          # Schema subcommands
+└── object.py          # Object subcommands
+```
+
+## Registering Commands
+
+```python
+# In cli_commands.py
+from ..ctl.branch import app as branch_app
+app.add_typer(branch_app, name="branch")
+
+# Or for top-level commands
+from .exporter import dump
+app.command(name="dump")(dump)
+```
+
+## Boundaries
+
+✅ **Always**
+
+- Use `@catch_exception(console=console)` decorator
+- Include `CONFIG_PARAM` in all commands
+- Use `initialize_client()` for client creation
+- Use Rich for output (tables, panels, console.print)
+
+🚫 **Never**
+
+- Use plain `print()` statements
+- Instantiate `InfrahubClient` directly (use `initialize_client`)
+- Forget error handling decorator