superset-showtime 0.5.8__py3-none-any.whl → 0.5.10__py3-none-any.whl

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"
 

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()

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.

{superset_showtime-0.5.8.dist-info → superset_showtime-0.5.10.dist-info}/METADATA

@@ -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.dist-info → superset_showtime-0.5.10.dist-info}/RECORD

@@ -1,17 +1,17 @@
-showtime/__init__.py,sha256=BG1XZS3HxkBt1uX9xaRqgw4rRho6Q6Yy3aTxcQxcPeA,448
+showtime/__init__.py,sha256=r5Mw0YBgwzRCe1nzqQk2iWxvfq0ZlUB73ibq-4NfFKk,449
 showtime/__main__.py,sha256=EVaDaTX69yIhCzChg99vqvFSCN4ELstEt7Mpb9FMZX8,109
-showtime/cli.py,sha256=eWu6MBPo0ERc_3rYRGwg_95ZZN8uqlqORBiRAbvbCpg,30933
+showtime/cli.py,sha256=8vIJT5TiqXuHDGxRBg6jV3oNv5nKrmDOs5OgltycPeI,31664
 showtime/core/__init__.py,sha256=54hbdFNGrzuNMBdraezfjT8Zi6g221pKlJ9mREnKwCw,34
 showtime/core/aws.py,sha256=uTjJAvEBQMyTccS93WZeNPhfeKQhJgOQQ0BJdnQjvCU,35007
 showtime/core/emojis.py,sha256=MHEDuPIdfNiop4zbNLuviz3eY05QiftYSHHCVbkfKhw,2129
-showtime/core/git_validation.py,sha256=h4MZPIaJB1KN6aO5sXf5j4IKOu5__nmZZSDRjWRoEpA,4127
+showtime/core/git_validation.py,sha256=W8I9dOZiai-oDJz8LQCEyQ-94CHjfwhE4th83Vu2nQs,5450
 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=vKlPPlIeSNT_WmlZkOekLH_tGYm4pyJUZFHQC9dVCKY,27756
 showtime/core/show.py,sha256=FpxDm52LASCJvf8UF998AtNiVzfdYIwNEsPAsOAAwL0,9701
 showtime/data/ecs-task-definition.json,sha256=Y8ZbAAXdIDMnM-8zzfdUTlwp5RpWSyhe1gtfygKkqW8,2343
-superset_showtime-0.5.8.dist-info/METADATA,sha256=pQD1Wr9BmGSgYwSyr17GwYpsh7QGUyFNKDmioltw08M,12052
-superset_showtime-0.5.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-superset_showtime-0.5.8.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
-superset_showtime-0.5.8.dist-info/RECORD,,
+superset_showtime-0.5.10.dist-info/METADATA,sha256=xLlmWh1tonx0z3rMEEFPlRKDOmf_i8GGS5p-mFacfbc,12053
+superset_showtime-0.5.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+superset_showtime-0.5.10.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
+superset_showtime-0.5.10.dist-info/RECORD,,