superset-showtime 0.1.0__py3-none-any.whl → 0.2.3__py3-none-any.whl

showtime/core/aws.py

@@ -56,6 +56,8 @@ class AWSInterface:
         sha: str,
         github_user: str = "unknown",
         feature_flags: List[Dict[str, str]] = None,
+        image_tag_override: Optional[str] = None,
+        force: bool = False,
     ) -> EnvironmentResult:
         """
         Create ephemeral environment with blue-green deployment support
@@ -81,20 +83,45 @@ class AWSInterface:
             requested_by=github_user,
         )
 
-        service_name = f"{show.aws_service_name}-service"  # pr-{pr_number}-{sha}-service
-        image_tag = show.aws_image_tag  # pr-{pr_number}-{sha}-ci
+        service_name = show.ecs_service_name  # pr-{pr_number}-{sha}-service
 
         try:
-            # Step 1: Check if ECR image exists (replicate GHA check-image step)
-            if not self._check_ecr_image_exists(image_tag):
-                return EnvironmentResult(
-                    success=False,
-                    error=f"Container image {image_tag} not found in ECR. Build the image first.",
+            # Handle force flag - delete existing service for this SHA first
+            if force:
+                print(f"🗑️ Force flag: Checking for existing service {service_name}")
+                if self._service_exists(service_name):
+                    print(f"🗑️ Deleting existing service: {service_name}")
+                    success = self._delete_ecs_service(service_name)
+                    if success:
+                        print("✅ Service deletion initiated, waiting for completion...")
+                        # Wait for service to be fully deleted before proceeding
+                        if self._wait_for_service_deletion(service_name):
+                            print("✅ Service deletion completed, proceeding with fresh deployment")
+                        else:
+                            print("⚠️ Service deletion timeout, proceeding anyway")
+                    else:
+                        print("⚠️ Failed to delete existing service, proceeding anyway")
+                else:
+                    print("ℹ️ No existing service found, proceeding with new deployment")
+            # Step 1: Determine which Docker image to use (DockerHub direct)
+            if image_tag_override:
+                # Use explicit override (can be any format)
+                docker_image = f"apache/superset:{image_tag_override}"
+                print(f"✅ Using override image: {docker_image}")
+            else:
+                # Use supersetbot PR-SHA format (what supersetbot creates)
+                supersetbot_tag = show.aws_image_tag  # pr-{pr_number}-{sha}-ci
+                docker_image = f"apache/superset:{supersetbot_tag}"
+                print(f"✅ Using DockerHub image: {docker_image} (supersetbot PR-SHA format)")
+                print(
+                    "💡 To test with different image: --image-tag latest or --image-tag pr-34639-9a82c20-ci"
                 )
 
+            # Note: No ECR image check needed - ECS will pull from DockerHub directly
+
             # Step 2: Create/update ECS task definition with feature flags
             task_def_arn = self._create_task_definition_with_image_and_flags(
-                image_tag, feature_flags or []
+                docker_image, feature_flags or []
             )
             if not task_def_arn:
                 return EnvironmentResult(success=False, error="Failed to create task definition")
@@ -128,9 +155,9 @@ class AWSInterface:
             if not self._wait_for_service_stability(service_name):
                 return EnvironmentResult(success=False, error="Service failed to become stable")
 
-            # Step 7: Health check the new service
+            # Step 7: Health check the new service (longer timeout for Superset + examples)
             print(f"🏥 Health checking service {service_name}...")
-            if not self._health_check_service(service_name):
+            if not self._health_check_service(service_name, max_attempts=20):  # 10 minutes total
                 return EnvironmentResult(success=False, error="Service failed health checks")
 
             # Step 8: Get IP after health checks pass
@@ -175,7 +202,9 @@ class AWSInterface:
             return True
 
         except Exception as e:
-            raise AWSError(message=str(e), operation="delete_environment", resource=service_name)
+            raise AWSError(
+                message=str(e), operation="delete_environment", resource=service_name
+            ) from e
 
     def get_environment_ip(self, service_name: str) -> Optional[str]:
         """
@@ -284,23 +313,18 @@ class AWSInterface:
             return False
 
     def _create_task_definition_with_image_and_flags(
-        self, image_tag: str, feature_flags: List[Dict[str, str]]
+        self, docker_image: str, feature_flags: List[Dict[str, str]]
     ) -> Optional[str]:
-        """Create ECS task definition with image and feature flags (replicate GHA task-def + env vars)"""
+        """Create ECS task definition with DockerHub image and feature flags"""
         try:
             # Load base task definition template
             task_def_path = Path(__file__).parent.parent / "data" / "ecs-task-definition.json"
             with open(task_def_path) as f:
                 task_def = json.load(f)
 
-            # Get ECR registry for full image URL
-            ecr_response = self.ecr_client.get_authorization_token()
-            registry_url = ecr_response["authorizationData"][0]["proxyEndpoint"]
-            registry_url = registry_url.replace("https://", "")
-            full_image_url = f"{registry_url}/{self.repository}:{image_tag}"
-
-            # Update image in container definition (replicate GHA render-task-definition)
-            task_def["containerDefinitions"][0]["image"] = full_image_url
+            # Use DockerHub image directly (no ECR needed)
+            # docker_image is already in format: apache/superset:abc123f-ci
+            task_def["containerDefinitions"][0]["image"] = docker_image
 
             # Add feature flags to environment (replicate GHA jq environment update)
             container_env = task_def["containerDefinitions"][0]["environment"]
@@ -353,7 +377,7 @@ class AWSInterface:
         """Create ECS service (replicate exact GHA create-service step)"""
         try:
             # Replicate exact GHA create-service command parameters
-            response = self.ecs_client.create_service(
+            self.ecs_client.create_service(
                 cluster=self.cluster,
                 serviceName=service_name,  # pr-{pr_number}-service
                 taskDefinition=self.cluster,  # Uses cluster name as task def family
@@ -469,7 +493,7 @@ class AWSInterface:
             return orphaned
 
         except Exception as e:
-            raise AWSError(message=str(e), operation="cleanup_orphaned_environments")
+            raise AWSError(message=str(e), operation="cleanup_orphaned_environments") from e
 
     def update_feature_flags(self, service_name: str, feature_flags: Dict[str, bool]) -> bool:
         """Update feature flags in running environment"""
@@ -582,7 +606,7 @@ class AWSInterface:
             if time_match.group(2) == "d":
                 hours *= 24
 
-            cutoff_timestamp = time.time() - (hours * 3600)
+            # cutoff_timestamp = time.time() - (hours * 3600)  # Not used in current implementation
             expired_services = []
 
             # List all services in cluster
@@ -756,3 +780,28 @@ class AWSInterface:
         except Exception as e:
             print(f"❌ Health check error: {e}")
             return False
+
+    def _wait_for_service_deletion(self, service_name: str, timeout_minutes: int = 5) -> bool:
+        """Wait for ECS service to be fully deleted"""
+        import time
+
+        try:
+            max_attempts = timeout_minutes * 12  # 5s intervals
+
+            for attempt in range(max_attempts):
+                # Check if service still exists
+                if not self._service_exists(service_name):
+                    print(f"✅ Service {service_name} fully deleted after {attempt * 5}s")
+                    return True
+
+                if attempt % 6 == 0:  # Every 30s
+                    print(f"⏳ Waiting for service deletion... ({attempt * 5}s elapsed)")
+
+                time.sleep(5)  # Check every 5 seconds
+
+            print(f"⚠️ Service deletion timeout after {timeout_minutes} minutes")
+            return False
+
+        except Exception as e:
+            print(f"❌ Error waiting for service deletion: {e}")
+            return False

showtime/core/circus.py

@@ -23,7 +23,6 @@ class Show:
     created_at: Optional[str] = None  # ISO timestamp
     ttl: str = "24h"  # 24h, 48h, close, etc.
     requested_by: Optional[str] = None  # GitHub username
-    config: str = "standard"  # Configuration (alerts,debug)
 
     @property
     def aws_service_name(self) -> str:
@@ -35,6 +34,11 @@ class Show:
         """Deterministic ECR image tag: pr-{pr_number}-{sha}-ci"""
         return f"pr-{self.pr_number}-{self.sha}-ci"
 
+    @property
+    def ecs_service_name(self) -> str:
+        """Deterministic ECS service name with -service suffix: pr-{pr_number}-{sha}-service"""
+        return f"{self.aws_service_name}-service"
+
     @property
     def is_active(self) -> bool:
         """Check if this is the currently active show"""
@@ -72,9 +76,6 @@ class Show:
         if self.requested_by:
             labels.append(f"🎪 {self.sha} 🤡 {self.requested_by}")
 
-        if self.config != "standard":
-            labels.append(f"🎪 {self.sha} ⚙️ {self.config}")
-
         return labels
 
     @classmethod
@@ -112,8 +113,6 @@ class Show:
                     show_data["ttl"] = value
                 elif emoji == "🤡":  # User (clown!)
                     show_data["requested_by"] = value
-                elif emoji == "⚙️":  # Config
-                    show_data["config"] = value
 
         # Only return Show if we found relevant labels for this SHA
         if any(label.endswith(f" {sha}") for label in labels if "🎯" in label or "🏗️" in label):
@@ -220,66 +219,51 @@ class PullRequest:
         self._shows = self._parse_shows_from_labels()
 
 
-# Utility functions for configuration label handling
-def is_configuration_label(label: str) -> bool:
-    """Check if label is a configuration command"""
-    return label.startswith("🎪 conf-")
-
-
-def parse_configuration_command(label: str) -> Optional[str]:
-    """
-    Parse configuration command from label
-
-    Args:
-        label: Label like "🎪 conf-enable-ALERTS"
-
-    Returns:
-        Command string like "enable-ALERTS" or None if not a config label
-    """
-    if not is_configuration_label(label):
-        return None
+def parse_ttl_days(ttl_str: str) -> Optional[float]:
+    """Parse TTL string to days"""
+    import re
 
-    return label.replace("🎪 conf-", "")
+    if ttl_str == "never":
+        return None  # Never expire
 
+    if ttl_str == "close":
+        return None  # Special handling needed
 
-def merge_config(current_config: str, command: str) -> str:
-    """
-    Merge new configuration command into existing config
+    # Parse number + unit: 24h, 7d, 2w, etc.
+    match = re.match(r"(\d+(?:\.\d+)?)(h|d|w)", ttl_str.lower())
+    if not match:
+        return 2.0  # Default 2 days if invalid
 
-    Args:
-        current_config: Current config string like "standard,alerts"
-        command: New command like "enable-DASHBOARD_RBAC" or "disable-ALERTS"
+    value = float(match.group(1))
+    unit = match.group(2)
 
-    Returns:
-        Updated config string
-    """
-    configs = current_config.split(",") if current_config != "standard" else []
+    if unit == "h":
+        return value / 24.0  # Hours to days
+    elif unit == "d":
+        return value  # Already in days
+    elif unit == "w":
+        return value * 7.0  # Weeks to days
 
-    # Handle feature flag commands
-    if command.startswith("enable-"):
-        feature = command.replace("enable-", "").lower()
-        configs = [c for c in configs if not c.startswith(f"no-{feature}")]
-        configs.append(feature)
+    return 2.0  # Default
 
-    elif command.startswith("disable-"):
-        feature = command.replace("disable-", "").lower()
-        configs = [c for c in configs if c != feature]
-        configs.append(f"no-{feature}")
 
-    # Handle debug toggle commands
-    elif command == "debug-on":
-        configs = [c for c in configs if c != "debug"]
-        configs.append("debug")
+def get_effective_ttl(pr) -> Optional[float]:
+    """Get effective TTL in days for a PR (handles multiple labels, conflicts)"""
+    ttl_labels = []
 
-    elif command == "debug-off":
-        configs = [c for c in configs if c != "debug"]
+    # Find all TTL labels for all shows
+    for show in pr.shows:
+        if show.ttl:
+            ttl_days = parse_ttl_days(show.ttl)
+            if ttl_days is None:  # "never" or "close"
+                if show.ttl == "never":
+                    return None  # Never expire takes precedence
+                # For "close", continue checking others
+            else:
+                ttl_labels.append(ttl_days)
 
-    # Handle size commands
-    elif command.startswith("size-"):
-        size = command  # Keep full size command
-        configs = [c for c in configs if not c.startswith("size-")]
-        configs.append(size)
+    if not ttl_labels:
+        return 2.0  # Default 2 days
 
-    # Return cleaned config
-    unique_configs = list(dict.fromkeys(configs))  # Remove duplicates, preserve order
-    return ",".join(unique_configs) if unique_configs else "standard"
+    # Use longest duration if multiple labels
+    return max(ttl_labels)

showtime/core/emojis.py

@@ -18,7 +18,6 @@ EMOJI_MEANINGS = {
     "🌐": "ip",  # Globe for IP address
     "⌛": "ttl",  # Hourglass for time-to-live
     "🤡": "requested_by",  # Clown for who requested (circus theme!)
-    "⚙️": "config",  # Gear for configuration
 }
 
 # Reverse mapping for creating labels
@@ -30,13 +29,9 @@ STATUS_DISPLAY = {
     "running": "🟢",
     "updating": "🔄",
     "failed": "❌",
-    "configuring": "⚙️",
     "stopping": "🛑",
 }
 
-# Configuration command prefixes
-CONFIG_PREFIX = f"{CIRCUS_PREFIX} conf-"
-
 
 def create_circus_label(emoji_key: str, value: str) -> str:
     """Create a circus tent label with proper spacing"""
@@ -79,8 +74,3 @@ def parse_circus_label(label: str) -> tuple[str, str]:
 def is_circus_label(label: str) -> bool:
     """Check if label is a circus tent label"""
     return label.startswith(f"{CIRCUS_PREFIX} ")
-
-
-def is_configuration_command(label: str) -> bool:
-    """Check if label is a configuration command"""
-    return label.startswith(CONFIG_PREFIX)

showtime/core/github.py

@@ -72,13 +72,29 @@ class GitHubInterface:
             return [label["name"] for label in labels_data]
 
     def add_label(self, pr_number: int, label: str) -> None:
-        """Add a label to a PR"""
+        """Add a label to a PR (automatically creates label definition if needed)"""
+
+        # Ensure label definition exists with proper color/description
+        self._ensure_label_definition_exists(label)
+
         url = f"{self.base_url}/repos/{self.org}/{self.repo}/issues/{pr_number}/labels"
 
         with httpx.Client() as client:
             response = client.post(url, headers=self.headers, json={"labels": [label]})
             response.raise_for_status()
 
+    def _ensure_label_definition_exists(self, label: str) -> None:
+        """Ensure label definition exists in repository with proper color/description"""
+        from .label_colors import get_label_color, get_label_description
+
+        try:
+            color = get_label_color(label)
+            description = get_label_description(label)
+            self.create_or_update_label(label, color, description)
+        except Exception:
+            # If label creation fails, continue anyway - label might already exist
+            pass
+
     def remove_label(self, pr_number: int, label: str) -> None:
         """Remove a label from a PR"""
         # URL encode the label name for special characters like emojis
@@ -212,3 +228,29 @@ class GitHubInterface:
             return deleted_labels
 
         return sha_labels
+
+    def create_or_update_label(self, name: str, color: str, description: str) -> bool:
+        """Create or update a label with color and description"""
+        import urllib.parse
+
+        # Check if label exists
+        encoded_name = urllib.parse.quote(name, safe="")
+        url = f"{self.base_url}/repos/{self.org}/{self.repo}/labels/{encoded_name}"
+
+        label_data = {"name": name, "color": color, "description": description}
+
+        with httpx.Client() as client:
+            # Try to update first (if exists)
+            response = client.patch(url, headers=self.headers, json=label_data)
+
+            if response.status_code == 200:
+                return False  # Updated existing
+            elif response.status_code == 404:
+                # Label doesn't exist, create it
+                create_url = f"{self.base_url}/repos/{self.org}/{self.repo}/labels"
+                response = client.post(create_url, headers=self.headers, json=label_data)
+                response.raise_for_status()
+                return True  # Created new
+            else:
+                response.raise_for_status()
+                return False

showtime/core/label_colors.py

@@ -0,0 +1,105 @@
+"""
+🎪 Circus tent label color scheme and definitions
+
+Centralized color map for all GitHub labels with descriptions.
+"""
+
+# Color Palette - Bright Yellow Circus Theme
+COLORS = {
+    # Theme Colors
+    "circus_yellow": "FFD700",  # Bright yellow - primary circus theme
+    "metadata_yellow": "FFF9C4",  # Light yellow - metadata labels
+    # Status Colors (Semantic)
+    "status_running": "28a745",  # Green - healthy/running
+    "status_building": "FFD700",  # Bright yellow - in progress
+    "status_failed": "dc3545",  # Red - error/failed
+    "status_updating": "fd7e14",  # Orange - updating/transitioning
+}
+
+# Label Definitions with Colors and Descriptions
+LABEL_DEFINITIONS = {
+    # Action/Trigger Labels (Bright Yellow - User-facing, namespaced)
+    "🎪 ⚡ showtime-trigger-start": {
+        "color": COLORS["circus_yellow"],
+        "description": "Create new ephemeral environment for this PR",
+    },
+    "🎪 🛑 showtime-trigger-stop": {
+        "color": COLORS["circus_yellow"],
+        "description": "Destroy ephemeral environment and clean up AWS resources",
+    },
+    "🎪 🧊 showtime-freeze": {
+        "color": "FFE4B5",  # Light orange
+        "description": "Freeze PR - prevent auto-sync on new commits",
+    },
+}
+
+# Status-specific label patterns (generated dynamically)
+STATUS_LABEL_COLORS = {
+    "running": COLORS["status_running"],  # 🎪 abc123f 🚦 running
+    "building": COLORS["status_building"],  # 🎪 abc123f 🚦 building
+    "failed": COLORS["status_failed"],  # 🎪 abc123f 🚦 failed
+    "updating": COLORS["status_updating"],  # 🎪 abc123f 🚦 updating
+}
+
+# Metadata label color (for all other circus tent labels)
+METADATA_LABEL_COLOR = COLORS["metadata_yellow"]  # 🎪 abc123f 📅 ..., 🎪 abc123f 🌐 ..., etc.
+
+
+def get_label_color(label_text: str) -> str:
+    """Get appropriate color for any circus tent label"""
+
+    # Check for exact matches in definitions
+    if label_text in LABEL_DEFINITIONS:
+        return LABEL_DEFINITIONS[label_text]["color"]
+
+    # Check for status labels with dynamic SHA
+    if " 🚦 " in label_text:
+        status = label_text.split(" 🚦 ")[-1]
+        return STATUS_LABEL_COLORS.get(status, COLORS["circus_yellow"])
+
+    # All other metadata labels (timestamps, IPs, TTL, users, pointers)
+    if label_text.startswith("🎪 "):
+        return METADATA_LABEL_COLOR
+
+    # Fallback
+    return COLORS["circus_yellow"]
+
+
+def get_label_description(label_text: str) -> str:
+    """Get appropriate description for any circus tent label"""
+
+    # Check for exact matches
+    if label_text in LABEL_DEFINITIONS:
+        return LABEL_DEFINITIONS[label_text]["description"]
+
+    # Dynamic descriptions for SHA-based labels
+    if " 🚦 " in label_text:
+        sha, status = label_text.replace("🎪 ", "").split(" 🚦 ")
+        return f"Environment {sha} status: {status}"
+
+    if " 📅 " in label_text:
+        sha, timestamp = label_text.replace("🎪 ", "").split(" 📅 ")
+        return f"Environment {sha} created at {timestamp}"
+
+    if " 🌐 " in label_text:
+        sha, url = label_text.replace("🎪 ", "").split(" 🌐 ")
+        return f"Environment {sha} URL: http://{url} (click to visit)"
+
+    if " ⌛ " in label_text:
+        sha, ttl = label_text.replace("🎪 ", "").split(" ⌛ ")
+        return f"Environment {sha} expires after {ttl}"
+
+    if " 🤡 " in label_text:
+        sha, user = label_text.replace("🎪 ", "").split(" 🤡 ")
+        return f"Environment {sha} requested by {user}"
+
+    if "🎪 🎯 " in label_text:
+        sha = label_text.replace("🎪 🎯 ", "")
+        return f"Active environment pointer - {sha} is receiving traffic"
+
+    if "🎪 🏗️ " in label_text:
+        sha = label_text.replace("🎪 🏗️ ", "")
+        return f"Building environment - {sha} deployment in progress"
+
+    # Fallback
+    return "Circus tent showtime label"

showtime/data/ecs-task-definition.json

@@ -31,6 +31,10 @@
                 {
                     "name": "TALISMAN_ENABLED",
                     "value": "False"
+                },
+                {
+                    "name": "SUPERSET__SQLALCHEMY_EXAMPLES_URI",
+                    "value": "duckdb:////app/data/examples.duckdb"
                 }
             ],
             "mountPoints": [],