infrahub-server 1.1.7__py3-none-any.whl → 1.2.0b1__py3-none-any.whl

infrahub_sdk/ctl/repository.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
+from typing import Optional
 
 import typer
 import yaml
@@ -8,15 +9,14 @@ from pydantic import ValidationError
 from rich.console import Console
 from rich.table import Table
 
-from infrahub_sdk.ctl.client import initialize_client
-
 from ..async_typer import AsyncTyper
-from ..ctl.exceptions import FileNotValidError
-from ..ctl.utils import init_logging
+from ..exceptions import FileNotValidError
 from ..graphql import Mutation, Query
 from ..schema.repository import InfrahubRepositoryConfig
-from ._file import read_file
+from ..utils import read_file
+from .client import initialize_client
 from .parameters import CONFIG_PARAM
+from .utils import init_logging
 
 app = AsyncTyper()
 console = Console()
@@ -69,12 +69,11 @@ async def add(
     name: str,
     location: str,
     description: str = "",
-    username: str | None = None,
+    username: Optional[str] = None,
     password: str = "",
-    commit: str = "",
+    ref: str = "",
     read_only: bool = False,
     debug: bool = False,
-    branch: str = typer.Option("main", help="Branch on which to add the repository."),
     _: str = CONFIG_PARAM,
 ) -> None:
     """Add a new repository."""
@@ -86,15 +85,24 @@ async def add(
             "name": {"value": name},
             "location": {"value": location},
             "description": {"value": description},
-            "commit": {"value": commit},
         },
     }
+    if read_only:
+        input_data["data"]["ref"] = {"value": ref}
+    else:
+        input_data["data"]["default_branch"] = {"value": ref}
 
     client = initialize_client()
 
