infrahub-server 1.7.0__tar.gz → 1.7.0rc0__tar.gz

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infrahub-server
-Version: 1.7.0
+Version: 1.7.0rc0
 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.
 Project-URL: Homepage, https://opsmill.com
 Project-URL: Repository, https://github.com/opsmill/infrahub

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/backend/infrahub/core/migrations/schema/attribute_kind_update.py

@@ -40,7 +40,7 @@ class AttributeKindUpdateMigrationQuery(AttributeMigrationQuery):
 // ------------
 // start with all the Attribute vertices we might care about
 // ------------
-MATCH (n:%(schema_kinds)s)-[:HAS_ATTRIBUTE]->(attr:Attribute)
+MATCH (n:%(schema_kind)s)-[:HAS_ATTRIBUTE]->(attr:Attribute)
 WHERE attr.name = $attr_name
 WITH DISTINCT n, attr
 
@@ -76,7 +76,7 @@ CALL (av_is_default, av_value) {
 // ------------
 WITH 1 AS one
 LIMIT 1
-MATCH (n:%(schema_kinds)s)-[:HAS_ATTRIBUTE]->(attr:Attribute)
+MATCH (n:%(schema_kind)s)-[:HAS_ATTRIBUTE]->(attr:Attribute)
 WHERE attr.name = $attr_name
 WITH DISTINCT n, attr
 
@@ -94,6 +94,7 @@ CALL (n, attr) {
     RETURN has_value_e, av
 }
 
+
 // ------------
 // create and update the HAS_VALUE edges
 // ------------
@@ -153,9 +154,7 @@ CALL (attr, n) {
     SET n.updated_at = $at, n.updated_by = $user_id
 }
         """ % {
-            "schema_kinds": (
-                f"{self.migration.previous_schema.kind}|Profile{self.migration.previous_schema.kind}|Template{self.migration.previous_schema.kind}"
-            ),
+            "schema_kind": self.migration.previous_schema.kind,
             "branch_filter": branch_filter,
             "new_attr_value_labels": new_attr_value_labels,
         }

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/backend/infrahub/core/schema/attribute_parameters.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import Any, Self
+from typing import Self
 
 from pydantic import ConfigDict, Field, model_validator
 
@@ -24,33 +24,6 @@ def get_attribute_parameters_class_for_kind(kind: str) -> type[AttributeParamete
 class AttributeParameters(HashableModel):
     model_config = ConfigDict(extra="forbid")
 
-    @classmethod
-    def convert_from(cls, source: AttributeParameters) -> Self:
-        """Convert from another AttributeParameters subclass.
-
-        Args:
-            source: The source AttributeParameters instance to convert from
-
-        Returns:
-            A new instance of the target class with compatible fields populated
-        """
-        source_data = source.model_dump()
-        return cls.convert_from_dict(source_data=source_data)
-
-    @classmethod
-    def convert_from_dict(cls, source_data: dict[str, Any]) -> Self:
-        """Convert from a dictionary to the target class.
-
-        Args:
-            source_data: The source dictionary to convert from
-
-        Returns:
-            A new instance of the target class with compatible fields populated
-        """
-        target_fields = set(cls.model_fields.keys())
-        filtered_data = {k: v for k, v in source_data.items() if k in target_fields}
-        return cls(**filtered_data)
-
 
 class TextAttributeParameters(AttributeParameters):
     regex: str | None = Field(

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/backend/infrahub/core/schema/attribute_schema.py

@@ -114,20 +114,13 @@ class AttributeSchema(GeneratedAttributeSchema):
     @field_validator("parameters", mode="before")
     @classmethod
     def set_parameters_type(cls, value: Any, info: ValidationInfo) -> Any:
-        """Override parameters class if using base AttributeParameters class and should be using a subclass.
-
-        This validator handles parameter type conversion when an attribute's kind changes.
-        Fields from the source that don't exist in the target are silently dropped.
-        Fields with the same name in both classes are preserved.
-        """
+        """Override parameters class if using base AttributeParameters class and should be using a subclass"""
         kind = info.data["kind"]
         expected_parameters_class = get_attribute_parameters_class_for_kind(kind=kind)
         if value is None:
             return expected_parameters_class()
         if not isinstance(value, expected_parameters_class) and isinstance(value, AttributeParameters):
-            return expected_parameters_class.convert_from(value)
-        if isinstance(value, dict):
-            return expected_parameters_class.convert_from_dict(source_data=value)
+            return expected_parameters_class(**value.model_dump())
         return value
 
     @model_validator(mode="after")

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/backend/infrahub/core/validators/attribute/kind.py

@@ -36,7 +36,7 @@ class AttributeKindUpdateValidatorQuery(AttributeSchemaValidatorQuery):
         self.params["null_value"] = NULL_VALUE
 
         query = """
-        MATCH (n:%(node_kinds)s)
+        MATCH p = (n:%(node_kind)s)
         CALL (n) {
             MATCH path = (root:Root)<-[rr:IS_PART_OF]-(n)-[ra:HAS_ATTRIBUTE]-(:Attribute { name: $attr_name } )-[rv:HAS_VALUE]-(av:AttributeValue)
             WHERE all(
@@ -51,10 +51,7 @@ class AttributeKindUpdateValidatorQuery(AttributeSchemaValidatorQuery):
         WHERE all(r in relationships(full_path) WHERE r.status = "active")
         AND attribute_value IS NOT NULL
         AND attribute_value <> $null_value
-        """ % {
-            "branch_filter": branch_filter,
-            "node_kinds": f"{self.node_schema.kind}|Profile{self.node_schema.kind}|Template{self.node_schema.kind}",
-        }
+        """ % {"branch_filter": branch_filter, "node_kind": self.node_schema.kind}
 
         self.add_to_query(query)
         self.return_labels = ["node.uuid", "attribute_value", "value_relationship.branch as value_branch"]

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/backend/infrahub/graphql/manager.py

@@ -598,10 +598,7 @@ class GraphQLSchemaManager:
                 required=False,
                 description="Human friendly identifier",
             ),
-            "_updated_at": graphene.DateTime(
-                required=False,
-                deprecation_reason="Query the node_metadata field instead. Will be removed in Infrahub 1.9",
-            ),
+            "_updated_at": graphene.DateTime(required=False),
             "display_label": graphene.String(required=False),
             "Meta": type("Meta", (object,), meta_attrs),
         }
@@ -1212,10 +1209,7 @@ class GraphQLSchemaManager:
 
         main_attrs: dict[str, Any] = {
             "node": graphene.Field(base_interface, required=False),
-            "_updated_at": graphene.DateTime(
-                required=False,
-                deprecation_reason="Query the node_metadata field instead. Will be removed in Infrahub 1.9",
-            ),
+            "_updated_at": graphene.DateTime(required=False),
             "node_metadata": graphene.Field(node_metadata, required=True),
             "Meta": type("Meta", (object,), meta_attrs),
         }

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/backend/infrahub/lock.py

@@ -10,7 +10,6 @@ from typing import TYPE_CHECKING
 
 import redis.asyncio as redis
 from prometheus_client import Histogram
-from redis import UsernamePasswordCredentialProvider
 from redis.asyncio.lock import Lock as GlobalLock
 
 from infrahub import config
@@ -276,16 +275,10 @@ class InfrahubLockRegistry:
     ) -> None:
         if config.SETTINGS.cache.enable and not local_only:
             if config.SETTINGS.cache.driver == config.CacheDriver.Redis:
