infrahub-server 1.5.5__py3-none-any.whl → 1.6.0b0__py3-none-any.whl

infrahub/graphql/types/branch.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from graphene import Boolean, Field, Int, String
+from graphene import Boolean, Field, Int, List, NonNull, String
 
 from infrahub.core.branch import Branch
 from infrahub.core.constants import GLOBAL_BRANCH_NAME
 
+from ...exceptions import BranchNotFoundError
 from .enums import InfrahubBranchStatus
 from .standard_node import InfrahubObjectType
 
@@ -33,6 +34,10 @@ class BranchType(InfrahubObjectType):
         name = "Branch"
         model = Branch
 
+    @staticmethod
+    async def _map_fields_to_graphql(objs: list[Branch], fields: dict) -> list[dict[str, Any]]:
+        return [await obj.to_graphql(fields=fields) for obj in objs]
+
     @classmethod
     async def get_list(
         cls,
@@ -46,4 +51,95 @@ class BranchType(InfrahubObjectType):
             if not objs:
                 return []
 
-            return [await obj.to_graphql(fields=fields) for obj in objs if obj.name != GLOBAL_BRANCH_NAME]
+            return await cls._map_fields_to_graphql(objs=objs, fields=fields)
+
+    @classmethod
+    async def get_by_name(
+        cls,
+        fields: dict,
+        graphql_context: GraphqlContext,
+        name: str,
+    ) -> dict[str, Any]:
+        branch_responses = await cls.get_list(fields=fields, graphql_context=graphql_context, name=name)
+
+        if branch_responses:
+            return branch_responses[0]
+        raise BranchNotFoundError(f"Branch with name '{name}' not found")
+
+
+class RequiredStringValueField(InfrahubObjectType):
+    value = String(required=True)
+
+
+class NonRequiredStringValueField(InfrahubObjectType):
+    value = String(required=False)
+
+
+class NonRequiredIntValueField(InfrahubObjectType):
+    value = Int(required=False)
+
+
+class NonRequiredBooleanValueField(InfrahubObjectType):
+    value = Boolean(required=False)
+
+
+class StatusField(InfrahubObjectType):
+    value = InfrahubBranchStatus(required=True)
+
+
+class InfrahubBranch(BranchType):
+    name = Field(RequiredStringValueField, required=True)
+    description = Field(NonRequiredStringValueField, required=False)
+    origin_branch = Field(NonRequiredStringValueField, required=False)
+    branched_from = Field(NonRequiredStringValueField, required=False)
+    graph_version = Field(NonRequiredIntValueField, required=False)
+    status = Field(StatusField, required=True)
+    sync_with_git = Field(NonRequiredBooleanValueField, required=False)
+    is_default = Field(NonRequiredBooleanValueField, required=False)
+    is_isolated = Field(
+        NonRequiredBooleanValueField, required=False, deprecation_reason="non isolated mode is not supported anymore"
+    )
+    has_schema_changes = Field(NonRequiredBooleanValueField, required=False)
+
+    class Meta:
+        description = "InfrahubBranch"
+        name = "InfrahubBranch"
+
+    @staticmethod
+    async def _map_fields_to_graphql(objs: list[Branch], fields: dict) -> list[dict[str, Any]]:
+        field_keys = fields.keys()
+        result: list[dict[str, Any]] = []
+        for obj in objs:
+            if obj.name == GLOBAL_BRANCH_NAME:
+                continue
+            data: dict[str, Any] = {}
+            for field in field_keys:
+                if field == "id":
+                    data["id"] = obj.uuid
+                    continue
+                value = getattr(obj, field, None)
+                if isinstance(fields.get(field), dict):
+                    data[field] = {"value": value}
+                else:
+                    data[field] = value
+            result.append(data)
+        return result
+
+
+class InfrahubBranchEdge(InfrahubObjectType):
+    node = Field(InfrahubBranch, required=True)
+
+
+class InfrahubBranchType(InfrahubObjectType):
+    count = Field(Int, description="Total number of items")
+    edges = Field(NonNull(List(of_type=NonNull(InfrahubBranchEdge))))
+    default_branch = Field(
+        InfrahubBranch,
+        required=True,
+        description="The default branch of the Infrahub instance, provides a direct way to access the default branch regardless of filters.",
+    )
+
+    @classmethod
+    async def get_list_count(cls, graphql_context: GraphqlContext, **kwargs: Any) -> int:
+        async with graphql_context.db.start_session(read_only=True) as db:
+            return await Branch.get_list_count(db=db, **kwargs)

infrahub/lock.py

@@ -58,7 +58,7 @@ class InfrahubMultiLock:
         self.locks = locks or []
         self.metrics = metrics
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> None:
         await self.acquire()
 
     async def __aexit__(
@@ -66,7 +66,7 @@ class InfrahubMultiLock:
         exc_type: type[BaseException] | None,
         exc_value: BaseException | None,
         traceback: TracebackType | None,
-    ):
+    ) -> None:
         await self.release()
 
     async def acquire(self) -> None:
