Exclude backward incompatible fields from plugin calls

Author: colinjc

src/dstack/plugins/builtin/rest_plugin/_plugin.py

@@ -1,6 +1,6 @@
 import json
 import os
-from typing import Type
+from typing import Dict, Optional, Type
 
 import requests
 from pydantic import ValidationError
@@ -9,6 +9,8 @@
 from dstack._internal.core.models.fleets import FleetSpec
 from dstack._internal.core.models.gateways import GatewaySpec
 from dstack._internal.core.models.volumes import VolumeSpec
+from dstack.api.server._fleets import _get_fleet_spec_excludes
+from dstack.api.server._runs import _get_run_spec_excludes
 from dstack.plugins import ApplyPolicy, ApplySpec, Plugin, RunSpec, get_plugin_logger
 from dstack.plugins.builtin.rest_plugin import (
     FleetSpecRequest,
@@ -44,12 +46,17 @@ def _check_request_rejected(self, response: SpecApplyResponse):
             logger.error(f"Plugin service rejected apply request: {response.error}")
             raise ServerClientError(f"Apply request rejected: {response.error}")
 
-    def _call_plugin_service(self, spec_request: SpecApplyRequest, endpoint: str) -> ApplySpec:
+    def _call_plugin_service(
+        self,
+        spec_request: SpecApplyRequest,
+        endpoint: str,
+        excludes: Optional[Dict],
+    ) -> ApplySpec:
         response = None
         try:
             response = requests.post(
                 f"{self._plugin_service_uri}{endpoint}",
-                json=spec_request.dict(),
+                json=spec_request.dict(exclude={"spec": excludes}),
                 headers={"accept": "application/json", "Content-Type": "application/json"},
                 timeout=PLUGIN_REQUEST_TIMEOUT_SEC,
             )
@@ -75,10 +82,11 @@ def _on_apply(
         user: str,
         project: str,
         spec: ApplySpec,
+        excludes: Optional[Dict] = None,
     ) -> ApplySpec:
         try:
             spec_request = request_cls(user=user, project=project, spec=spec)
-            spec_json = self._call_plugin_service(spec_request, endpoint)
+            spec_json = self._call_plugin_service(spec_request, endpoint, excludes)
             response = response_cls(**spec_json)
             self._check_request_rejected(response)
             return response.spec
@@ -88,7 +96,13 @@ def _on_apply(
 
     def on_run_apply(self, user: str, project: str, spec: RunSpec) -> RunSpec:
         return self._on_apply(
-            RunSpecRequest, RunSpecResponse, "/apply_policies/on_run_apply", user, project, spec
+            RunSpecRequest,
+            RunSpecResponse,
+            "/apply_policies/on_run_apply",
+            user,
+            project,
+            spec,
+            excludes=_get_run_spec_excludes(spec),
         )
 
     def on_fleet_apply(self, user: str, project: str, spec: FleetSpec) -> FleetSpec:
@@ -99,6 +113,7 @@ def on_fleet_apply(self, user: str, project: str, spec: FleetSpec) -> FleetSpec:
             user,
             project,
             spec,
+            excludes=_get_fleet_spec_excludes(spec),
         )
 
     def on_volume_apply(self, user: str, project: str, spec: VolumeSpec) -> VolumeSpec: