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

showtime/__init__.py

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

showtime/core/pull_request.py

@@ -4,6 +4,7 @@
 Handles atomic transactions, trigger processing, and environment orchestration.
 """
 
+import os
 from dataclasses import dataclass
 from datetime import datetime
 from typing import Any, List, Optional
@@ -244,6 +245,9 @@ class PullRequest:
                 show.status = "running"
                 print(f"✅ Deployment completed - environment running at {show.ip}:8080")
                 self._update_show_labels(show, dry_run_github)
+                
+                # Show AWS console URLs for monitoring
+                self._show_service_urls(show)
 
                 self._post_success_comment(show, dry_run_github)
                 return SyncResult(success=True, action_taken="create_environment", show=show)
@@ -273,6 +277,9 @@ class PullRequest:
                 new_show.status = "running"
                 print(f"✅ Rolling update completed - new environment at {new_show.ip}:8080")
                 self._update_show_labels(new_show, dry_run_github)
+                
+                # Show AWS console URLs for monitoring
+                self._show_service_urls(new_show)
 
                 self._post_rolling_success_comment(old_show, new_show, dry_run_github)
                 return SyncResult(success=True, action_taken=action_needed, show=new_show)
@@ -424,7 +431,7 @@ class PullRequest:
             status="building",
             created_at=datetime.utcnow().strftime("%Y-%m-%dT%H-%M"),
             ttl="24h",
-            requested_by="github_actor",  # TODO: Get from context
+            requested_by=os.getenv("GITHUB_ACTOR", "unknown"),
         )
 
     def _post_building_comment(self, show: Show, dry_run: bool = False) -> None:
@@ -507,6 +514,9 @@ class PullRequest:
         if dry_run:
             return
 
+        # Refresh labels to get current state (atomic claim may have changed them)
+        self.refresh_labels()
+
         # First, remove any existing status labels for this SHA to ensure clean transitions
         sha_status_labels = [
             label for label in self.labels 
@@ -515,22 +525,39 @@ class PullRequest:
         for old_status_label in sha_status_labels:
             get_github().remove_label(self.pr_number, old_status_label)
 
-        # Now do normal differential updates
-        current_labels = {label for label in self.labels if label.startswith("🎪")}
+        # Now do normal differential updates - only for this SHA
+        current_sha_labels = {
+            label for label in self.labels 
+            if label.startswith("🎪") and (
+                label.startswith(f"🎪 {show.sha} ") or  # SHA-first format: 🎪 abc123f 📅 ...
+                label.startswith(f"🎪 🎯 {show.sha}") or  # Pointer format: 🎪 🎯 abc123f
+                label.startswith(f"🎪 🏗️ {show.sha}")    # Building pointer: 🎪 🏗️ abc123f
+            )
+        }
         desired_labels = set(show.to_circus_labels())
 
         # Remove the status labels we already cleaned up from the differential
-        current_labels = current_labels - set(sha_status_labels)
+        current_sha_labels = current_sha_labels - set(sha_status_labels)
 
         # Only add labels that don't exist
-        labels_to_add = desired_labels - current_labels
+        labels_to_add = desired_labels - current_sha_labels
         for label in labels_to_add:
             get_github().add_label(self.pr_number, label)
 
         # Only remove labels that shouldn't exist (excluding status labels already handled)
-        labels_to_remove = current_labels - desired_labels
+        labels_to_remove = current_sha_labels - desired_labels
         for label in labels_to_remove:
             get_github().remove_label(self.pr_number, label)
 
-        # Refresh our label cache
+        # Final refresh to update cache with all changes
         self.refresh_labels()
+
+    def _show_service_urls(self, show: Show) -> None:
+        """Show AWS console URLs for monitoring deployment"""
+        from .github_messages import get_aws_console_urls
+        
+        urls = get_aws_console_urls(show.ecs_service_name)
+        print(f"\n🎪 Monitor deployment progress:")
+        print(f"📝 Logs: {urls['logs']}")
+        print(f"📊 Service: {urls['service']}")
+        print("")

showtime/core/show.py

@@ -166,10 +166,10 @@ class Show:
         # Detect if running in CI environment
         is_ci = bool(os.getenv("GITHUB_ACTIONS") or os.getenv("CI"))
         
-        # Base command
+        # Build command without final path
         cmd = [
             "docker",
-            "buildx",
+            "buildx", 
             "build",
             "--push",
             "--platform",
@@ -182,7 +182,6 @@ class Show:
             "LOAD_EXAMPLES_DUCKDB=true",
             "-t",
             tag,
-            ".",
         ]
 
         # Add caching based on environment
@@ -190,16 +189,16 @@ class Show:
             # Full registry caching in CI (Docker driver supports it)
             cmd.extend([
                 "--cache-from",
-                "type=registry,ref=apache/superset-cache:3.10-slim-bookworm",
+                "type=registry,ref=apache/superset-cache:showtime",
                 "--cache-to", 
-                "type=registry,mode=max,ref=apache/superset-cache:3.10-slim-bookworm",
+                "type=registry,mode=max,ref=apache/superset-cache:showtime",
             ])
             print("🐳 CI environment: Using full registry caching")
         else:
             # Local build: cache-from only (no cache export)
             cmd.extend([
                 "--cache-from",
-                "type=registry,ref=apache/superset-cache:3.10-slim-bookworm",
+                "type=registry,ref=apache/superset-cache:showtime",
             ])
             print("🐳 Local environment: Using cache-from only (no export)")
 
@@ -209,12 +208,16 @@ class Show:
         force_load = os.getenv("DOCKER_LOAD", "false").lower() == "true"
         
         if native_x86 or force_load:
-            cmd.insert(-1, "--load")  # Insert before the "." argument
+            cmd.append("--load")
             print("🐳 Will load image to local Docker daemon (native x86_64 platform)")
         else:
             print("🐳 Cross-platform build - pushing to registry only (no local load)")
 
+        # Add build context path last
+        cmd.append(".")
+
         print(f"🐳 Building Docker image: {tag}")
+        print(f"🐳 Command: {' '.join(cmd)}")
 
         # Stream output in real-time
         process = subprocess.Popen(

showtime/data/ecs-task-definition.json

@@ -43,10 +43,6 @@
                 {
                     "name": "PYTHONUNBUFFERED",
                     "value": "1"
-                },
-                {
-                    "name": "PYTHONPATH",
-                    "value": "/app/docker/pythonpath_dev"
                 }
             ],
             "mountPoints": [],

{superset_showtime-0.4.2.dist-info → superset_showtime-0.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superset-showtime
-Version: 0.4.2
+Version: 0.4.8
 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.4.2.dist-info → superset_showtime-0.4.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-showtime/__init__.py,sha256=jzoTTK9K3uRo5GuAPaej-89Ny35OFYmHBR3FTQ7MiVk,448
+showtime/__init__.py,sha256=fYCOH7lhPuP2SN1kHK5U4MGhM6I1uFSOs31oG5B8L40,448
 showtime/__main__.py,sha256=EVaDaTX69yIhCzChg99vqvFSCN4ELstEt7Mpb9FMZX8,109
 showtime/cli.py,sha256=faFM6pe3gz49_1KrzUeri7dQffqz4WP92JmGxPaIOC0,25249
 showtime/core/__init__.py,sha256=54hbdFNGrzuNMBdraezfjT8Zi6g221pKlJ9mREnKwCw,34
@@ -7,10 +7,10 @@ showtime/core/emojis.py,sha256=MHEDuPIdfNiop4zbNLuviz3eY05QiftYSHHCVbkfKhw,2129
 showtime/core/github.py,sha256=uETvKDO2Yhpqg3fxLtrKaCuZR3b-1LVmgnf5aLcqrAQ,9988
 showtime/core/github_messages.py,sha256=MfgwCukrEsWWesMsuL8saciDgP4nS-gijzu8DXr-Alg,7450
 showtime/core/label_colors.py,sha256=efhbFnz_3nqEnEqmgyF6_hZbxtCu_fmb68BIIUpSsnk,3895
-showtime/core/pull_request.py,sha256=Yxc7Oy0dkvQQm3DbwUKbiCAW0wEivM8U2j5vSRwIDxE,20475
-showtime/core/show.py,sha256=BRMH_Z53UfK0VXAMHfzS0u7_s0h634VKTMzWMniRNsg,9759
-showtime/data/ecs-task-definition.json,sha256=0ZaE0FZ8IWduXd2RyscMhXeVgxyym6qtjH02CK9mXBI,2235
-superset_showtime-0.4.2.dist-info/METADATA,sha256=h_RweT3LG7UW7HLTx49Gv26ulSJUV2c-YVULpYm_gw8,12052
-superset_showtime-0.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-superset_showtime-0.4.2.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
-superset_showtime-0.4.2.dist-info/RECORD,,
+showtime/core/pull_request.py,sha256=GE88HO6KnqgnOgNdVOlFsn--T7oR1Tl6wYhah0luJbQ,21665
+showtime/core/show.py,sha256=-nMRShKWTjXGVuxuxrc0WK6l8ON-8iYm5QA8uvGoMOk,9806
+showtime/data/ecs-task-definition.json,sha256=2acmqoF-3CxaBJP_VDkMMpG_U2RI4VPk1JvFOprMFyc,2098
+superset_showtime-0.4.8.dist-info/METADATA,sha256=zYs12JPPFHfLVNmC39bzABgmt_BW3mu2XZ79ZzJ32Yc,12052
+superset_showtime-0.4.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+superset_showtime-0.4.8.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
+superset_showtime-0.4.8.dist-info/RECORD,,