@@ -86,7 +86,7 @@ class NATSLock:
         self.token = None
         self.service = service
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> None:
         await self.acquire()
 
     async def __aexit__(
@@ -94,7 +94,7 @@ class NATSLock:
         exc_type: type[BaseException] | None,
         exc_value: BaseException | None,
         traceback: TracebackType | None,
-    ):
+    ) -> None:
         await self.release()
 
     async def acquire(self) -> None:
@@ -162,7 +162,7 @@ class InfrahubLock:
     def acquire_time(self, value: int) -> None:
         self._acquire_time = value
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> None:
         await self.acquire()
 
     async def __aexit__(
@@ -170,7 +170,7 @@ class InfrahubLock:
         exc_type: type[BaseException] | None,
         exc_value: BaseException | None,
         traceback: TracebackType | None,
-    ):
+    ) -> None:
         await self.release()
 
     async def acquire(self) -> None:

infrahub/patch/constants.py

@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class PatchPlanFilename(str, Enum):
+class PatchPlanFilename(StrEnum):
     VERTICES_TO_ADD = "vertices_to_add.json"
     VERTICES_TO_UPDATE = "vertices_to_update.json"
     VERTICES_TO_DELETE = "vertices_to_delete.json"

infrahub/task_manager/task.py

@@ -1,7 +1,7 @@
 import asyncio
 import hashlib
 import json
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from typing import Any
 from uuid import UUID
 
@@ -353,7 +353,7 @@ class PrefectTask:
         logger = get_logger()
 
         async with get_client(sync_client=False) as client:
