Merge branch 'develop' into atg-20250103-ihs-55

Author: dgarros

.github/workflows/ci.yml

@@ -75,7 +75,7 @@ jobs:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
       - name: "Setup environment"
-        run: "pip install ruff==0.7.1"
+        run: "pip install ruff==0.8.6"
       - name: "Linting: ruff check"
         run: "ruff check ."
       - name: "Linting: ruff format"
@@ -141,7 +141,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: "Setup environment"
         run: |
-          pipx install poetry
+          pipx install poetry==1.8.5
           poetry config virtualenvs.prefer-active-python true
           pip install invoke toml codecov
       - name: "Install Package"
@@ -192,7 +192,7 @@ jobs:
           python-version: "3.12"
       - name: "Setup environment"
         run: |
-          pipx install poetry
+          pipx install poetry==1.8.5
           poetry config virtualenvs.prefer-active-python true
           pip install invoke toml codecov
       - name: "Install Package"

.github/workflows/publish-pypi.yml

@@ -41,6 +41,7 @@ jobs:
       - name: "Install Poetry"
         uses: "snok/install-poetry@v1"
         with:
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true

.github/workflows/release.yml

@@ -30,6 +30,7 @@ jobs:
       - name: "Install Poetry"
         uses: "snok/install-poetry@v1"
         with:
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
@@ -56,7 +57,7 @@ jobs:
               | jq -r '.tag_name') >> "$GITHUB_OUTPUT"
 
       - name: Check tag version
-        if: github.event.release.tag_name != format('infrahub-v{0}', steps.release.outputs.version)
+        if: github.event.release.tag_name != format('v{0}', steps.release.outputs.version)
         run: |
           echo "Tag version does not match python project version"
           exit 1

CHANGELOG.md

