simplify update

Author: V2arK

centml/sdk/api.py

@@ -9,7 +9,6 @@
     CreateComputeDeploymentRequest,
     CreateCServeV2DeploymentRequest,
     CreateCServeV3DeploymentRequest,
-    CServeV2Recipe,
     ApiException,
     Metric,
 )
@@ -74,59 +73,50 @@ def update_inference(self, deployment_id: int, request: CreateInferenceDeploymen
     def update_compute(self, deployment_id: int, request: CreateComputeDeploymentRequest):
         return self._api.update_compute_deployment_deployments_compute_put(deployment_id, request)
 
+    def detect_deployment_version(self, deployment_id: int) -> str:
+        """Detect if a deployment is V2 or V3 by testing the specific API endpoints"""
+        try:
+            # Try V3 endpoint first
+            self._api.get_cserve_v3_deployment_deployments_cserve_v3_deployment_id_get(deployment_id)
+            return 'v3'
+        except ApiException as e:
+            if e.status in [404, 400]:  # V3 endpoint doesn't exist for this deployment
+                try:
+                    # Try V2 endpoint
+                    self._api.get_cserve_v2_deployment_deployments_cserve_v2_deployment_id_get(deployment_id)
+                    return 'v2'
+                except ApiException:
+                    # If both fail, it might not be a CServe deployment or doesn't exist
+                    raise ValueError(f"Deployment {deployment_id} is not a valid CServe deployment or does not exist")
+            else:
+                # Other error (auth, network, etc.)
+                raise
+
     def update_cserve(
         self, deployment_id: int, request: Union[CreateCServeV2DeploymentRequest, CreateCServeV3DeploymentRequest]
     ):
-        """Update CServe deployment - automatically handles both V2 and V3 deployments"""
-        # Determine the approach based on the request type
+        """Update CServe deployment - validates request type matches deployment version"""
+        # Detect the deployment version
+        deployment_version = self.detect_deployment_version(deployment_id)
+
+        # Validate request type matches deployment version
         if isinstance(request, CreateCServeV3DeploymentRequest):
-            # V3 request - try V3 API first, fallback if deployment is actually V2
-            try:
-                return self._api.update_cserve_v3_deployment_deployments_cserve_v3_put(deployment_id, request)
-            except ApiException as e:
-                if e.status in [404, 400]:  # V3 API failed, deployment might be V2
-                    # Convert V3 request to V2 and try V2 API
-                    v2_request = self._convert_v3_to_v2_request(request)
-                    return self._api.update_cserve_v2_deployment_deployments_cserve_v2_put(deployment_id, v2_request)
-                else:
-                    raise
+            if deployment_version != 'v3':
+                raise ValueError(
+                    f"Deployment {deployment_id} is CServe {deployment_version.upper()}, but you provided a V3 request. Please use CreateCServeV2DeploymentRequest instead."
+                )
+            return self._api.update_cserve_v3_deployment_deployments_cserve_v3_put(deployment_id, request)
         elif isinstance(request, CreateCServeV2DeploymentRequest):
-            # V2 request - try V2 API first, fallback to V3 if deployment is actually V3
-            try:
-                return self._api.update_cserve_v2_deployment_deployments_cserve_v2_put(deployment_id, request)
-            except ApiException as e:
-                if e.status in [404, 400]:  # V2 API failed, deployment might be V3
-                    # Convert V2 request to V3 and try V3 API
-                    v3_request = self.convert_v2_to_v3_request(request)
-                    return self._api.update_cserve_v3_deployment_deployments_cserve_v3_put(deployment_id, v3_request)
-                else:
-                    raise
+            if deployment_version != 'v2':
+                raise ValueError(
+                    f"Deployment {deployment_id} is CServe {deployment_version.upper()}, but you provided a V2 request. Please use CreateCServeV3DeploymentRequest instead."
+                )
+            return self._api.update_cserve_v2_deployment_deployments_cserve_v2_put(deployment_id, request)
         else:
             raise ValueError(
                 f"Unsupported request type: {type(request)}. Expected CreateCServeV2DeploymentRequest or CreateCServeV3DeploymentRequest."
             )
 
-    def _convert_v3_to_v2_request(self, v3_request: CreateCServeV3DeploymentRequest) -> CreateCServeV2DeploymentRequest:
-        """Convert V3 request format to V2 format (reverse of convert_v2_to_v3_request)"""
-        # Get all fields from V3 request
-        kwargs = v3_request.model_dump() if hasattr(v3_request, 'model_dump') else v3_request.dict()
-
-        # Remove old V3 field names
-        min_replicas = kwargs.pop('min_replicas', None)
-        max_replicas = kwargs.pop('max_replicas', None)
-        initial_replicas = kwargs.pop('initial_replicas', None)
-        # Remove V3-only fields
-        kwargs.pop('max_surge', None)
-        kwargs.pop('max_unavailable', None)
-
-        # Add new V2 field names
-        kwargs['min_scale'] = min_replicas
-        kwargs['max_scale'] = max_replicas
-        if initial_replicas is not None:
-            kwargs['initial_scale'] = initial_replicas
-
-        return CreateCServeV2DeploymentRequest(**kwargs)
-
     def _update_status(self, id, new_status):
         status_req = platform_api_python_client.DeploymentStatusRequest(status=new_status)
         self._api.update_deployment_status_deployments_status_deployment_id_put(id, status_req)
@@ -181,28 +171,6 @@ def detect_cserve_deployment_version(self, deployment_response):
         # Default to V2 for backward compatibility
         return 'v2'
 
-    def convert_v2_to_v3_request(self, v2_request: CreateCServeV2DeploymentRequest) -> CreateCServeV3DeploymentRequest:
-        """Convert V2 request format to V3 format with field mapping"""
-        # Get all fields from V2 request
-        kwargs = v2_request.model_dump() if hasattr(v2_request, 'model_dump') else v2_request.dict()
-
-        # Remove old V2 field names
-        min_scale = kwargs.pop('min_scale', None)
-        max_scale = kwargs.pop('max_scale', None)
-        initial_scale = kwargs.pop('initial_scale', None)
-
-        # Add new V3 field names
-        kwargs['min_replicas'] = min_scale
-        kwargs['max_replicas'] = max_scale
-        if initial_scale is not None:
-            kwargs['initial_replicas'] = initial_scale
-
-        # Add V3-specific fields
-        kwargs['max_surge'] = None
-        kwargs['max_unavailable'] = None
-
-        return CreateCServeV3DeploymentRequest(**kwargs)
-
     # pylint: disable=R0917
     def get_deployment_usage(
         self, id: int, metric: Metric, start_time_in_seconds: int, end_time_in_seconds: int, step: int