-            cutoff = datetime.now(timezone.utc) - timedelta(days=days_to_keep)
+            cutoff = datetime.now(UTC) - timedelta(days=days_to_keep)
 
             flow_run_filter = FlowRunFilter(
                 start_time=FlowRunFilterStartTime(before_=cutoff),  # type: ignore[arg-type]

infrahub/telemetry/constants.py

@@ -1,9 +1,9 @@
-from enum import Enum
+from enum import StrEnum
 
 TELEMETRY_KIND: str = "community"
 TELEMETRY_VERSION: str = "20250318"
 
 
-class InfrahubType(str, Enum):
+class InfrahubType(StrEnum):
     COMMUNITY = "community"
     ENTERPRISE = "enterprise"

infrahub/trigger/models.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import timedelta
-from enum import Enum, StrEnum
+from enum import StrEnum
 from typing import TYPE_CHECKING, Any, TypeVar
 
 from prefect.events.actions import RunDeployment
@@ -92,7 +92,7 @@ class TriggerSetupReport(BaseModel):
         return created + updated
 
 
-class TriggerType(str, Enum):
+class TriggerType(StrEnum):
     ACTION_TRIGGER_RULE = "action_trigger_rule"
     BUILTIN = "builtin"
     WEBHOOK = "webhook"

infrahub/utils.py

@@ -76,7 +76,7 @@ def get_nested_dict(nested_dict: dict[str, Any], keys: list[str]) -> dict[str, A
     return current_level if isinstance(current_level, dict) else {}
 
 
-def get_all_subclasses(cls: AnyClass) -> list[AnyClass]:
+def get_all_subclasses[AnyClass: type](cls: AnyClass) -> list[AnyClass]:
     """Recursively get all subclasses of the given class."""
     subclasses: list[AnyClass] = []
     for subclass in cls.__subclasses__():

infrahub/validators/tasks.py

@@ -12,7 +12,7 @@ from .events import send_start_validator
 ValidatorType = TypeVar("ValidatorType", bound=CoreValidator)
 
 
-async def start_validator(
+async def start_validator[ValidatorType: CoreValidator](
     client: InfrahubClient,
     validator: CoreValidator | None,
     validator_type: type[ValidatorType],

infrahub/workers/infrahub_async.py

@@ -1,5 +1,7 @@
+import asyncio
 import logging
 import os
+from pathlib import Path
 from typing import Any
 
 import typer
@@ -122,6 +124,7 @@ class InfrahubWorkerAsync(BaseWorker):
         )
 
         set_component_type(component_type=self.component_type)
+        await self.set_git_global_config()
         await self._init_services(client=client)
 
         if not registry.schema_has_been_initialized():
@@ -204,3 +207,37 @@ class InfrahubWorkerAsync(BaseWorker):
         )
 
         self.service = service
+
+    async def set_git_global_config(self) -> None:
+        global_config_file = config.SETTINGS.git.global_config_file
+        if not os.getenv("GIT_CONFIG_GLOBAL") and global_config_file:
+            config_dir = Path(global_config_file).parent
+            try:
+                config_dir.mkdir(exist_ok=True, parents=True)
+            except FileExistsError:
+                pass
+            os.environ["GIT_CONFIG_GLOBAL"] = global_config_file
+            self._logger.info(f"Set git config file to {global_config_file}")
+
+        await self._run_git_config_global(config.SETTINGS.git.user_name, setting_name="user.name")
+        await self._run_git_config_global(config.SETTINGS.git.user_email, setting_name="user.email")
+        await self._run_git_config_global("'*'", "--replace-all", setting_name="safe.directory")
+        await self._run_git_config_global("true", setting_name="credential.usehttppath")
+        await self._run_git_config_global(config.SETTINGS.dev.git_credential_helper, setting_name="credential.helper")
+
+    async def _run_git_config_global(self, *args: str, setting_name: str) -> None:
+        proc = await asyncio.create_subprocess_exec(
+            "git",
+            "config",
+            "--global",
+            setting_name,
+            *args,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
+        _, stderr = await proc.communicate()
+        if proc.returncode != 0:
+            error_msg = stderr.decode("utf-8", errors="ignore").strip() or "unknown error"
+            self._logger.error(f"Failed to set git {setting_name}: %s", error_msg)
+        else:
+            self._logger.info(f"Git {setting_name} set")

infrahub_sdk/async_typer.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 import asyncio
 import inspect
+from collections.abc import Callable
 from functools import partial, wraps
-from typing import Any, Callable
+from typing import Any
 
 from typer import Typer
 

infrahub_sdk/batch.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import AsyncGenerator, Awaitable, Generator
+from collections.abc import AsyncGenerator, Awaitable, Callable, Generator
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
     from .node import InfrahubNode, InfrahubNodeSync

infrahub_sdk/client.py

@@ -5,14 +5,13 @@ import copy
 import logging
 import time
 import warnings
-from collections.abc import Coroutine, Mapping, MutableMapping
+from collections.abc import Callable, Coroutine, Mapping, MutableMapping
 from datetime import datetime
 from functools import wraps
 from time import sleep
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Literal,
     TypedDict,
     TypeVar,
@@ -300,7 +299,7 @@ class BaseClient:
         if prefix_length:
             input_data["prefix_length"] = prefix_length
         if member_type:
-            if member_type not in ("prefix", "address"):
+            if member_type not in {"prefix", "address"}:
                 raise ValueError("member_type possible values are 'prefix' or 'address'")
             input_data["member_type"] = member_type
         if prefix_type:
@@ -957,7 +956,7 @@ class InfrahubClient(BaseClient):
             try:
                 resp = await self._post(url=url, payload=payload, headers=headers, timeout=timeout)
 
-                if raise_for_error in (None, True):
+                if raise_for_error in {None, True}:
                     resp.raise_for_status()
 
                 retry = False
@@ -971,7 +970,7 @@ class InfrahubClient(BaseClient):
                     self.log.error(f"Unable to connect to {self.address} .. ")
                     raise
             except httpx.HTTPStatusError as exc:
-                if exc.response.status_code in [401, 403]:
+                if exc.response.status_code in {401, 403}:
                     response = decode_json(response=exc.response)
                     errors = response.get("errors", [])
                     messages = [error.get("message") for error in errors]
@@ -1209,7 +1208,7 @@ class InfrahubClient(BaseClient):
             timeout=timeout or self.default_timeout,
         )
 
-        if raise_for_error in (None, True):
+        if raise_for_error in {None, True}:
             resp.raise_for_status()
 
         return decode_json(response=resp)
@@ -1818,7 +1817,7 @@ class InfrahubClientSync(BaseClient):
             try:
                 resp = self._post(url=url, payload=payload, headers=headers, timeout=timeout)
 
-                if raise_for_error in (None, True):
+                if raise_for_error in {None, True}:
                     resp.raise_for_status()
 
                 retry = False
@@ -1832,7 +1831,7 @@ class InfrahubClientSync(BaseClient):
                     self.log.error(f"Unable to connect to {self.address} .. ")
                     raise
             except httpx.HTTPStatusError as exc:
-                if exc.response.status_code in [401, 403]:
+                if exc.response.status_code in {401, 403}:
                     response = decode_json(response=exc.response)
                     errors = response.get("errors", [])
                     messages = [error.get("message") for error in errors]
@@ -2447,7 +2446,7 @@ class InfrahubClientSync(BaseClient):
             timeout=timeout or self.default_timeout,
         )
 
-        if raise_for_error in (None, True):
+        if raise_for_error in {None, True}:
             resp.raise_for_status()
 
         return decode_json(response=resp)

infrahub_sdk/config.py

@@ -173,7 +173,7 @@ class Config(ConfigBase):
         # When using structlog the logger doesn't expose the expected methods by looking at the
         # object to pydantic rejects them. This is a workaround to allow structlog to be used
         # as a logger
-        return self.log  # type: ignore
+        return self.log  # type: ignore[return-value]
 
     @model_validator(mode="before")
     @classmethod
@@ -194,7 +194,7 @@ class Config(ConfigBase):
             "log": self.log,
         }
         covered_keys = list(config.keys())
