infrahub-server 1.5.0b0__py3-none-any.whl → 1.5.0b1__py3-none-any.whl

infrahub_sdk/graphql/query.py

@@ -0,0 +1,77 @@
+from __future__ import annotations
+
+from typing import Any
+
+from .renderers import render_input_block, render_query_block, render_variables_to_string
+
+
+class BaseGraphQLQuery:
+    query_type: str = "not-defined"
+    indentation: int = 4
+
+    def __init__(self, query: dict, variables: dict | None = None, name: str | None = None):
+        self.query = query
+        self.variables = variables
+        self.name = name or ""
+
+    def render_first_line(self) -> str:
+        first_line = self.query_type
+
+        if self.name:
+            first_line += " " + self.name
+
+        if self.variables:
+            first_line += f" ({render_variables_to_string(self.variables)})"
+
+        first_line += " {"
+
+        return first_line
+
+
+class Query(BaseGraphQLQuery):
+    query_type = "query"
+
+    def render(self, convert_enum: bool = False) -> str:
+        lines = [self.render_first_line()]
+        lines.extend(
+            render_query_block(
+                data=self.query, indentation=self.indentation, offset=self.indentation, convert_enum=convert_enum
+            )
+        )
+        lines.append("}")
+
+        return "\n" + "\n".join(lines) + "\n"
+
+
+class Mutation(BaseGraphQLQuery):
+    query_type = "mutation"
+
+    def __init__(self, *args: Any, mutation: str, input_data: dict, **kwargs: Any):
+        self.input_data = input_data
+        self.mutation = mutation
+        super().__init__(*args, **kwargs)
+
+    def render(self, convert_enum: bool = False) -> str:
+        lines = [self.render_first_line()]
+        lines.append(" " * self.indentation + f"{self.mutation}(")
+        lines.extend(
+            render_input_block(
+                data=self.input_data,
+                indentation=self.indentation,
+                offset=self.indentation * 2,
+                convert_enum=convert_enum,
+            )
+        )
+        lines.append(" " * self.indentation + "){")
+        lines.extend(
+            render_query_block(
+                data=self.query,
+                indentation=self.indentation,
+                offset=self.indentation * 2,
+                convert_enum=convert_enum,
+            )
+        )
+        lines.append(" " * self.indentation + "}")
+        lines.append("}")
+
+        return "\n" + "\n".join(lines) + "\n"

infrahub_sdk/{graphql.py → graphql/renderers.py}

@@ -6,10 +6,35 @@ from typing import Any
 
 from pydantic import BaseModel
 
-VARIABLE_TYPE_MAPPING = ((str, "String!"), (int, "Int!"), (float, "Float!"), (bool, "Boolean!"))
+from .constants import VARIABLE_TYPE_MAPPING
 
 
 def convert_to_graphql_as_string(value: Any, convert_enum: bool = False) -> str:  # noqa: PLR0911
+    """Convert a Python value to its GraphQL string representation.
+
+    This function handles various Python types and converts them to their appropriate
+    GraphQL string format, including proper quoting, formatting, and special handling
+    for different data types.
+
+    Args:
+        value: The value to convert to GraphQL string format. Can be None, str, bool,
+            int, float, Enum, list, BaseModel, or any other type.
+        convert_enum: If True, converts Enum values to their underlying value instead
+            of their name. Defaults to False.
+
+    Returns:
+        str: The GraphQL string representation of the value.
+
+    Examples:
+        >>> convert_to_graphql_as_string("hello")
+        '"hello"'
+        >>> convert_to_graphql_as_string(True)
+        'true'
+        >>> convert_to_graphql_as_string([1, 2, 3])
+        '[1, 2, 3]'
+        >>> convert_to_graphql_as_string(None)
+        'null'
+    """
     if value is None:
         return "null"
     if isinstance(value, str) and value.startswith("$"):
@@ -56,6 +81,34 @@ def render_variables_to_string(data: dict[str, type[str | int | float | bool]])
 
 
 def render_query_block(data: dict, offset: int = 4, indentation: int = 4, convert_enum: bool = False) -> list[str]:
+    """Render a dictionary structure as a GraphQL query block with proper formatting.
+
+    This function recursively processes a dictionary to generate GraphQL query syntax
+    with proper indentation, handling of aliases, filters, and nested structures.
+    Special keys like "@filters" and "@alias" are processed for GraphQL-specific
+    formatting.
+
+    Args:
+        data: Dictionary representing the GraphQL query structure. Can contain
+            nested dictionaries, special keys like "@filters" and "@alias", and
+            various value types.
+        offset: Number of spaces to use for initial indentation. Defaults to 4.
+        indentation: Number of spaces to add for each nesting level. Defaults to 4.
+        convert_enum: If True, converts Enum values to their underlying value.
+            Defaults to False.
+
+    Returns:
+        list[str]: List of formatted lines representing the GraphQL query block.
+
+    Examples:
+        >>> data = {"user": {"name": None, "email": None}}
+        >>> render_query_block(data)
+        ['    user {', '        name', '        email', '    }']
+
+        >>> data = {"user": {"@alias": "u", "@filters": {"id": 123}, "name": None}}
+        >>> render_query_block(data)
+        ['    u: user(id: 123) {', '        name', '    }']
+    """
     FILTERS_KEY = "@filters"
     ALIAS_KEY = "@alias"
     KEYWORDS_TO_SKIP = [FILTERS_KEY, ALIAS_KEY]
