infrahub-server 1.6.3__tar.gz → 1.7.0b0__tar.gz

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/.gitignore

@@ -6,7 +6,7 @@ coverage.xml
 script.py
 **/*.local.*
 local/*
-.vscode/settings.json
+**/.vscode/settings.json
 node_modules/*
 development/docker-compose.override.yml
 development/docker-compose.dev-override.yml

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infrahub-server
-Version: 1.6.3
+Version: 1.7.0b0
 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
@@ -11,9 +11,10 @@ License-File: LICENSE.txt
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: <3.13,>=3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: <3.14,>=3.12
 Requires-Dist: aio-pika<9.5,>=9.4
-Requires-Dist: aiodataloader==0.4.0
+Requires-Dist: aiodataloader==0.4.3
 Requires-Dist: ariadne-codegen==0.15.3
 Requires-Dist: asgi-correlation-id==4.2.0
 Requires-Dist: authlib==1.6.5
@@ -24,7 +25,7 @@ Requires-Dist: click==8.1.7
 Requires-Dist: deepdiff==8.6.1
 Requires-Dist: dulwich==0.22.7
 Requires-Dist: email-validator<2.2,>=2.1
-Requires-Dist: fast-depends==2.4.12
+Requires-Dist: fast-depends==3.0.5
 Requires-Dist: fastapi-storages<0.4,>=0.3
 Requires-Dist: fastapi==0.121.1
 Requires-Dist: gitpython<4,>=3
@@ -33,22 +34,22 @@ Requires-Dist: gunicorn<24,>=23.0.0
 Requires-Dist: jinja2<4,>=3
 Requires-Dist: lunr<0.8,>=0.7.0.post1
 Requires-Dist: nats-py==2.7.2
-Requires-Dist: neo4j-rust-ext<5.29,>=5.28
-Requires-Dist: neo4j<5.29,>=5.28
+Requires-Dist: neo4j-rust-ext==6.0.3.0
+Requires-Dist: neo4j==6.0.3
 Requires-Dist: netaddr==1.3.0
 Requires-Dist: netutils==1.12.0
-Requires-Dist: numpy==1.26.2
-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-redis==0.2.6
-Requires-Dist: prefect==3.5.0
-Requires-Dist: pyarrow<15,>=14
+Requires-Dist: numpy>=1.26.2
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.39.0
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.39.0
+Requires-Dist: opentelemetry-instrumentation-aio-pika==0.60b0
+Requires-Dist: opentelemetry-instrumentation-fastapi==0.60b0
+Requires-Dist: prefect-redis==0.2.8
+Requires-Dist: prefect==3.6.7
+Requires-Dist: pyarrow>=14
 Requires-Dist: pydantic-settings<2.9,>=2.8
-Requires-Dist: pydantic<2.11,>=2.10
+Requires-Dist: pydantic<2.13,>=2.12
 Requires-Dist: pyjwt<2.9,>=2.8
-Requires-Dist: pytest<7.5,>=7.4
+Requires-Dist: pytest<9.1,>=9.0
 Requires-Dist: python-multipart==0.0.18
 Requires-Dist: pyyaml<7,>=6
 Requires-Dist: redis[hiredis]==6.0.0

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/actions/tasks.py

@@ -211,8 +211,10 @@ async def configure_action_rules(
     service: InfrahubServices,
 ) -> None:
     await setup_triggers_specific(
-        gatherer=gather_trigger_action_rules, trigger_type=TriggerType.ACTION_TRIGGER_RULE, db=service.database
-    )  # type: ignore[misc]
+        gatherer=gather_trigger_action_rules,  # type: ignore[arg-type]
+        trigger_type=TriggerType.ACTION_TRIGGER_RULE,
+        db=service.database,
+    )
 
 
 async def _get_targets(

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/api/schema.py

@@ -366,6 +366,7 @@ async def load_schema(
                 diff=result.diff,
                 limit=result.diff.all,
                 update_db=True,
+                user_id=account_session.account_id,
             )
             branch.update_schema_hash()
             log.info("Schema has been updated", branch=branch.name, hash=branch.active_schema_hash.main)
@@ -375,7 +376,7 @@ async def load_schema(
                 branch.is_isolated = True
                 log.info("Branch converted to isolated mode because the schema has changed", branch=branch.name)
 
-            await branch.save(db=dbt)
+            await branch.save(db=dbt, user_id=account_session.account_id)
             updated_branch = registry.schema.get_schema_branch(name=branch.name)
             updated_hash = updated_branch.get_hash()
 
@@ -387,6 +388,7 @@ async def load_schema(
             new_schema=candidate_schema,
             previous_schema=origin_schema,
             migrations=result.migrations,
+            user_id=account_session.account_id,
         )
         migration_error_msgs = await service.workflow.execute_workflow(
             workflow=SCHEMA_APPLY_MIGRATION,

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/artifacts/tasks.py

@@ -14,6 +14,7 @@ async def create(model: CheckArtifactCreate) -> ValidatorConclusion:
     await add_tags(branches=[model.branch_name], nodes=[model.target_id])
 
     client = get_client()
+    client.request_context = model.context.to_request_context()
 
     validator = await client.get(kind=InfrahubKind.ARTIFACTVALIDATOR, id=model.validator_id, include=["checks"])
 

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/auth.py

@@ -73,8 +73,8 @@ async def authenticate_with_password(
 ) -> models.UserToken:
     selected_branch = await registry.get_branch(db=db, branch=branch)
 
-    response: list[CoreGenericAccount] = await NodeManager.query(
-        schema=InfrahubKind.GENERICACCOUNT,
+    response = await NodeManager.query(
+        schema=CoreGenericAccount,
         db=db,
         branch=selected_branch,
         filters={"name__value": credentials.username},

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/cli/db.py

@@ -603,17 +603,17 @@ RETURN vertices, edges
     edge_path = export_dir / Path("edges.csv")
     edge_path.touch(exist_ok=True)
 
-    graph_node_schemas = [GraphNodeProperties, GraphRelationshipProperties, GraphAttributeProperties]
+    graph_node_schemas = (GraphNodeProperties, GraphRelationshipProperties, GraphAttributeProperties)
     graph_vertex_properties = set()
-    for graph_schema in graph_node_schemas:
-        for field_name, field_info in graph_schema.model_fields.items():
+    for graph_node_schema in graph_node_schemas:
+        for field_name, field_info in graph_node_schema.model_fields.items():
             property_name = field_info.alias or field_name
             graph_vertex_properties.add(property_name)
 
-    graph_edge_schemas = [GraphRelationshipIsPartOf, GraphRelationshipDefault]
+    graph_edge_schemas = (GraphRelationshipIsPartOf, GraphRelationshipDefault)
     graph_edge_properties = set()
-    for graph_schema in graph_edge_schemas:
-        for field_name, field_info in graph_schema.model_fields.items():
+    for graph_edge_schema in graph_edge_schemas:
+        for field_name, field_info in graph_edge_schema.model_fields.items():
             property_name = field_info.alias or field_name
             graph_edge_properties.add(property_name)
 

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/computed_attribute/gather.py

@@ -7,9 +7,9 @@ from prefect import task
 from prefect.cache_policies import NONE
 from prefect.logging import get_run_logger
 
-from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
 from infrahub.core.protocols import CoreGenericRepository, CoreGraphQLQuery
+from infrahub.core.protocols import CoreTransformPython as CoreTransformPythonNode
 from infrahub.core.registry import registry
 from infrahub.database import InfrahubDatabase  # noqa: TC001  needed for prefect flow
 from infrahub.git.utils import get_repositories_commit_per_branch
@@ -24,7 +24,6 @@ from .models import (
 )
 
 if TYPE_CHECKING:
-    from infrahub.core.protocols import CoreTransformPython as CoreTransformPythonNode
     from infrahub.git.models import RepositoryData
 
 
@@ -48,9 +47,9 @@ async def gather_python_transform_attributes(
     if not transform_names:
         return []
 
-    transforms: list[CoreTransformPythonNode] = await NodeManager.query(
+    transforms = await NodeManager.query(
         db=db,
-        schema=InfrahubKind.TRANSFORMPYTHON,
+        schema=CoreTransformPythonNode,
         branch=branch_name,
         fields={"id": None, "name": None, "repository": None, "query": None},
         filters={"name__values": transform_names},

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/computed_attribute/tasks.py

@@ -42,8 +42,10 @@ mutation UpdateAttribute(
     $kind: String!,
     $attribute: String!,
     $value: String!
+    $context_account_id: String!
   ) {
   InfrahubUpdateComputedAttribute(
+    context: {account: {id: $context_account_id}},
     data: {id: $id, attribute: $attribute, value: $value, kind: $kind}
   ) {
     ok
@@ -62,7 +64,7 @@ async def process_transform(
     object_id: str,
     computed_attribute_name: str,  # noqa: ARG001
     computed_attribute_kind: str,  # noqa: ARG001
-    context: InfrahubContext,  # noqa: ARG001
+    context: InfrahubContext,
     updated_fields: list[str] | None = None,  # noqa: ARG001
 ) -> None:
     await add_tags(branches=[branch_name], nodes=[object_id])
@@ -103,7 +105,7 @@ async def process_transform(
             name=transform.repository.peer.name.value,
             repository_kind=str(transform.repository.peer.typename),
             commit=repo_node.commit.value,
-        )  # type: ignore[misc]
+        )
 
         data = await client.query_gql_query(
             name=transform.query.id,
@@ -120,11 +122,17 @@ async def process_transform(
             location=f"{transform.file_path.value}::{transform.class_name.value}",
             data=data,
             convert_query_response=transform.convert_query_response.value,
-        )  # type: ignore[misc]
+        )  # type: ignore[call-overload]
 
         await client.execute_graphql(
             query=UPDATE_ATTRIBUTE,
-            variables={"id": object_id, "kind": node_kind, "attribute": attribute_name, "value": transformed_data},
+            variables={
+                "id": object_id,
+                "kind": node_kind,
+                "attribute": attribute_name,
+                "value": transformed_data,
+                "context_account_id": context.account.account_id,
+            },
             branch_name=branch_name,
         )
 
@@ -168,6 +176,7 @@ async def computed_attribute_jinja2_update_value(
     node_kind: str,
     attribute_name: str,
     template: Jinja2Template,
+    context: InfrahubContext,
 ) -> None:
     log = get_run_logger()
     client = get_client()
@@ -182,7 +191,13 @@ async def computed_attribute_jinja2_update_value(
     try:
         await client.execute_graphql(
             query=UPDATE_ATTRIBUTE,
-            variables={"id": obj.node_id, "kind": node_kind, "attribute": attribute_name, "value": value},
+            variables={
+                "id": obj.node_id,
+                "kind": node_kind,
+                "attribute": attribute_name,
+                "value": value,
+                "context_account_id": context.account.account_id,
+            },
             branch_name=branch_name,
         )
         log.info(f"Updating computed attribute {node_kind}.{attribute_name}='{value}' ({obj.node_id})")
@@ -202,7 +217,7 @@ async def process_jinja2(
     object_id: str,
     computed_attribute_name: str,
     computed_attribute_kind: str,
-    context: InfrahubContext,  # noqa: ARG001
+    context: InfrahubContext,
     updated_fields: list[str] | None = None,
 ) -> None:
     log = get_run_logger()
@@ -258,6 +273,7 @@ async def process_jinja2(
                 node_kind=node_schema.kind,
                 attribute_name=computed_macro.attribute.name,
                 template=jinja_template,
+                context=context,
             )
 
         _ = [response async for _, response in batch.execute()]
@@ -462,6 +478,7 @@ async def query_transform_targets(
                         "object_id": subscriber.object_id,
                         "computed_attribute_name": computed_attribute.name,
                         "computed_attribute_kind": subscriber.kind,
+                        "context": context,
                     },
                 )
 

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/config.py

@@ -207,6 +207,14 @@ class MainSettings(BaseSettings):
     def convert_to_path(cls, value: Path | str) -> Path:
         return Path(value) if isinstance(value, str) else value
 
+    @property
+    def infrahub_address(self) -> str:
+        """This is the address that the Prefect worker will use to connect to Infrahub API."""
+        if self.internal_address:
+            return self.internal_address
+
+        raise InitializationError()
+
 
 class FileSystemStorageSettings(BaseSettings):
     # Make variable lookup case-sensitive to avoid fetching $PATH value

infrahub_server-1.7.0b0/backend/infrahub/constants/enums.py

@@ -0,0 +1,12 @@
+from enum import StrEnum
+
+
+class OrderDirection(StrEnum):
+    ASC = "ASC"
+    DESC = "DESC"
+
+
+class OrderByField(StrEnum):
+    ID = "id"
+    CREATED_AT = "created_at"
+    UPDATED_AT = "updated_at"

{infrahub_server-1.6.3 → infrahub_server-1.7.0b0}/backend/infrahub/core/account.py

@@ -54,15 +54,11 @@ class AccountGlobalPermissionQuery(Query):
     name: str = "account_global_permissions"
     type: QueryType = QueryType.READ
 
-    def __init__(
-        self,
-        account_id: str,
-        branch: Branch | None = None,
-        branch_agnostic: bool = False,
-    ) -> None:
-        super().__init__(branch=branch, branch_agnostic=branch_agnostic)
+    def __init__(self, account_id: str, **kwargs: Any):
         self.account_id = account_id
+        super().__init__(**kwargs)
 
+    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
         self.params["account_id"] = self.account_id
 
         branch_filter, branch_params = self.branch.get_query_filter_path(
@@ -70,6 +66,7 @@ class AccountGlobalPermissionQuery(Query):
         )
         self.params.update(branch_params)
 
+        # ruff: noqa: E501
         query = """
         MATCH (account:%(generic_account_node)s)
         WHERE account.uuid = $account_id
@@ -296,7 +293,7 @@ class AccountObjectPermissionQuery(Query):
 
 
 async def fetch_permissions(account_id: str, db: InfrahubDatabase, branch: Branch) -> AssignedPermissions:
-    query1 = AccountGlobalPermissionQuery(branch=branch, account_id=account_id, branch_agnostic=True)
+    query1 = await AccountGlobalPermissionQuery.init(db=db, branch=branch, account_id=account_id, branch_agnostic=True)
     await query1.execute(db=db)
     global_permissions = query1.get_permissions()