superset-showtime 0.5.8__tar.gz → 0.5.10__tar.gz

{superset_showtime-0.5.8 → superset_showtime-0.5.10}/.claude/settings.local.json

@@ -43,12 +43,14 @@
       "Bash(showtime sync:*)",
       "Bash(AWS_PROFILE=\"\" showtime sync 34831 --dry-run-aws --dry-run-github)",
       "Bash(git stash:*)",
-      "Bash(showtime list:*)"
+      "Bash(showtime list:*)",
+      "Bash(showtime git-check)"
     ],
     "deny": [],
     "ask": [],
     "additionalDirectories": [
-      "/private/tmp"
+      "/private/tmp",
+      "/Users/max/code/superset"
     ]
   }
 }

{superset_showtime-0.5.8 → superset_showtime-0.5.10}/PKG-INFO

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

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

{superset_showtime-0.5.8 → superset_showtime-0.5.10}/showtime/cli.py

@@ -815,6 +815,31 @@ def cleanup(
         p(f"❌ Cleanup failed: {e}")
 
 
+@app.command()
+def git_check() -> None:
+    """🔍 Test Git SHA validation locally"""
+    from rich import print as p
+
+    from .core.git_validation import REQUIRED_SHA, validate_required_sha
+
+    p("🔍 [bold blue]Testing Git SHA Validation[/bold blue]")
+    p(f"Required SHA: [cyan]{REQUIRED_SHA}[/cyan]")
+
+    try:
+        is_valid, error_msg = validate_required_sha()
+
+        if is_valid:
+            p(
+                "✅ [bold green]Validation PASSED[/bold green] - Required commit found in Git history"
+            )
+        else:
+            p("❌ [bold red]Validation FAILED[/bold red]")
+            p(f"Error: {error_msg}")
+
+    except Exception as e:
+        p(f"❌ [bold red]Validation ERROR[/bold red]: {e}")
+
+
 def main() -> None:
     """Main entry point for the CLI"""
     app()

{superset_showtime-0.5.8 → superset_showtime-0.5.10}/showtime/core/git_validation.py

@@ -16,7 +16,8 @@ except ImportError:
 
 
 # Hard-coded required SHA - update this when needed
-REQUIRED_SHA = "277f03c2075a74fbafb55531054fb5083debe5cc"  # Placeholder SHA for testing
+# https://github.com/apache/superset/commit/47414e18d4c2980d0cc4718b3e704845f7dfd356
+REQUIRED_SHA = "47414e18d4c2980d0cc4718b3e704845f7dfd356"
 
 
 class GitValidationError(Exception):
@@ -49,6 +50,7 @@ def is_git_repository(path: str = ".") -> bool:
 def validate_required_sha(required_sha: Optional[str] = None) -> Tuple[bool, Optional[str]]:
     """
     Validate that the required SHA exists in the current Git repository.
+    Tries to fetch the SHA from origin if validation fails in a shallow clone.
 
     Args:
         required_sha: SHA to validate (default: REQUIRED_SHA constant)
@@ -68,28 +70,40 @@ def validate_required_sha(required_sha: Optional[str] = None) -> Tuple[bool, Opt
     try:
         repo = Repo(".")
 
-        # Check if SHA exists in repository
+        # First attempt: Search for SHA in git log (has to work in shallow clones where merge_base fails)
+        is_valid, error = _validate_sha_in_log(repo, sha_to_check)
+        if is_valid:
+            return True, None
+
+        # If validation failed, check if we're in a shallow clone and try fetching
         try:
-            commit = repo.commit(sha_to_check)
-
-            # Check if SHA is reachable from current HEAD
-            # This ensures the required commit is in our branch history
-            try:
-                repo.merge_base(commit, repo.head.commit)
-                return True, None
-            except Exception:
-                # SHA exists but not in current branch history
-                return False, (
-                    f"Required commit {sha_to_check} exists but is not reachable from current HEAD. "
-                    f"Please ensure your branch includes the required commit."
-                )
+            is_shallow = repo.git.rev_parse("--is-shallow-repository") == "true"
+            if is_shallow:
+                try:
+                    print(f"🌊 Shallow clone detected, attempting to fetch {sha_to_check[:7]}...")
+                    repo.git.fetch("origin", sha_to_check)
+
+                    # Retry validation after fetch
+                    is_valid_after_fetch, error_after_fetch = _validate_sha_in_log(
+                        repo, sha_to_check
+                    )
+                    if is_valid_after_fetch:
+                        print(f"✅ Successfully fetched and validated {sha_to_check[:7]}")
+                        return True, None
+                    else:
+                        return False, error_after_fetch
+
+                except Exception as fetch_error:
+                    return False, (
+                        f"Required commit {sha_to_check} not found in shallow clone. "
+                        f"Failed to fetch from origin: {fetch_error}"
+                    )
+            else:
+                return False, error
 
         except Exception:
-            # SHA doesn't exist in repository
-            return False, (
-                f"Required commit {sha_to_check} not found in repository. "
-                f"Please update to a branch that includes this commit."
-            )
+            # If shallow check fails, return original error
+            return False, error
 
     except InvalidGitRepositoryError:
         return False, "Current directory is not a Git repository"
@@ -97,6 +111,21 @@ def validate_required_sha(required_sha: Optional[str] = None) -> Tuple[bool, Opt
         return False, f"Git validation error: {e}"
 
 
+def _validate_sha_in_log(repo: "Repo", sha_to_check: str) -> Tuple[bool, Optional[str]]:
+    """Helper function to validate SHA exists in git log output."""
+    try:
+        log_output = repo.git.log("--oneline", "--all")
+        if sha_to_check in log_output or sha_to_check[:7] in log_output:
+            return True, None
+        else:
+            return False, (
+                f"Required commit {sha_to_check} not found in Git history. "
+                f"Please update to a branch that includes this commit."
+            )
+    except Exception as e:
+        return False, f"Git log search failed: {e}"
+
+
 def get_validation_error_message(required_sha: Optional[str] = None) -> str:
     """
     Get a user-friendly error message for SHA validation failure.