Rebase

minitriga · minitriga · commit 0b36f8b2b271 · 2025-01-06T10:37:33.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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"
diff --git a/.github/workflows/publish-pypi.yml b/.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
diff --git a/.github/workflows/release.yml b/.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
diff --git a/CHANGELOG.md b/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
diff --git a/changelog/191.changed.md b/changelog/191.changed.md
diff --git a/infrahub_sdk/branch.py b/infrahub_sdk/branch.py
@@ -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:
diff --git a/infrahub_sdk/checks.py b/infrahub_sdk/checks.py
@@ -12,13 +12,10 @@
 
 from infrahub_sdk.repository import GitRepoManager
 
-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
diff --git a/infrahub_sdk/client.py b/infrahub_sdk/client.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)
 
@@ -711,7 +709,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(
@@ -1147,7 +1145,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,
@@ -1297,7 +1295,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,
@@ -2181,7 +2179,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,
@@ -2327,7 +2325,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,
diff --git a/infrahub_sdk/ctl/branch.py b/infrahub_sdk/ctl/branch.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."""
diff --git a/infrahub_sdk/ctl/cli_commands.py b/infrahub_sdk/ctl/cli_commands.py
@@ -308,7 +308,7 @@ def transform(
         None, help="Variables to pass along with the query. Format key=value key=value."
     ),
     branch: str = typer.Option(None, help="Branch on which to run the transformation"),
-    debug: bool = False,
+    debug: bool = False,  # noqa: ARG001
     _: str = CONFIG_PARAM,
     list_available: bool = typer.Option(False, "--list", help="Show available transforms"),
     out: str = typer.Option(None, help="Path to a file to save the result."),
diff --git a/infrahub_sdk/ctl/generator.py b/infrahub_sdk/ctl/generator.py
@@ -19,12 +19,12 @@
 
 async def run(
     generator_name: str,
-    path: str,
-    debug: bool,
+    path: str,  # noqa: ARG001
+    debug: bool,  # noqa: ARG001
     list_available: bool,
     branch: str | None = None,
     variables: list[str] | None = None,
-) -> None:  # pylint: disable=unused-argument
+) -> None:
     repository_config = get_repository_config(Path(config.INFRAHUB_REPO_CONFIG_FILE))
 
     if list_available or not generator_name:
@@ -68,7 +68,6 @@ async def run(
             infrahub_node=InfrahubNode,
         )
         await generator._init_client.schema.all(branch=generator.branch_name)
-        await generator.process_nodes(data=data)
         await generator.run(identifier=generator_config.name, data=data)
 
     else:
diff --git a/infrahub_sdk/generator.py b/infrahub_sdk/generator.py
@@ -97,16 +97,15 @@ async def collect_data(self) -> dict:
             update_group=True,
             subscribers=self.subscribers,
         )
-        unpacked = data.get("data") or data
-        await self.process_nodes(data=unpacked)
-        return data
+        return data.get("data") or data
 
     async def run(self, identifier: str, data: dict | None = None) -> None:
         """Execute the generator after collecting the data from the GraphQL query."""
 
         if not data:
             data = await self.collect_data()
         unpacked = data.get("data") or data
+        await self.process_nodes(data=unpacked)
 
         async with self._init_client.start_tracking(
             identifier=identifier, params=self.params, delete_unused_nodes=True, group_type="CoreGeneratorGroup"
diff --git a/infrahub_sdk/node.py b/infrahub_sdk/node.py
@@ -904,7 +904,7 @@ def _strip_unmodified_dict(data: dict, original_data: dict, variables: dict, ite
                         variables.pop(variable_key)
 
         # TODO: I do not feel _great_ about this
-        if not data_item and data_item != []:
+        if not data_item and data_item != [] and item in data:
             data.pop(item)
 
     def _strip_unmodified(self, data: dict, variables: dict) -> tuple[dict, dict]:
diff --git a/infrahub_sdk/playback.py b/infrahub_sdk/playback.py
@@ -44,7 +44,7 @@ def _read_request(
         url: str,
         method: HTTPMethod,
         headers: dict[str, Any],
-        timeout: int,  # pylint: disable=unused-argument
+        timeout: int,  # noqa: ARG002
         payload: dict | None = None,
     ) -> httpx.Response:
         content: bytes | None = None
diff --git a/infrahub_sdk/pytest_plugin/items/base.py b/infrahub_sdk/pytest_plugin/items/base.py
@@ -65,7 +65,7 @@ def get_result_differences(self, computed: Any) -> str | None:
     def runtest(self) -> None:
         """Run the test logic."""
 
-    def repr_failure(self, excinfo: pytest.ExceptionInfo, style: str | None = None) -> str:
+    def repr_failure(self, excinfo: pytest.ExceptionInfo, style: str | None = None) -> str:  # noqa: ARG002
         return str(excinfo.value)
 
     def reportinfo(self) -> tuple[Path | str, int | None, str]:
diff --git a/infrahub_sdk/pytest_plugin/items/check.py b/infrahub_sdk/pytest_plugin/items/check.py
@@ -37,9 +37,10 @@ def instantiate_check(self) -> None:
             str(self.resource_config.file_path.parent) if self.resource_config.file_path.parent != Path() else None  # type: ignore[attr-defined]
         )
 
-        self.check_instance = self.resource_config.load_class(  # type: ignore[attr-defined]
+        check_class = self.resource_config.load_class(  # type: ignore[attr-defined]
             import_root=self.repository_base, relative_path=relative_path
         )
+        self.check_instance = check_class()
 
     def run_check(self, variables: dict[str, Any]) -> Any:
         self.instantiate_check()
diff --git a/infrahub_sdk/pytest_plugin/items/python_transform.py b/infrahub_sdk/pytest_plugin/items/python_transform.py
@@ -36,9 +36,12 @@ def instantiate_transform(self) -> None:
         relative_path = (
             str(self.resource_config.file_path.parent) if self.resource_config.file_path.parent != Path() else None  # type: ignore[attr-defined]
         )
-        self.transform_instance = self.resource_config.load_class(  # type: ignore[attr-defined]
+        transform_class = self.resource_config.load_class(  # type: ignore[attr-defined]
             import_root=self.repository_base, relative_path=relative_path
         )
+        client = self.session.infrahub_client  # type: ignore[attr-defined]
+        # TODO: Look into seeing how a transform class may use the branch, but set as a empty string for the time being to keep current behaviour
+        self.transform_instance = transform_class(branch="", client=client)
 
     def run_transform(self, variables: dict[str, Any]) -> Any:
         self.instantiate_transform()
diff --git a/infrahub_sdk/schema/main.py b/infrahub_sdk/schema/main.py
@@ -259,6 +259,8 @@ class BaseSchema(BaseModel):
     description: str | None = None
     include_in_menu: bool | None = None
     menu_placement: str | None = None
+    display_labels: list[str] | None = None
+    human_friendly_id: list[str] | None = None
     icon: str | None = None
     uniqueness_constraints: list[list[str]] | None = None
     documentation: str | None = None
@@ -286,7 +288,6 @@ class BaseNodeSchema(BaseSchema):
     inherit_from: list[str] = Field(default_factory=list)
     branch: BranchSupportType | None = None
     default_filter: str | None = None
-    human_friendly_id: list[str] | None = None
     generate_profile: bool | None = None
     parent: str | None = None
     children: str | None = None
diff --git a/infrahub_sdk/spec/object.py b/infrahub_sdk/spec/object.py
@@ -16,7 +16,7 @@ class InfrahubObjectFileData(BaseModel):
     data: list[dict[str, Any]] = Field(default_factory=list)
 
     @classmethod
-    def enrich_node(cls, data: dict, context: dict) -> dict:
+    def enrich_node(cls, data: dict, context: dict) -> dict:  # noqa: ARG003
         return data
 
     @classmethod
diff --git a/infrahub_sdk/testing/schemas/animal.py b/infrahub_sdk/testing/schemas/animal.py
diff --git a/infrahub_sdk/testing/schemas/car_person.py b/infrahub_sdk/testing/schemas/car_person.py
diff --git a/infrahub_sdk/transforms.py b/infrahub_sdk/transforms.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/tests/integration/test_infrahub_client.py b/tests/integration/test_infrahub_client.py
diff --git a/tests/integration/test_node.py b/tests/integration/test_node.py
diff --git a/tests/unit/sdk/conftest.py b/tests/unit/sdk/conftest.py
diff --git a/tests/unit/sdk/test_node.py b/tests/unit/sdk/test_node.py
