Exclude until_ready from requests when not set

Also make it optional in the configuration for
more reliable detection of whether it is set.

Author: jvstme

src/dstack/_internal/core/compatibility/runs.py

@@ -1,7 +1,9 @@
 from typing import Optional
 
 from dstack._internal.core.models.common import IncludeExcludeDictType, IncludeExcludeSetType
+from dstack._internal.core.models.configurations import ServiceConfiguration
 from dstack._internal.core.models.runs import (
+    DEFAULT_PROBE_UNTIL_READY,
     DEFAULT_REPLICA_GROUP_NAME,
     ApplyRunPlanInput,
     JobSpec,
@@ -60,12 +62,12 @@ def get_run_spec_excludes(run_spec: RunSpec) -> IncludeExcludeDictType:
     configuration_excludes: IncludeExcludeDictType = {}
     profile_excludes: IncludeExcludeSetType = set()
 
-    # Add excludes like this:
-    #
-    # if run_spec.configuration.tags is None:
-    #     configuration_excludes["tags"] = True
-    # if run_spec.profile is not None and run_spec.profile.tags is None:
-    #     profile_excludes.add("tags")
+    if isinstance(run_spec.configuration, ServiceConfiguration):
+        if run_spec.configuration.probes:
+            probe_excludes: IncludeExcludeDictType = {}
+            configuration_excludes["probes"] = {"__all__": probe_excludes}
+            if all(p.until_ready is None for p in run_spec.configuration.probes):
+                probe_excludes["until_ready"] = True
 
     if configuration_excludes:
         spec_excludes["configuration"] = configuration_excludes
@@ -83,4 +85,10 @@ def get_job_spec_excludes(job_specs: list[JobSpec]) -> IncludeExcludeDictType:
     spec_excludes: IncludeExcludeDictType = {}
     if all(s.replica_group == DEFAULT_REPLICA_GROUP_NAME for s in job_specs):
         spec_excludes["replica_group"] = True
+
+    probe_excludes: IncludeExcludeDictType = {}
+    spec_excludes["probes"] = {"__all__": probe_excludes}
+    if all(all(p.until_ready == DEFAULT_PROBE_UNTIL_READY for p in s.probes) for s in job_specs):
+        probe_excludes["until_ready"] = True
+
     return spec_excludes

src/dstack/_internal/core/models/configurations.py

@@ -54,6 +54,7 @@
 DEFAULT_PROBE_INTERVAL = 15
 DEFAULT_PROBE_READY_AFTER = 1
 DEFAULT_PROBE_METHOD = "get"
+DEFAULT_PROBE_UNTIL_READY = False
 MAX_PROBE_URL_LEN = 2048
 DEFAULT_REPLICA_GROUP_NAME = "0"
 
@@ -373,15 +374,15 @@ class ProbeConfig(generate_dual_core_model(ProbeConfigConfig)):
         ),
     ] = None
     until_ready: Annotated[
-        bool,
+        Optional[bool],
         Field(
             description=(
                 "If `true`, the probe will stop being executed as soon as it reaches the"
                 " `ready_after` threshold of successful executions."
-                " Defaults to `false`"
+                f" Defaults to `{str(DEFAULT_PROBE_UNTIL_READY).lower()}`"
             ),
         ),
-    ] = False
+    ] = None
 
     @validator("timeout", pre=True)
     def parse_timeout(cls, v: Optional[Union[int, str]]) -> Optional[int]:

src/dstack/_internal/core/models/runs.py

@@ -17,6 +17,7 @@
 )
 from dstack._internal.core.models.configurations import (
     DEFAULT_PROBE_METHOD,
+    DEFAULT_PROBE_UNTIL_READY,
     DEFAULT_REPLICA_GROUP_NAME,
     LEGACY_REPO_DIR,
     AnyRunConfiguration,
@@ -247,7 +248,7 @@ class ProbeSpec(CoreModel):
     timeout: int
     interval: int
     ready_after: int
-    until_ready: bool = False
+    until_ready: bool = DEFAULT_PROBE_UNTIL_READY
 
 
 class JobSpec(CoreModel):

src/dstack/_internal/server/services/jobs/configurators/base.py

@@ -15,6 +15,7 @@
     DEFAULT_PROBE_METHOD,
     DEFAULT_PROBE_READY_AFTER,
     DEFAULT_PROBE_TIMEOUT,
+    DEFAULT_PROBE_UNTIL_READY,
     DEFAULT_PROBE_URL,
     DEFAULT_REPLICA_GROUP_NAME,
     LEGACY_REPO_DIR,
@@ -444,7 +445,7 @@ def _probe_config_to_spec(c: ProbeConfig) -> ProbeSpec:
         method=c.method if c.method is not None else DEFAULT_PROBE_METHOD,
         headers=c.headers,
         body=c.body,
-        until_ready=c.until_ready,
+        until_ready=c.until_ready if c.until_ready is not None else DEFAULT_PROBE_UNTIL_READY,
     )