1212 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313 See the License for the specific language governing permissions and
1414 limitations under the License.
15- */
15+ */
1616
17- // ECS Model Construct.
1817import { ISecurityGroup , IVpc , SubnetSelection } from 'aws-cdk-lib/aws-ec2' ;
1918import { AmiHardwareType } from 'aws-cdk-lib/aws-ecs' ;
2019import { Bucket } from 'aws-cdk-lib/aws-s3' ;
2120import { Construct } from 'constructs' ;
2221
2322import { ECSCluster } from './ecsCluster' ;
2423import { getModelIdentifier } from './utils' ;
25- import { BaseProps , Config , Ec2Metadata , EcsSourceType , ModelConfig } from './ecs- schema' ;
24+ import { BaseProps , Config , Ec2Metadata , EcsClusterConfig , EcsSourceType } from '../../../lib/ schema' ;
2625import { StringParameter } from 'aws-cdk-lib/aws-ssm' ;
2726
2827// This is the amount of memory to buffer (or subtract off) from the total instance memory, if we don't include this,
@@ -33,11 +32,11 @@ const CONTAINER_MEMORY_BUFFER = 1024 * 5;
3332 * Properties for the EcsModel Construct.
3433 *
3534 * @property {IVpc } vpc - The virtual private cloud (VPC).
36- * @property {SecurityGroup } securityGroup - The security group to use for the ECS cluster
37- * @property {ModelConfig } modelConfig - The model configuration.
35+ * @property {ISecurityGroup } securityGroup - The security group to use for the ECS cluster
36+ * @property {EcsClusterConfig } modelConfig - The model configuration.
3837 */
3938type ECSModelProps = {
40- modelConfig : ModelConfig ;
39+ modelConfig : EcsClusterConfig ;
4140 securityGroup : ISecurityGroup ;
4241 vpc : IVpc ;
4342 subnetSelection ?: SubnetSelection ;
@@ -51,10 +50,10 @@ export class EcsModel extends Construct {
5150 public readonly endpointUrl : string ;
5251
5352 /**
54- * @param {Construct } scope - The parent or owner of the construct.
55- * @param {string } id - The unique identifier for the construct within its scope.
56- * @param {ECSModelProps } props - The properties of the construct.
57- */
53+ * @param {Construct } scope - The parent or owner of the construct.
54+ * @param {string } id - The unique identifier for the construct within its scope.
55+ * @param {ECSModelProps } props - The properties of the construct.
56+ */
5857 constructor ( scope : Construct , id : string , props : ECSModelProps ) {
5958 super ( scope , id ) ;
6059 const { config, modelConfig, securityGroup, vpc, subnetSelection } = props ;
@@ -87,15 +86,15 @@ export class EcsModel extends Construct {
8786 }
8887
8988 /**
90- * Generates environment variables for Docker at runtime based on the configuration. The environment variables
91- * include the local model path, S3 bucket for models, model name, and other variables depending on the model type.
92- *
93- * @param {Config } config - The application configuration.
94- * @param {ModelConfig } modelConfig - Configuration for the specific model.
95- * @returns {Object } An object containing the environment variables. The object has string keys and values, which
96- * represent the environment variables for Docker at runtime.
97- */
98- private getEnvironmentVariables ( config : Config , modelConfig : ModelConfig ) : { [ key : string ] : string } {
89+ * Generates environment variables for Docker at runtime based on the configuration. The environment variables
90+ * include the local model path, S3 bucket for models, model name, and other variables depending on the model type.
91+ *
92+ * @param {Config } config - The application configuration.
93+ * @param {EcsClusterConfig } modelConfig - Configuration for the specific model.
94+ * @returns {Object } An object containing the environment variables. The object has string keys and values, which
95+ * represent the environment variables for Docker at runtime.
96+ */
97+ private getEnvironmentVariables ( config : Config , modelConfig : EcsClusterConfig ) : { [ key : string ] : string } {
9998 const environment : { [ key : string ] : string } = {
10099 LOCAL_MODEL_PATH : `${ config . nvmeContainerMountPath } ,
101100 S3_BUCKET_MODELS : config . s3BucketModels ,
@@ -127,15 +126,15 @@ export class EcsModel extends Construct {
127126 }
128127
129128 /**
130- * Generates build arguments for the Docker build based on the configuration. The build arguments include the base
131- * image, and depending on the model type, either the local code path or the S3 deb URL.
132- *
133- * @param {Config } config - The application configuration.
134- * @param {ModelConfig } modelConfig - Configuration for the specific model.
135- * @returns {Object } An object containing the build arguments. The object has string keys and values, which represent
136- * the arguments for the Docker build.
137- */
138- private getBuildArguments ( config : Config , modelConfig : ModelConfig ) : { [ key : string ] : string } | undefined {
129+ * Generates build arguments for the Docker build based on the configuration. The build arguments include the base
130+ * image, and depending on the model type, either the local code path or the S3 deb URL.
131+ *
132+ * @param {Config } config - The application configuration.
133+ * @param {EcsClusterConfig } modelConfig - Configuration for the specific model.
134+ * @returns {Object } An object containing the build arguments. The object has string keys and values, which represent
135+ * the arguments for the Docker build.
136+ */
137+ private getBuildArguments ( config : Config , modelConfig : EcsClusterConfig ) : { [ key : string ] : string } | undefined {
139138 if ( modelConfig . containerConfig . image . type !== EcsSourceType . ASSET ) {
140139 return undefined ;
141140 }
0 commit comments