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

infrahub_sdk/object_store.py

@@ -16,7 +16,7 @@ class ObjectStoreBase:
 
 
 class ObjectStore(ObjectStoreBase):
-    def __init__(self, client: InfrahubClient):
+    def __init__(self, client: InfrahubClient) -> None:
         self.client = client
 
     async def get(self, identifier: str, tracker: str | None = None) -> str:
@@ -64,7 +64,7 @@ class ObjectStore(ObjectStoreBase):
 
 
 class ObjectStoreSync(ObjectStoreBase):
-    def __init__(self, client: InfrahubClientSync):
+    def __init__(self, client: InfrahubClientSync) -> None:
         self.client = client
 
     def get(self, identifier: str, tracker: str | None = None) -> str:

infrahub_sdk/operation.py

@@ -19,7 +19,7 @@ class InfrahubOperation:
         convert_query_response: bool,
         branch: str,
         root_directory: str,
-    ):
+    ) -> None:
         self.branch = branch
         self.convert_query_response = convert_query_response
         self.root_directory = root_directory or os.getcwd()

infrahub_sdk/protocols_generator/generator.py

@@ -34,7 +34,7 @@ def move_to_end_of_list(lst: list, item: str) -> list:
 
 
 class CodeGenerator:
-    def __init__(self, schema: dict[str, MainSchemaTypesAll]):
+    def __init__(self, schema: dict[str, MainSchemaTypesAll]) -> None:
         self.generics: dict[str, GenericSchemaAPI | GenericSchema] = {}
         self.nodes: dict[str, NodeSchemaAPI | NodeSchema] = {}
         self.profiles: dict[str, ProfileSchemaAPI] = {}

infrahub_sdk/pytest_plugin/exceptions.py

@@ -7,37 +7,37 @@ class Error(Exception):
 
 
 class InvalidResourceConfigError(Error):
-    def __init__(self, resource_name: str):
+    def __init__(self, resource_name: str) -> None:
         super().__init__(f"Improperly configured resource with name '{resource_name}'.")
 
 
 class DirectoryNotFoundError(Error):
-    def __init__(self, name: str, message: str = ""):
+    def __init__(self, name: str, message: str = "") -> None:
         self.message = message or f"Unable to find directory {name!r}."
         super().__init__(self.message)
 
 
 class FileNotValidError(Error):
-    def __init__(self, name: str, message: str = ""):
+    def __init__(self, name: str, message: str = "") -> None:
         self.message = message or f"Unable to access file {name!r}."
         super().__init__(self.message)
 
 
 class OutputMatchError(Error):
-    def __init__(self, name: str, message: str = "", differences: str = ""):
+    def __init__(self, name: str, message: str = "", differences: str = "") -> None:
         self.message = message or f"Rendered output does not match expected output for {name!r}."
         self.differences = differences
         super().__init__(self.message)
 
 
 class Jinja2TransformError(Error):
-    def __init__(self, name: str, message: str = ""):
+    def __init__(self, name: str, message: str = "") -> None:
         self.message = message or f"Unexpected error happened while processing {name!r}."
         super().__init__(self.message)
 
 
 class Jinja2TransformUndefinedError(Error):
-    def __init__(self, name: str, rtb: Traceback, errors: list[tuple[Frame, Syntax]], message: str = ""):
+    def __init__(self, name: str, rtb: Traceback, errors: list[tuple[Frame, Syntax]], message: str = "") -> None:
         self.rtb = rtb
         self.errors = errors
         self.message = message or f"Unable to render Jinja2 transform {name!r}."
@@ -45,18 +45,18 @@ class Jinja2TransformUndefinedError(Error):
 
 
 class CheckDefinitionError(Error):
-    def __init__(self, name: str, message: str = ""):
+    def __init__(self, name: str, message: str = "") -> None:
         self.message = message or f"Check {name!r} is not properly defined."
         super().__init__(self.message)
 
 
 class CheckResultError(Error):