-        for field in Config.model_fields.keys():
+        for field in Config.model_fields:
             if field not in covered_keys:
                 config[field] = deepcopy(getattr(self, field))
 

infrahub_sdk/ctl/branch.py

@@ -49,7 +49,7 @@ async def list_branch(_: str = CONFIG_PARAM) -> None:
     table.add_column("Status")
 
     # identify the default branch and always print it first
-    default_branch = [branch for branch in branches.values() if branch.is_default][0]
+    default_branch = next(branch for branch in branches.values() if branch.is_default)
     table.add_row(
         default_branch.name,
         default_branch.description or " - ",

infrahub_sdk/ctl/cli.py

@@ -4,8 +4,8 @@ try:
     from .cli_commands import app
 except ImportError as exc:
     sys.exit(
-        f"Module {exc.name} is not available, install the 'ctl' extra of the infrahub-sdk package, `pip install 'infrahub-sdk[ctl]'` or enable the "
-        "Poetry shell and run `poetry install --extras ctl`."
+        f"Module {exc.name} is not available, install the 'ctl' extra of the infrahub-sdk package, "
+        f"`pip install 'infrahub-sdk[ctl]'` or run `uv sync --extra ctl`."
     )
 
 __all__ = ["app"]

infrahub_sdk/ctl/cli_commands.py

@@ -6,8 +6,9 @@ import importlib
 import logging
 import platform
 import sys
+from collections.abc import Callable
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
 
 import typer
 import ujson

infrahub_sdk/ctl/graphql.py

@@ -108,7 +108,7 @@ async def export_schema(
     schema_text = await client.schema.get_graphql_schema()
 
     destination.parent.mkdir(parents=True, exist_ok=True)
-    destination.write_text(schema_text)
+    destination.write_text(schema_text, encoding="utf-8")
     console.print(f"[green]Schema exported to {destination}")
 
 
@@ -180,5 +180,5 @@ async def generate_return_types(
 
             generate_result_types(directory=directory, package=package_generator, fragment=module_fragment)
 
-            for file_name in package_generator._result_types_files.keys():
+            for file_name in package_generator._result_types_files:
                 console.print(f"[green]Generated {file_name} in {directory}")

infrahub_sdk/ctl/importer.py

@@ -16,7 +16,7 @@ from .parameters import CONFIG_PARAM
 
 def local_directory() -> Path:
     # We use a function here to avoid failure when generating the documentation due to directory name
-    return Path().resolve()
+    return Path.cwd()
 
 
 def load(

infrahub_sdk/ctl/utils.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import asyncio
 import logging
 import traceback
-from collections.abc import Coroutine
+from collections.abc import Callable, Coroutine
 from functools import wraps
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, NoReturn, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, NoReturn, Optional, TypeVar
 
 import typer
 from click.exceptions import Exit
@@ -46,7 +46,7 @@ def init_logging(debug: bool = False) -> None:
 
     log_level = "DEBUG" if debug else "INFO"
     FORMAT = "%(message)s"
-    logging.basicConfig(level=log_level, format=FORMAT, datefmt="[%X]", handlers=[RichHandler()])
+    logging.basicConfig(level=log_level, format=FORMAT, datefmt="[%X]", handlers=[RichHandler(show_path=debug)])
     logging.getLogger("infrahubctl")
 
 

infrahub_sdk/node/attribute.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import ipaddress
-from typing import TYPE_CHECKING, Any, Callable, get_args
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, get_args
 
 from ..protocols_base import CoreNodeBase
 from ..uuidt import UUIDT
@@ -25,7 +26,7 @@ class Attribute:
         self.name = name
         self._schema = schema
 
-        if not isinstance(data, dict) or "value" not in data.keys():
+        if not isinstance(data, dict) or "value" not in data:
             data = {"value": data}
 
         self._properties_flag = PROPERTIES_FLAG
@@ -34,12 +35,12 @@ class Attribute:
 
         self._read_only = ["updated_at", "is_inherited"]
 
-        self.id: str | None = data.get("id", None)
+        self.id: str | None = data.get("id")
 
-        self._value: Any | None = data.get("value", None)
+        self._value: Any | None = data.get("value")
         self.value_has_been_mutated = False
-        self.is_default: bool | None = data.get("is_default", None)
-        self.is_from_profile: bool | None = data.get("is_from_profile", None)
+        self.is_default: bool | None = data.get("is_default")
+        self.is_from_profile: bool | None = data.get("is_from_profile")
 
         if self._value:
             value_mapper: dict[str, Callable] = {
@@ -49,11 +50,11 @@ class Attribute:
             mapper = value_mapper.get(schema.kind, lambda value: value)
             self._value = mapper(data.get("value"))
 
-        self.is_inherited: bool | None = data.get("is_inherited", None)
-        self.updated_at: str | None = data.get("updated_at", None)
+        self.is_inherited: bool | None = data.get("is_inherited")
+        self.updated_at: str | None = data.get("updated_at")
 
-        self.is_visible: bool | None = data.get("is_visible", None)
-        self.is_protected: bool | None = data.get("is_protected", None)
+        self.is_visible: bool | None = data.get("is_visible")
+        self.is_protected: bool | None = data.get("is_protected")
 
         self.source: NodeProperty | None = None
         self.owner: NodeProperty | None = None

infrahub_sdk/node/constants.py

@@ -1,12 +1,11 @@
 import ipaddress
 import re
-from typing import Union
 
 PROPERTIES_FLAG = ["is_visible", "is_protected"]
 PROPERTIES_OBJECT = ["source", "owner"]
 SAFE_VALUE = re.compile(r"(^[\. /:a-zA-Z0-9_-]+$)|(^$)")
 
-IP_TYPES = Union[ipaddress.IPv4Interface, ipaddress.IPv6Interface, ipaddress.IPv4Network, ipaddress.IPv6Network]
+IP_TYPES = ipaddress.IPv4Interface | ipaddress.IPv6Interface | ipaddress.IPv4Network | ipaddress.IPv6Network
 
 ARTIFACT_FETCH_FEATURE_NOT_SUPPORTED_MESSAGE = (
     "calling artifact_fetch is only supported for nodes that are Artifact Definition target"