@@ -97,6 +150,33 @@ def render_query_block(data: dict, offset: int = 4, indentation: int = 4, conver
 
 
 def render_input_block(data: dict, offset: int = 4, indentation: int = 4, convert_enum: bool = False) -> list[str]:
+    """Render a dictionary structure as a GraphQL input block with proper formatting.
+
+    This function recursively processes a dictionary to generate GraphQL input syntax
+    with proper indentation, handling nested objects, arrays, and various data types.
+    Unlike query blocks, input blocks don't handle special keys like "@filters" or
+    "@alias" and focus on data structure representation.
+
+    Args:
+        data: Dictionary representing the GraphQL input structure. Can contain
+            nested dictionaries, lists, and various value types.
+        offset: Number of spaces to use for initial indentation. Defaults to 4.
+        indentation: Number of spaces to add for each nesting level. Defaults to 4.
+        convert_enum: If True, converts Enum values to their underlying value.
+            Defaults to False.
+
+    Returns:
+        list[str]: List of formatted lines representing the GraphQL input block.
+
+    Examples:
+        >>> data = {"name": "John", "age": 30}
+        >>> render_input_block(data)
+        ['    name: "John"', '    age: 30']
+
+        >>> data = {"user": {"name": "John", "hobbies": ["reading", "coding"]}}
+        >>> render_input_block(data)
+        ['    user: {', '        name: "John"', '        hobbies: [', '            "reading",', '            "coding",', '        ]', '    }']
+    """
     offset_str = " " * offset
     lines = []
     for key, value in data.items():
@@ -130,75 +210,3 @@ def render_input_block(data: dict, offset: int = 4, indentation: int = 4, conver
         else:
             lines.append(f"{offset_str}{key}: {convert_to_graphql_as_string(value=value, convert_enum=convert_enum)}")
     return lines
-
-
-class BaseGraphQLQuery:
-    query_type: str = "not-defined"
-    indentation: int = 4
-
-    def __init__(self, query: dict, variables: dict | None = None, name: str | None = None):
-        self.query = query
-        self.variables = variables
-        self.name = name or ""
-
-    def render_first_line(self) -> str:
-        first_line = self.query_type
-
-        if self.name:
-            first_line += " " + self.name
-
-        if self.variables:
-            first_line += f" ({render_variables_to_string(self.variables)})"
-
-        first_line += " {"
-
-        return first_line
-
-
-class Query(BaseGraphQLQuery):
-    query_type = "query"
-
-    def render(self, convert_enum: bool = False) -> str:
-        lines = [self.render_first_line()]
-        lines.extend(
-            render_query_block(
-                data=self.query, indentation=self.indentation, offset=self.indentation, convert_enum=convert_enum
-            )
-        )
-        lines.append("}")
-
-        return "\n" + "\n".join(lines) + "\n"
-
-
-class Mutation(BaseGraphQLQuery):
-    query_type = "mutation"
-
-    def __init__(self, *args: Any, mutation: str, input_data: dict, **kwargs: Any):
-        self.input_data = input_data
-        self.mutation = mutation
-        super().__init__(*args, **kwargs)
-
-    def render(self, convert_enum: bool = False) -> str:
-        lines = [self.render_first_line()]
-        lines.append(" " * self.indentation + f"{self.mutation}(")
-        lines.extend(
-            render_input_block(
-                data=self.input_data,
-                indentation=self.indentation,
-                offset=self.indentation * 2,
-                convert_enum=convert_enum,
-            )
-        )
-        lines.append(" " * self.indentation + "){")
-        lines.extend(
-            render_query_block(
-                data=self.query,
-                indentation=self.indentation,
-                offset=self.indentation * 2,
-                convert_enum=convert_enum,
-            )
-        )
-        lines.append(" " * self.indentation + "}")
-        lines.append("}")
-
-        return "\n" + "\n".join(lines) + "\n"

infrahub_sdk/graphql/utils.py

@@ -0,0 +1,40 @@
+import ast
+
+
+def get_class_def_index(module: ast.Module) -> int:
+    """Get the index of the first class definition in the module.
+    It's useful to insert other classes before the first class definition."""
+    for idx, item in enumerate(module.body):
+        if isinstance(item, ast.ClassDef):
+            return idx
+    return -1
+
+
+def insert_fragments_inline(module: ast.Module, fragment: ast.Module) -> ast.Module:
+    """Insert the Pydantic classes for the fragments inline into the module.
+
+    If no class definitions exist in module, fragments are appended to the end.
+    """
+    module_class_def_index = get_class_def_index(module)
+
+    fragment_classes: list[ast.ClassDef] = [item for item in fragment.body if isinstance(item, ast.ClassDef)]
+
+    # Handle edge case when no class definitions exist
+    if module_class_def_index == -1:
+        # Append fragments to the end of the module
+        module.body.extend(fragment_classes)
+    else:
+        # Insert fragments before the first class definition
+        for idx, item in enumerate(fragment_classes):
+            module.body.insert(module_class_def_index + idx, item)
+
+    return module
+
+
+def remove_fragment_import(module: ast.Module) -> ast.Module:
+    """Remove the fragment import from the module."""
+    for item in module.body:
+        if isinstance(item, ast.ImportFrom) and item.module == "fragments":
+            module.body.remove(item)
+            return module
+    return module

infrahub_sdk/protocols.py

@@ -131,6 +131,7 @@ class CoreGenericRepository(CoreNode):
     queries: RelationshipManager
     checks: RelationshipManager
     generators: RelationshipManager
+    groups_objects: RelationshipManager
 
 
 class CoreGroup(CoreNode):
@@ -355,6 +356,10 @@ class CoreGeneratorAction(CoreAction):
     generator: RelatedNode
 
 
+class CoreGeneratorAwareGroup(CoreGroup):
+    pass
+
+
 class CoreGeneratorCheck(CoreCheck):
     instance: String
 
@@ -366,6 +371,8 @@ class CoreGeneratorDefinition(CoreTaskTarget):
     file_path: String
     class_name: String
     convert_query_response: BooleanOptional
+    execute_in_proposed_change: BooleanOptional
+    execute_after_merge: BooleanOptional
     query: RelatedNode
     repository: RelatedNode
     targets: RelatedNode
@@ -681,6 +688,7 @@ class CoreGenericRepositorySync(CoreNodeSync):
     queries: RelationshipManagerSync
     checks: RelationshipManagerSync
     generators: RelationshipManagerSync
+    groups_objects: RelationshipManagerSync
 
 
 class CoreGroupSync(CoreNodeSync):
@@ -905,6 +913,10 @@ class CoreGeneratorActionSync(CoreActionSync):
     generator: RelatedNodeSync
 
 
+class CoreGeneratorAwareGroupSync(CoreGroupSync):
+    pass
+
+
 class CoreGeneratorCheckSync(CoreCheckSync):
     instance: String
 
@@ -916,6 +928,8 @@ class CoreGeneratorDefinitionSync(CoreTaskTargetSync):
     file_path: String
     class_name: String
     convert_query_response: BooleanOptional
+    execute_in_proposed_change: BooleanOptional
+    execute_after_merge: BooleanOptional
     query: RelatedNodeSync
     repository: RelatedNodeSync
     targets: RelatedNodeSync

infrahub_sdk/schema/__init__.py

@@ -474,6 +474,25 @@ class InfrahubSchema(InfrahubSchemaBase):
 
         return branch_schema.nodes
 
+    async def get_graphql_schema(self, branch: str | None = None) -> str:
+        """Get the GraphQL schema as a string.
+
+        Args:
+            branch: The branch to get the schema for. Defaults to default_branch.
+
+        Returns:
+            The GraphQL schema as a string.
+        """
+        branch = branch or self.client.default_branch
+        url = f"{self.client.address}/schema.graphql?branch={branch}"
+
+        response = await self.client._get(url=url)
+
+        if response.status_code != 200:
+            raise ValueError(f"Failed to fetch GraphQL schema: HTTP {response.status_code} - {response.text}")
+
+        return response.text
+
     async def _fetch(self, branch: str, namespaces: list[str] | None = None) -> BranchSchema:
         url_parts = [("branch", branch)]
         if namespaces:
@@ -697,6 +716,25 @@ class InfrahubSchemaSync(InfrahubSchemaBase):
 
         return branch_schema.nodes
 
+    def get_graphql_schema(self, branch: str | None = None) -> str:
+        """Get the GraphQL schema as a string.
+
+        Args:
+            branch: The branch to get the schema for. Defaults to default_branch.
+
+        Returns:
+            The GraphQL schema as a string.
+        """
+        branch = branch or self.client.default_branch
+        url = f"{self.client.address}/schema.graphql?branch={branch}"
+
+        response = self.client._get(url=url)
+
+        if response.status_code != 200:
+            raise ValueError(f"Failed to fetch GraphQL schema: HTTP {response.status_code} - {response.text}")
+
+        return response.text
+
     def _fetch(self, branch: str, namespaces: list[str] | None = None) -> BranchSchema:
         url_parts = [("branch", branch)]
         if namespaces:

infrahub_sdk/schema/repository.py

@@ -96,6 +96,14 @@ class InfrahubGeneratorDefinitionConfig(InfrahubRepositoryConfigElement):
         default=False,
         description="Decide if the generator should convert the result of the GraphQL query to SDK InfrahubNode objects.",
     )
+    execute_in_proposed_change: bool = Field(
+        default=True,
+        description="Decide if the generator should execute in a proposed change.",
+    )
+    execute_after_merge: bool = Field(
+        default=True,
+        description="Decide if the generator should execute after a merge.",
+    )
 
     def load_class(self, import_root: str | None = None, relative_path: str | None = None) -> type[InfrahubGenerator]:
         module = import_module(module_path=self.file_path, import_root=import_root, relative_path=relative_path)

infrahub_sdk/spec/object.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 import copy
 import re
+from abc import ABC, abstractmethod
 from enum import Enum
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, ClassVar
 
 from pydantic import BaseModel, Field
 
@@ -45,6 +46,11 @@ class RelationshipDataFormat(str, Enum):
     MANY_REF = "many_ref_list"
 
 
+class ObjectStrategy(str, Enum):
+    NORMAL = "normal"
+    RANGE_EXPAND = "range_expand"
+
+
 class RelationshipInfo(BaseModel):
     name: str
     rel_schema: RelationshipSchema
@@ -168,7 +174,7 @@ async def get_relationship_info(
 
 
 def expand_data_with_ranges(data: list[dict[str, Any]]) -> list[dict[str, Any]]:
-    """Expand any item in self.data with range pattern in any value. Supports multiple fields, requires equal expansion length."""
+    """Expand any item in data with range pattern in any value. Supports multiple fields, requires equal expansion length."""
     range_pattern = re.compile(MATCH_PATTERN)
     expanded = []
     for item in data:
@@ -198,16 +204,69 @@ def expand_data_with_ranges(data: list[dict[str, Any]]) -> list[dict[str, Any]]:
     return expanded
 
 
+class DataProcessor(ABC):
+    """Abstract base class for data processing strategies"""
+
+    @abstractmethod
+    def process_data(self, data: list[dict[str, Any]]) -> list[dict[str, Any]]:
+        """Process the data according to the strategy"""
+
+
+class SingleDataProcessor(DataProcessor):
+    """Process data without any expansion"""
+
+    def process_data(self, data: list[dict[str, Any]]) -> list[dict[str, Any]]:
+        return data
+
+
+class RangeExpandDataProcessor(DataProcessor):
+    """Process data with range expansion"""
+
+    def process_data(self, data: list[dict[str, Any]]) -> list[dict[str, Any]]:
+        return expand_data_with_ranges(data)
+
+
+class DataProcessorFactory:
+    """Factory to create appropriate data processor based on strategy"""
+
+    _processors: ClassVar[dict[ObjectStrategy, type[DataProcessor]]] = {
+        ObjectStrategy.NORMAL: SingleDataProcessor,
+        ObjectStrategy.RANGE_EXPAND: RangeExpandDataProcessor,
+    }
+
+    @classmethod
+    def get_processor(cls, strategy: ObjectStrategy) -> DataProcessor:
+        processor_class = cls._processors.get(strategy)
+        if not processor_class:
+            raise ValueError(
+                f"Unknown strategy: {strategy} - no processor found. Valid strategies are: {list(cls._processors.keys())}"
+            )
+        return processor_class()
+
+    @classmethod
+    def register_processor(cls, strategy: ObjectStrategy, processor_class: type[DataProcessor]) -> None:
+        """Register a new processor for a strategy - useful for future extensions"""
+        cls._processors[strategy] = processor_class
+
+
 class InfrahubObjectFileData(BaseModel):
     kind: str
+    strategy: ObjectStrategy = ObjectStrategy.NORMAL
     data: list[dict[str, Any]] = Field(default_factory=list)
 
+    def _get_processed_data(self, data: list[dict[str, Any]]) -> list[dict[str, Any]]:
+        """Get data processed according to the strategy"""
+        processor = DataProcessorFactory.get_processor(self.strategy)
+        return processor.process_data(data)
+
     async def validate_format(self, client: InfrahubClient, branch: str | None = None) -> list[ObjectValidationError]:
         errors: list[ObjectValidationError] = []
         schema = await client.schema.get(kind=self.kind, branch=branch)
-        expanded_data = expand_data_with_ranges(self.data)
-        self.data = expanded_data
-        for idx, item in enumerate(expanded_data):
+
+        processed_data = self._get_processed_data(data=self.data)
+        self.data = processed_data
+
+        for idx, item in enumerate(processed_data):
             errors.extend(
                 await self.validate_object(
                     client=client,
@@ -216,14 +275,16 @@ class InfrahubObjectFileData(BaseModel):
                     data=item,
                     branch=branch,
                     default_schema_kind=self.kind,
+                    strategy=self.strategy,  # Pass strategy down
                 )
             )
         return errors
 
     async def process(self, client: InfrahubClient, branch: str | None = None) -> None:
         schema = await client.schema.get(kind=self.kind, branch=branch)
-        expanded_data = expand_data_with_ranges(self.data)
-        for idx, item in enumerate(expanded_data):
+        processed_data = self._get_processed_data(data=self.data)
+
+        for idx, item in enumerate(processed_data):
             await self.create_node(
                 client=client,
                 schema=schema,
@@ -243,6 +304,7 @@ class InfrahubObjectFileData(BaseModel):
         context: dict | None = None,
         branch: str | None = None,
         default_schema_kind: str | None = None,
+        strategy: ObjectStrategy = ObjectStrategy.NORMAL,
     ) -> list[ObjectValidationError]:
         errors: list[ObjectValidationError] = []
         context = context.copy() if context else {}
@@ -292,6 +354,7 @@ class InfrahubObjectFileData(BaseModel):
                         context=context,
                         branch=branch,
                         default_schema_kind=default_schema_kind,
+                        strategy=strategy,
                     )
                 )
 
