Back porting lambda arn bug, HPO validation bug, and bumping to 1.5.1

awslabs · Jun 26, 2024 · 56500f7 · 56500f7
1 parent 8bb9827
commit 56500f7
Show file tree

Hide file tree

Showing 6 changed files with 19,202 additions and 97 deletions.
diff --git a/bin/mlspace-cdk.ts b/bin/mlspace-cdk.ts
@@ -113,6 +113,8 @@ const coreStack = new CoreStack(app, 'mlspace-core', {
  encryptionKey: kmsStack.masterKey,
  mlSpaceAppRole,
  mlSpaceNotebookRole,
+ mlspaceEndpointConfigInstanceConstraintPolicy,
+ mlspaceJobInstanceConstraintPolicy,
  mlSpaceVPC,
  lambdaSecurityGroups: [vpcStack.vpcSecurityGroup],
  mlSpaceDefaultSecurityGroupId: vpcStack.vpcSecurityGroupId,

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@amzn/mlspace",
  "homepage": "/Prod",
- "version": "1.5.0",
+ "version": "1.5.1",
  "main": "dist/lib/index.js",
  "types": "dist/types/index.d.ts",
  "private": true,

diff --git a/frontend/src/entities/jobs/hpo/create/hpo-job-create.tsx b/frontend/src/entities/jobs/hpo/create/hpo-job-create.tsx
@@ -376,6 +376,7 @@ export function HPOJobCreate () {
  element={
  <Wizard
  activeStepIndex={state.activeStepIndex}
+ isLoadingNextStep={state.formSubmitting}
  onNavigate={(event) => {
  switch (event.detail.reason) {
  case 'step':

diff --git a/frontend/src/entities/jobs/hpo/create/training-definitions/training-job-definition.tsx b/frontend/src/entities/jobs/hpo/create/training-definitions/training-job-definition.tsx
@@ -232,7 +232,6 @@ export function TrainingJobDefinition (props: TrainingJobDefinitionProps) {
  }
  });
  const parameterRanges = Object.values(item.HyperParameterRanges.ContinuousParameterRanges).concat(Object.values(item.HyperParameterRanges.IntegerParameterRanges));
-
  parameterRanges.forEach(
  (parameterRange: any) => {
  const hyperParameter = algorithm.defaultHyperParameters.find(
@@ -243,14 +242,9 @@ export function TrainingJobDefinition (props: TrainingJobDefinitionProps) {
  let nanError = false;
  [parameterRange.MinValue, parameterRange.MaxValue].forEach(
  (value, index) => {
- // Only evaluate the validator if:
- // - The field is required
- // - OR the field has a value
- // - OR this is the max field and the min field has a value
- // This evaluation avoids the issue where a blank value is evaluated as a 0 on a forced safeParse even for optional fields
- if ((!hyperParameter.zValidator?.isOptional || value || (index === 1 && parameterRange.MinValue)) && !nanError ) {
+ if (hyperParameter.zValidator && !nanError ) {
  // Any word alternatives should not apply to ranges
- let parseResult = hyperParameter.zValidator?.safeParse(value);
+ let parseResult = hyperParameter.zValidator.safeParse(value);
  if (parseResult?.success === false) {
  ctx.addIssue({
  code: 'custom',
@@ -264,6 +258,13 @@ export function TrainingJobDefinition (props: TrainingJobDefinitionProps) {
  ) +
  ` (${index === 0 ? 'min value' : 'max value'})`,
  });
+ } else if (value && ((index === 1 && !parameterRange.MinValue) || (index === 0 && !parameterRange.MaxValue))) {
+ // Ensure the min/max fields are populated if their counterpart is populated
+ ctx.addIssue({
+ code: 'custom',
+ path: ['hyperparameters', parameterRange.Name],
+ message: `Please set a ${index === 1 ? 'min ' : 'max'} value`,
+ });
  } else {
  // Check if the user put an approved non-number alternate value in the range field and alert on this unique scenario
  parseResult = z.coerce.number({ 

diff --git a/lib/stacks/infra/core.ts b/lib/stacks/infra/core.ts
@@ -21,7 +21,7 @@ import { ISecurityGroup, IVpc } from 'aws-cdk-lib/aws-ec2';
 import { CfnSecurityConfiguration } from 'aws-cdk-lib/aws-emr';
 import { Rule, Schedule } from 'aws-cdk-lib/aws-events';
 import { LambdaFunction } from 'aws-cdk-lib/aws-events-targets';
-import { Effect, IRole, PolicyStatement, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
+import { Effect, IManagedPolicy, IRole, PolicyStatement, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
 import { IKey } from 'aws-cdk-lib/aws-kms';
 import { Code, Function } from 'aws-cdk-lib/aws-lambda';
 import {
@@ -53,6 +53,8 @@ export type CoreStackProps = {
  readonly encryptionKey: IKey;
  readonly mlSpaceAppRole: IRole;
  readonly mlSpaceNotebookRole: IRole;
+ readonly mlspaceEndpointConfigInstanceConstraintPolicy?: IManagedPolicy,
+ readonly mlspaceJobInstanceConstraintPolicy?: IManagedPolicy,
  readonly mlSpaceVPC: IVpc;
  readonly mlSpaceDefaultSecurityGroupId: string;
  readonly isIso?: boolean;
@@ -237,8 +239,8 @@ export class CoreStack extends Stack {
  role: props.mlSpaceAppRole,
  environment: {
  APP_CONFIG_TABLE: props.mlspaceConfig.APP_CONFIGURATION_TABLE_NAME,
- ENDPOINT_CONFIG_INSTANCE_CONSTRAINT_POLICY_ARN: props.mlspaceConfig.ENDPOINT_CONFIG_INSTANCE_CONSTRAINT_POLICY_ARN,
- JOB_INSTANCE_CONSTRAINT_POLICY_ARN: props.mlspaceConfig.JOB_INSTANCE_CONSTRAINT_POLICY_ARN,
+ ENDPOINT_CONFIG_INSTANCE_CONSTRAINT_POLICY_ARN: props.mlspaceEndpointConfigInstanceConstraintPolicy?.managedPolicyArn || '',
+ JOB_INSTANCE_CONSTRAINT_POLICY_ARN: props.mlspaceJobInstanceConstraintPolicy?.managedPolicyArn || '',
  SYSTEM_TAG: props.mlspaceConfig.SYSTEM_TAG,
  MANAGE_IAM_ROLES: props.mlspaceConfig.MANAGE_IAM_ROLES ? 'True' : '',
  },