infrahub-server 1.2.12__py3-none-any.whl → 1.3.0__py3-none-any.whl

infrahub_sdk/protocols.py

@@ -68,6 +68,12 @@ class BuiltinIPPrefix(CoreNode):
     children: RelationshipManager
 
 
+class CoreAction(CoreNode):
+    name: String
+    description: StringOptional
+    triggers: RelationshipManager
+
+
 class CoreArtifactTarget(CoreNode):
     artifacts: RelationshipManager
 
@@ -154,6 +160,10 @@ class CoreMenu(CoreNode):
     children: RelationshipManager
 
 
+class CoreNodeTriggerMatch(CoreNode):
+    trigger: RelatedNode
+
+
 class CoreObjectComponentTemplate(CoreNode):
     template_name: String
 
@@ -195,6 +205,14 @@ class CoreTransformation(CoreNode):
     tags: RelationshipManager
 
 
+class CoreTriggerRule(CoreNode):
+    name: String
+    description: StringOptional
+    active: Boolean
+    branch_scope: Dropdown
+    action: RelatedNode
+
+
 class CoreValidator(CoreNode):
     label: StringOptional
     state: Enum
@@ -328,6 +346,10 @@ class CoreFileThread(CoreThread):
     repository: RelatedNode
 
 
+class CoreGeneratorAction(CoreAction):
+    generator: RelatedNode
+
+
 class CoreGeneratorCheck(CoreCheck):
     instance: String
 
@@ -382,6 +404,16 @@ class CoreGraphQLQueryGroup(CoreGroup):
     query: RelatedNode
 
 
+class CoreGroupAction(CoreAction):
+    add_members: Boolean
+    group: RelatedNode
+
+
+class CoreGroupTriggerRule(CoreTriggerRule):
+    members_added: Boolean
+    group: RelatedNode
+
+
 class CoreIPAddressPool(CoreResourcePool, LineageSource):
     default_address_type: String
     default_prefix_length: IntegerOptional
@@ -401,6 +433,25 @@ class CoreMenuItem(CoreMenu):
     pass
 
 
+class CoreNodeTriggerAttributeMatch(CoreNodeTriggerMatch):
+    attribute_name: String
+    value: StringOptional
+    value_previous: StringOptional
+    value_match: Dropdown
+
+
+class CoreNodeTriggerRelationshipMatch(CoreNodeTriggerMatch):
+    relationship_name: String
+    added: Boolean
+    peer: StringOptional
+
+
+class CoreNodeTriggerRule(CoreTriggerRule):
+    node_kind: String
+    mutation_action: Enum
+    matches: RelationshipManager
+
+
 class CoreNumberPool(CoreResourcePool, LineageSource):
     node: String
     node_attribute: String