-    def __init__(self, name: str, message: str = ""):
+    def __init__(self, name: str, message: str = "") -> None:
         self.message = message or f"Unexpected result for check {name!r}."
         super().__init__(self.message)
 
 
 class PythonTransformDefinitionError(Error):
-    def __init__(self, name: str, message: str = ""):
+    def __init__(self, name: str, message: str = "") -> None:
         self.message = message or f"Python transform {name!r} is not properly defined."
         super().__init__(self.message)

infrahub_sdk/pytest_plugin/items/base.py

@@ -25,7 +25,7 @@ class InfrahubItem(pytest.Item):
         resource_config: InfrahubRepositoryConfigElement,
         test: InfrahubTest,
         **kwargs: dict[str, Any],
-    ):
+    ) -> None:
         super().__init__(*args, **kwargs)  # type: ignore[arg-type]
         self.resource_name: str = resource_name
         self.resource_config: InfrahubRepositoryConfigElement = resource_config

infrahub_sdk/pytest_plugin/items/check.py

@@ -27,7 +27,7 @@ class InfrahubCheckItem(InfrahubItem):
         resource_config: InfrahubRepositoryConfigElement,
         test: InfrahubTest,
         **kwargs: dict[str, Any],
-    ):
+    ) -> None:
         super().__init__(*args, resource_name=resource_name, resource_config=resource_config, test=test, **kwargs)
 
         self.check_instance: InfrahubCheck

infrahub_sdk/pytest_plugin/items/python_transform.py

@@ -28,7 +28,7 @@ class InfrahubPythonTransformItem(InfrahubItem):
         resource_config: InfrahubRepositoryConfigElement,
         test: InfrahubTest,
         **kwargs: dict[str, Any],
-    ):
+    ) -> None:
         super().__init__(*args, resource_name=resource_name, resource_config=resource_config, test=test, **kwargs)
 
         self.transform_instance: InfrahubTransform

infrahub_sdk/repository.py

@@ -7,7 +7,7 @@ from dulwich.repo import Repo
 
 
 class GitRepoManager:
-    def __init__(self, root_directory: str, branch: str = "main"):
+    def __init__(self, root_directory: str, branch: str = "main") -> None:
         self.root_directory = root_directory
         self.branch = branch
         self.git: Repo = self.initialize_repo()

infrahub_sdk/schema/__init__.py

@@ -115,7 +115,7 @@ class InfrahubSchemaBase:
     client: InfrahubClient | InfrahubClientSync
     cache: dict[str, BranchSchema]
 
-    def __init__(self, client: InfrahubClient | InfrahubClientSync):
+    def __init__(self, client: InfrahubClient | InfrahubClientSync) -> None:
         self.client = client
         self.cache = {}
 

infrahub_sdk/spec/object.py

@@ -209,6 +209,7 @@ class InfrahubObjectFileData(BaseModel):
                 position=[idx + 1],
                 branch=branch,
                 default_schema_kind=self.kind,
+                parameters=self.parameters,
             )
 
     @classmethod
@@ -458,7 +459,6 @@ class InfrahubObjectFileData(BaseModel):
                             data=value,
                             branch=branch,
                             default_schema_kind=default_schema_kind,
-                            parameters=parameters,
                         )
                         clean_data[key] = nodes[0]
 
@@ -470,7 +470,9 @@ class InfrahubObjectFileData(BaseModel):
                             data=value,
                             branch=branch,
                             default_schema_kind=default_schema_kind,
-                            parameters=parameters,
+                            parameters=InfrahubObjectParameters(**value.get("parameters"))
+                            if "parameters" in value
+                            else None,
                         )
                         clean_data[key] = nodes
 
@@ -509,7 +511,9 @@ class InfrahubObjectFileData(BaseModel):
                 context=context,
                 branch=branch,
                 default_schema_kind=default_schema_kind,
-                parameters=parameters,
+                parameters=InfrahubObjectParameters(**data[rel].get("parameters"))
+                if "parameters" in data[rel]
+                else None,
             )
 
         return node

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.0b2.dist-info → infrahub_server-1.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.5.0b2
+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
@@ -24,7 +24,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)