refactor: smart bootstrap

yanbasic · yanbasic · commit dd601c09ba0e · 2025-07-18T22:15:37.000+08:00
diff --git a/src/emd/cli.py b/src/emd/cli.py
@@ -23,7 +23,7 @@
 app.add_typer(
     bootstrap.app,
     name="bootstrap",
-    help="Initialize AWS resources for model deployment",
+    help="[Optional] Manually initialize AWS resources (auto-handled by deploy)",
 )
 app.add_typer(
     deploy.app,
diff --git a/src/emd/commands/bootstrap.py b/src/emd/commands/bootstrap.py
@@ -4,7 +4,7 @@
 from emd.constants import ENV_STACK_NAME,ENV_BUCKET_NAME_PREFIX
 from typing_extensions import Annotated
 from emd.sdk.bootstrap import create_env_stack,get_bucket_name
-from emd.utils.decorators import catch_aws_credential_errors, load_aws_profile
+from emd.utils.decorators import catch_aws_credential_errors, load_aws_profile, show_update_notification
 from emd.utils.logger_utils import make_layout
 from emd.utils.aws_service_utils import get_current_region
 
@@ -15,17 +15,25 @@
 layout = make_layout()
 
 @app.callback(invoke_without_command=True)
+@show_update_notification
 @catch_aws_credential_errors
 @load_aws_profile
 def bootstrap(
     skip_confirm: Annotated[
         Optional[bool], typer.Option("--skip-confirm", help="Skip confirmation")
     ] = False,
 ):
+    """
+    Manually initialize AWS resources for model deployment.
+    
+    Note: This command is optional. Running 'emd deploy' will automatically
+    set up infrastructure when needed.
+    """
+    console.print("[dim]ℹ️  Note: 'emd deploy' now automatically sets up infrastructure when needed.[/dim]")
+    console.print()
 
     region = get_current_region()
-    typer.echo("AWS environment is properly configured.")
-    layout["main"].update("[bold red]Initalizing environment...[/bold red]")
+    layout["main"].update("[bold red]Initializing environment...[/bold red]")
     try:
         bucket_name = get_bucket_name(
             bucket_prefix=ENV_BUCKET_NAME_PREFIX,
diff --git a/src/emd/commands/config.py b/src/emd/commands/config.py
@@ -2,7 +2,7 @@
 from rich.console import Console
 import boto3
 from typing import Annotated
-from emd.utils.decorators import catch_aws_credential_errors
+from emd.utils.decorators import catch_aws_credential_errors, show_update_notification
 
 from emd.patch_questionary.select_with_help import select_with_help,Choice
 from emd.utils.profile_manager import profile_manager
@@ -17,6 +17,7 @@
 
 
 @app.command(help="Set the default profile name for deployment")
+@show_update_notification
 @catch_aws_credential_errors
 def set_default_profile_name(
     name: Annotated[
@@ -57,6 +58,7 @@ def set_default_profile_name(
 
 
 @app.command(help="Show current default profile")
+@show_update_notification
 @catch_aws_credential_errors
 def show_default_profile_name():
     name = profile_manager.load_profile_name_from_local()
@@ -67,6 +69,7 @@ def show_default_profile_name():
 
 
 @app.command(help="Remove the default profile")
+@show_update_notification
 @catch_aws_credential_errors
 def remove_default_profile_name():
     name = profile_manager.remove_profile_name_from_local()
diff --git a/src/emd/commands/deploy.py b/src/emd/commands/deploy.py
@@ -25,7 +25,8 @@
 from emd.utils.aws_service_utils import check_cn_region
 import questionary
 from emd.utils.accelerator_utils import get_gpu_num,check_cuda_exists,check_neuron_exists
-from emd.utils.decorators import catch_aws_credential_errors,check_emd_env_exist,load_aws_profile
+from emd.utils.decorators import catch_aws_credential_errors,check_emd_env_exist,load_aws_profile,show_update_notification
+from emd.utils.smart_bootstrap import smart_bootstrap_manager
 from emd.utils.logger_utils import make_layout
 from emd.utils.exceptions import ModelNotSupported,ServiceNotSupported,InstanceNotSupported
 from prompt_toolkit import prompt
@@ -203,6 +204,7 @@ def get_prompt_message():
 
 #@app.callback(invoke_without_command=True)(invoke_without_command=True)
 @app.callback(invoke_without_command=True)
+@show_update_notification
 @catch_aws_credential_errors
 @check_emd_env_exist
 @load_aws_profile
@@ -245,13 +247,20 @@ def deploy(
     local_gpus:Annotated[
         str, typer.Option("--local-gpus", help="Local gpu ids to deploy the model (e.g. `0,1,2`), only working with local deployment mode.")
     ] = None,
+    disable_auto_bootstrap: Annotated[
+        Optional[bool], typer.Option("--disable-auto-bootstrap", help="Disable automatic bootstrap when infrastructure version mismatch is detected")
+    ] = False,
 ):
     if only_allow_local_deploy:
         allow_local_deploy = True
         region = LOCAL_REGION
     else:
         region = get_current_region()
 
+    # SMART BOOTSTRAP CHECK - Auto bootstrap if infrastructure version mismatch
+    if region != LOCAL_REGION and not disable_auto_bootstrap:  # Skip for local deployments or if disabled
+        smart_bootstrap_manager.auto_bootstrap_if_needed(region)
+
     if dockerfile_local_path:
         response = sdk_deploy(
             model_id='custom-docker',
diff --git a/src/emd/commands/destroy.py b/src/emd/commands/destroy.py
@@ -5,7 +5,7 @@
 from emd.constants import MODEL_DEFAULT_TAG
 from typing_extensions import Annotated
 from emd.sdk.destroy import destroy as sdk_destroy
-from emd.utils.decorators import catch_aws_credential_errors,check_emd_env_exist,load_aws_profile
+from emd.utils.decorators import catch_aws_credential_errors,check_emd_env_exist,load_aws_profile,show_update_notification
 from emd.utils.logger_utils import make_layout
 from emd.revision import convert_version_name_to_stack_name
 
@@ -16,6 +16,7 @@
 
 #@app.callback(invoke_without_command=True)(invoke_without_command=True)
 @app.callback(invoke_without_command=True)
+@show_update_notification
 @catch_aws_credential_errors
 @check_emd_env_exist
 @load_aws_profile
diff --git a/src/emd/commands/invoke/invoke.py b/src/emd/commands/invoke/invoke.py
@@ -8,7 +8,7 @@
 from emd.models import Model
 from emd.models.utils.constants import ModelType
 from emd.utils.logger_utils import make_layout
-from emd.utils.decorators import catch_aws_credential_errors,check_emd_env_exist,load_aws_profile
+from emd.utils.decorators import catch_aws_credential_errors,check_emd_env_exist,load_aws_profile,show_update_notification
 
 app = typer.Typer(pretty_exceptions_enable=False)
 console = Console()
@@ -121,6 +121,7 @@ def vlm_invoke(model_id,model_tag):
 
 
 @app.callback(invoke_without_command=True)
+@show_update_notification
 @catch_aws_credential_errors
 @check_emd_env_exist
 @load_aws_profile
diff --git a/src/emd/commands/models.py b/src/emd/commands/models.py
@@ -3,14 +3,15 @@
 
 import typer
 from emd.models import Model
-from emd.utils.decorators import catch_aws_credential_errors
+from emd.utils.decorators import catch_aws_credential_errors, show_update_notification
 from rich.console import Console
 from typing_extensions import Annotated
 
 app = typer.Typer(pretty_exceptions_enable=False)
 console = Console()
 
 @app.callback(invoke_without_command=True)
+@show_update_notification
 @catch_aws_credential_errors
 def list_supported_models(
     model_id: Annotated[
diff --git a/src/emd/commands/status.py b/src/emd/commands/status.py
@@ -4,7 +4,7 @@
 from emd.constants import MODEL_DEFAULT_TAG
 from emd.sdk.status import get_model_status
 from emd.utils.aws_service_utils import get_account_id
-from emd.utils.decorators import catch_aws_credential_errors, check_emd_env_exist, load_aws_profile
+from emd.utils.decorators import catch_aws_credential_errors, check_emd_env_exist, load_aws_profile, show_update_notification
 from emd.utils.logger_utils import make_layout
 from rich.console import Console
 from rich.table import Table
@@ -15,6 +15,7 @@
 
 
 @app.callback(invoke_without_command=True)
+@show_update_notification
 @catch_aws_credential_errors
 @check_emd_env_exist
 @load_aws_profile
diff --git a/src/emd/commands/version.py b/src/emd/commands/version.py
@@ -1,12 +1,14 @@
 from emd.revision import VERSION, COMMIT_HASH
 import typer
 from emd.utils.logger_utils import make_layout
+from emd.utils.decorators import show_update_notification
 
 app = typer.Typer(pretty_exceptions_enable=False)
 layout = make_layout()
 
 
 #@app.callback(invoke_without_command=True)(invoke_without_command=True)
 @app.callback(invoke_without_command=True)
+@show_update_notification
 def version():
     print(f"emd {VERSION} (build {COMMIT_HASH})")
diff --git a/src/emd/models/embeddings/bge_vl.py b/src/emd/models/embeddings/bge_vl.py
@@ -27,9 +27,7 @@
             local_instance,
         ],
         supported_services=[
-            sagemaker_service,
-            ecs_service,
-            local_service
+            ecs_service
         ],
         supported_frameworks=[
             fastapi_framework
diff --git a/src/emd/revision.py b/src/emd/revision.py
@@ -1,6 +1,6 @@
 # import importlib.metadata
-VERSION = "0.0.0"
-COMMIT_HASH = "00000000"
+VERSION = "0.0.2"
+COMMIT_HASH = "00000001"
 
 def convert_version_name_to_stack_name(version_name:str):
     return version_name.replace(".","-")
diff --git a/src/emd/sdk/bootstrap.py b/src/emd/sdk/bootstrap.py
@@ -29,11 +29,8 @@
 logger = get_logger(__name__)
 
 
-def get_version_md5_value():
-    version_md5_value = calculate_md5_string(
-        f"{VERSION}-{get_account_id()}"
-    )[:8]
-    return version_md5_value
+def get_bucket_mid_name():
+    return get_account_id()
 
 
 def get_bucket_name(
@@ -44,7 +41,7 @@ def get_bucket_name(
     get bucket name
     """
     assert region is not None,region
-    version_md5_value = get_version_md5_value()
+    version_md5_value = get_bucket_mid_name()
     bucket_name = f"{bucket_prefix}-{version_md5_value}-{region}"
     return bucket_name
 
@@ -75,7 +72,7 @@ def create_env_stack(
         logger.info(f"env stack: {stack_name} exists...")
         return
     logger.info(f"create env stack: {stack_name}...")
-    # version_md5_value = get_version_md5_value()
+    # version_md5_value = get_bucket_mid_name()
     if bucket_name is None:
         bucket_name = get_bucket_name(
             bucket_prefix=bucket_prefix,
diff --git a/src/emd/sdk/deploy.py b/src/emd/sdk/deploy.py
@@ -180,7 +180,6 @@ def deploy(
         if resource["ResourceType"] == "AWS::CodePipeline::Pipeline"
     ]
     pipeline_name = pipeline_resources[0]["PhysicalResourceId"]
-    logger.info("AWS environment is properly configured.")
 
     if dockerfile_local_path:
         if not os.path.exists(dockerfile_local_path):
diff --git a/src/emd/utils/aws_service_management.py b/src/emd/utils/aws_service_management.py
@@ -31,7 +31,6 @@ def check_aws_environment():
         # Try to create a boto3 client and make a simple API call
         sts = boto3.client('sts', region_name=get_current_region())
         response = sts.get_caller_identity()
-        typer.echo("AWS environment is properly configured.")
         account_id = response['Account']
         region = boto3.session.Session().region_name
         typer.echo(f"AWS Account: {account_id}")
diff --git a/src/emd/utils/aws_service_utils.py b/src/emd/utils/aws_service_utils.py
@@ -58,7 +58,6 @@ def check_aws_environment():
         # Try to create a boto3 client and make a simple API call
         sts = boto3.client("sts", region_name=get_current_region())
         response = sts.get_caller_identity()
-        logger.info("AWS environment is properly configured.")
         account_id = response["Account"]
         region = boto3.session.Session().region_name
         logger.info(f"AWS Account: {account_id}\nAWS Region: {region}")
diff --git a/src/emd/utils/decorators.py b/src/emd/utils/decorators.py
@@ -15,6 +15,18 @@
 
 logger =  get_logger(__name__)
 
+def show_update_notification(func):
+    """Decorator to show update notification before command execution"""
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        # Import here to avoid circular imports
+        from .update_notifier import update_notifier
+        # Show update notification at the start
+        update_notifier.show_update_notification()
+        # Execute the original command
+        return func(*args, **kwargs)
+    return wrapper
+
 def catch_aws_credential_errors(fn):
     @wraps(fn)
     def inner(*args,**kwargs):
@@ -38,9 +50,9 @@ def inner(*args, **kwargs):
             logger.error(traceback.format_exc())
             console = Console()
             if "does not exist" in str(e) and ENV_STACK_NAME in str(e):
-                console.print("[yellow]Infrastructure not bootstrapped.[/yellow]")
+                console.print("[yellow]Infrastructure not set up.[/yellow]")
                 console.print(
-                    "Please run 'emd bootstrap' first to set up required AWS resources."
+                    "Run 'emd deploy' to automatically set up required AWS resources."
                 )
             raise typer.Exit(1)
     return inner
@@ -95,20 +107,20 @@ def inner(*args, **kwargs):
 
 
 @catch_aws_credential_errors
-def print_aws_profile():
+def print_aws_config():
     console = Console()
     sts = boto3.client("sts", region_name=get_current_region())
     response = sts.get_caller_identity()
-    profile_name = os.environ.get("AWS_PROFILE","default")
     account_id = response["Account"]
     region = get_current_region()
+    
     if region is None:
         console.print("[yellow]warning: Unable to determine AWS region.[/yellow]")
         raise typer.Exit(1)
+    
     console.print(Panel.fit(
         f"[bold green]Account ID:[/bold green] {account_id}\n"
-        f"[bold green]Region    :[/bold green] {region}\n"
-        f"[bold green]Profile   :[/bold green] {profile_name}",
+        f"[bold green]Region    :[/bold green] {region}",
         title="[bold blue]AWS Configuration[/bold blue]",
         border_style="blue"
     ))
@@ -119,14 +131,19 @@ def load_aws_profile(fn):
     @wraps(fn)
     def wrapper(*args, **kwargs):
         try:
-            print_aws_profile()
-        except:
-            if kwargs.get("allow_local_deploy") or kwargs.get("only_allow_local_deploy",False):
-                logger.warning("Unable to load AWS profile. Proceeding with local deployment.")
+            print_aws_config()
+        except Exception as e:
+            error_msg = str(e)
+            logger.error(f"AWS configuration loading failed: {error_msg}")
+            logger.debug(traceback.format_exc())
+            
+            if kwargs.get("allow_local_deploy") or kwargs.get("only_allow_local_deploy", False):
+                logger.warning(f"AWS configuration error: {error_msg}. Proceeding with local deployment.")
                 kwargs['only_allow_local_deploy'] = True
                 return fn(*args, **kwargs)
+            
             console = Console()
-            console.print("[red]Error: Unable to load AWS profile.[/red]")
+            console.print(f"[red]❌ AWS Configuration Error: {error_msg}[/red]")
             raise typer.Exit(1)
         return fn(*args, **kwargs)
     return wrapper
diff --git a/src/emd/utils/exceptions.py b/src/emd/utils/exceptions.py
@@ -1,7 +1,7 @@
 from emd.constants import ENV_STACK_NAME
 class EnvStackNotExistError(Exception):
     def __init__(self,env_stack_name=ENV_STACK_NAME):
-        super().__init__( f"Environment stack '{env_stack_name}' does not exist. Please run `emd bootstrap` to build the emd environment.")
+        super().__init__( f"Environment stack '{env_stack_name}' does not exist. Run 'emd deploy' to automatically set up the EMD environment.")
 
 
 class AWSCredentialsError(Exception):
@@ -12,7 +12,7 @@ def __init__(self):
 
 class DmaaEnvStackNotReadyError(Exception):
     def __init__(self, env_stack_name=ENV_STACK_NAME):
-        super().__init__( f"Environment stack '{env_stack_name}' is not ready. Please run `emd bootstrap` to build the emd environment.")
+        super().__init__( f"Environment stack '{env_stack_name}' is not ready. Run 'emd deploy' to automatically set up the EMD environment.")
 
 
 
diff --git a/src/emd/utils/update_notifier.py b/src/emd/utils/update_notifier.py
diff --git a/src/pipeline/utils/aws_service_utils.py b/src/pipeline/utils/aws_service_utils.py

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`app.add_typer(`
`24`	`24`	`bootstrap.app,`
`25`	`25`	`name="bootstrap",`
`26`		`- help="Initialize AWS resources for model deployment",`
	`26`	`+ help="[Optional] Manually initialize AWS resources (auto-handled by deploy)",`
`27`	`27`	`)`
`28`	`28`	`app.add_typer(`
`29`	`29`	`deploy.app,`