-                credential_provider: UsernamePasswordCredentialProvider | None = None
-                if config.SETTINGS.cache.username and config.SETTINGS.cache.password:
-                    credential_provider = UsernamePasswordCredentialProvider(
-                        username=config.SETTINGS.cache.username, password=config.SETTINGS.cache.password
-                    )
                 self.connection = redis.Redis(
                     host=config.SETTINGS.cache.address,
                     port=config.SETTINGS.cache.service_port,
                     db=config.SETTINGS.cache.database,
-                    credential_provider=credential_provider,
                     ssl=config.SETTINGS.cache.tls_enabled,
                     ssl_cert_reqs="optional" if not config.SETTINGS.cache.tls_insecure else "none",
                     ssl_check_hostname=not config.SETTINGS.cache.tls_insecure,

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/backend/infrahub/services/adapters/cache/redis.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import redis.asyncio as redis
-from redis import UsernamePasswordCredentialProvider
 
 from infrahub import config
 from infrahub.services.adapters.cache import InfrahubCache
@@ -14,16 +13,10 @@ if TYPE_CHECKING:
 
 class RedisCache(InfrahubCache):
     def __init__(self) -> None:
-        credential_provider: UsernamePasswordCredentialProvider | None = None
-        if config.SETTINGS.cache.username and config.SETTINGS.cache.password:
-            credential_provider = UsernamePasswordCredentialProvider(
-                username=config.SETTINGS.cache.username, password=config.SETTINGS.cache.password
-            )
         self.connection = redis.Redis(
             host=config.SETTINGS.cache.address,
             port=config.SETTINGS.cache.service_port,
             db=config.SETTINGS.cache.database,
-            credential_provider=credential_provider,
             ssl=config.SETTINGS.cache.tls_enabled,
             ssl_cert_reqs="optional" if not config.SETTINGS.cache.tls_insecure else "none",
             ssl_check_hostname=not config.SETTINGS.cache.tls_insecure,

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "infrahub-server"
-version = "1.7.0"
+version = "1.7.0rc0"
 description = "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."
 authors = [{ name = "OpsMill", email = "info@opsmill.com" }]
 requires-python = ">=3.12,<3.14"
@@ -994,6 +994,7 @@ include = ["python_testcontainers/**"]
 # The ignored rules below should be removed once the code has been updated, they are included    #
 # like this so that we can reactivate them one by one.                                           #
 ##################################################################################################
+invalid-argument-type = "ignore"
 possibly-missing-attribute = "ignore"
 too-many-positional-arguments = "ignore"
 unresolved-attribute = "ignore"
@@ -1082,17 +1083,8 @@ include = ["backend/infrahub/services/**"]
 # like this so that we can reactivate them one by one.                                           #
 ##################################################################################################
 deprecated = "ignore"
-unresolved-attribute = "ignore"
-
-[[tool.ty.overrides]]
-include = ["backend/infrahub/services/adapters/**/nats.py"]
-
-[tool.ty.overrides.rules]
-##################################################################################################
-# The ignored rules below should be removed once the code has been updated, they are included    #
-# like this so that we can reactivate them one by one.                                           #
-##################################################################################################
 possibly-missing-attribute = "ignore"
+unresolved-attribute = "ignore"
 
 [[tool.ty.overrides]]
 include = ["backend/infrahub/proposed_change/**"]
@@ -1441,6 +1433,16 @@ invalid-return-type = "ignore"
 possibly-missing-attribute = "ignore"
 unresolved-import = "ignore"
 
+[[tool.ty.overrides]]
+include = ["backend/tests/conftest.py"]
+
+[tool.ty.overrides.rules]
+##################################################################################################
+# The ignored rules below should be removed once the code has been updated, they are included    #
+# like this so that we can reactivate them one by one.                                           #
+##################################################################################################
+invalid-argument-type = "ignore"
+
 [tool.hatch.build.targets.sdist]
 include = [
     "backend/infrahub",

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/python_sdk/infrahub_sdk/analyzer.py

@@ -30,10 +30,10 @@ class GraphQLOperation(BaseModel):
 
 
 class GraphQLQueryAnalyzer:
-    def __init__(self, query: str, schema: GraphQLSchema | None = None, document: DocumentNode | None = None) -> None:
+    def __init__(self, query: str, schema: GraphQLSchema | None = None) -> None:
         self.query: str = query
         self.schema: GraphQLSchema | None = schema
-        self.document: DocumentNode = document or parse(self.query)
+        self.document: DocumentNode = parse(self.query)
         self._fields: dict | None = None
 
     @property

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/python_sdk/infrahub_sdk/branch.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import warnings
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Literal, overload
 from urllib.parse import urlencode
@@ -92,6 +93,7 @@ class InfrahubBranchManager(InfraHubBranchManagerBase):
         sync_with_git: bool = True,
         description: str = "",
         wait_until_completion: Literal[True] = True,
+        background_execution: bool | None = False,
     ) -> BranchData: ...
 
     @overload
@@ -101,6 +103,7 @@ class InfrahubBranchManager(InfraHubBranchManagerBase):
         sync_with_git: bool = True,
         description: str = "",
         wait_until_completion: Literal[False] = False,
+        background_execution: bool | None = False,
     ) -> str: ...
 
     async def create(
@@ -109,9 +112,19 @@ class InfrahubBranchManager(InfraHubBranchManagerBase):
         sync_with_git: bool = True,
         description: str = "",
         wait_until_completion: bool = True,
+        background_execution: bool | None = False,
     ) -> BranchData | str:
+        if background_execution is not None:
+            warnings.warn(
+                "`background_execution` is deprecated, please use `wait_until_completion` instead.",
+                DeprecationWarning,
+                stacklevel=1,
+            )
+
+        background_execution = background_execution or not wait_until_completion
         input_data = {
-            "wait_until_completion": wait_until_completion,
+            # Should be switched to `wait_until_completion` once `background_execution` is removed server side.
+            "background_execution": background_execution,
             "data": {
                 "name": branch_name,
                 "description": description,
@@ -119,14 +132,15 @@ class InfrahubBranchManager(InfraHubBranchManagerBase):
             },
         }
 
-        mutation_query = MUTATION_QUERY_DATA if wait_until_completion else MUTATION_QUERY_TASK
+        mutation_query = MUTATION_QUERY_TASK if background_execution else MUTATION_QUERY_DATA
         query = Mutation(mutation="BranchCreate", input_data=input_data, query=mutation_query)
         response = await self.client.execute_graphql(query=query.render(), tracker="mutation-branch-create")
 
-        if wait_until_completion:
-            return BranchData(**response["BranchCreate"]["object"])
-
-        return response["BranchCreate"]["task"]["id"]
+        # Make sure server version is recent enough to support background execution, as previously
+        # using background_execution=True had no effect.
+        if background_execution and "task" in response["BranchCreate"]:
+            return response["BranchCreate"]["task"]["id"]
+        return BranchData(**response["BranchCreate"]["object"])
 
     async def delete(self, branch_name: str) -> bool:
         input_data = {
@@ -247,6 +261,7 @@ class InfrahubBranchManagerSync(InfraHubBranchManagerBase):
         sync_with_git: bool = True,
         description: str = "",
         wait_until_completion: Literal[True] = True,
+        background_execution: bool | None = False,
     ) -> BranchData: ...
 
     @overload
@@ -256,6 +271,7 @@ class InfrahubBranchManagerSync(InfraHubBranchManagerBase):
         sync_with_git: bool = True,
         description: str = "",
         wait_until_completion: Literal[False] = False,
+        background_execution: bool | None = False,
     ) -> str: ...
 
     def create(
@@ -264,9 +280,19 @@ class InfrahubBranchManagerSync(InfraHubBranchManagerBase):
         sync_with_git: bool = True,
         description: str = "",
         wait_until_completion: bool = True,
+        background_execution: bool | None = False,
     ) -> BranchData | str:
+        if background_execution is not None:
+            warnings.warn(
+                "`background_execution` is deprecated, please use `wait_until_completion` instead.",
+                DeprecationWarning,
+                stacklevel=1,
+            )
+
+        background_execution = background_execution or not wait_until_completion
         input_data = {
-            "wait_until_completion": wait_until_completion,
+            # Should be switched to `wait_until_completion` once `background_execution` is removed server side.
+            "background_execution": background_execution,
             "data": {
                 "name": branch_name,
                 "description": description,
@@ -274,14 +300,15 @@ class InfrahubBranchManagerSync(InfraHubBranchManagerBase):
             },
         }
 
-        mutation_query = MUTATION_QUERY_DATA if wait_until_completion else MUTATION_QUERY_TASK
+        mutation_query = MUTATION_QUERY_TASK if background_execution else MUTATION_QUERY_DATA
         query = Mutation(mutation="BranchCreate", input_data=input_data, query=mutation_query)
         response = self.client.execute_graphql(query=query.render(), tracker="mutation-branch-create")
 
-        if wait_until_completion:
-            return BranchData(**response["BranchCreate"]["object"])
-
-        return response["BranchCreate"]["task"]["id"]
+        # Make sure server version is recent enough to support background execution, as previously
+        # using background_execution=True had no effect.
+        if background_execution and "task" in response["BranchCreate"]:
+            return response["BranchCreate"]["task"]["id"]
+        return BranchData(**response["BranchCreate"]["object"])
 
     def delete(self, branch_name: str) -> bool:
         input_data = {

{infrahub_server-1.7.0 → infrahub_server-1.7.0rc0}/python_sdk/infrahub_sdk/checks.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+import asyncio
 import importlib
-import inspect
-import pathlib
+import os
 import warnings
 from abc import abstractmethod
 from typing import TYPE_CHECKING, Any
@@ -55,7 +55,7 @@ class InfrahubCheck:
         self.branch = branch
         self.params = params or {}
 
-        self.root_directory = root_directory or str(pathlib.Path.cwd())
+        self.root_directory = root_directory or os.getcwd()
 
         self._client = client
 
@@ -160,7 +160,7 @@ class InfrahubCheck:
             data = await self.collect_data()
         unpacked = data.get("data") or data
 
-        if inspect.iscoroutinefunction(self.validate):
+        if asyncio.iscoroutinefunction(self.validate):
             await self.validate(data=unpacked)
         else:
             self.validate(data=unpacked)