@@ -307,6 +370,7 @@ class InfrahubObjectFileData(BaseModel):
         context: dict | None = None,
         branch: str | None = None,
         default_schema_kind: str | None = None,
+        strategy: ObjectStrategy = ObjectStrategy.NORMAL,
     ) -> list[ObjectValidationError]:
         context = context.copy() if context else {}
         errors: list[ObjectValidationError] = []
@@ -348,7 +412,10 @@ class InfrahubObjectFileData(BaseModel):
             rel_info.find_matching_relationship(peer_schema=peer_schema)
             context.update(rel_info.get_context(value="placeholder"))
 
-            expanded_data = expand_data_with_ranges(data=data["data"])
+            # Use strategy-aware data processing
+            processor = DataProcessorFactory.get_processor(strategy)
+            expanded_data = processor.process_data(data["data"])
+
             for idx, peer_data in enumerate(expanded_data):
                 context["list_index"] = idx
                 errors.extend(
@@ -360,6 +427,7 @@ class InfrahubObjectFileData(BaseModel):
                         context=context,
                         branch=branch,
                         default_schema_kind=default_schema_kind,
+                        strategy=strategy,
                     )
                 )
             return errors
@@ -633,14 +701,20 @@ class ObjectFile(InfrahubFile):
     @property
     def spec(self) -> InfrahubObjectFileData:
         if not self._spec:
