Skip to content

Merge stable into develop #605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 7, 2025
Merged

Merge stable into develop #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c45b4b8
Revert "Create batch directly instead of using create_batch while fet…
fatih-acar Nov 6, 2025
8bce2a8
fix(client): do not use shared semaphore for batches
fatih-acar Nov 6, 2025
7b0e10d
Merge branch 'stable' into fac-merge-stable-into-develop
fatih-acar Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions infrahub_sdk/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ def _initialize(self) -> None:
self.object_store = ObjectStore(self)
self.store = NodeStore(default_branch=self.default_branch)
self.task = InfrahubTaskManager(self)
self.concurrent_execution_limit = asyncio.Semaphore(self.max_concurrent_execution)
self._request_method: AsyncRequester = self.config.requester or self._default_request_method
self.group_context = InfrahubGroupContext(self)

Expand Down Expand Up @@ -1599,8 +1598,7 @@ async def allocate_next_ip_prefix(

async def create_batch(self, return_exceptions: bool = False) -> InfrahubBatch:
return InfrahubBatch(
semaphore=self.concurrent_execution_limit,
return_exceptions=return_exceptions,
max_concurrent_execution=self.max_concurrent_execution, return_exceptions=return_exceptions
)

async def get_list_repositories(
Expand Down
4 changes: 1 addition & 3 deletions infrahub_sdk/node/relationship.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from collections.abc import Iterable
from typing import TYPE_CHECKING, Any

from ..batch import InfrahubBatch
from ..exceptions import (
Error,
UninitializedError,
Expand Down Expand Up @@ -166,7 +165,7 @@ async def fetch(self) -> None:
raise Error("Unable to fetch the peer, id and/or typename are not defined")
ids_per_kind_map[peer.typename].append(peer.id)

batch = InfrahubBatch(max_concurrent_execution=self.client.max_concurrent_execution)
batch = await self.client.create_batch()
for kind, ids in ids_per_kind_map.items():
batch.add(
task=self.client.filters,
Expand Down Expand Up @@ -289,7 +288,6 @@ def fetch(self) -> None:
raise Error("Unable to fetch the peer, id and/or typename are not defined")
ids_per_kind_map[peer.typename].append(peer.id)

# Unlike Async, no need to create a new batch from scratch because we are not using a semaphore
batch = self.client.create_batch()
for kind, ids in ids_per_kind_map.items():
batch.add(
Expand Down