-    credential = await client.create(kind="CorePasswordCredential", name=name, username=username, password=password)
-    await credential.save(allow_upsert=True)
-    input_data["data"]["credential"] = {"id": credential.id}
+    if username or password:
+        credential = await client.create(
+            kind="CorePasswordCredential",
+            name=name,
+            username=username,
+            password=password,
+        )
+        await credential.save(allow_upsert=True)
+        input_data["data"]["credential"] = {"id": credential.id}
 
     query = Mutation(
         mutation="CoreReadOnlyRepositoryCreate" if read_only else "CoreRepositoryCreate",
@@ -102,18 +110,18 @@ async def add(
         query={"ok": None},
     )
 
-    await client.execute_graphql(query=query.render(), branch_name=branch, tracker="mutation-repository-create")
+    await client.execute_graphql(query=query.render(), tracker="mutation-repository-create")
 
 
 @app.command()
 async def list(
-    branch: str | None = None,
+    branch: Optional[str] = typer.Option(None, help="Branch on which to list repositories."),
     debug: bool = False,
     _: str = CONFIG_PARAM,
 ) -> None:
     init_logging(debug=debug)
 
-    client = initialize_client(branch=branch)
+    client = initialize_client()
 
     repo_status_query = {
         "CoreGenericRepository": {

infrahub_sdk/ctl/schema.py

@@ -108,7 +108,7 @@ def get_node(schemas_data: list[dict], schema_index: int, node_index: int) -> di
 async def load(
     schemas: list[Path],
     debug: bool = False,
-    branch: str = typer.Option("main", help="Branch on which to load the schema."),
+    branch: str = typer.Option(None, help="Branch on which to load the schema."),
     wait: int = typer.Option(0, help="Time in seconds to wait until the schema has converged across all workers"),
     _: str = CONFIG_PARAM,
 ) -> None:
@@ -159,7 +159,7 @@ async def load(
 async def check(
     schemas: list[Path],
     debug: bool = False,
-    branch: str = typer.Option("main", help="Branch on which to check the schema."),
+    branch: str = typer.Option(None, help="Branch on which to check the schema."),
     _: str = CONFIG_PARAM,
 ) -> None:
     """Check if schema files are valid and what would be the impact of loading them with Infrahub."""

infrahub_sdk/ctl/utils.py

@@ -6,21 +6,19 @@ import traceback
 from collections.abc import Coroutine
 from functools import wraps
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, NoReturn, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, NoReturn, Optional, TypeVar
 
-import pendulum
 import typer
 from click.exceptions import Exit
 from httpx import HTTPError
-from pendulum.datetime import DateTime
 from rich.console import Console
 from rich.logging import RichHandler
 from rich.markup import escape
 
-from ..ctl.exceptions import FileNotValidError, QueryNotFoundError
 from ..exceptions import (
     AuthenticationError,
     Error,
+    FileNotValidError,
     GraphQLError,
     NodeNotFoundError,
     ResourceNotDefinedError,
@@ -30,6 +28,7 @@ from ..exceptions import (
 )
 from ..yaml import YamlFile
 from .client import initialize_client_sync
+from .exceptions import QueryNotFoundError
 
 if TYPE_CHECKING:
     from ..schema.repository import InfrahubRepositoryConfig
@@ -88,7 +87,7 @@ def catch_exception(
             async def async_wrapper(*args: Any, **kwargs: Any) -> T:
                 try:
                     return await func(*args, **kwargs)
-                except (Error, Exception) as exc:  # pylint: disable=broad-exception-caught
+                except (Error, Exception) as exc:
                     return handle_exception(exc=exc, console=console, exit_code=exit_code)
 
             return async_wrapper
@@ -97,7 +96,7 @@ def catch_exception(
         def wrapper(*args: Any, **kwargs: Any) -> T:
             try:
                 return func(*args, **kwargs)
-            except (Error, Exception) as exc:  # pylint: disable=broad-exception-caught
+            except (Error, Exception) as exc:
                 return handle_exception(exc=exc, console=console, exit_code=exit_code)
 
         return wrapper
@@ -144,27 +143,13 @@ def print_graphql_errors(console: Console, errors: list) -> None:
             console.print(f"[red]{escape(str(error))}")
 
 
-def parse_cli_vars(variables: list[str] | None) -> dict[str, str]:
+def parse_cli_vars(variables: Optional[list[str]]) -> dict[str, str]:
     if not variables:
         return {}
 
     return {var.split("=")[0]: var.split("=")[1] for var in variables if "=" in var}
 
 
-def calculate_time_diff(value: str) -> str | None:
-    """Calculate the time in human format between a timedate in string format and now."""
-    try:
-        time_value = pendulum.parse(value)
-    except pendulum.parsing.exceptions.ParserError:
-        return None
-
-    if not isinstance(time_value, DateTime):
-        return None
-
-    pendulum.set_locale("en")
-    return time_value.diff_for_humans(other=pendulum.now(), absolute=True)
-
-
 def find_graphql_query(name: str, directory: str | Path = ".") -> str:
     if isinstance(directory, str):
         directory = Path(directory)

infrahub_sdk/ctl/validate.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import sys
 from pathlib import Path
+from typing import Optional
 
 import typer
 import ujson
@@ -57,7 +58,7 @@ async def validate_schema(schema: Path, _: str = CONFIG_PARAM) -> None:
 @catch_exception(console=console)
 def validate_graphql(
     query: str,
-    variables: list[str] | None = typer.Argument(
+    variables: Optional[list[str]] = typer.Argument(
         None, help="Variables to pass along with the query. Format key=value key=value."
     ),
     debug: bool = typer.Option(False, help="Display more troubleshooting information."),

infrahub_sdk/data.py

@@ -20,7 +20,7 @@ class RepositoryData(BaseModel):
     branch_info: dict[str, RepositoryBranchInfo] = Field(default_factory=dict)
 
     def get_staging_branch(self) -> str | None:
-        for branch, info in self.branch_info.items():  # pylint: disable=no-member
+        for branch, info in self.branch_info.items():
             if info.internal_status == "staging":
                 return branch
         return None

infrahub_sdk/exceptions.py

@@ -131,3 +131,15 @@ class UninitializedError(Error):
 
 class InvalidResponseError(Error):
     """Raised when an object requires an initialization step before use"""
+
+
+class FileNotValidError(Error):
+    def __init__(self, name: str, message: str = ""):
+        self.message = message or f"Cannot parse '{name}' content."
+        super().__init__(self.message)
+
+
+class TimestampFormatError(Error):
+    def __init__(self, message: str | None = None):
+        self.message = message or "Invalid timestamp format"
+        super().__init__(self.message)

infrahub_sdk/generator.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 import os
 from abc import abstractmethod
 from typing import TYPE_CHECKING
@@ -27,6 +28,7 @@ class InfrahubGenerator:
         generator_instance: str = "",
         params: dict | None = None,
         convert_query_response: bool = False,
+        logger: logging.Logger | None = None,
     ) -> None:
         self.query = query
         self.branch = branch
@@ -41,6 +43,7 @@ class InfrahubGenerator:
         self._related_nodes: list[InfrahubNode] = []
         self.infrahub_node = infrahub_node
         self.convert_query_response = convert_query_response
+        self.logger = logger if logger else logging.getLogger("infrahub.tasks")
 
     @property
     def store(self) -> NodeStore:

infrahub_sdk/node.py

@@ -25,7 +25,6 @@ if TYPE_CHECKING:
     from .schema import AttributeSchemaAPI, MainSchemaTypesAPI, RelationshipSchemaAPI
     from .types import Order
 
-# pylint: disable=too-many-lines
 
 PROPERTIES_FLAG = ["is_visible", "is_protected"]
 PROPERTIES_OBJECT = ["source", "owner"]
@@ -801,7 +800,7 @@ class InfrahubNodeBase:
         Returns:
             dict[str, Dict]: Representation of an input data in dict format
         """
-        # pylint: disable=too-many-branches
+
         data = {}
         variables = {}
 
@@ -1119,14 +1118,14 @@ class InfrahubNode(InfrahubNodeBase):
     async def artifact_generate(self, name: str) -> None:
         self._validate_artifact_support(ARTIFACT_GENERATE_FEATURE_NOT_SUPPORTED_MESSAGE)
 
-        artifact = await self._client.get(kind="CoreArtifact", definition__name__value=name, object__ids=[self.id])
+        artifact = await self._client.get(kind="CoreArtifact", name__value=name, object__ids=[self.id])
         await artifact.definition.fetch()  # type: ignore[attr-defined]
         await artifact.definition.peer.generate([artifact.id])  # type: ignore[attr-defined]
 
     async def artifact_fetch(self, name: str) -> str | dict[str, Any]:
         self._validate_artifact_support(ARTIFACT_GENERATE_FEATURE_NOT_SUPPORTED_MESSAGE)
 
-        artifact = await self._client.get(kind="CoreArtifact", definition__name__value=name, object__ids=[self.id])
+        artifact = await self._client.get(kind="CoreArtifact", name__value=name, object__ids=[self.id])
         content = await self._client.object_store.get(identifier=artifact.storage_id.value)  # type: ignore[attr-defined]
         return content
 
@@ -1251,7 +1250,6 @@ class InfrahubNode(InfrahubNodeBase):
         Returns:
             dict[str, Union[Any, Dict]]: GraphQL query in dictionary format
         """
-        # pylint: disable=too-many-branches
 
         data: dict[str, Any] = {}
 
@@ -1637,13 +1635,13 @@ class InfrahubNodeSync(InfrahubNodeBase):
 
     def artifact_generate(self, name: str) -> None:
         self._validate_artifact_support(ARTIFACT_GENERATE_FEATURE_NOT_SUPPORTED_MESSAGE)
-        artifact = self._client.get(kind="CoreArtifact", definition__name__value=name, object__ids=[self.id])
+        artifact = self._client.get(kind="CoreArtifact", name__value=name, object__ids=[self.id])
         artifact.definition.fetch()  # type: ignore[attr-defined]
         artifact.definition.peer.generate([artifact.id])  # type: ignore[attr-defined]
 
     def artifact_fetch(self, name: str) -> str | dict[str, Any]:
         self._validate_artifact_support(ARTIFACT_FETCH_FEATURE_NOT_SUPPORTED_MESSAGE)
-        artifact = self._client.get(kind="CoreArtifact", definition__name__value=name, object__ids=[self.id])
+        artifact = self._client.get(kind="CoreArtifact", name__value=name, object__ids=[self.id])
         content = self._client.object_store.get(identifier=artifact.storage_id.value)  # type: ignore[attr-defined]
         return content
 
@@ -1763,7 +1761,6 @@ class InfrahubNodeSync(InfrahubNodeBase):
         Returns:
             dict[str, Union[Any, Dict]]: GraphQL query in dictionary format
         """
-        # pylint: disable=too-many-branches
 
         data: dict[str, Any] = {}
 

infrahub_sdk/protocols.py

@@ -73,7 +73,7 @@ class CoreArtifactTarget(CoreNode):
 
 
 class CoreBasePermission(CoreNode):
-    decision: Enum
+    description: StringOptional
     identifier: StringOptional
     roles: RelationshipManager
 
@@ -108,7 +108,6 @@ class CoreGenericAccount(CoreNode):
     label: StringOptional
     description: StringOptional
     account_type: Enum
-    role: Enum
     status: Dropdown
     tokens: RelationshipManager
 
@@ -155,6 +154,10 @@ class CoreMenu(CoreNode):
     children: RelationshipManager
 
 
+class CoreObjectTemplate(CoreNode):
+    template_name: String
+
+
 class CoreProfile(CoreNode):
     profile_name: String
     profile_priority: IntegerOptional
@@ -200,6 +203,8 @@ class CoreValidator(CoreNode):
 
 class CoreWebhook(CoreNode):
     name: String
+    event_type: Enum
+    branch_scope: Dropdown
     description: StringOptional
     url: URL
     validate_certificates: BooleanOptional
@@ -222,7 +227,7 @@ class CoreAccount(LineageOwner, LineageSource, CoreGenericAccount):
     pass
 
 
-class CoreAccountGroup(CoreGroup):
+class CoreAccountGroup(LineageOwner, LineageSource, CoreGroup):
     roles: RelationshipManager
 
 
@@ -350,8 +355,8 @@ class CoreGeneratorValidator(CoreValidator):
 
 
 class CoreGlobalPermission(CoreBasePermission):
-    name: String
     action: Dropdown
+    decision: Enum
 
 
 class CoreGraphQLQuery(CoreNode):
@@ -402,6 +407,7 @@ class CoreObjectPermission(CoreBasePermission):
     namespace: String
     name: String
     action: Enum
+    decision: Enum
 
 
 class CoreObjectThread(CoreThread):
@@ -538,7 +544,7 @@ class CoreArtifactTargetSync(CoreNodeSync):
 
 
 class CoreBasePermissionSync(CoreNodeSync):
-    decision: Enum
+    description: StringOptional
     identifier: StringOptional
     roles: RelationshipManagerSync
 
@@ -573,7 +579,6 @@ class CoreGenericAccountSync(CoreNodeSync):
     label: StringOptional
     description: StringOptional
     account_type: Enum
-    role: Enum
     status: Dropdown
     tokens: RelationshipManagerSync
 
@@ -620,6 +625,10 @@ class CoreMenuSync(CoreNodeSync):
     children: RelationshipManagerSync
 
 
+class CoreObjectTemplateSync(CoreNodeSync):
+    template_name: String
+
+
 class CoreProfileSync(CoreNodeSync):
     profile_name: String
     profile_priority: IntegerOptional
@@ -665,6 +674,8 @@ class CoreValidatorSync(CoreNodeSync):
 
 class CoreWebhookSync(CoreNodeSync):
     name: String
+    event_type: Enum
+    branch_scope: Dropdown
     description: StringOptional
     url: URL
     validate_certificates: BooleanOptional
@@ -687,7 +698,7 @@ class CoreAccountSync(LineageOwnerSync, LineageSourceSync, CoreGenericAccountSyn
     pass
 
 
-class CoreAccountGroupSync(CoreGroupSync):
+class CoreAccountGroupSync(LineageOwnerSync, LineageSourceSync, CoreGroupSync):
     roles: RelationshipManagerSync
 
 
@@ -815,8 +826,8 @@ class CoreGeneratorValidatorSync(CoreValidatorSync):
 
 
 class CoreGlobalPermissionSync(CoreBasePermissionSync):
-    name: String
     action: Dropdown
+    decision: Enum
 
 
 class CoreGraphQLQuerySync(CoreNodeSync):
@@ -867,6 +878,7 @@ class CoreObjectPermissionSync(CoreBasePermissionSync):
     namespace: String
     name: String
     action: Enum
+    decision: Enum
 
 
 class CoreObjectThreadSync(CoreThreadSync):

infrahub_sdk/schema/__init__.py

@@ -34,6 +34,7 @@ from .main import (
     RelationshipSchemaAPI,
     SchemaRoot,
     SchemaRootAPI,
+    TemplateSchemaAPI,
 )
 
 if TYPE_CHECKING:
@@ -58,12 +59,10 @@ __all__ = [
     "RelationshipSchemaAPI",
     "SchemaRoot",
     "SchemaRootAPI",
+    "TemplateSchemaAPI",
 ]
 
 
-# pylint: disable=redefined-builtin
-
-
 class DropdownMutationOptionalArgs(TypedDict):
     color: str | None
     description: str | None
@@ -81,8 +80,10 @@ class EnumMutation(str, Enum):
 
 
 MainSchemaTypes: TypeAlias = Union[NodeSchema, GenericSchema]
-MainSchemaTypesAPI: TypeAlias = Union[NodeSchemaAPI, GenericSchemaAPI, ProfileSchemaAPI]
-MainSchemaTypesAll: TypeAlias = Union[NodeSchema, GenericSchema, NodeSchemaAPI, GenericSchemaAPI, ProfileSchemaAPI]
+MainSchemaTypesAPI: TypeAlias = Union[NodeSchemaAPI, GenericSchemaAPI, ProfileSchemaAPI, TemplateSchemaAPI]
+MainSchemaTypesAll: TypeAlias = Union[
+    NodeSchema, GenericSchema, NodeSchemaAPI, GenericSchemaAPI, ProfileSchemaAPI, TemplateSchemaAPI
+]
 
 
 class InfrahubSchemaBase:
@@ -420,6 +421,10 @@ class InfrahubSchema(InfrahubSchemaBase):
             profile = ProfileSchemaAPI(**profile_schema)
             nodes[profile.kind] = profile
 
+        for template_schema in data.get("templates", []):
+            template = TemplateSchemaAPI(**template_schema)
+            nodes[template.kind] = template
+
         return nodes
 
 
@@ -624,6 +629,10 @@ class InfrahubSchemaSync(InfrahubSchemaBase):
             profile = ProfileSchemaAPI(**profile_schema)
             nodes[profile.kind] = profile
 
+        for template_schema in data.get("templates", []):
+            template = TemplateSchemaAPI(**template_schema)
+            nodes[template.kind] = template
+
         return nodes
 
     def load(

infrahub_sdk/schema/main.py

@@ -31,6 +31,7 @@ class RelationshipKind(str, Enum):
     GROUP = "Group"
     HIERARCHY = "Hierarchy"
     PROFILE = "Profile"
+    TEMPLATE = "Template"
 
 
 class RelationshipDirection(str, Enum):
@@ -290,6 +291,7 @@ class BaseNodeSchema(BaseSchema):
     branch: BranchSupportType | None = None
     default_filter: str | None = None
     generate_profile: bool | None = None
+    generate_template: bool | None = None
     parent: str | None = None
     children: str | None = None
 
@@ -308,6 +310,10 @@ class ProfileSchemaAPI(BaseSchema, BaseSchemaAttrRelAPI):
     inherit_from: list[str] = Field(default_factory=list)
 
 
+class TemplateSchemaAPI(BaseSchema, BaseSchemaAttrRelAPI):
+    inherit_from: list[str] = Field(default_factory=list)
+
+
 class NodeExtensionSchema(BaseModel):
     model_config = ConfigDict(use_enum_values=True)
 
@@ -341,3 +347,4 @@ class SchemaRootAPI(BaseModel):
     generics: list[GenericSchemaAPI] = Field(default_factory=list)
     nodes: list[NodeSchemaAPI] = Field(default_factory=list)
     profiles: list[ProfileSchemaAPI] = Field(default_factory=list)
+    templates: list[TemplateSchemaAPI] = Field(default_factory=list)

infrahub_sdk/task/__init__.py

@@ -0,0 +1 @@
+

infrahub_sdk/task/constants.py

@@ -0,0 +1,3 @@
+from .models import TaskState
+
+FINAL_STATES = [TaskState.COMPLETED, TaskState.FAILED, TaskState.CANCELLED, TaskState.CRASHED]

infrahub_sdk/task/exceptions.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+
+class TaskError(Exception):
+    def __init__(self, message: str | None = None):
+        self.message = message
+        super().__init__(self.message)
+
+
+class TaskNotFoundError(TaskError):
+    def __init__(self, id: str):
+        self.message = f"Task with id {id} not found"
+        super().__init__(self.message)
+
+
+class TooManyTasksError(TaskError):
+    def __init__(self, expected_id: str, received_ids: list[str]):
+        self.message = f"Expected 1 task with id {expected_id}, but got {len(received_ids)}"
+        super().__init__(self.message)
+
+
+class TaskNotCompletedError(TaskError):
+    def __init__(self, id: str, message: str | None = None):
+        self.message = message or f"Task with id {id} is not completed"
+        super().__init__(self.message)