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

showtime/__init__.py

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

showtime/core/git_validation.py

@@ -50,7 +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.
+    Uses GitHub API for reliable validation in shallow clone environments.
 
     Args:
         required_sha: SHA to validate (default: REQUIRED_SHA constant)
@@ -60,55 +60,90 @@ def validate_required_sha(required_sha: Optional[str] = None) -> Tuple[bool, Opt
         - (True, None) if validation passes
         - (False, error_message) if validation fails
     """
-    if Repo is None:
-        return False, "GitPython not available for SHA validation"
-
     sha_to_check = required_sha or REQUIRED_SHA
     if not sha_to_check:
         return True, None  # No requirement set
 
+    # Try GitHub API validation first (works in shallow clones)
     try:
-        repo = Repo(".")
+        return _validate_sha_via_github_api(sha_to_check)
+    except Exception as e:
+        print(f"⚠️ GitHub API validation failed: {e}")
+
+    # Fallback to Git validation for non-GitHub origins
+    if Repo is None:
+        print("⚠️ GitPython not available, skipping SHA validation")
+        return True, None
 
-        # First attempt: Search for SHA in git log (has to work in shallow clones where merge_base fails)
+    try:
+        repo = Repo(".")
         is_valid, error = _validate_sha_in_log(repo, sha_to_check)
         if is_valid:
             return True, None
+        else:
+            print(f"⚠️ Git validation failed: {error}")
+            return True, None  # Allow operation to continue
 
-        # If validation failed, check if we're in a shallow clone and try fetching
-        try:
-            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 InvalidGitRepositoryError:
+        print("⚠️ Not a Git repository, skipping SHA validation")
+        return True, None
+    except Exception as e:
+        print(f"⚠️ Git validation error: {e}")
+        return True, None
 
-        except Exception:
-            # If shallow check fails, return original error
-            return False, error
 
-    except InvalidGitRepositoryError:
-        return False, "Current directory is not a Git repository"
+def _validate_sha_via_github_api(required_sha: str) -> Tuple[bool, Optional[str]]:
+    """Validate SHA using GitHub API - works reliably in shallow clones"""
+    try:
+        import httpx
+        from git import Repo
+
+        from .github import GitHubInterface
+
+        # Get current SHA from Git
+        repo = Repo(".")
+        current_sha = repo.head.commit.hexsha
+
+        # Use existing GitHubInterface (handles all the setup/token detection)
+        github = GitHubInterface()
+
+        # 1. Check if required SHA exists
+        commit_url = f"{github.base_url}/repos/{github.org}/{github.repo}/commits/{required_sha}"
+
+        with httpx.Client() as client:
+            response = client.get(commit_url, headers=github.headers)
+            if response.status_code == 404:
+                return False, f"Required SHA {required_sha[:7]} not found in repository"
+            response.raise_for_status()
+
+        # 2. Compare SHAs to verify ancestry
+        compare_url = f"{github.base_url}/repos/{github.org}/{github.repo}/compare/{required_sha}...{current_sha}"
+
+        with httpx.Client() as client:
+            response = client.get(compare_url, headers=github.headers)
+            if response.status_code == 404:
+                return (
+                    False,
+                    f"Current branch does not include required SHA {required_sha[:7]}. Please rebase onto main.",
+                )
+            response.raise_for_status()
+
+            data = response.json()
+            status = data.get("status")
+
+            # If status is 'ahead' or 'identical', required SHA is ancestor (good)
+            # If status is 'behind', current is behind required (bad)
+            if status in ["ahead", "identical"]:
+                return True, None
+            else:
+                return (
+                    False,
+                    f"Current branch does not include required SHA {required_sha[:7]}. Please rebase onto main.",
+                )
+
     except Exception as e:
-        return False, f"Git validation error: {e}"
+        # Re-raise to be caught by the caller for proper fallback handling
+        raise Exception(f"GitHub API validation error: {e}") from e
 
 
 def _validate_sha_in_log(repo: "Repo", sha_to_check: str) -> Tuple[bool, Optional[str]]:

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

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

@@ -1,17 +1,17 @@
-showtime/__init__.py,sha256=r5Mw0YBgwzRCe1nzqQk2iWxvfq0ZlUB73ibq-4NfFKk,449
+showtime/__init__.py,sha256=HcxA_d-Wu3K1hL8OL_1I6y3u8cclS3dbUSMbv4RG2GA,449
 showtime/__main__.py,sha256=EVaDaTX69yIhCzChg99vqvFSCN4ELstEt7Mpb9FMZX8,109
 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=W8I9dOZiai-oDJz8LQCEyQ-94CHjfwhE4th83Vu2nQs,5450
+showtime/core/git_validation.py,sha256=Knr-9IAHXlhhkBeReJPlqzBG_TDWlevIqYaB26OPM04,6686
 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.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,,
+superset_showtime-0.5.11.dist-info/METADATA,sha256=Ekcs0XHNPJC-W8ZfULfh8CqbZTpKehGk1yJWirNOYAE,12053
+superset_showtime-0.5.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+superset_showtime-0.5.11.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
+superset_showtime-0.5.11.dist-info/RECORD,,