-            self._spec = InfrahubObjectFileData(**self.data.spec)
+            try:
+                self._spec = InfrahubObjectFileData(**self.data.spec)
+            except Exception as exc:
+                raise ValidationError(identifier=str(self.location), message=str(exc))
         return self._spec
 
     def validate_content(self) -> None:
         super().validate_content()
         if self.kind != InfrahubFileKind.OBJECT:
             raise ValueError("File is not an Infrahub Object file")
-        self._spec = InfrahubObjectFileData(**self.data.spec)
+        try:
+            self._spec = InfrahubObjectFileData(**self.data.spec)
+        except Exception as exc:
+            raise ValidationError(identifier=str(self.location), message=str(exc))
 
     async def validate_format(self, client: InfrahubClient, branch: str | None = None) -> None:
         self.validate_content()

infrahub_sdk/spec/range_expansion.py

@@ -1,7 +1,7 @@
 import itertools
 import re
 
-MATCH_PATTERN = r"(\[[\w,-]+\])"
+MATCH_PATTERN = r"(\[[\w,-]*[-,][\w,-]*\])"
 
 
 def _escape_brackets(s: str) -> str:

infrahub_sdk/transforms.py

@@ -17,7 +17,7 @@ INFRAHUB_TRANSFORM_VARIABLE_TO_IMPORT = "INFRAHUB_TRANSFORMS"
 class InfrahubTransform(InfrahubOperation):
     name: str | None = None
     query: str
