superset-showtime 0.4.0__tar.gz → 0.4.5__tar.gz

{superset_showtime-0.4.0 → superset_showtime-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superset-showtime
-Version: 0.4.0
+Version: 0.4.5
 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.0 → superset_showtime-0.4.5}/showtime/__init__.py

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

{superset_showtime-0.4.0 → superset_showtime-0.4.5}/showtime/cli.py

@@ -206,6 +206,12 @@ def status(
         if show_data["requested_by"]:
             table.add_row("Requested by", f"@{show_data['requested_by']}")
 
+        # Show active triggers
+        trigger_labels = [label for label in pr.labels if "showtime-trigger-" in label]
+        if trigger_labels:
+            trigger_display = ", ".join(trigger_labels)
+            table.add_row("Active Triggers", trigger_display)
+
         if verbose:
             table.add_row("All Labels", ", ".join(pr.circus_labels))
 

{superset_showtime-0.4.0 → superset_showtime-0.4.5}/showtime/core/pull_request.py

@@ -364,10 +364,12 @@ class PullRequest:
         if trigger_labels:
             for trigger in trigger_labels:
                 if "showtime-trigger-start" in trigger:
-                    if self.current_show and self.current_show.needs_update(target_sha):
+                    if self.current_show and self.current_show.status == "failed":
+                        return "create_environment"  # Replace failed environment
+                    elif self.current_show and self.current_show.needs_update(target_sha):
                         return "rolling_update"
                     elif self.current_show:
-                        return "no_action"  # Same commit
+                        return "no_action"  # Same commit, healthy environment
                     else:
                         return "create_environment"
                 elif "showtime-trigger-stop" in trigger:
@@ -505,6 +507,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 
@@ -513,22 +518,29 @@ 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()

{superset_showtime-0.4.0 → superset_showtime-0.4.5}/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
@@ -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(

superset_showtime-0.4.5/tests/unit/test_label_transitions.py

@@ -0,0 +1,284 @@
+"""
+Tests for circus tent label state transitions and cleanup
+"""
+
+from unittest.mock import Mock, call, patch
+
+from showtime.core.pull_request import PullRequest
+from showtime.core.show import Show
+
+
+@patch('showtime.core.pull_request.get_github')
+def test_status_transition_building_to_running(mock_get_github):
+    """Test clean transition from building to running state"""
+    mock_github = Mock()
+    mock_get_github.return_value = mock_github
+    
+    # Start with building state
+    pr = PullRequest(1234, [
+        "🎪 abc123f 🚦 building",
+        "🎪 🎯 abc123f",
+        "🎪 abc123f 📅 2024-01-15T14-30",
+    ])
+    
+    # Transition to running
+    show = Show(
+        pr_number=1234,
+        sha="abc123f",
+        status="running",  # New status
+        created_at="2024-01-15T14-30",
+        ip="52.1.2.3"  # Added during deployment
+    )
+    
+    with patch.object(pr, 'refresh_labels'):
+        pr._update_show_labels(show, dry_run=False)
+        
+        # Should remove old building status
+        remove_calls = [call.args[1] for call in mock_github.remove_label.call_args_list]
+        assert "🎪 abc123f 🚦 building" in remove_calls
+        
+        # Should add running status and IP
+        add_calls = [call.args[1] for call in mock_github.add_label.call_args_list]
+        assert "🎪 abc123f 🚦 running" in add_calls
+        assert "🎪 abc123f 🌐 52.1.2.3:8080" in add_calls
+
+
+@patch('showtime.core.pull_request.get_github')
+def test_status_transition_building_to_failed(mock_get_github):
+    """Test transition from building to failed state (Docker failure)"""
+    mock_github = Mock()
+    mock_get_github.return_value = mock_github
+    
+    # Start with building state
+    pr = PullRequest(1234, [
+        "🎪 abc123f 🚦 building",
+        "🎪 🏗️ abc123f",  # Building pointer
+        "🎪 abc123f 📅 2024-01-15T14-30",
+    ])
+    
+    # Docker build fails, transition to failed
+    show = Show(
+        pr_number=1234,
+        sha="abc123f",
+        status="failed",  # Build failed
+        created_at="2024-01-15T14-30",
+    )
+    
+    with patch.object(pr, 'refresh_labels'):
+        pr._update_show_labels(show, dry_run=False)
+        
+        # Should remove building status
+        remove_calls = [call.args[1] for call in mock_github.remove_label.call_args_list]
+        assert "🎪 abc123f 🚦 building" in remove_calls
+        
+        # Should add failed status
+        add_calls = [call.args[1] for call in mock_github.add_label.call_args_list]
+        assert "🎪 abc123f 🚦 failed" in add_calls
+
+
+@patch('showtime.core.pull_request.get_github')
+def test_multiple_orphaned_status_cleanup(mock_get_github):
+    """Test cleanup of multiple orphaned status labels (the bug scenario)"""
+    mock_github = Mock()
+    mock_get_github.return_value = mock_github
+    
+    # PR with multiple orphaned status labels from previous failed transitions
+    pr = PullRequest(1234, [
+        "🎪 abc123f 🚦 building",    # Old status 1
+        "🎪 abc123f 🚦 failed",     # Old status 2  
+        "🎪 abc123f 🚦 deploying",  # Old status 3
+        "🎪 🎯 abc123f",            # Pointer
+        "🎪 abc123f 📅 2024-01-15T14-30",
+        "🎪 abc123f 🤡 maxime",
+    ])
+    
+    # Clean transition to running
+    show = Show(
+        pr_number=1234,
+        sha="abc123f",
+        status="running",
+        created_at="2024-01-15T14-30",
+        requested_by="maxime",
+        ip="52.1.2.3"
+    )
+    
+    with patch.object(pr, 'refresh_labels'):
+        pr._update_show_labels(show, dry_run=False)
+        
+        # Should remove ALL orphaned status labels
+        remove_calls = [call.args[1] for call in mock_github.remove_label.call_args_list]
+        assert "🎪 abc123f 🚦 building" in remove_calls
+        assert "🎪 abc123f 🚦 failed" in remove_calls  
+        assert "🎪 abc123f 🚦 deploying" in remove_calls
+        
+        # Should add only the new running status
+        add_calls = [call.args[1] for call in mock_github.add_label.call_args_list]
+        running_status_calls = [call for call in add_calls if "🚦 running" in call]
+        assert len(running_status_calls) == 1
+        assert "🎪 abc123f 🚦 running" in add_calls
+
+
+@patch('showtime.core.pull_request.get_github')
+def test_status_transition_with_concurrent_changes(mock_get_github):
+    """Test status transition doesn't interfere with other SHA labels"""
+    mock_github = Mock()
+    mock_get_github.return_value = mock_github
+    
+    # PR with two environments - one transitioning, one stable
+    pr = PullRequest(1234, [
+        "🎪 abc123f 🚦 building",   # Transitioning environment
+        "🎪 def456a 🚦 running",    # Stable environment  
+        "🎪 🎯 abc123f",            # Active pointer
+        "🎪 🏗️ def456a",            # Building pointer
+        "🎪 abc123f 📅 2024-01-15T14-30",
+        "🎪 def456a 📅 2024-01-15T15-00",
+    ])
+    
+    # Transition abc123f to running (should not affect def456a)
+    show = Show(
+        pr_number=1234,
+        sha="abc123f",
+        status="running",
+        created_at="2024-01-15T14-30",
+        ip="52.1.2.3"
+    )
+    
+    with patch.object(pr, 'refresh_labels'):
+        pr._update_show_labels(show, dry_run=False)
+        
+        # Should only remove abc123f building status
+        remove_calls = [call.args[1] for call in mock_github.remove_label.call_args_list]
+        assert "🎪 abc123f 🚦 building" in remove_calls
+        
+        # Should NOT remove def456a status
+        assert "🎪 def456a 🚦 running" not in remove_calls
+        
+        # Should add abc123f running status
+        add_calls = [call.args[1] for call in mock_github.add_label.call_args_list]
+        assert "🎪 abc123f 🚦 running" in add_calls
+
+
+@patch('showtime.core.pull_request.get_github')
+def test_status_replacement_preserves_other_labels(mock_get_github):
+    """Test that status replacement preserves non-status labels"""
+    mock_github = Mock()
+    mock_get_github.return_value = mock_github
+    
+    # PR with various label types
+    pr = PullRequest(1234, [
+        "🎪 abc123f 🚦 building",       # Status - should be replaced
+        "🎪 🎯 abc123f",                # Pointer - should stay
+        "🎪 abc123f 📅 2024-01-15T14-30", # Timestamp - should stay
+        "🎪 abc123f ⌛ 24h",            # TTL - should stay  
+        "🎪 abc123f 🤡 maxime",         # User - should stay
+        "bug",                          # Non-circus - should stay
+        "enhancement",                  # Non-circus - should stay
+    ])
+    
+    # Same show, just status change
+    show = Show(
+        pr_number=1234,
+        sha="abc123f", 
+        status="failed",  # Status changed
+        created_at="2024-01-15T14-30",
+        ttl="24h",
+        requested_by="maxime"
+    )
+    
+    with patch.object(pr, 'refresh_labels'):
+        pr._update_show_labels(show, dry_run=False)
+        
+        # Should remove only building status
+        remove_calls = [call.args[1] for call in mock_github.remove_label.call_args_list]
+        assert "🎪 abc123f 🚦 building" in remove_calls
+        assert len([call for call in remove_calls if "🎪 abc123f" in call]) == 1
+        
+        # Should add only failed status (other labels already exist)
+        add_calls = [call.args[1] for call in mock_github.add_label.call_args_list]
+        assert "🎪 abc123f 🚦 failed" in add_calls
+
+
+@patch('showtime.core.pull_request.get_github')
+def test_status_transition_dry_run_mode(mock_get_github):
+    """Test that dry run mode doesn't make GitHub API calls"""
+    mock_github = Mock()
+    mock_get_github.return_value = mock_github
+    
+    pr = PullRequest(1234, [
+        "🎪 abc123f 🚦 building",
+        "🎪 🎯 abc123f",
+    ])
+    
+    show = Show(pr_number=1234, sha="abc123f", status="running")
+    
+    # Dry run should not make any API calls
+    pr._update_show_labels(show, dry_run=True)
+    
+    mock_github.remove_label.assert_not_called()
+    mock_github.add_label.assert_not_called()
+
+
+@patch('showtime.core.pull_request.get_github')
+def test_no_status_labels_to_clean(mock_get_github):
+    """Test behavior when no existing status labels exist"""
+    mock_github = Mock()
+    mock_get_github.return_value = mock_github
+    
+    # PR with no status labels
+    pr = PullRequest(1234, [
+        "🎪 🎯 abc123f",  # Just pointer
+        "bug", "enhancement"
+    ])
+    
+    # Add first status
+    show = Show(
+        pr_number=1234,
+        sha="abc123f",
+        status="building",
+        created_at="2024-01-15T14-30"
+    )
+    
+    with patch.object(pr, 'refresh_labels'):
+        pr._update_show_labels(show, dry_run=False)
+        
+        # Should not try to remove any status labels
+        remove_calls = [call.args[1] for call in mock_github.remove_label.call_args_list]
+        status_removes = [call for call in remove_calls if "🚦" in call]
+        assert len(status_removes) == 0
+        
+        # Should add new status and timestamp
+        add_calls = [call.args[1] for call in mock_github.add_label.call_args_list]
+        assert "🎪 abc123f 🚦 building" in add_calls
+
+
+def test_status_label_identification_edge_cases():
+    """Test edge cases in status label identification"""
+    from showtime.core.pull_request import PullRequest
+    
+    # Test various malformed labels that should not be treated as status
+    labels = [
+        "🎪 abc123f 🚦 running",      # Valid status
+        "🎪 abc123f🚦building",       # No spaces - invalid
+        "🎪 abc123f 🚦",             # No status value - invalid
+        "🎪 🚦 building abc123f",     # Wrong order - invalid
+        "🎪 abc123 🚦 failed",       # Wrong SHA length - invalid
+        "🎪 abc123f 🚦 weird-status", # Valid format, weird status
+        "🎪 def456a 🚦 running",      # Different SHA - should not match
+    ]
+    
+    pr = PullRequest(1234, labels)
+    
+    # Test that status filtering only matches the correct SHA
+    sha_status_labels = [
+        label for label in labels 
+        if label.startswith("🎪 abc123f 🚦 ")
+    ]
+    
+    # Should match exactly 2: running and weird-status
+    assert len(sha_status_labels) == 2
+    assert "🎪 abc123f 🚦 running" in sha_status_labels
+    assert "🎪 abc123f 🚦 weird-status" in sha_status_labels
+    
+    # Should not match other SHAs or malformed labels
+    assert "🎪 def456a 🚦 running" not in sha_status_labels
+    assert "🎪 abc123f🚦building" not in sha_status_labels