superset-showtime 0.6.6__py3-none-any.whl → 0.6.7__py3-none-any.whl

showtime/__init__.py

@@ -4,7 +4,7 @@
 Circus tent emoji state tracking for Apache Superset ephemeral environments.
 """
 
-__version__ = "0.6.6"
+__version__ = "0.6.7"
 __author__ = "Maxime Beauchemin"
 __email__ = "maximebeauchemin@gmail.com"
 

showtime/cli.py

@@ -8,6 +8,7 @@ from typing import Dict, Optional
 
 import typer
 from rich.console import Console
+from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.table import Table
 
 from .core.github import GitHubError, GitHubInterface
@@ -172,7 +173,15 @@ def status(
 ) -> None:
     """Show environment status for PR"""
     try:
-        pr = PullRequest.from_id(pr_number)
+        # Show spinner while fetching PR status
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=Console(),
+            transient=True,
+        ) as progress:
+            progress.add_task(description=f"🎪 Fetching status for PR #{pr_number}...", total=None)
+            pr = PullRequest.from_id(pr_number)
 
         # Use PullRequest method for data
         status_data = pr.get_status()
@@ -183,8 +192,9 @@ def status(
 
         show_data = status_data["show"]
 
-        # Create status table
-        table = Table(title=f"🎪 Environment Status - PR #{pr_number}")
+        # Create status table with clickable PR link
+        pr_url = f"https://github.com/apache/superset/pull/{pr_number}"
+        table = Table(title=f"🎪 Environment Status - [link={pr_url}]PR #{pr_number}[/link]")
         table.add_column("Property", style="cyan")
         table.add_column("Value", style="white")
 
@@ -193,10 +203,11 @@ def status(
         status_display = STATUS_DISPLAY.get(show_data["status"], "❓")
         table.add_row("Status", f"{status_display} {show_data['status'].title()}")
         table.add_row("Environment", f"`{show_data['sha']}`")
-        table.add_row("AWS Service", f"`{show_data['aws_service_name']}`")
+        table.add_row("Service Name", f"`{show_data['aws_service_name']}`")
 
         if show_data["ip"]:
-            table.add_row("URL", f"http://{show_data['ip']}:8080")
+            superset_url = f"http://{show_data['ip']}:8080"
+            table.add_row("Superset URL", f"[link={superset_url}]{superset_url}[/link]")
         if show_data["created_at"]:
             table.add_row("Created", show_data["created_at"])
 
@@ -205,6 +216,13 @@ def status(
         if show_data["requested_by"]:
             table.add_row("Requested by", f"@{show_data['requested_by']}")
 
+        # Add AWS Console URLs - clickable
+        from .core.github_messages import get_aws_console_urls
+
+        aws_urls = get_aws_console_urls(show_data["aws_service_name"])
+        table.add_row("AWS Logs", f"[link={aws_urls['logs']}]View Logs ↗[/link]")
+        table.add_row("AWS Service", f"[link={aws_urls['service']}]View Service ↗[/link]")
+
         # Show active triggers
         trigger_labels = [label for label in pr.labels if "showtime-trigger-" in label]
         if trigger_labels:
@@ -289,8 +307,16 @@ def list(
 ) -> None:
     """List all environments"""
     try:
-        # Use PullRequest method for data collection
-        all_environments = PullRequest.list_all_environments()
+        # Show spinner while fetching environments
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=Console(),
+            transient=True,
+        ) as progress:
+            progress.add_task(description="🎪 Fetching environments...", total=None)
+            # Use PullRequest method for data collection
+            all_environments = PullRequest.list_all_environments()
 
         if not all_environments:
             p("🎪 No environments currently running")
@@ -328,8 +354,9 @@ def list(
         table.add_column("TTL", style="yellow", min_width=6)
         table.add_column("User", style="magenta", min_width=10)
 
-        # Sort by PR number, then by show type (active first, then building, then orphaned)
-        type_priority = {"active": 1, "building": 2, "orphaned": 3}
+        # Sort by PR number, then by show type (active first, then building, then orphaned, legacy last)
+        # TODO: Remove after legacy cleanup - legacy type priority
+        type_priority = {"active": 1, "building": 2, "orphaned": 3, "legacy": 4}
         sorted_envs = sorted(
             filtered_envs,
             key=lambda e: (
@@ -348,6 +375,8 @@ def list(
                 type_display = "🎯"  # Active environment (has pointer)
             elif show_type == "building":
                 type_display = "🔨"  # Building environment (hammer is single-width)
+            elif show_type == "legacy":  # TODO: Remove after legacy cleanup
+                type_display = "⚠️"  # Legacy environment (no SHA in service name)
             else:
                 type_display = "👻"  # Orphaned environment (no pointer)
 
@@ -374,17 +403,26 @@ def list(
             # Simple status display - just emoji
             status_display = "🟢" if show_data["status"] == "running" else "❌"
 
+            # TODO: Remove after legacy cleanup - handle missing legacy fields
+            sha_display = show_data["sha"] if show_data["sha"] != "-" else "-"
+            ttl_display = show_data["ttl"] if show_data["ttl"] else "-"
+            user_display = (
+                f"@{show_data['requested_by']}"
+                if show_data["requested_by"] and show_data["requested_by"] != "-"
+                else "-"
+            )
+
             table.add_row(
                 clickable_pr,
                 f"{show_data['aws_service_name']}-service",
                 type_display,
                 status_display,
-                show_data["sha"],
+                sha_display,
                 age_display,
                 superset_url,
                 aws_logs_link,
-                show_data["ttl"],
-                f"@{show_data['requested_by']}" if show_data["requested_by"] else "-",
+                ttl_display,
+                user_display,
             )
 
         p(table)

showtime/core/pull_request.py

@@ -646,10 +646,15 @@ class PullRequest:
         pr_numbers = get_github().find_prs_with_shows()
 
         all_environments = []
+        github_service_names = set()  # Track services we found via GitHub
+
         for pr_number in pr_numbers:
             pr = cls.from_id(pr_number)
             # Show ALL environments, not just current_show
             for show in pr.shows:
+                # Track this service name for later
+                github_service_names.add(show.ecs_service_name)
+
                 # Determine show type based on pointer presence
                 show_type = "orphaned"  # Default
 
@@ -674,10 +679,64 @@ class PullRequest:
                         "age": show.age_display(),  # Add age display
                         "aws_service_name": show.aws_service_name,
                         "show_type": show_type,  # New field for display
+                        "is_legacy": False,  # Regular environment
                     },
                 }
                 all_environments.append(environment_data)
 
+        # TODO: Remove after legacy cleanup - Find AWS-only services (legacy pr-XXXXX-service format)
+        try:
+            from .aws import get_aws
+            from .service_name import ServiceName
+
+            aws = get_aws()
+            aws_services = aws.list_circus_environments()
+
+            for aws_service in aws_services:
+                service_name_str = aws_service.get("service_name", "")
+
+                # Skip if we already have this from GitHub
+                if service_name_str in github_service_names:
+                    continue
+
+                # Parse the service name to get PR number
+                try:
+                    svc = ServiceName.from_service_name(service_name_str)
+
+                    # Legacy services have no SHA
+                    is_legacy = svc.sha is None
+
+                    # Add as a legacy/orphaned environment
+                    environment_data = {
+                        "pr_number": svc.pr_number,
+                        "status": "active",  # Keep for compatibility
+                        "show": {
+                            "sha": svc.sha or "-",  # Show dash for missing SHA
+                            "status": aws_service["status"].lower()
+                            if aws_service.get("status")
+                            else "running",
+                            "ip": aws_service.get("ip"),
+                            "ttl": None,  # Legacy environments have no TTL labels
+                            "requested_by": "-",  # Unknown user for legacy
+                            "created_at": None,  # Will show as "-" in display
+                            "age": "-",  # Unknown age
+                            "aws_service_name": svc.base_name,  # pr-XXXXX or pr-XXXXX-sha format
+                            "show_type": "legacy"
+                            if is_legacy
+                            else "orphaned",  # Mark as legacy type
+                            "is_legacy": is_legacy,  # Flag for display formatting
+                        },
+                    }
+                    all_environments.append(environment_data)
+
+                except ValueError:
+                    # Skip services that don't match our pattern
+                    continue
+
+        except Exception:
+            # If AWS lookup fails, just show GitHub-based environments
+            pass
+
         return all_environments
 
     def _determine_action(self, target_sha: str) -> str:

{superset_showtime-0.6.6.dist-info → superset_showtime-0.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superset-showtime
-Version: 0.6.6
+Version: 0.6.7
 Summary: 🎪 Apache Superset ephemeral environment management with circus tent emoji state tracking
 Project-URL: Homepage, https://github.com/apache/superset-showtime
 Project-URL: Documentation, https://superset-showtime.readthedocs.io/

{superset_showtime-0.6.6.dist-info → superset_showtime-0.6.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
-showtime/__init__.py,sha256=bt0MtNlw2hIVZqnlWzbnKBcl21Y7mwUeYRPXNjM287g,448
+showtime/__init__.py,sha256=2Ky3eSk7FJq4kHOp0cH41haCJ3X8gZ5WpzxUqKXRnNM,448
 showtime/__main__.py,sha256=EVaDaTX69yIhCzChg99vqvFSCN4ELstEt7Mpb9FMZX8,109
-showtime/cli.py,sha256=HgGl_QqpgjauR0dd9ZC8WdfQSDWBamlbDms6ezazAXw,32428
+showtime/cli.py,sha256=uGqtmFHXTZd8vMWuoGZ6BLVWzuY34hMx-GMCkgvqvKk,34369
 showtime/core/__init__.py,sha256=54hbdFNGrzuNMBdraezfjT8Zi6g221pKlJ9mREnKwCw,34
 showtime/core/aws.py,sha256=7ifPmYryeuLR2c7RtGGzge8Ny9H6ZL40mDESiM1_fi8,34065
 showtime/core/constants.py,sha256=ssHiswRorqp2CnsZOebz2zqGsnDlMy9aeTQy8gju9fY,290
@@ -10,12 +10,12 @@ showtime/core/git_validation.py,sha256=2V9BSEjubGG4EHKZjcOUGYDWddNpB9uBZ_EVdU00C
 showtime/core/github.py,sha256=klUxIzUZRE7iQhG36A0lrtgnt6sTkmUjFazaXGgMlCY,12940
 showtime/core/github_messages.py,sha256=LDYAbVHMEwJaldeJy0ddKe91oRV3RVsUNAXo-RU5oDs,7490
 showtime/core/label_colors.py,sha256=gSe7EIMl4YjWkIgKHUvuaRSwgEB_B-NYQBxFFlF8Z3s,4065
-showtime/core/pull_request.py,sha256=VMAwcf6bAdYiEeGmsaTWt5BhpA1--rgS8A84R5UcHeI,42342
+showtime/core/pull_request.py,sha256=vFlv6pTR3xI5jSODEaQh_af7CUA5kf1StQqQhmzVczI,44964
 showtime/core/service_name.py,sha256=ZgYzlgnMdMqqatCMVarSyzv9Za9njxDSfIvgYd0LUIY,3126
 showtime/core/show.py,sha256=VzjOeUG2ra2tdDIzO1EHkZiEt-kMznRk9O2PQ7VuE4I,10224
 showtime/core/sync_state.py,sha256=oe1lTWWPzfvEAzLBAowdsSJZIdmm5NN-RewzpYTj8zE,4147
 showtime/data/ecs-task-definition.json,sha256=d-NLkIhvr4C6AnwDfDIwUTx-6KFMH9wRkt6pVCbqZY4,2365
-superset_showtime-0.6.6.dist-info/METADATA,sha256=ZBNN-bgaUQ9I3-gaIyClKz1Ii5jQQZXkUKMdG7dH2sM,12052
-superset_showtime-0.6.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-superset_showtime-0.6.6.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
-superset_showtime-0.6.6.dist-info/RECORD,,
+superset_showtime-0.6.7.dist-info/METADATA,sha256=_2odjOOHSF_gh7E__iGf2oa4p7a0XV-Ow3qsgW2DVEw,12052
+superset_showtime-0.6.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+superset_showtime-0.6.7.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
+superset_showtime-0.6.7.dist-info/RECORD,,