fix: update status output

Author: yanbasic

src/emd/cfn/ecs/template.yaml

@@ -388,25 +388,6 @@ Resources:
         GroupId: !Ref ServiceSecurityGroup
         IpProtocol: -1
         SourceSecurityGroupId: !Ref PublicLoadBalancerSecurityGroup
-  ListenerRulePath:
-    Type: AWS::ElasticLoadBalancingV2::ListenerRule
-    Properties:
-      ListenerArn: !Ref PublicLoadBalancerListenerArn
-      Priority: !GetAtt GetPriorityNumber.Priority
-      Conditions:
-        - Field: path-pattern
-          PathPatternConfig:
-            Values:
-              - !Join
-                - ''
-                - - '/'
-                  - !Ref ModelId
-                  - '/'
-                  - !Ref ModelTag
-                  - '/*'
-      Actions:
-        - Type: forward
-          TargetGroupArn: !Ref ServiceTargetGroup
 
   ForceApiRouterDeployment:
     Type: Custom::ForceApiRouterDeployment

src/emd/commands/status.py

@@ -8,6 +8,8 @@
 from typing import Annotated, Optional
 from emd.sdk.status import get_model_status
 from rich.table import Table
+from rich.panel import Panel
+from rich.box import Box, SIMPLE, MINIMAL
 from emd.utils.decorators import catch_aws_credential_errors,check_emd_env_exist,load_aws_profile
 from emd.constants import MODEL_DEFAULT_TAG
 from emd.utils.logger_utils import make_layout
@@ -31,7 +33,7 @@ def status(
         str, typer.Argument(help="Model tag")
     ] = MODEL_DEFAULT_TAG,
 ):
-    ret = get_model_status(model_id,model_tag=model_tag)
+    ret = get_model_status(model_id, model_tag=model_tag)
     inprogress = ret['inprogress']
     completed = ret['completed']
 
@@ -40,49 +42,84 @@ def status(
         if d['status'] == "Stopped":
             continue
         data.append({
-            "model_id":d['model_id'],
-            "model_tag":d['model_tag'],
+            "model_id": d['model_id'],
+            "model_tag": d['model_tag'],
             "status": f"{d['status']} ({d['stage_name']})",
-            "service_type":d['service_type'],
-            "instance_type":d['instance_type'],
-            "create_time":d['create_time'],
-            "outputs":d['outputs'],
+            "service_type": d['service_type'],
+            "instance_type": d['instance_type'],
+            "create_time": d['create_time'],
+            "outputs": d['outputs'],
         })
 
     for d in completed:
         data.append({
-            "model_id":d['model_id'],
-            "model_tag":d['model_tag'],
+            "model_id": d['model_id'],
+            "model_tag": d['model_tag'],
             "status": d['stack_status'],
-            "service_type":d['service_type'],
-            "instance_type":d['instance_type'],
-            "create_time":d['create_time'],
-            "outputs":d['outputs'],
+            "service_type": d['service_type'],
+            "instance_type": d['instance_type'],
+            "create_time": d['create_time'],
+            "outputs": d['outputs'],
         })
 
     account_id = get_account_id()
-    table = Table(show_lines=True, expand=True)
-    table.add_column("ModelId", justify="left",overflow='fold')
-    table.add_column("ModelTag", justify="left",overflow='fold')
-    table.add_column("Status", justify="left",overflow='fold')
-    table.add_column("Service", justify="left",overflow='fold',max_width=19)
-    table.add_column("Instance", justify="left",overflow='fold')
-    table.add_column("CreateTime", justify="left",overflow='fold')
-    table.add_column("Outputs", justify="left",overflow='fold')
-
-    # table.field_names = ["model_id", "status"]
-    for d in data:
-        table.add_row(
-            d['model_id'],
-            d['model_tag'],
-            d['status'],
-            d['service_type'],
-            d['instance_type'],
-            d['create_time'].replace(" ", "\n"),
-            d['outputs']
-        )
-        # table.add_row([d['model_id'], d['status']])
-    console.print(table)
+    
+    # Display each model in its own table box
+    for model_data in data:
+        # Create a table for the model with a thinner border
+        model_table = Table(show_header=False, expand=True)
+        
+        # Add a single column for the model name header
+        model_table.add_column(justify="center")
+        
+        # Add the model name as the first row with bold styling
+        model_name = f"{model_data['model_id']}/{model_data['model_tag']}"
+        model_table.add_row(model_name, style="bold")
+        
+        # Create a nested table for model details
+        details_table = Table(show_header=False, box=None, expand=True)
+        details_table.add_column(justify="left", style="cyan", width=20)
+        details_table.add_column(justify="left", overflow="fold")
+        
+        # Add model details as name/value pairs
+        details_table.add_row("Status", model_data['status'])
+        details_table.add_row("Service Type", model_data['service_type'])
+        details_table.add_row("Instance Type", model_data['instance_type'])
+        details_table.add_row("Create Time", model_data['create_time'])
+        
+        # Parse and add outputs as separate rows
+        try:
+            # Check if outputs is a string that looks like a dictionary
+            if model_data['outputs'] and isinstance(model_data['outputs'], str) and '{' in model_data['outputs']:
+                # Try to convert the string to a dictionary
+                import ast
+                outputs_dict = ast.literal_eval(model_data['outputs'])
+                if isinstance(outputs_dict, dict):
+                    # Define the order of priority keys
+                    priority_keys = ["BaseURL", "Model", "ModelAPIKey"]
+                    
+                    # First add priority keys if they exist
+                    for key in priority_keys:
+                        if key in outputs_dict:
+                            details_table.add_row(key, str(outputs_dict[key]))
+                    
+                    # Then add any remaining keys
+                    for key, value in outputs_dict.items():
+                        if key not in priority_keys:
+                            details_table.add_row(key, str(value))
+                else:
+                    details_table.add_row("Outputs", model_data['outputs'])
+            else:
+                details_table.add_row("Outputs", model_data['outputs'])
+        except (SyntaxError, ValueError):
+            # If parsing fails, just show the raw outputs
+            details_table.add_row("Outputs", model_data['outputs'])
+        
+        # Add the details table as a row in the main table
+        model_table.add_row(details_table)
+        
+        console.print(model_table)
+        console.print()  # Add a blank line between models
 
 
 if __name__ == "__main__":