-    timeout: int = 10
+    timeout: int = 60
 
     def __init__(
         self,

{infrahub_server-1.5.0b0.dist-info → infrahub_server-1.5.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.5.0b0
+Version: 1.5.0b1
 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: Apache-2.0
 Author: OpsMill
@@ -13,8 +13,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: Jinja2 (>=3,<4)
 Requires-Dist: aio-pika (>=9.4,<9.5)
 Requires-Dist: aiodataloader (==0.4.0)
+Requires-Dist: ariadne-codegen (==0.15.3)
 Requires-Dist: asgi-correlation-id (==4.2.0)
-Requires-Dist: authlib (==1.3.2)
+Requires-Dist: authlib (==1.6.5)
 Requires-Dist: bcrypt (>=4.1,<4.2)
 Requires-Dist: boto3 (==1.34.129)
 Requires-Dist: copier (>=9.8.0,<10.0.0)
@@ -37,8 +38,8 @@ 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.4.22)
-Requires-Dist: prefect-redis (==0.2.4)
+Requires-Dist: prefect (==3.4.23)
+Requires-Dist: prefect-redis (==0.2.5)
 Requires-Dist: pyarrow (>=14)
 Requires-Dist: pydantic (>=2.10,<2.11)
 Requires-Dist: pydantic-settings (>=2.8,<2.9)