fix:fix cli bugs (#44)

* chore: remove doc link

* feat: add version

* fix: update percent of ECS health status

* chore: add message for quota limits

Author: yanbasic

src/emd/cfn/ecs/cluster.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: EMD ECS Cluster - Ensure all associated models are deleted before removing this stack.
+Description: Easy Model Deployer ECS Cluster - Ensure all associated models are deleted before removing this stack. Please go to https://github.com/aws-samples/easy-model-deployer for more information.
 Parameters:
   VPCID:
     Type: AWS::EC2::VPC::Id

src/emd/cfn/ecs/template.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploy an ECS cluster with GPU-optimized AMI to run EMD model in a new VPC with secure networking.
+Description: Easy Model Deployer model deployment stack for Amazon ECS. The invoke URL can be found in the stack Outputs. Please go to https://github.com/aws-samples/easy-model-deployer for more information.
 Parameters:
   VPCID:
     Type: AWS::EC2::VPC::Id
@@ -302,7 +302,7 @@ Resources:
             - !Ref ServiceSecurityGroup
           Subnets: !Ref Subnets
       DeploymentConfiguration:
-        MaximumPercent: 200
+        MaximumPercent: 100
         MinimumHealthyPercent: 75
       DesiredCount: !Ref DesiredCount
       TaskDefinition: !Ref TaskDefinition

src/emd/cfn/sagemaker/template.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Create a SageMaker Endpoint using an ECR image URI
+Description: Easy Model Deployer model deployment stack for Amazon SageMaker. The invoke endpoint can be found in the stack Outputs. Please go to https://github.com/aws-samples/easy-model-deployer for more information.
 
 Parameters:
   ECRImageURI:

src/emd/cfn/sagemaker_async/template.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Create a SageMaker Endpoint using an ECR image URI
+Description: Easy Model Deployer model deployment stack for Amazon SageMaker. The invoke endpoint can be found in the stack Outputs. Please go to https://github.com/aws-samples/easy-model-deployer for more information.
 
 Parameters:
   ECRImageURI:

src/emd/cfn/vpc/template.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: EMD Networking - Ensure all associated models are deleted before removing this stack.
+Description: Easy Model Deployer Networking - Ensure all associated models are deleted before removing this stack. Please go to https://github.com/aws-samples/easy-model-deployer for more information.
 # This template creates a VPC, 2 public subnets in 2 different
 # availability zones (to be used with EMD), and S3 endpoint to allow
 # the ECS cluster to access the S3 bucket.

src/emd/cli.py

@@ -74,11 +74,13 @@
     name="config",
     help="Set default config",
 )
-# app.add_typer(
-#     version.app,
-#     name="version",
-#     help="Show version",
-# )
+
+app.add_typer(
+    version.app,
+    name="version",
+    help="Show version",
+)
+
 @app.command(help="List supported models")
 @catch_aws_credential_errors
 def list_supported_models(model_id: Annotated[
@@ -105,6 +107,9 @@ def callback(ctx: typer.Context):
         )
         # Show main help
         console.print(ctx.get_help())
+        console.print(
+            " [dim]Further help: [link=https://github.com/aws-samples/easy-model-deployer]https://github.com/aws-samples/easy-model-deployer[/link][/dim]\n",
+        )
 
 if __name__ == "__main__":
     bootstrap.bootstrap()

src/emd/commands/deploy.py

@@ -387,7 +387,9 @@ def deploy(
                     choices=[
                         Choice(
                             title=instance.instance_type,
-                            description=instance.description,
+                            description=(instance.description + '\n\n' +
+                                "Note: If your deployment takes over 20 minutes, check your AWS service quotas, especially for G or P instances. Quotas are based on vCPUs, not instance count. Ensure your requests fit the limits. See Amazon EC2 instance type quotas for detail: https://docs.aws.amazon.com/ec2/latest/instances/ec2-instance-quota-types.html."
+                            )
                         )
                         for instance in supported_instances
                     ],

src/emd/commands/version.py

@@ -1,6 +1,5 @@
-from emd.revision import VERSION
+from emd.revision import VERSION, COMMIT_HASH
 import typer
-from emd.utils.decorators import load_aws_profile, catch_aws_credential_errors, check_emd_env_exist
 from emd.utils.logger_utils import make_layout
 
 app = typer.Typer(pretty_exceptions_enable=False)
@@ -9,8 +8,5 @@
 
 #@app.callback(invoke_without_command=True)(invoke_without_command=True)
 @app.callback(invoke_without_command=True)
-@catch_aws_credential_errors
-@check_emd_env_exist
-@load_aws_profile
 def version():
-    print(VERSION)
+    print(f"emd {VERSION} (build {COMMIT_HASH})")

src/emd/sdk/destroy.py

@@ -61,7 +61,6 @@ def stop_pipeline_execution(
 def destroy_ecs(model_id,model_tag,stack_name):
     cf_client = boto3.client('cloudformation')
     cf_client.delete_stack(StackName=stack_name)
-    logger.warning(f"model: {model_id}, model_tag: {model_tag} is a ECS service, if the destruction fails, please destroy it manually using the guide at https://amzn-chn.feishu.cn/docx/YjTadv82Po7IBXxmS1RcmMGHndg")
 
 def destroy(model_id:str,model_tag=MODEL_DEFAULT_TAG,waiting_until_complete=True):
     check_env_stack_exist_and_complete()