simplify git

Author: eyw520

servers/fai-lambda/shared/utils/git.py

@@ -44,67 +44,23 @@ def clone_repo(repository: str, session_id: str, session_type: str = "session")
         raise RuntimeError("GITHUB_TOKEN environment variable not set")
 
     base_path = Path(os.environ.get("HOME", "/mnt/efs")) / "repos"
-    cache_path = base_path / repository.replace("/", "_")
     session_path = base_path / f"{session_type}-{session_id}" / repository
 
     base_path.mkdir(parents=True, exist_ok=True)
     session_path.parent.mkdir(parents=True, exist_ok=True)
 
     cleanup_old_sessions(base_path)
 
-    clone_url = f"https://x-access-token:{github_token}@github.com/{repository}.git"
-
-    if cache_path.exists() and (cache_path / ".git").exists():
-        logger.info(f"Found cached repo at {cache_path}, copying to {session_path}")
-        try:
-            if session_path.exists():
-                shutil.rmtree(session_path)
-            shutil.copytree(cache_path, session_path)
-
-            configure_git_auth(str(session_path))
-
-            subprocess.run(
-                ["git", "fetch", "origin"],
-                cwd=str(session_path),
-                check=True,
-                capture_output=True,
-                text=True,
-            )
-            subprocess.run(
-                ["git", "reset", "--hard", "origin/HEAD"],
-                cwd=str(session_path),
-                check=True,
-                capture_output=True,
-                text=True,
-            )
-            logger.info(f"Successfully reused cached repo and updated to latest")
-        except Exception as e:
-            logger.warning(f"Failed to reuse cache: {e}, will clone fresh")
-            if session_path.exists():
-                shutil.rmtree(session_path)
-            _clone_fresh(clone_url, session_path, repository)
-            configure_git_auth(str(session_path))
-    else:
-        logger.info(f"No cache found, cloning fresh into {session_path}")
-        _clone_fresh(clone_url, session_path, repository)
-        configure_git_auth(str(session_path))
-
-        try:
-            if cache_path.exists():
-                shutil.rmtree(cache_path)
-            shutil.copytree(session_path, cache_path)
-            logger.info(f"Cached repo for future use at {cache_path}")
-        except Exception as e:
-            logger.warning(f"Failed to create cache: {e}, continuing without cache")
-
-    return str(session_path)
+    if session_path.exists():
+        logger.info(f"Removing existing session path: {session_path}")
+        shutil.rmtree(session_path)
 
+    clone_url = f"https://x-access-token:{github_token}@github.com/{repository}.git"
 
-def _clone_fresh(clone_url: str, repo_path: Path, repository: str) -> None:
-    """Helper to clone a repository from scratch."""
+    logger.info(f"Cloning {repository} into {session_path}")
     try:
         subprocess.run(
-            ["git", "clone", clone_url, str(repo_path)],
+            ["git", "clone", clone_url, str(session_path)],
             check=True,
             capture_output=True,
             text=True,
@@ -114,6 +70,10 @@ def _clone_fresh(clone_url: str, repo_path: Path, repository: str) -> None:
         logger.error(f"Failed to clone repository: {e.stderr}")
         raise RuntimeError(f"Failed to clone {repository}: {e.stderr}")
 
+    configure_git_auth(str(session_path))
+
+    return str(session_path)
+
 
 def configure_git_auth(repo_path: str) -> None:
     """Configure git user for the repository."""