fixes

Author: katieperry4

frontend/src/__mocks__/mockMaaSModelRefResource.ts

@@ -9,7 +9,7 @@ export const mockMaaSModelRef = ({
   },
   displayName = 'Test LLM Inference Service',
   description = 'Test LLM Inference Service Description',
-}: MaaSModelRef): MaaSModelRef => ({
+}: Partial<MaaSModelRef> = {}): MaaSModelRef => ({
   name,
   namespace,
   modelRef,

packages/maas/bff/internal/api/maasmodelref_handlers_test.go

@@ -156,8 +156,8 @@ var _ = Describe("MaaSModelRefHandlers", Ordered, func() {
 						Name: "updated-model",
 					},
 					EndpointOverride: "https://custom-endpoint.example.com",
-					DisplayName:      "Updated LLM Model",
-					Description:      "A high-performance updated language model",
+					DisplayName:      &[]string{"Updated LLM Model"}[0],
+					Description:      &[]string{"A high-performance updated language model"}[0],
 				},
 				k8Factory,
 				identity,

packages/maas/bff/internal/models/maasmodelref.go

@@ -15,6 +15,6 @@ type CreateMaaSModelRefRequest struct {
 type UpdateMaaSModelRefRequest struct {
 	ModelRef         ModelReference `json:"modelRef"`
 	EndpointOverride string         `json:"endpointOverride,omitempty"`
-	DisplayName      string         `json:"displayName,omitempty"`
-	Description      string         `json:"description,omitempty"`
+	DisplayName      *string        `json:"displayName,omitempty"`
+	Description      *string        `json:"description,omitempty"`
 }

packages/maas/bff/internal/repositories/maasmodelrefs.go

@@ -87,15 +87,20 @@ func (r *MaaSModelRefsRepository) UpdateMaaSModelRef(ctx context.Context, namesp
 	if annotations == nil {
 		annotations = map[string]string{}
 	}
-	if request.DisplayName != "" {
-		annotations[displayNameAnnotation] = request.DisplayName
-	} else {
-		delete(annotations, displayNameAnnotation)
-	}
-	if request.Description != "" {
-		annotations[descriptionAnnotation] = request.Description
-	} else {
-		delete(annotations, descriptionAnnotation)
+
+	if request.DisplayName != nil {
+		if *request.DisplayName == "" {
+			delete(annotations, displayNameAnnotation)
+		} else {
+			annotations[displayNameAnnotation] = *request.DisplayName
+		}
+	}
+	if request.Description != nil {
+		if *request.Description == "" {
+			delete(annotations, descriptionAnnotation)
+		} else {
+			annotations[descriptionAnnotation] = *request.Description
+		}
 	}
 	existing.SetAnnotations(annotations)
 	existing.Object["spec"] = existingSpec

packages/maas/frontend/src/odh/modelServingExtensions/modelDeploymentWizard/MaaSEndpointCheckbox.tsx

@@ -6,7 +6,6 @@ import { isLLMInferenceServiceActive } from '@odh-dashboard/llmd-serving/formUti
 
 export type MaaSFieldValue = {
   isChecked: boolean;
-  endpointOverride?: string;
 };
 
 export const maasFieldSchema = z.object({
@@ -16,7 +15,7 @@ export const maasFieldSchema = z.object({
 
 const setMaaSFieldData = (value: MaaSFieldValue): MaaSFieldValue => value;
 const getInitialMaaSFieldData = (value?: MaaSFieldValue): MaaSFieldValue =>
-  value ?? { isChecked: false, endpointOverride: undefined };
+  value ?? { isChecked: false };
 
 type MaaSFieldProps = {
   id: string;

packages/model-serving/src/components/deploymentWizard/deploying/useModelDeploymentSubmit.ts

@@ -4,7 +4,7 @@ import { getServingRuntimeFromTemplate } from '@odh-dashboard/internal/pages/mod
 import { useDeployMethod } from './useDeployMethod';
 import { ModelDeploymentWizardValidation } from '../useDeploymentWizardValidation';
 import { useWizardFieldApply } from '../useWizardFieldApply';
-import { useWizardFieldPostDeploy } from '../useWizardFieldPostDeploy';
+import { useWizardFieldPostDeploy, type PostDeployFailure } from '../useWizardFieldPostDeploy';
 import { deployModel } from '../utils';
 import { Deployment, DeploymentAssemblyResources } from '../../../../extension-points';
 import { InitialWizardFormData } from '../types';
@@ -32,6 +32,8 @@ export const useModelDeploymentSubmit = (
   isLoading: boolean;
   submitError: Error | null;
   clearSubmitError: () => void;
+  submitWarnings: PostDeployFailure[];
+  clearSubmitWarnings: () => void;
 } => {
   const { deployMethod, deployMethodLoaded } = useDeployMethod(formState, resources);
   const { applyFieldData, applyExtensionsLoaded } = useWizardFieldApply(
@@ -43,6 +45,9 @@ export const useModelDeploymentSubmit = (
   const [submitError, setSubmitError] = React.useState<Error | null>(null);
   const [isLoading, setIsLoading] = React.useState(false);
 
+  // Warnings that something went wrong during post-deployment, doesn't block submission and closing of the wizard
+  const [submitWarnings, setSubmitWarnings] = React.useState<PostDeployFailure[]>([]);
+
   const onSave = React.useCallback(
     async (overwrite?: boolean) => {
       setSubmitError(null);
@@ -97,7 +102,10 @@ export const useModelDeploymentSubmit = (
           initialWizardData,
           applyFieldData,
         );
-        await runPostDeploy(deployedDeployment.model, existingDeployment);
+        const failures = await runPostDeploy(deployedDeployment.model, existingDeployment);
+        if (failures.length > 0) {
+          setSubmitWarnings(failures);
+        }
         exitWizardOnSubmit();
       } catch (error) {
         setSubmitError(error instanceof Error ? error : new Error(String(error)));
@@ -131,7 +139,9 @@ export const useModelDeploymentSubmit = (
       isLoading,
       submitError,
       clearSubmitError: () => setSubmitError(null),
+      submitWarnings,
+      clearSubmitWarnings: () => setSubmitWarnings([]),
     }),
-    [onSave, deployMethod?.properties.supportsOverwrite, isLoading, submitError],
+    [onSave, deployMethod?.properties.supportsOverwrite, isLoading, submitError, submitWarnings],
   );
 };

packages/model-serving/src/components/deploymentWizard/useWizardFieldPostDeploy.ts

@@ -7,12 +7,17 @@ import {
   type Deployment,
 } from '../../../extension-points';
 
+/** A record of a post-deploy extension that failed, including the field it belongs to. */
+export type PostDeployFailure = { fieldId: string; error: Error };
+
 /**
  * Hook that returns an async function to run all active post-deploy extensions after
  * a deployment is saved. Each extension receives the field's current data, the newly
  * saved model resource (which now has a uid), and the original deployment (if editing).
  *
  * Post-deploy extensions are only executed if their associated WizardField2 is active.
+ * Errors thrown by individual extensions are caught and collected as PostDeployFailure
+ * entries; subsequent extensions still run and the returned promise always resolves so these errors don't block submission and closing of the wizard
  *
  * @param wizardState - The current wizard form state at the point of submission
  */
@@ -22,7 +27,7 @@ export const useWizardFieldPostDeploy = (
   runPostDeploy: (
     deployedModel: Deployment['model'],
     existingDeployment?: Deployment,
-  ) => Promise<void>;
+  ) => Promise<PostDeployFailure[]>;
   postDeployExtensionsLoaded: boolean;
   postDeployExtensionErrors: Error[];
 } => {
@@ -47,12 +52,21 @@ export const useWizardFieldPostDeploy = (
   );
 
   const runPostDeploy = React.useCallback(
-    async (deployedModel: Deployment['model'], existingDeployment?: Deployment): Promise<void> => {
+    async (
+      deployedModel: Deployment['model'],
+      existingDeployment?: Deployment,
+    ): Promise<PostDeployFailure[]> => {
+      const failures: PostDeployFailure[] = [];
       for (const ext of activePostDeployExtensions) {
         const { fieldId } = ext.properties;
         const fieldData: unknown = wizardState[fieldId];
-        await ext.properties.postDeploy(fieldData, deployedModel, existingDeployment);
+        try {
+          await ext.properties.postDeploy(fieldData, deployedModel, existingDeployment);
+        } catch (err) {
+          failures.push({ fieldId, error: err instanceof Error ? err : new Error(String(err)) });
+        }
       }
+      return failures;
     },
     [activePostDeployExtensions, wizardState],
   );