llama-deploy-core 0.2.7a1__tar.gz → 0.3.0a1__tar.gz

{llama_deploy_core-0.2.7a1 → llama_deploy_core-0.3.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: llama-deploy-core
-Version: 0.2.7a1
+Version: 0.3.0a1
 Summary: Core models and schemas for LlamaDeploy
 License: MIT
 Requires-Dist: pydantic>=2.0.0

{llama_deploy_core-0.2.7a1 → llama_deploy_core-0.3.0a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llama-deploy-core"
-version = "0.2.7a1"
+version = "0.3.0a1"
 description = "Core models and schemas for LlamaDeploy"
 readme = "README.md"
 license = { text = "MIT" }

{llama_deploy_core-0.2.7a1 → llama_deploy_core-0.3.0a1}/src/llama_deploy/core/git/git_util.py

@@ -46,20 +46,42 @@ def parse_github_repo_url(repo_url: str) -> tuple[str, str]:
 def inject_basic_auth(url: str, basic_auth: str | None = None) -> str:
     """Inject basic auth into a URL if provided"""
     if basic_auth and "://" in url and "@" not in url:
-        url = url.replace("https://", f"https://{basic_auth}@")
+        scheme, rest = url.split("://", 1)
+        url = f"{scheme}://{basic_auth}@{rest}"
     return url
 
 
-def _run_process(args: list[str], cwd: str | None = None) -> str:
-    """Run a process and raise an exception if it fails"""
-    result = subprocess.run(
-        args, cwd=cwd, capture_output=True, text=True, check=True, timeout=30
-    )
+def _run_process(args: list[str], cwd: str | None = None, timeout: int = 30) -> str:
+    """Run a process and raise a GitAccessError with detailed output if it fails.
+
+    The error message includes the command, return code, working directory,
+    and both stdout and stderr to aid debugging (e.g., git fetch failures).
+    """
+    try:
+        result = subprocess.run(
+            args, cwd=cwd, capture_output=True, text=True, check=False, timeout=timeout
+        )
+    except subprocess.TimeoutExpired:
+        cmd = " ".join(args)
+        where = f" (cwd={cwd})" if cwd else ""
+        raise GitAccessError(f"Command timed out after {timeout}s: {cmd}{where}")
+
     if result.returncode != 0:
-        raise subprocess.CalledProcessError(
-            result.returncode, args, result.stdout, result.stderr
+        cmd = " ".join(args)
+        where = f" (cwd={cwd})" if cwd else ""
+        stdout = (result.stdout or "").strip()
+        stderr = (result.stderr or "").strip()
+        details = []
+        if stdout:
+            details.append(f"stdout:\n{stdout}")
+        if stderr:
+            details.append(f"stderr:\n{stderr}")
+        detail_block = "\n\n".join(details) if details else "(no output)"
+        raise GitAccessError(
+            f"Command failed with exit code {result.returncode}: {cmd}{where}\n{detail_block}"
         )
-    return result.stdout.strip()
+
+    return (result.stdout or "").strip()
 
 
 class GitAccessError(Exception):
@@ -120,6 +142,7 @@ def clone_repo(
                 if resolved_branch:
                     git_ref = resolved_branch
                 else:
+                    # Try exact tag match; if it fails, we just ignore and proceed
                     try:
                         resolved_tag = _run_process(
                             ["git", "describe", "--tags", "--exact-match"],
@@ -127,34 +150,23 @@ def clone_repo(
                         )
                         if resolved_tag:
                             git_ref = resolved_tag
-                    except subprocess.CalledProcessError:
+                    except GitAccessError:
                         pass
             else:  # Checkout the ref
                 if did_exist:
-                    try:
-                        _run_process(
-                            ["git", "fetch", "origin"], cwd=str(dest_dir.absolute())
-                        )
-                    except subprocess.CalledProcessError:
-                        raise GitAccessError("Failed to resolve git reference")
-                try:
                     _run_process(
-                        ["git", "checkout", git_ref], cwd=str(dest_dir.absolute())
+                        ["git", "fetch", "origin"], cwd=str(dest_dir.absolute())
                     )
-                except subprocess.CalledProcessError as e:
-                    # Check error message to determine if it's a network issue or ref not found
-                    if "unable to access" in str(
-                        e.stderr
-                    ) or "fatal: unable to access repository" in str(e.stderr):
-                        raise GitAccessError("Failed to resolve git reference")
-                    else:
-                        raise GitAccessError(f"Commit SHA '{git_ref}' not found")
+                _run_process(["git", "checkout", git_ref], cwd=str(dest_dir.absolute()))
             # if no ref, stay on whatever the clone gave us/current commit
             # return the resolved sha
             resolved_sha = _run_process(
                 ["git", "rev-parse", "HEAD"], cwd=str(dest_dir.absolute())
             ).strip()
             return GitCloneResult(git_sha=resolved_sha, git_ref=git_ref)
+    except GitAccessError:
+        # Re-raise enriched errors from _run_process directly
+        raise
     except subprocess.TimeoutExpired:
         raise GitAccessError("Timeout while cloning repository")