Merge branch 'main' into fix/autorag-max-pred-length

Author: nickmazzi

frontend/src/components/NumberInputWrapper.scss

@@ -1,4 +1,8 @@
 .odh-number-input-wrapper {
+  .pf-v6-c-number-input__unit {
+    white-space: nowrap;
+  }
+
   &.m-full-width {
     width: 100%;
     display: flex;
@@ -8,8 +12,5 @@
         width: 100%;
       }
     }
-    .pf-v6-c-number-input__unit {
-      white-space: nowrap;
-    }
   }
 }

frontend/src/components/NumberInputWrapper.tsx

@@ -8,13 +8,15 @@ type NumberInputWrapperProps = {
   onBlur?: (blurValue: number | undefined) => void;
   onChange?: (newValue: number | undefined) => void;
   intOnly?: boolean;
+  increment?: number;
   fullWidth?: boolean;
 } & Omit<React.ComponentProps<typeof NumberInput>, 'onChange' | 'onPlus' | 'onMinus'>;
 
 const NumberInputWrapper: React.FC<NumberInputWrapperProps> = ({
   onBlur,
   onChange,
   intOnly = true,
+  increment = 1,
   fullWidth = false,
   value,
   validated,
@@ -23,7 +25,7 @@ const NumberInputWrapper: React.FC<NumberInputWrapperProps> = ({
   ...otherProps
 }) => (
   <NumberInput
-    className={fullWidth ? 'odh-number-input-wrapper m-full-width' : undefined}
+    className={fullWidth ? 'odh-number-input-wrapper m-full-width' : 'odh-number-input-wrapper'}
     inputProps={{ placeholder: '' }}
     inputName="value-unit-input"
     {...otherProps}
@@ -43,10 +45,10 @@ const NumberInputWrapper: React.FC<NumberInputWrapperProps> = ({
                 onChange(undefined);
                 return;
               }
-              if (min) {
+              if (min != null) {
                 v = Math.max(v, min);
               }
-              if (max) {
+              if (max != null) {
                 v = Math.min(v, max);
               }
               onChange(v);
@@ -64,16 +66,16 @@ const NumberInputWrapper: React.FC<NumberInputWrapperProps> = ({
     onPlus={
       onChange
         ? () => {
-            const newVal = (value || 0) + 1;
-            onChange(min ? Math.max(newVal, min) : newVal);
+            const newVal = (value || 0) + increment;
+            onChange(max != null ? Math.min(newVal, max) : newVal);
           }
         : undefined
     }
     onMinus={
       onChange
         ? () => {
-            const newVal = (value || 0) - 1;
-            onChange(max ? Math.min(newVal, max) : newVal);
+            const newVal = (value || 0) - increment;
+            onChange(min != null ? Math.max(newVal, min) : newVal);
           }
         : undefined
     }

frontend/src/k8sTypes.ts

@@ -499,6 +499,7 @@ export enum DeploymentMode {
 export type InferenceServiceAnnotations = DisplayNameAnnotations &
   Partial<{
     'security.opendatahub.io/enable-auth': string;
+    'security.opendatahub.io/auth-proxy-type': 'kube-rbac-proxy' | 'oauth-proxy' | string;
     'serving.kserve.io/deploymentMode': DeploymentMode;
     'serving.knative.openshift.io/enablePassthrough': 'true';
     'sidecar.istio.io/inject': 'true';
@@ -529,6 +530,7 @@ export type InferenceServiceKind = K8sResourceCommon & {
       annotations?: Record<string, string>;
       tolerations?: Toleration[];
       nodeSelector?: NodeSelector;
+      timeout?: number;
       deploymentStrategy?: {
         type: 'RollingUpdate' | 'Recreate';
       };

frontend/src/pages/modelServing/customServingRuntimes/utils.ts

@@ -159,9 +159,8 @@ export const findTemplateByName = (
       getServingRuntimeNameFromTemplate(t) === templateName || t.metadata.name === templateName,
   );
 
-export const isTemplateKind = (
-  resource: ServingRuntimeKind | TemplateKind,
-): resource is TemplateKind => resource.kind === 'Template';
+export const isTemplateKind = (resource: K8sResourceCommon): resource is TemplateKind =>
+  resource.kind === 'Template';
 
 export const getEnabledPlatformsFromTemplate = (
   template: TemplateKind,

frontend/src/pages/projects/screens/detail/connections/__tests__/ManageConnectionsModal.spec.tsx

@@ -198,7 +198,7 @@ describe('Create connection modal', () => {
                 type: 'numeric',
                 name: 'numeric 3',
                 envVar: 'env3',
-                properties: { min: 0 },
+                properties: { min: 0, max: 100 },
               },
             ],
           }),
@@ -236,18 +236,21 @@ describe('Create connection modal', () => {
     });
     expect(createButton).toBeEnabled();
 
-    // numeric
+    // numeric - values outside min/max are auto-corrected on blur
     await act(async () => {
       fireEvent.change(numeric, {
         target: { value: '-10' },
       });
+      fireEvent.blur(numeric);
     });
-    expect(createButton).toBeDisabled();
+    // Value is clamped to min (0), so button remains enabled
+    expect(createButton).toBeEnabled();
 
     await act(async () => {
       fireEvent.change(numeric, {
         target: { value: '2' },
       });
+      fireEvent.blur(numeric);
     });
     expect(createButton).toBeEnabled();
 

package-lock.json

@@ -0,0 +1,11 @@
+projectName: rayjob-e2e-test
+rayJobName: test-ray-job-pause-scale
+flavorName: ray-e2e-flavor
+clusterQueueName: ray-e2e-cluster-queue
+localQueueName: ray-e2e-local-queue
+cpuQuota: 100
+memoryQuota: 200
+gpuQuota: 8
+workerGroupName: worker-group-1
+rayImage: rayproject/ray:2.9.0
+rayVersion: "2.9.0"

packages/cypress/cypress/fixtures/e2e/modelTraining/rayJobs/testRayjobPauseScale.yaml

@@ -8,4 +8,3 @@ cpuQuota: 100
 memoryQuota: 200
 gpuQuota: 8
 
-

packages/cypress/cypress/fixtures/e2e/modelTraining/trainJobs/testTrainjobProgression.yaml

@@ -0,0 +1,47 @@
+apiVersion: ray.io/v1
+kind: RayJob
+metadata:
+  name: ${rayJobName}
+  namespace: ${namespace}
+  labels:
+    kueue.x-k8s.io/queue-name: ${localQueueName}
+spec:
+  shutdownAfterJobFinishes: true
+  ttlSecondsAfterFinished: 86400
+  submissionMode: K8sJobMode
+  entrypoint: python -c "import time; time.sleep(86400)"
+  rayClusterSpec:
+    rayVersion: '${rayVersion}'
+    headGroupSpec:
+      rayStartParams:
+        dashboard-host: '0.0.0.0'
+      template:
+        spec:
+          containers:
+            - name: ray-head
+              image: ${rayImage}
+              resources:
+                limits:
+                  cpu: '1'
+                  memory: 4Gi
+                requests:
+                  cpu: 500m
+                  memory: 2Gi
+    workerGroupSpecs:
+      - groupName: ${workerGroupName}
+        replicas: 1
+        minReplicas: 0
+        maxReplicas: 10
+        rayStartParams: {}
+        template:
+          spec:
+            containers:
+              - name: ray-worker
+                image: ${rayImage}
+                resources:
+                  limits:
+                    cpu: '1'
+                    memory: 2Gi
+                  requests:
+                    cpu: 500m
+                    memory: 2Gi

packages/cypress/cypress/fixtures/resources/yaml/ray-job-e2e.yaml

@@ -951,6 +951,10 @@ class RayJobResourcesTab {
     return cy.findByTestId('nodes-value');
   }
 
+  findNodesEditButton() {
+    return cy.findByTestId('nodes-edit-button');
+  }
+
   findProcessesPerNodeValue() {
     return cy.findByTestId('processes-per-node-value');
   }