Merge branch 'develop' into 'infrahub-develop' with resolved conflicts

Fixes conflict in infrahub_sdk/client.py

Author: ogenstad

.github/workflows/ci.yml

@@ -146,7 +146,7 @@ jobs:
       - name: "Install dependencies"
         run: npm install
       - name: "Setup Python environment"
-        run: "pip install invoke toml"
+        run: "pip install invoke"
       - name: "Build docs website"
         run: "invoke docs"
 
@@ -176,7 +176,7 @@ jobs:
       - name: "Install dependencies"
         run: "poetry install --no-interaction --no-ansi --extras ctl"
       - name: "Setup environment"
-        run: "pip install invoke toml"
+        run: "poetry run pip install invoke"
       - name: "Validate generated documentation"
         run: "poetry run invoke docs-validate"
 
@@ -236,7 +236,11 @@ jobs:
         run: |
           pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }} --python python${{ matrix.python-version }}
           poetry config virtualenvs.create true --local
-          pip install invoke toml codecov
+          pip install invoke codecov
+      - name: "Install tomli for Python < 3.11"
+        if: matrix.python-version == '3.9' || matrix.python-version == '3.10'
+        run: |
+          pip install tomli
       - name: "Install Package"
         run: "poetry install --all-extras"
       - name: "Mypy Tests"
@@ -289,7 +293,7 @@ jobs:
         run: |
           pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           poetry config virtualenvs.create true --local
-          pip install invoke toml codecov
+          pip install invoke codecov
       - name: "Install Package"
         run: "poetry install --all-extras"
       - name: "Integration Tests"
@@ -362,7 +366,7 @@ jobs:
   #       run: |
   #         pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
   #         poetry config virtualenvs.create true --local
-  #         pip install invoke toml codecov
+  #         pip install invoke codecov
 
   #     - name: "Install Package"
   #       run: "poetry install --all-extras"

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-ast
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-toml
+      - id: check-yaml
+      - id: end-of-file-fixer
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.11.9
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [--fix]
+      # Run the formatter.
+      - id: ruff-format

changelog/+convert-object-type.added.md

@@ -0,0 +1 @@
+Add `convert_object_type` method to allow converting an object to another type.

changelog/+escape-hfid.fixed.md

@@ -0,0 +1 @@
+- Fixed issue with improperly escaped special characters in `hfid` fields and other string values in GraphQL mutations by implementing proper JSON-style string escaping

changelog/464.housekeeping.md

@@ -0,0 +1 @@
+Handle error gracefully when loading schema instead of failing with an exception

changelog/473.fixed.md

@@ -0,0 +1 @@
+JsonDecodeError now includes server response content in error message when JSON decoding fails, providing better debugging information for non-JSON server responses.

changelog/528.housekeeping.md

@@ -0,0 +1 @@
+Replace toml package with tomllib and tomli optionally for when Python version is less than 3.11

changelog/529.added.md

@@ -0,0 +1,2 @@
+Add `create_diff` method to create a diff summary between two timestamps
+Update `get_diff_summary` to accept optional time range parameters

changelog/535.fixed.md

@@ -0,0 +1 @@
+Fix branch handling in `_run_transform` and `execute_graphql_query` functions in Infrahubctl to use environment variables for branch management.

changelog/549.fixed.md

@@ -0,0 +1 @@
+Allow the ability to clear optional attributes by setting them to None if they have been mutated by the user.