From 158fceccf57545b57aa86306aadf060dce51470c Mon Sep 17 00:00:00 2001
From: Jvst Me <git@jvst.me>
Date: Thu, 19 Mar 2026 00:51:45 +0100
Subject: [PATCH] Do not filter by fleet in `filter_instances()`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Motivation:
- Simplify the implementation and improve the
  performance of the upcoming `<project>/<fleet>`
  syntax in the `fleets` property. Filtering by
  fleet in `filter_instance()` would require
  loading the project from the database for each
  fleet in order to support filtering by
  `<project>/<fleet>`.
- Make the behavior of `dstack offer --fleet`
  consistent for idle instances and backend
  offers, by ignoring `--fleet` for both. At least
  as a temporary solution, until we support
  filtering backend offers by `--fleet`.

Apart from `dstack offer`, there is no other
impact of this change for end users. In all other
cases when `filter_instances()` is called,
filtering by fleet is actually redundant — either
because the instances are already pre-filtered by
`select_run_candidate_fleet_models_with_filters`,
or because `profile.fleets` is guaranteed to be
`None` (the case for autocreated fleets).
---
 src/dstack/_internal/cli/commands/offer.py        | 8 ++++++++
 src/dstack/_internal/server/services/instances.py | 9 ---------
 src/dstack/_internal/server/services/runs/plan.py | 2 --
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/dstack/_internal/cli/commands/offer.py b/src/dstack/_internal/cli/commands/offer.py
index dd8123153..1744b0bfb 100644
--- a/src/dstack/_internal/cli/commands/offer.py
+++ b/src/dstack/_internal/cli/commands/offer.py
@@ -15,8 +15,11 @@
 from dstack._internal.core.models.configurations import ApplyConfigurationType, TaskConfiguration
 from dstack._internal.core.models.gpus import GpuGroup
 from dstack._internal.core.models.runs import RunSpec
+from dstack._internal.utils.logging import get_logger
 from dstack.api.utils import load_profile
 
+logger = get_logger(__name__)
+
 
 class OfferConfigurator(BaseRunConfigurator):
     TYPE = ApplyConfigurationType.TASK
@@ -74,6 +77,11 @@ def _register(self):
 
     def _command(self, args: argparse.Namespace):
         super()._command(args)
+        if args.fleets:
+            logger.warning(
+                "Specifying `--fleet` in `dstack offer` has no defined effect"
+                " and may be disallowed in a future release"
+            )
         # Set image and user so that the server (a) does not default gpu.vendor
         # to nvidia — `dstack offer` should show all vendors, and (b) does not
         # attempt to pull image config from the Docker registry.
diff --git a/src/dstack/_internal/server/services/instances.py b/src/dstack/_internal/server/services/instances.py
index 78d841cb6..bf9de6183 100644
--- a/src/dstack/_internal/server/services/instances.py
+++ b/src/dstack/_internal/server/services/instances.py
@@ -363,7 +363,6 @@ def filter_instances(
     *,
     requirements: Optional[Requirements] = None,
     status: Optional[InstanceStatus] = None,
-    fleet_model: Optional[FleetModel] = None,
     multinode: bool = False,
     master_job_provisioning_data: Optional[JobProvisioningData] = None,
     volumes: Optional[List[List[Volume]]] = None,
@@ -417,12 +416,6 @@ def filter_instances(
             continue
         if instance.health.is_failure():
             continue
-        if profile.fleets is not None:
-            fleet_name = fleet_model.name if fleet_model is not None else None
-            if fleet_name is None and instance.fleet is not None:
-                fleet_name = instance.fleet.name
-            if fleet_name is None or fleet_name not in profile.fleets:
-                continue
         if status is not None and instance.status != status:
             continue
         jpd = get_instance_provisioning_data(instance)
@@ -467,7 +460,6 @@ def get_shared_instances_with_offers(
     requirements: Requirements,
     *,
     idle_only: bool = False,
-    fleet_model: Optional[FleetModel] = None,
     multinode: bool = False,
     volumes: Optional[List[List[Volume]]] = None,
 ) -> list[tuple[InstanceModel, InstanceOfferWithAvailability]]:
@@ -476,7 +468,6 @@ def get_shared_instances_with_offers(
     filtered_instances = filter_instances(
         instances=instances,
         profile=profile,
-        fleet_model=fleet_model,
         multinode=multinode,
         volumes=volumes,
         shared=True,
diff --git a/src/dstack/_internal/server/services/runs/plan.py b/src/dstack/_internal/server/services/runs/plan.py
index 50526ae66..2e608019d 100644
--- a/src/dstack/_internal/server/services/runs/plan.py
+++ b/src/dstack/_internal/server/services/runs/plan.py
@@ -484,7 +484,6 @@ def get_instance_offers_in_fleet(
         instances=fleet_model.instances,
         profile=profile,
         requirements=job.job_spec.requirements,
-        fleet_model=fleet_model,
         multinode=multinode,
         master_job_provisioning_data=master_job_provisioning_data,
         volumes=volumes,
@@ -495,7 +494,6 @@ def get_instance_offers_in_fleet(
         instances=fleet_model.instances,
         profile=profile,
         requirements=job.job_spec.requirements,
-        fleet_model=fleet_model,
         multinode=multinode,
         volumes=volumes,
     )