Skip to content

Commit

Permalink
feat(client-sagemaker): SageMaker Autopilot adds new metrics for all …
Browse files Browse the repository at this point in the history
…candidate models generated by Autopilot experiments; RStudio on SageMaker now allows users to bring your own development environment in a custom image.
  • Loading branch information
awstools committed May 3, 2022
1 parent a775394 commit 417ad38
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 72 deletions.
Expand Up @@ -11,8 +11,7 @@ import {
SerdeContext as __SerdeContext,
} from "@aws-sdk/types";

import { CreateImageVersionRequest } from "../models/models_0";
import { CreateImageVersionResponse } from "../models/models_1";
import { CreateImageVersionRequest, CreateImageVersionResponse } from "../models/models_1";
import {
deserializeAws_json1_1CreateImageVersionCommand,
serializeAws_json1_1CreateImageVersionCommand,
Expand Down
3 changes: 2 additions & 1 deletion clients/client-sagemaker/src/commands/ListTagsCommand.ts
Expand Up @@ -11,7 +11,8 @@ import {
SerdeContext as __SerdeContext,
} from "@aws-sdk/types";

import { ListTagsInput, ListTagsOutput } from "../models/models_2";
import { ListTagsInput } from "../models/models_2";
import { ListTagsOutput } from "../models/models_3";
import { deserializeAws_json1_1ListTagsCommand, serializeAws_json1_1ListTagsCommand } from "../protocols/Aws_json1_1";
import { SageMakerClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../SageMakerClient";

Expand Down
66 changes: 34 additions & 32 deletions clients/client-sagemaker/src/models/models_0.ts
Expand Up @@ -4217,6 +4217,23 @@ export enum MetricSetSource {
VALIDATION = "Validation",
}

export enum AutoMLMetricExtendedEnum {
ACCURACY = "Accuracy",
AUC = "AUC",
BALANCED_ACCURACY = "BalancedAccuracy",
F1 = "F1",
F1_MACRO = "F1macro",
LogLoss = "LogLoss",
MAE = "MAE",
MSE = "MSE",
PRECISION = "Precision",
PRECISION_MACRO = "PrecisionMacro",
R2 = "R2",
RECALL = "Recall",
RECALL_MACRO = "RecallMacro",
RMSE = "RMSE",
}

/**
* <p>Information about the metric for a candidate produced by an AutoML job.</p>
*/
Expand All @@ -4235,6 +4252,11 @@ export interface MetricDatum {
* <p>The dataset split from which the AutoML job produced the metric.</p>
*/
Set?: MetricSetSource | string;

/**
* <p>The name of the standard metric.</p>
*/
StandardMetricName?: AutoMLMetricExtendedEnum | string;
}

export namespace MetricDatum {
Expand Down Expand Up @@ -8990,7 +9012,18 @@ export namespace KernelGatewayAppSettings {
/**
* <p>A collection of settings that apply to an <code>RSessionGateway</code> app.</p>
*/
export interface RSessionAppSettings {}
export interface RSessionAppSettings {
/**
* <p>Specifies the ARN's of a SageMaker image and SageMaker image version, and the instance type that
* the version runs on.</p>
*/
DefaultResourceSpec?: ResourceSpec;

/**
* <p>A list of custom SageMaker images that are configured to run as a RSession app.</p>
*/
CustomImages?: CustomImage[];
}

export namespace RSessionAppSettings {
/**
Expand Down Expand Up @@ -11909,34 +11942,3 @@ export namespace CreateImageResponse {
...obj,
});
}

export interface CreateImageVersionRequest {
/**
* <p>The registry path of the container image to use as the starting point for this
* version. The path is an Amazon Elastic Container Registry (ECR) URI in the following format:</p>
* <p>
* <code><acct-id>.dkr.ecr.<region>.amazonaws.com/<repo-name[:tag] or [@digest]></code>
* </p>
*/
BaseImage: string | undefined;

/**
* <p>A unique ID. If not specified, the Amazon Web Services CLI and Amazon Web Services SDKs, such as the SDK for Python
* (Boto3), add a unique value to the call.</p>
*/
ClientToken?: string;

/**
* <p>The <code>ImageName</code> of the <code>Image</code> to create a version of.</p>
*/
ImageName: string | undefined;
}

export namespace CreateImageVersionRequest {
/**
* @internal
*/
export const filterSensitiveLog = (obj: CreateImageVersionRequest): any => ({
...obj,
});
}
40 changes: 31 additions & 9 deletions clients/client-sagemaker/src/models/models_1.ts
Expand Up @@ -104,6 +104,37 @@ import {
VpcConfig,
} from "./models_0";

export interface CreateImageVersionRequest {
/**
* <p>The registry path of the container image to use as the starting point for this
* version. The path is an Amazon Elastic Container Registry (ECR) URI in the following format:</p>
* <p>
* <code><acct-id>.dkr.ecr.<region>.amazonaws.com/<repo-name[:tag] or [@digest]></code>
* </p>
*/
BaseImage: string | undefined;

/**
* <p>A unique ID. If not specified, the Amazon Web Services CLI and Amazon Web Services SDKs, such as the SDK for Python
* (Boto3), add a unique value to the call.</p>
*/
ClientToken?: string;

/**
* <p>The <code>ImageName</code> of the <code>Image</code> to create a version of.</p>
*/
ImageName: string | undefined;
}

export namespace CreateImageVersionRequest {
/**
* @internal
*/
export const filterSensitiveLog = (obj: CreateImageVersionRequest): any => ({
...obj,
});
}

export interface CreateImageVersionResponse {
/**
* <p>The Amazon Resource Name (ARN) of the image version.</p>
Expand Down Expand Up @@ -11330,12 +11361,3 @@ export namespace LabelingJobOutput {
...obj,
});
}

export enum LabelingJobStatus {
COMPLETED = "Completed",
FAILED = "Failed",
INITIALIZING = "Initializing",
IN_PROGRESS = "InProgress",
STOPPED = "Stopped",
STOPPING = "Stopping",
}
32 changes: 9 additions & 23 deletions clients/client-sagemaker/src/models/models_2.ts
Expand Up @@ -89,7 +89,6 @@ import {
LabelingJobInputConfig,
LabelingJobOutput,
LabelingJobOutputConfig,
LabelingJobStatus,
LabelingJobStoppingConditions,
MemberDefinition,
ModelArtifacts,
Expand Down Expand Up @@ -138,6 +137,15 @@ import {
TrialComponentStatus,
} from "./models_1";

export enum LabelingJobStatus {
COMPLETED = "Completed",
FAILED = "Failed",
INITIALIZING = "Initializing",
IN_PROGRESS = "InProgress",
STOPPED = "Stopped",
STOPPING = "Stopping",
}

export interface DescribeLabelingJobResponse {
/**
* <p>The processing status of the labeling job. </p>
Expand Down Expand Up @@ -10916,25 +10924,3 @@ export namespace ListTagsInput {
...obj,
});
}

export interface ListTagsOutput {
/**
* <p>An array of <code>Tag</code> objects, each with a tag key and a value.</p>
*/
Tags?: Tag[];

/**
* <p> If response is truncated, SageMaker includes a token in the response. You can use this
* token in your subsequent request to fetch next set of tokens. </p>
*/
NextToken?: string;
}

export namespace ListTagsOutput {
/**
* @internal
*/
export const filterSensitiveLog = (obj: ListTagsOutput): any => ({
...obj,
});
}
22 changes: 22 additions & 0 deletions clients/client-sagemaker/src/models/models_3.ts
Expand Up @@ -102,6 +102,28 @@ import {
Workteam,
} from "./models_2";

export interface ListTagsOutput {
/**
* <p>An array of <code>Tag</code> objects, each with a tag key and a value.</p>
*/
Tags?: Tag[];

/**
* <p> If response is truncated, SageMaker includes a token in the response. You can use this
* token in your subsequent request to fetch next set of tokens. </p>
*/
NextToken?: string;
}

export namespace ListTagsOutput {
/**
* @internal
*/
export const filterSensitiveLog = (obj: ListTagsOutput): any => ({
...obj,
});
}

export interface ListTrainingJobsRequest {
/**
* <p>If the result of the previous <code>ListTrainingJobs</code> request was truncated,
Expand Down
25 changes: 21 additions & 4 deletions clients/client-sagemaker/src/protocols/Aws_json1_1.ts
Expand Up @@ -769,7 +769,6 @@ import {
CreateHyperParameterTuningJobResponse,
CreateImageRequest,
CreateImageResponse,
CreateImageVersionRequest,
CustomImage,
DataCaptureConfig,
DataCatalogConfig,
Expand Down Expand Up @@ -877,6 +876,7 @@ import {
VpcConfig,
} from "../models/models_0";
import {
CreateImageVersionRequest,
CreateImageVersionResponse,
CreateInferenceRecommendationsJobRequest,
CreateInferenceRecommendationsJobResponse,
Expand Down Expand Up @@ -1341,7 +1341,6 @@ import {
ListSubscribedWorkteamsRequest,
ListSubscribedWorkteamsResponse,
ListTagsInput,
ListTagsOutput,
MetricData,
ModelMetadataFilter,
ModelMetadataSearchExpression,
Expand Down Expand Up @@ -1389,6 +1388,7 @@ import {
Workteam,
} from "../models/models_2";
import {
ListTagsOutput,
ListTrainingJobsForHyperParameterTuningJobRequest,
ListTrainingJobsForHyperParameterTuningJobResponse,
ListTrainingJobsRequest,
Expand Down Expand Up @@ -22365,7 +22365,14 @@ const serializeAws_json1_1RetryStrategy = (input: RetryStrategy, context: __Serd
};

const serializeAws_json1_1RSessionAppSettings = (input: RSessionAppSettings, context: __SerdeContext): any => {
return {};
return {
...(input.CustomImages !== undefined &&
input.CustomImages !== null && { CustomImages: serializeAws_json1_1CustomImages(input.CustomImages, context) }),
...(input.DefaultResourceSpec !== undefined &&
input.DefaultResourceSpec !== null && {
DefaultResourceSpec: serializeAws_json1_1ResourceSpec(input.DefaultResourceSpec, context),
}),
};
};

const serializeAws_json1_1RStudioServerProAppSettings = (
Expand Down Expand Up @@ -30445,6 +30452,7 @@ const deserializeAws_json1_1MetricDatum = (output: any, context: __SerdeContext)
return {
MetricName: __expectString(output.MetricName),
Set: __expectString(output.Set),
StandardMetricName: __expectString(output.StandardMetricName),
Value: __limitedParseFloat32(output.Value),
} as any;
};
Expand Down Expand Up @@ -33070,7 +33078,16 @@ const deserializeAws_json1_1RetryStrategy = (output: any, context: __SerdeContex
};

const deserializeAws_json1_1RSessionAppSettings = (output: any, context: __SerdeContext): RSessionAppSettings => {
return {} as any;
return {
CustomImages:
output.CustomImages !== undefined && output.CustomImages !== null
? deserializeAws_json1_1CustomImages(output.CustomImages, context)
: undefined,
DefaultResourceSpec:
output.DefaultResourceSpec !== undefined && output.DefaultResourceSpec !== null
? deserializeAws_json1_1ResourceSpec(output.DefaultResourceSpec, context)
: undefined,
} as any;
};

const deserializeAws_json1_1RStudioServerProAppSettings = (
Expand Down

0 comments on commit 417ad38

Please sign in to comment.