infrahub-server 1.5.0b1__py3-none-any.whl → 1.5.1__py3-none-any.whl

infrahub_sdk/spec/processors/range_expand_processor.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+import copy
+import logging
+import re
+from typing import Any
+
+from ...exceptions import ValidationError
+from ..range_expansion import MATCH_PATTERN, range_expansion
+from .data_processor import DataProcessor
+
+log = logging.getLogger("infrahub_sdk")
+
+
+class RangeExpandDataProcessor(DataProcessor):
+    """Process data with range expansion"""
+
+    @classmethod
+    async def process_data(
+        cls,
+        data: list[dict[str, Any]],
+    ) -> list[dict[str, Any]]:
+        """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:
+            # Find all fields to expand
+            expand_fields = {}
+            for key, value in item.items():
+                if isinstance(value, str) and range_pattern.search(value):
+                    try:
+                        expand_fields[key] = range_expansion(value)
+                    except (ValueError, TypeError, KeyError):
+                        # If expansion fails, treat as no expansion
+                        log.debug(
+                            f"Range expansion failed for value '{value}' in key '{key}'. Treating as no expansion."
+                        )
+                        expand_fields[key] = [value]
+            if not expand_fields:
+                expanded.append(item)
+                continue
+            # Check all expanded lists have the same length
+            lengths = [len(v) for v in expand_fields.values()]
+            if len(set(lengths)) > 1:
+                raise ValidationError(
+                    identifier="range_expansion",
+                    message=f"Range expansion mismatch: fields expanded to different lengths: {lengths}",
+                )
+            n = lengths[0]
+            # Zip expanded values and produce new items
+            for i in range(n):
+                new_item = copy.deepcopy(item)
+                for key, values in expand_fields.items():
+                    new_item[key] = values[i]
+                expanded.append(new_item)
+        return expanded

infrahub_sdk/task/exceptions.py

@@ -2,24 +2,24 @@ from __future__ import annotations
 
 
 class TaskError(Exception):
-    def __init__(self, message: str | None = None):
+    def __init__(self, message: str | None = None) -> None:
         self.message = message
         super().__init__(self.message)
 
 
 class TaskNotFoundError(TaskError):
-    def __init__(self, id: str):
+    def __init__(self, id: str) -> None:
         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]):
+    def __init__(self, expected_id: str, received_ids: list[str]) -> None:
         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):
+    def __init__(self, id: str, message: str | None = None) -> None:
         self.message = message or f"Task with id {id} is not completed"
         super().__init__(self.message)

infrahub_sdk/task/manager.py

@@ -86,7 +86,7 @@ class InfraHubTaskManagerBase:
 class InfrahubTaskManager(InfraHubTaskManagerBase):
     client: InfrahubClient
 
-    def __init__(self, client: InfrahubClient):
+    def __init__(self, client: InfrahubClient) -> None:
         self.client = client
 
     async def count(self, filters: TaskFilter | None = None) -> int:
@@ -321,7 +321,7 @@ class InfrahubTaskManager(InfraHubTaskManagerBase):
 class InfrahubTaskManagerSync(InfraHubTaskManagerBase):
     client: InfrahubClientSync
 
-    def __init__(self, client: InfrahubClientSync):
+    def __init__(self, client: InfrahubClientSync) -> None:
         self.client = client
 
     def count(self, filters: TaskFilter | None = None) -> int:

infrahub_sdk/task/models.py

@@ -49,12 +49,14 @@ class Task(BaseModel):
         related_nodes: list[TaskRelatedNode] = []
         logs: list[TaskLog] = []
 
-        if data.get("related_nodes"):
-            related_nodes = [TaskRelatedNode(**item) for item in data["related_nodes"]]
+        if "related_nodes" in data:
+            if data.get("related_nodes"):
+                related_nodes = [TaskRelatedNode(**item) for item in data["related_nodes"]]
             del data["related_nodes"]
 
-        if data.get("logs"):
-            logs = [TaskLog(**item["node"]) for item in data["logs"]["edges"]]
+        if "logs" in data:
+            if data.get("logs"):
+                logs = [TaskLog(**item["node"]) for item in data["logs"]["edges"]]
             del data["logs"]
 
         return cls(**data, related_nodes=related_nodes, logs=logs)

infrahub_sdk/timestamp.py

@@ -29,7 +29,7 @@ REGEX_MAPPING = {
 class Timestamp:
     _obj: ZonedDateTime
 
-    def __init__(self, value: str | ZonedDateTime | Timestamp | None = None):
+    def __init__(self, value: str | ZonedDateTime | Timestamp | None = None) -> None:
         if value and isinstance(value, ZonedDateTime):
             self._obj = value
         elif value and isinstance(value, self.__class__):

infrahub_sdk/transfer/exporter/json.py

@@ -22,7 +22,7 @@ if TYPE_CHECKING:
 
 
 class LineDelimitedJSONExporter(ExporterInterface):
-    def __init__(self, client: InfrahubClient, console: Console | None = None):
+    def __init__(self, client: InfrahubClient, console: Console | None = None) -> None:
         self.client = client
         self.console = console
 

infrahub_sdk/transfer/importer/json.py

@@ -31,7 +31,7 @@ class LineDelimitedJSONImporter(ImporterInterface):
         topological_sorter: InfrahubSchemaTopologicalSorter,
         continue_on_error: bool = False,
         console: Console | None = None,
-    ):
+    ) -> None:
         self.client = client
         self.topological_sorter = topological_sorter
         self.continue_on_error = continue_on_error

infrahub_sdk/transforms.py

@@ -27,7 +27,7 @@ class InfrahubTransform(InfrahubOperation):
         branch: str = "",
         root_directory: str = "",
         server_url: str = "",
-    ):
+    ) -> None:
         super().__init__(
             client=client,
             infrahub_node=infrahub_node,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.5.0b1
+Version: 1.5.1
 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
@@ -18,11 +18,13 @@ Requires-Dist: asgi-correlation-id (==4.2.0)
 Requires-Dist: authlib (==1.6.5)
 Requires-Dist: bcrypt (>=4.1,<4.2)
 Requires-Dist: boto3 (==1.34.129)
+Requires-Dist: cachetools-async (>=0.0.5,<0.0.6)
+Requires-Dist: click (==8.1.7)
 Requires-Dist: copier (>=9.8.0,<10.0.0)
 Requires-Dist: dulwich (>=0.22.7,<0.23.0)
 Requires-Dist: email-validator (>=2.1,<2.2)
 Requires-Dist: fast-depends (>=2.4.12,<3.0.0)
-Requires-Dist: fastapi (==0.116.1)
+Requires-Dist: fastapi (==0.121.1)
 Requires-Dist: fastapi-storages (>=0.3,<0.4)
 Requires-Dist: gitpython (>=3,<4)
 Requires-Dist: graphene (>=3.4,<3.5)