Skip to content

Merge develop into infrahub-develop#1174

Merged
polmichel merged 6 commits into
infrahub-developfrom
develop
Jul 13, 2026
Merged

Merge develop into infrahub-develop#1174
polmichel merged 6 commits into
infrahub-developfrom
develop

Conversation

@infrahub-github-bot-app

@infrahub-github-bot-app infrahub-github-bot-app Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Merging develop into infrahub-develop after merging pull request #1173.


Summary by cubic

Aligns the async and sync Python SDK clients and fixes small drifts. Branch merges now enforce a 120s minimum timeout, upserts omit hfid for better performance, and messages/docs are corrected.

  • Bug Fixes
    • Sync branch.merge applies max(120, default_timeout) to match async.
    • create(allow_upsert=True) omits hfid in mutation payload in both clients to avoid server-side overhead.
    • Corrected async artifact_fetch unsupported message and a resource-pool error text typo.
    • Updated client.filters return type to list[InfrahubNode] and aligned internal annotations to keep async/sync twins consistent.

Written for commit bfedde9. Summary will update on new commits.

Review in cubic

dgarros and others added 6 commits July 12, 2026 19:56
The hand-maintained async/sync client twins had silently diverged. Fix the
behavioral and annotation drift and lock the two behavioral fixes with tests:

- branch: sync merge now applies the 120s minimum timeout floor like async
- node: sync create(allow_upsert=True) excludes the hfid to avoid upsert overhead
- node: async artifact fetch uses the FETCH (not GENERATE) unsupported message
- node: fix sync resource-pool error text typo ("Allocate" -> "Allocated")
- client: fix async filters docstring return type (InfrahubNode, not the Sync)
- schema/node: converge private-helper annotations that drifted between twins

Add regression tests covering the upsert-hfid exclusion and the merge timeout
floor for both the async and sync clients.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Regenerated docs/docs/python-sdk/sdk_ref/infrahub_sdk/client.mdx to match
the corrected InfrahubClient.filters docstring (list[InfrahubNode] instead
of list[InfrahubNodeSync]) from the async/sync twin drift fix.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
fix: correct drifted async/sync twins and add parity regression tests
Merge stable into develop
@infrahub-github-bot-app infrahub-github-bot-app Bot requested a review from a team as a code owner July 13, 2026 08:53
@github-actions github-actions Bot added the type/documentation Improvements or additions to documentation label Jul 13, 2026
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying infrahub-sdk-python with  Cloudflare Pages  Cloudflare Pages

Latest commit: bfedde9
Status: ✅  Deploy successful!
Preview URL: https://1bf666ab.infrahub-sdk-python.pages.dev
Branch Preview URL: https://develop.infrahub-sdk-python.pages.dev

View logs

@codecov

codecov Bot commented Jul 13, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 87.50000% with 1 line in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
infrahub_sdk/node/node.py 83.33% 1 Missing ⚠️
@@                 Coverage Diff                  @@
##           infrahub-develop    #1174      +/-   ##
====================================================
+ Coverage             82.96%   83.02%   +0.06%     
====================================================
  Files                   139      139              
  Lines                 12703    12703              
  Branches               1906     1906              
====================================================
+ Hits                  10539    10547       +8     
+ Misses                 1597     1587      -10     
- Partials                567      569       +2     
Flag Coverage Δ
integration-tests 41.92% <12.50%> (-0.04%) ⬇️
python-3.10 56.64% <50.00%> (+0.14%) ⬆️
python-3.11 56.63% <50.00%> (+0.14%) ⬆️
python-3.12 56.64% <50.00%> (+0.14%) ⬆️
python-3.13 56.64% <50.00%> (+0.14%) ⬆️
python-3.14 56.64% <50.00%> (+0.14%) ⬆️
python-filler-3.12 22.71% <37.50%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
infrahub_sdk/branch.py 75.24% <100.00%> (+5.82%) ⬆️
infrahub_sdk/client.py 76.53% <ø> (ø)
infrahub_sdk/schema/__init__.py 73.56% <ø> (ø)
infrahub_sdk/node/node.py 87.38% <83.33%> (-0.38%) ⬇️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@polmichel polmichel merged commit 5e879b0 into infrahub-develop Jul 13, 2026
36 checks passed
@polmichel polmichel self-assigned this Jul 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants