superset-showtime 0.2.9__py3-none-any.whl → 0.4.2__py3-none-any.whl

showtime/core/aws.py

@@ -11,7 +11,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
-import boto3
+import boto3  # type: ignore[import-untyped]
 
 
 @dataclass
@@ -36,7 +36,12 @@ class EnvironmentResult:
 class AWSInterface:
     """AWS ECS/ECR client replicating current GHA logic"""
 
-    def __init__(self, region: str = None, cluster: str = None, repository: str = None):
+    def __init__(
+        self,
+        region: Optional[str] = None,
+        cluster: Optional[str] = None,
+        repository: Optional[str] = None,
+    ):
         self.region = region or os.getenv("AWS_REGION", "us-west-2")
         self.cluster = cluster or os.getenv("ECS_CLUSTER", "superset-ci")
         self.repository = repository or os.getenv("ECR_REPOSITORY", "superset-ci")
@@ -55,24 +60,23 @@ class AWSInterface:
         pr_number: int,
         sha: str,
         github_user: str = "unknown",
-        feature_flags: List[Dict[str, str]] = None,
+        feature_flags: Optional[List[Dict[str, str]]] = None,
         image_tag_override: Optional[str] = None,
         force: bool = False,
     ) -> EnvironmentResult:
         """
-        Create ephemeral environment with blue-green deployment support
-
-        Blue-Green Steps:
-        1. Check if ECR image exists
-        2. Create Show object for consistent naming
-        3. Check for existing services (blue)
-        4. Create new service with SHA (green)
-        5. Wait for deployment stability
-        6. Get public IP and return for traffic switching
+        Create ephemeral environment (replaces any existing service with same name)
+
+        Steps:
+        1. Create task definition with feature flags
+        2. Delete any existing service with same name (clean slate)
+        3. Create fresh ECS service
+        4. Deploy and wait for stability
+        5. Health check and return IP
         """
         from datetime import datetime
 
-        from .circus import Show
+        from .show import Show
 
         # Create Show object for consistent AWS naming
         show = Show(
@@ -126,22 +130,21 @@ class AWSInterface:
             if not task_def_arn:
                 return EnvironmentResult(success=False, error="Failed to create task definition")
 
-            # Step 3: Blue-Green Logic - Check for existing services
-            print(f"🔍 Checking for existing services for PR #{pr_number}")
+            # Step 3: Clean slate - Delete any existing service with this exact name
+            print(f"🔍 Checking for existing service: {service_name}")
             existing_services = self._find_pr_services(pr_number)
 
-            if existing_services:
-                print(
-                    f"📊 Found {len(existing_services)} existing services - starting blue-green deployment"
-                )
-                for svc in existing_services:
-                    print(f"   🔵 Blue: {svc['service_name']} ({svc['status']})")
+            for existing_service in existing_services:
+                if existing_service["service_name"] == service_name:
+                    print(f"🗑️ Deleting existing service: {service_name}")
+                    self._delete_ecs_service(service_name)
+                    break
 
-            # Step 4: Create new green service
-            print(f"🟢 Creating green service: {service_name}")
+            # Step 4: Create fresh service
+            print(f"🆕 Creating service: {service_name}")
             success = self._create_ecs_service(service_name, pr_number, github_user, task_def_arn)
             if not success:
-                return EnvironmentResult(success=False, error="Green service creation failed")
+                return EnvironmentResult(success=False, error="Service creation failed")
 
             # Step 5: Deploy task definition to green service
             success = self._deploy_task_definition(service_name, task_def_arn)
@@ -254,7 +257,8 @@ class AWSInterface:
                 return None
 
             eni = eni_response["NetworkInterfaces"][0]
-            return eni.get("Association", {}).get("PublicIp")
+            public_ip = eni.get("Association", {}).get("PublicIp")
+            return str(public_ip) if public_ip else None
 
         except Exception:
             return None
@@ -336,7 +340,7 @@ class AWSInterface:
             task_def_arn = response["taskDefinition"]["taskDefinitionArn"]
 
             print(f"✅ Created task definition: {task_def_arn}")
-            return task_def_arn
+            return str(task_def_arn)
 
         except Exception as e:
             print(f"❌ Task definition creation failed: {e}")

showtime/core/github.py

@@ -7,7 +7,7 @@ and circus tent emoji state synchronization.
 
 import os
 from dataclasses import dataclass
-from typing import Dict, List, Optional
+from typing import Any, Dict, List, Optional
 
 import httpx
 
@@ -23,7 +23,9 @@ class GitHubError(Exception):
 class GitHubInterface:
     """GitHub API client for circus tent label operations"""
 
-    def __init__(self, token: str = None, org: str = None, repo: str = None):
+    def __init__(
+        self, token: Optional[str] = None, org: Optional[str] = None, repo: Optional[str] = None
+    ):
         self.token = token or self._detect_token()
         self.org = org or os.getenv("GITHUB_ORG", "apache")
         self.repo = repo or os.getenv("GITHUB_REPO", "superset")
@@ -120,16 +122,17 @@ class GitHubInterface:
     def get_latest_commit_sha(self, pr_number: int) -> str:
         """Get the latest commit SHA for a PR"""
         pr_data = self.get_pr_data(pr_number)
-        return pr_data["head"]["sha"]
+        return str(pr_data["head"]["sha"])
 
-    def get_pr_data(self, pr_number: int) -> dict:
+    def get_pr_data(self, pr_number: int) -> Dict[str, Any]:
         """Get full PR data including description"""
         url = f"{self.base_url}/repos/{self.org}/{self.repo}/pulls/{pr_number}"
 
         with httpx.Client() as client:
             response = client.get(url, headers=self.headers)
             response.raise_for_status()
-            return response.json()
+            result: Dict[str, Any] = response.json()
+            return result
 
     def get_circus_labels(self, pr_number: int) -> List[str]:
         """Get only circus tent emoji labels for a PR"""
@@ -149,7 +152,7 @@ class GitHubInterface:
         # Search for PRs with any circus tent labels
         params = {
             "q": f"repo:{self.org}/{self.repo} is:pr 🎪",
-            "per_page": 100,
+            "per_page": "100",
         }  # Include closed PRs
 
         with httpx.Client() as client:
@@ -205,6 +208,7 @@ class GitHubInterface:
                 return False  # Label doesn't exist
             else:
                 response.raise_for_status()
+                return False  # Should never reach here
 
     def cleanup_sha_labels(self, dry_run: bool = False) -> List[str]:
         """Clean up all circus tent labels with SHA patterns from repository"""

showtime/core/github_messages.py

@@ -5,10 +5,9 @@ Centralized PR comment functions with type hints and clean formatting.
 """
 
 import os
-import textwrap
 from typing import Dict, List, Optional
 
-from .circus import Show
+from .show import Show
 
 # AWS Console URL constants
 BASE_AWS_URL = "https://us-west-2.console.aws.amazon.com/ecs/v2/clusters/superset-ci/services"
@@ -42,7 +41,7 @@ def _create_header_links(sha: str) -> Dict[str, str]:
     Returns:
         Dict with showtime_link, gha_link, commit_link
     """
-    from .circus import short_sha
+    from .show import short_sha
 
     repo_path = get_repo_path()
     return {
@@ -60,13 +59,7 @@ def _format_comment(header: str, bullets: List[str]) -> str:
         bullets: List of bullet point strings (without •)
     """
     bullet_text = "\n".join(f"• {bullet}" for bullet in bullets)
-    return textwrap.dedent(
-        f"""
-        {header}
-
-        {bullet_text}
-    """
-    ).strip()
+    return f"{header}\n\n{bullet_text}"
 
 
 def get_commit_url(repo_path: str, sha: str) -> str:
@@ -182,7 +175,7 @@ def rolling_start_comment(current_show: Show, new_sha: str) -> str:
         current_show: Current Show object with SHA and IP
         new_sha: New environment SHA (full SHA, will be truncated)
     """
-    from .circus import short_sha
+    from .show import short_sha
 
     links = _create_header_links(new_sha)
     header = f"🎪 {links['showtime_link']} is updating {current_show.short_sha}→{short_sha(new_sha)} on {links['gha_link']} for {links['commit_link']}"
@@ -223,7 +216,7 @@ def rolling_failure_comment(current_show: Show, new_sha: str, error: str) -> str
         new_sha: Failed new environment SHA (full SHA, will be truncated)
         error: Error message describing what went wrong
     """
-    from .circus import short_sha
+    from .show import short_sha
 
     links = _create_header_links(new_sha)
     header = f"🎪 {links['showtime_link']} failed updating to {short_sha(new_sha)} on {links['gha_link']} for {links['commit_link']}"