@@ -448,6 +499,11 @@ class CoreRepository(LineageOwner, LineageSource, CoreGenericRepository, CoreTas
     commit: StringOptional
 
 
+class CoreRepositoryGroup(CoreGroup):
+    content: Dropdown
+    repository: RelatedNode
+
+
 class CoreRepositoryValidator(CoreValidator):
     repository: RelatedNode
 
@@ -545,6 +601,12 @@ class BuiltinIPPrefixSync(CoreNodeSync):
     children: RelationshipManagerSync
 
 
+class CoreActionSync(CoreNodeSync):
+    name: String
+    description: StringOptional
+    triggers: RelationshipManagerSync
+
+
 class CoreArtifactTargetSync(CoreNodeSync):
     artifacts: RelationshipManagerSync
 
@@ -631,6 +693,10 @@ class CoreMenuSync(CoreNodeSync):
     children: RelationshipManagerSync
 
 
+class CoreNodeTriggerMatchSync(CoreNodeSync):
+    trigger: RelatedNodeSync
+
+
 class CoreObjectComponentTemplateSync(CoreNodeSync):
     template_name: String
 
@@ -672,6 +738,14 @@ class CoreTransformationSync(CoreNodeSync):
     tags: RelationshipManagerSync
 
 
+class CoreTriggerRuleSync(CoreNodeSync):
+    name: String
+    description: StringOptional
+    active: Boolean
+    branch_scope: Dropdown
+    action: RelatedNodeSync
+
+
 class CoreValidatorSync(CoreNodeSync):
     label: StringOptional
     state: Enum
@@ -805,6 +879,10 @@ class CoreFileThreadSync(CoreThreadSync):
     repository: RelatedNodeSync
 
 
+class CoreGeneratorActionSync(CoreActionSync):
+    generator: RelatedNodeSync
+
+
 class CoreGeneratorCheckSync(CoreCheckSync):
     instance: String
 
@@ -859,6 +937,16 @@ class CoreGraphQLQueryGroupSync(CoreGroupSync):
     query: RelatedNodeSync
 
 
+class CoreGroupActionSync(CoreActionSync):
+    add_members: Boolean
+    group: RelatedNodeSync
+
+
+class CoreGroupTriggerRuleSync(CoreTriggerRuleSync):
+    members_added: Boolean
+    group: RelatedNodeSync
+
+
 class CoreIPAddressPoolSync(CoreResourcePoolSync, LineageSourceSync):
     default_address_type: String
     default_prefix_length: IntegerOptional
@@ -878,6 +966,25 @@ class CoreMenuItemSync(CoreMenuSync):
     pass
 
 
+class CoreNodeTriggerAttributeMatchSync(CoreNodeTriggerMatchSync):
+    attribute_name: String
+    value: StringOptional
+    value_previous: StringOptional
+    value_match: Dropdown
+
+
+class CoreNodeTriggerRelationshipMatchSync(CoreNodeTriggerMatchSync):
+    relationship_name: String
+    added: Boolean
+    peer: StringOptional
+
+
+class CoreNodeTriggerRuleSync(CoreTriggerRuleSync):
+    node_kind: String
+    mutation_action: Enum
+    matches: RelationshipManagerSync
+
+
 class CoreNumberPoolSync(CoreResourcePoolSync, LineageSourceSync):
     node: String
     node_attribute: String
@@ -925,6 +1032,11 @@ class CoreRepositorySync(LineageOwnerSync, LineageSourceSync, CoreGenericReposit
     commit: StringOptional
 
 
+class CoreRepositoryGroupSync(CoreGroupSync):
+    content: Dropdown
+    repository: RelatedNodeSync
+
+
 class CoreRepositoryValidatorSync(CoreValidatorSync):
     repository: RelatedNodeSync
 

infrahub_sdk/protocols_base.py

@@ -10,11 +10,42 @@ if TYPE_CHECKING:
 
 
 @runtime_checkable
-class RelatedNode(Protocol): ...
+class RelatedNodeBase(Protocol):
+    @property
+    def id(self) -> str | None: ...
+
+    @property
+    def hfid(self) -> list[Any] | None: ...
+
+    @property
+    def hfid_str(self) -> str | None: ...
+
+    @property
+    def is_resource_pool(self) -> bool: ...
+
+    @property
+    def initialized(self) -> bool: ...
+
+    @property
+    def display_label(self) -> str | None: ...
+
+    @property
+    def typename(self) -> str | None: ...
+
+    def _generate_input_data(self, allocate_from_pool: bool = False) -> dict[str, Any]: ...
+
+    def _generate_mutation_query(self) -> dict[str, Any]: ...
+
+    @classmethod
+    def _generate_query_data(cls, peer_data: dict[str, Any] | None = None, property: bool = False) -> dict: ...
+
+
+@runtime_checkable
+class RelatedNode(RelatedNodeBase, Protocol): ...
 
 
 @runtime_checkable
-class RelatedNodeSync(Protocol): ...
+class RelatedNodeSync(RelatedNodeBase, Protocol): ...
 
 
 @runtime_checkable
@@ -147,6 +178,7 @@ class CoreNodeBase(Protocol):
     _internal_id: str
     id: str  # NOTE this is incorrect, should be str | None
     display_label: str | None
+    typename: str | None
 
     @property
     def hfid(self) -> list[str] | None: ...

infrahub_sdk/pytest_plugin/items/python_transform.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, Any
 import ujson
 from httpx import HTTPStatusError
 
+from ...node import InfrahubNode
 from ..exceptions import OutputMatchError, PythonTransformDefinitionError
 from ..models import InfrahubTestExpectedResult
 from .base import InfrahubItem
@@ -41,7 +42,7 @@ class InfrahubPythonTransformItem(InfrahubItem):
         )
         client = self.session.infrahub_client  # type: ignore[attr-defined]
         # TODO: Look into seeing how a transform class may use the branch, but set as a empty string for the time being to keep current behaviour
-        self.transform_instance = transform_class(branch="", client=client)
+        self.transform_instance = transform_class(branch="", client=client, infrahub_node=InfrahubNode)
 
     def run_transform(self, variables: dict[str, Any]) -> Any:
         self.instantiate_transform()

infrahub_sdk/query_groups.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any
 
 from .constants import InfrahubClientMode
 from .exceptions import NodeNotFoundError
@@ -19,12 +20,13 @@ class InfrahubGroupContextBase:
         self.related_node_ids: list[str] = []
         self.related_group_ids: list[str] = []
         self.unused_member_ids: list[str] | None = None
-        self.previous_members: list[RelatedNodeBase] | None = None
+        self.previous_members: Sequence[RelatedNodeBase] | None = None
         self.previous_children: list[RelatedNodeBase] | None = None
         self.identifier: str | None = None
         self.params: dict[str, str] = {}
         self.delete_unused_nodes: bool = False
         self.group_type: str = "CoreStandardGroup"
+        self.group_params: dict[str, Any] = {}
 
     def set_properties(
         self,
@@ -32,6 +34,8 @@ class InfrahubGroupContextBase:
         params: dict[str, str] | None = None,
         delete_unused_nodes: bool = False,
         group_type: str | None = None,
+        group_params: dict[str, Any] | None = None,
+        branch: str | None = None,
     ) -> None:
         """Setter method to set the values of identifier and params.
 
@@ -43,6 +47,8 @@ class InfrahubGroupContextBase:
         self.params = params or {}
         self.delete_unused_nodes = delete_unused_nodes
         self.group_type = group_type or self.group_type
+        self.group_params = group_params or {}
+        self.branch = branch
 
     def _get_params_as_str(self) -> str:
         """Convert the params in dict format, into a string"""
@@ -87,14 +93,16 @@ class InfrahubGroupContext(InfrahubGroupContextBase):
     async def get_group(self, store_peers: bool = False) -> InfrahubNode | None:
         group_name = self._generate_group_name()
         try:
-            group = await self.client.get(kind=self.group_type, name__value=group_name, include=["members"])
+            group = await self.client.get(
+                kind=self.group_type, name__value=group_name, include=["members"], branch=self.branch
+            )
         except NodeNotFoundError:
             return None
 
         if not store_peers:
             return group
 
-        self.previous_members = group.members.peers  # type: ignore[attr-defined]
+        self.previous_members = group._get_relationship_many(name="members").peers
         return group
 
     async def delete_unused(self) -> None:
@@ -151,6 +159,8 @@ class InfrahubGroupContext(InfrahubGroupContextBase):
             name=group_name,
             description=description,
             members=members,
+            branch=self.branch,
+            **self.group_params,
         )
         await group.save(allow_upsert=True, update_group_context=False)
 
@@ -186,7 +196,7 @@ class InfrahubGroupContextSync(InfrahubGroupContextBase):
         if not store_peers:
             return group
 
-        self.previous_members = group.members.peers  # type: ignore[attr-defined]
+        self.previous_members = group._get_relationship_many(name="members").peers
         return group
 
     def delete_unused(self) -> None:
@@ -243,6 +253,8 @@ class InfrahubGroupContextSync(InfrahubGroupContextBase):
             name=group_name,
             description=description,
             members=members,
+            branch=self.branch,
+            **self.group_params,
         )
         group.save(allow_upsert=True, update_group_context=False)
 

infrahub_sdk/schema/main.py

@@ -49,6 +49,7 @@ class AttributeKind(str, Enum):
     TEXTAREA = "TextArea"
     DATETIME = "DateTime"
     NUMBER = "Number"
+    NUMBERPOOL = "NumberPool"
     DROPDOWN = "Dropdown"
     EMAIL = "Email"
     PASSWORD = "Password"  # noqa: S105

infrahub_sdk/schema/repository.py

@@ -147,6 +147,18 @@ class InfrahubRepositoryGraphQLConfig(InfrahubRepositoryConfigElement):
             return file.read()
 
 
+class InfrahubObjectConfig(InfrahubRepositoryConfigElement):
+    model_config = ConfigDict(extra="forbid")
+    name: str = Field(..., description="The name associated to the object file")
+    file_path: Path = Field(..., description="The file within the repository containing object data.")
+
+
+class InfrahubMenuConfig(InfrahubRepositoryConfigElement):
+    model_config = ConfigDict(extra="forbid")
+    name: str = Field(..., description="The name of the menu")
+    file_path: Path = Field(..., description="The file within the repository containing menu data.")
+
+
 RESOURCE_MAP: dict[Any, str] = {
     InfrahubJinja2TransformConfig: "jinja2_transforms",
     InfrahubCheckDefinitionConfig: "check_definitions",
@@ -154,6 +166,8 @@ RESOURCE_MAP: dict[Any, str] = {
     InfrahubPythonTransformConfig: "python_transforms",
     InfrahubGeneratorDefinitionConfig: "generator_definitions",
     InfrahubRepositoryGraphQLConfig: "queries",
+    InfrahubObjectConfig: "objects",
+    InfrahubMenuConfig: "menus",
 }
 
 
@@ -176,6 +190,8 @@ class InfrahubRepositoryConfig(BaseModel):
         default_factory=list, description="Generator definitions"
     )
     queries: list[InfrahubRepositoryGraphQLConfig] = Field(default_factory=list, description="GraphQL Queries")
+    objects: list[Path] = Field(default_factory=list, description="Objects")
+    menus: list[Path] = Field(default_factory=list, description="Menus")
 
     @field_validator(
         "check_definitions",

infrahub_sdk/spec/object.py

@@ -459,7 +459,7 @@ class InfrahubObjectFileData(BaseModel):
         await node.save(allow_upsert=True)
 
         display_label = node.get_human_friendly_id_as_string() or f"{node.get_kind()} : {node.id}"
-        client.log.info(f"Node: {display_label}")
+        client.log.info(f"Created node: {display_label}")
 
         for rel in remaining_rels:
             context = {}

infrahub_sdk/store.py

@@ -4,7 +4,7 @@ import warnings
 from typing import TYPE_CHECKING, Literal, overload
 
 from .exceptions import NodeInvalidError, NodeNotFoundError
-from .node import parse_human_friendly_id
+from .node.parsers import parse_human_friendly_id
 
 if TYPE_CHECKING:
     from .client import SchemaType, SchemaTypeSync

infrahub_sdk/testing/schemas/car_person.py

@@ -48,6 +48,7 @@ class SchemaCarPerson:
             namespace=NAMESPACE,
             include_in_menu=True,
             label="Person",
+            default_filter="name__value",
             human_friendly_id=["name__value"],
             attributes=[
                 Attr(name="name", kind=AttributeKind.TEXT, unique=True),

infrahub_sdk/utils.py

@@ -240,21 +240,6 @@ def is_valid_url(url: str) -> bool:
         return False
 
 
-def find_files(extension: str | list[str], directory: str | Path = ".") -> list[Path]:
-    files: list[Path] = []
-
-    if isinstance(extension, str):
-        extension = [extension]
-    if isinstance(directory, str):
-        directory = Path(directory)
-
-    for ext in extension:
-        files.extend(list(directory.glob(f"**/*.{ext}")))
-        files.extend(list(directory.glob(f"**/.*.{ext}")))
-
-    return files
-
-
 def get_branch(branch: str | None = None, directory: str | Path = ".") -> str:
     """If branch isn't provide, return the name of the local Git branch."""
     if branch:
@@ -351,14 +336,16 @@ def write_to_file(path: Path, value: Any) -> bool:
     return written is not None
 
 
-def read_file(file_name: Path) -> str:
-    if not file_name.is_file():
-        raise FileNotValidError(name=str(file_name), message=f"{file_name} is not a valid file")
+def read_file(file_path: Path) -> str:
+    if not file_path.is_file():
+        raise FileNotValidError(name=str(file_path.name), message=f"{file_path.name}: not found at {file_path.parent}")
     try:
-        with Path.open(file_name, encoding="utf-8") as fobj:
+        with Path.open(file_path, encoding="utf-8") as fobj:
             return fobj.read()
     except UnicodeDecodeError as exc:
-        raise FileNotValidError(name=str(file_name), message=f"Unable to read {file_name} with utf-8 encoding") from exc
+        raise FileNotValidError(
+            name=str(file_path.name), message=f"Unable to read {file_path.name} with utf-8 encoding"
+        ) from exc
 
 
 def get_user_permissions(data: list[dict]) -> dict:

infrahub_sdk/yaml.py

@@ -10,7 +10,7 @@ from typing_extensions import Self
 from yaml.parser import ParserError
 
 from .exceptions import FileNotValidError
-from .utils import find_files, read_file
+from .utils import read_file
 
 
 class InfrahubFileApiVersion(str, Enum):
@@ -121,12 +121,13 @@ class YamlFile(LocalFile):
     def load_from_disk(cls, paths: list[Path]) -> list[Self]:
         yaml_files: list[Self] = []
         for file_path in paths:
-            if file_path.is_file():
+            if file_path.is_file() and file_path.suffix in [".yaml", ".yml", ".json"]:
                 yaml_files.extend(cls.load_file_from_disk(path=file_path))
             elif file_path.is_dir():
-                files = find_files(extension=["yaml", "yml", "json"], directory=file_path)
-                for item in files:
-                    yaml_files.extend(cls.load_file_from_disk(path=item))
+                sub_paths = [Path(sub_file_path) for sub_file_path in file_path.glob("*")]
+                sub_files = cls.load_from_disk(paths=sub_paths)
+                sorted_sub_files = sorted(sub_files, key=lambda x: x.location)
+                yaml_files.extend(sorted_sub_files)
             else:
                 raise FileNotValidError(name=str(file_path), message=f"{file_path} does not exist!")
 

{infrahub_server-1.2.12.dist-info → infrahub_server-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.2.12
+Version: 1.3.0
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
 License: AGPL-3.0-only
 Author: OpsMill
@@ -38,7 +38,7 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (==1.28.1)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (==1.28.1)
 Requires-Dist: opentelemetry-instrumentation-aio-pika (==0.49b1)
 Requires-Dist: opentelemetry-instrumentation-fastapi (==0.49b1)
-Requires-Dist: prefect (==3.3.7)
+Requires-Dist: prefect (==3.4.1)
 Requires-Dist: prefect-redis (==0.2.2)
 Requires-Dist: pyarrow (>=14,<15)
 Requires-Dist: pydantic (>=2.10,<2.11)
@@ -55,7 +55,7 @@ Requires-Dist: toml (>=0.10,<0.11)
 Requires-Dist: typer (==0.12.5)
 Requires-Dist: ujson (>=5,<6)
 Requires-Dist: uvicorn[standard] (>=0.32,<0.33)
-Requires-Dist: whenever (==0.7.2)
+Requires-Dist: whenever (==0.7.3)
 Project-URL: Documentation, https://docs.infrahub.app/
 Project-URL: Homepage, https://opsmill.com
 Project-URL: Repository, https://github.com/opsmill/infrahub