@@ -11,6 +11,21 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [1.4.1](https://github.com/opsmill/infrahub-sdk-python/tree/v1.3.0) - 2025-01-05
+
+### Fixed
+
+- Fixes an issue introduced in 1.4 that would prevent a node with relationship of cardinality one from being updated.
+
+## [1.4.0](https://github.com/opsmill/infrahub-sdk-python/tree/v1.4.0) - 2025-01-03
+
+### Changed
+
+- The inclusion of properties for Attribute and Relationships by default has been disabled when querying nodes from Infrahub.
+  it can be enabled by using the parameter `property` in `client.get|all|filters` method ([#191](https://github.com/opsmill/infrahub-sdk-python/issues/191))
+- Fix an issue with python-transform-unit-process failing to run ([#198](https://github.com/opsmill/infrahub-sdk-python/issues/198))
+- Add processing of nodes when no variable are passed into the command to run generators ([#176](https://github.com/opsmill/infrahub-sdk-python/issues/176))
+
 ## [1.3.0](https://github.com/opsmill/infrahub-sdk-python/tree/v1.3.0) - 2024-12-30
 
 ### Added

changelog/158.added.me

@@ -0,0 +1 @@
+Add `count` method to both sync and async clients to retrieve the number of objects of a given kind

changelog/191.changed.md

@@ -40,6 +40,7 @@ class BranchData(BaseModel):
 
 
 MUTATION_QUERY_DATA = {"ok": None, "object": BRANCH_DATA}
+MUTATION_QUERY_TASK = {"ok": None, "task": {"id": None}}
 
 QUERY_ALL_BRANCHES_DATA = {"Branch": BRANCH_DATA}
 
@@ -119,13 +120,14 @@ async def create(
             },
         }
 
-        query = Mutation(mutation="BranchCreate", input_data=input_data, query=MUTATION_QUERY_DATA)
+        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")
 
         # 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 BranchData(**response["BranchCreate"]["task"]["id"])
+            return response["BranchCreate"]["task"]["id"]
         return BranchData(**response["BranchCreate"]["object"])
 
     async def delete(self, branch_name: str) -> bool:

infrahub_sdk/branch.py

@@ -11,13 +11,10 @@
 from git.repo import Repo
 from pydantic import BaseModel, Field
 
-from .exceptions import InfrahubCheckNotFoundError, UninitializedError
+from .exceptions import UninitializedError
 
 if TYPE_CHECKING:
-    from pathlib import Path
-
     from . import InfrahubClient
-    from .schema.repository import InfrahubCheckDefinitionConfig
 
 INFRAHUB_CHECK_VARIABLE_TO_IMPORT = "INFRAHUB_CHECKS"
 
@@ -176,27 +173,3 @@ async def run(self, data: dict | None = None) -> bool:
             self.log_info("Check succesfully completed")
 
         return self.passed
-
-
-def get_check_class_instance(
-    check_config: InfrahubCheckDefinitionConfig, search_path: Path | None = None
-) -> InfrahubCheck:
-    if check_config.file_path.is_absolute() or search_path is None:
-        search_location = check_config.file_path
-    else:
-        search_location = search_path / check_config.file_path
-
-    try:
-        spec = importlib.util.spec_from_file_location(check_config.class_name, search_location)
-        module = importlib.util.module_from_spec(spec)  # type: ignore[arg-type]
-        spec.loader.exec_module(module)  # type: ignore[union-attr]
-
-        # Get the specified class from the module
-        check_class = getattr(module, check_config.class_name)
-
-        # Create an instance of the class
-        check_instance = check_class()
-    except (FileNotFoundError, AttributeError) as exc:
-        raise InfrahubCheckNotFoundError(name=check_config.name) from exc
-
-    return check_instance

infrahub_sdk/checks.py

@@ -58,8 +58,6 @@
     from types import TracebackType
 
 
-# pylint: disable=redefined-builtin  disable=too-many-lines
-
 SchemaType = TypeVar("SchemaType", bound=CoreNode)
 SchemaTypeSync = TypeVar("SchemaTypeSync", bound=CoreNodeSync)
 
@@ -543,6 +541,25 @@ async def _process_nodes_and_relationships(
 
         return ProcessRelationsNode(nodes=nodes, related_nodes=related_nodes)
 
+    async def count(
+        self,
+        kind: str | type[SchemaType],
+        at: Timestamp | None = None,
+        branch: str | None = None,
+        timeout: int | None = None,
+    ) -> int:
+        """Return the number of nodes of a given kind."""
+        schema = await self.schema.get(kind=kind, branch=branch)
+
+        branch = branch or self.default_branch
+        if at:
+            at = Timestamp(at)
+
+        response = await self.execute_graphql(
+            query=Query(query={schema.kind: {"count": None}}).render(), branch_name=branch, at=at, timeout=timeout
+        )
+        return int(response.get(schema.kind, {}).get("count", 0))
+
     @overload
     async def all(
         self,
@@ -727,7 +744,7 @@ async def filters(
                 fragment=fragment,
                 prefetch_relationships=prefetch_relationships,
                 partial_match=partial_match,
-                # property=property,
+                property=property,
             )
             query = Query(query=query_data)
             response = await self.execute_graphql(
@@ -1163,7 +1180,7 @@ async def allocate_next_ip_address(
     async def allocate_next_ip_address(
         self,
         resource_pool: CoreNode,
-        kind: type[SchemaType] | None = None,  # pylint: disable=unused-argument
+        kind: type[SchemaType] | None = None,  # noqa: ARG002
         identifier: str | None = None,
         prefix_length: int | None = None,
         address_type: str | None = None,
@@ -1313,7 +1330,7 @@ async def allocate_next_ip_prefix(
     async def allocate_next_ip_prefix(
         self,
         resource_pool: CoreNode,
-        kind: type[SchemaType] | None = None,  # pylint: disable=unused-argument
+        kind: type[SchemaType] | None = None,  # noqa: ARG002
         identifier: str | None = None,
         prefix_length: int | None = None,
         member_type: str | None = None,
@@ -1583,6 +1600,25 @@ def execute_graphql(
 
         # TODO add a special method to execute mutation that will check if the method returned OK
 
+    def count(
+        self,
+        kind: str | type[SchemaType],
+        at: Timestamp | None = None,
+        branch: str | None = None,
+        timeout: int | None = None,
+    ) -> int:
+        """Return the number of nodes of a given kind."""
+        schema = self.schema.get(kind=kind, branch=branch)
+
+        branch = branch or self.default_branch
+        if at:
+            at = Timestamp(at)
+
+        response = self.execute_graphql(
+            query=Query(query={schema.kind: {"count": None}}).render(), branch_name=branch, at=at, timeout=timeout
+        )
+        return int(response.get(schema.kind, {}).get("count", 0))
+
     @overload
     def all(
         self,
@@ -2213,7 +2249,7 @@ def allocate_next_ip_address(
     def allocate_next_ip_address(
         self,
         resource_pool: CoreNodeSync,
-        kind: type[SchemaTypeSync] | None = None,  # pylint: disable=unused-argument
+        kind: type[SchemaTypeSync] | None = None,  # noqa: ARG002
         identifier: str | None = None,
         prefix_length: int | None = None,
         address_type: str | None = None,
@@ -2359,7 +2395,7 @@ def allocate_next_ip_prefix(
     def allocate_next_ip_prefix(
         self,
         resource_pool: CoreNodeSync,
-        kind: type[SchemaTypeSync] | None = None,  # pylint: disable=unused-argument
+        kind: type[SchemaTypeSync] | None = None,  # noqa: ARG002
         identifier: str | None = None,
         prefix_length: int | None = None,
         member_type: str | None = None,

infrahub_sdk/client.py

@@ -83,7 +83,7 @@ async def create(
     sync_with_git: bool = typer.Option(
         False, help="Extend the branch to Git and have Infrahub create the branch in connected repositories."
     ),
-    isolated: bool = typer.Option(True, hidden=True, help="Set the branch to isolated mode (deprecated)"),  # pylint: disable=unused-argument
+    isolated: bool = typer.Option(True, hidden=True, help="Set the branch to isolated mode (deprecated)"),  # noqa: ARG001
     _: str = CONFIG_PARAM,
 ) -> None:
     """Create a new branch."""