git-copilot-commit 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

git_copilot_commit/cli.py

@@ -151,6 +151,21 @@ def commit_with_retry_no_verify(
         raise typer.Exit(1)
 
 
+@app.command("authenticate")
+@app.command("login", hidden=True)
+def authenticate(
+    force: bool = typer.Option(
+        False, "--force", help="Replace cached GitHub Copilot credentials"
+    ),
+):
+    """Authenticate with GitHub Copilot and cache credentials locally."""
+    try:
+        github_copilot.login(force=force)
+    except github_copilot.CopilotError as exc:
+        console.print(f"[red]Authentication failed: {exc}[/red]")
+        raise typer.Exit(1)
+
+
 @app.command()
 def commit(
     all_files: bool = typer.Option(
@@ -180,11 +195,15 @@ def commit(
 
     try:
         existing_credentials = github_copilot.load_credentials()
-    except Exception as _:
+    except github_copilot.CopilotError:
         existing_credentials = None
 
     if existing_credentials is None:
-        github_copilot.login()
+        try:
+            github_copilot.login(force=True)
+        except github_copilot.CopilotError as exc:
+            console.print(f"[red]Authentication failed: {exc}[/red]")
+            raise typer.Exit(1)
 
     # Load settings and use default model if none provided
     settings = Settings()
@@ -228,11 +247,17 @@ def commit(
             Panel(context.strip(), title="User Context", border_style="magenta")
         )
 
-    # Generate or use provided commit message
-    with console.status(
-        "[yellow]Generating commit message based on [bold]`git diff --staged`[/] ...[/yellow]"
-    ):
-        commit_message = generate_commit_message(repo, model, context=context)
+    try:
+        github_copilot.ensure_auth_ready(model=model)
+
+        # Generate or use provided commit message
+        with console.status(
+            "[yellow]Generating commit message based on [bold]`git diff --staged`[/] ...[/yellow]"
+        ):
+            commit_message = generate_commit_message(repo, model, context=context)
+    except github_copilot.CopilotError as exc:
+        console.print(f"[red]Could not generate a commit message: {exc}[/red]")
+        raise typer.Exit(1)
 
     console.print("[yellow]Generated commit message.[/yellow]")
 

git_copilot_commit/github_copilot.py

@@ -10,7 +10,7 @@ import uuid
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
-from typing import Any
+from typing import Any, Callable, TypeVar
 
 import httpx
 import typer
@@ -19,6 +19,7 @@ from rich.panel import Panel
 from rich.table import Table
 
 APP_NAME = "github-copilot-commit"
+CLI_AUTH_COMMAND = "git-copilot-commit authenticate"
 DEFAULT_GITHUB_DOMAIN = "github.com"
 USER_AGENT = "GitHubCopilotChat/0.35.0"
 EDITOR_VERSION = "vscode/1.107.0"
@@ -49,12 +50,24 @@ app = typer.Typer(
 
 console = Console()
 console_err = Console(stderr=True)
+T = TypeVar("T")
 
 
 class CopilotError(RuntimeError):
     pass
 
 
+class CopilotHttpError(CopilotError):
+    def __init__(
+        self, status_code: int, reason_phrase: str, detail: str | None = None
+    ) -> None:
+        self.status_code = status_code
+        self.reason_phrase = reason_phrase
+        self.detail = detail
+        suffix = f": {detail}" if detail else ""
+        super().__init__(f"{status_code} {reason_phrase}{suffix}")
+
+
 @dataclass(slots=True)
 class DeviceCodeResponse:
     device_code: str
@@ -290,8 +303,7 @@ def request_json(
         detail = response.text.strip()
         if len(detail) > 400:
             detail = f"{detail[:397]}..."
-        suffix = f": {detail}" if detail else ""
-        raise CopilotError(f"{response.status_code} {response.reason_phrase}{suffix}")
+        raise CopilotHttpError(response.status_code, response.reason_phrase, detail)
 
     content_type = response.headers.get("content-type", "")
     if "application/json" not in content_type:
@@ -364,10 +376,9 @@ def iter_sse_events(response: httpx.Response, url: str):
             yield payload
 
 
-def load_credentials() -> CopilotCredentials | None:
-    path = credentials_path()
+def read_json_object(path: Path) -> dict[str, Any] | None:
     if not path.exists():
-        return
+        return None
 
     try:
         raw = json.loads(path.read_text(encoding="utf-8"))
@@ -379,11 +390,23 @@ def load_credentials() -> CopilotCredentials | None:
     if not isinstance(raw, dict):
         raise CopilotError(f"Cached credentials in {path} are not a JSON object.")
 
+    return raw
+
+
+def load_stored_credentials_from_path(path: Path) -> CopilotCredentials | None:
+    raw = read_json_object(path)
+    if raw is None:
+        return None
+
     return CopilotCredentials.from_dict(raw)
 
 
+def load_credentials() -> CopilotCredentials | None:
+    return load_stored_credentials_from_path(credentials_path())
+
+
 def save_credentials(credentials: CopilotCredentials) -> Path:
-    path = credentials_path()
+    path = credentials_path().expanduser()
     path.parent.mkdir(parents=True, exist_ok=True)
     payload = json.dumps(credentials.to_dict(), indent=2, sort_keys=True)
     path.write_text(f"{payload}\n", encoding="utf-8")
@@ -573,7 +596,7 @@ def ensure_fresh_credentials(client: httpx.Client) -> CopilotCredentials:
     credentials = load_credentials()
     if credentials is None:
         raise CopilotError(
-            f"No cached Copilot credentials found. Run `{Path(__file__).name} auth login` first."
+            f"No cached Copilot credentials found. Run `{CLI_AUTH_COMMAND}` first."
         )
 
     if not credentials.is_expired():
@@ -588,6 +611,23 @@ def ensure_fresh_credentials(client: httpx.Client) -> CopilotCredentials:
     return refreshed
 
 
+def should_reauthenticate(exc: CopilotError) -> bool:
+    if isinstance(exc, CopilotHttpError):
+        return exc.status_code == 401
+
+    message = str(exc)
+    retryable_prefixes = (
+        "No cached Copilot credentials found.",
+        "Cached GitHub access token is missing or invalid.",
+        "Cached Copilot token is missing or invalid.",
+        "Cached Copilot expiration timestamp is missing or invalid.",
+        "Cached enterprise domain is invalid.",
+        "Unable to read cached credentials from ",
+        "Cached credentials in ",
+    )
+    return any(message.startswith(prefix) for prefix in retryable_prefixes)
+
+
 def copilot_request_headers(
     access_token: str,
     *,
@@ -886,9 +926,8 @@ def responses_completion(
                 detail = response.read().decode("utf-8", errors="replace").strip()
                 if len(detail) > 400:
                     detail = f"{detail[:397]}..."
-                suffix = f": {detail}" if detail else ""
-                raise CopilotError(
-                    f"{response.status_code} {response.reason_phrase}{suffix}"
+                raise CopilotHttpError(
+                    response.status_code, response.reason_phrase, detail
                 )
 
             content_type = response.headers.get("content-type", "")
@@ -1101,24 +1140,19 @@ def print_login_summary(
     console.print(Panel.fit(table, title="Login Summary"))
 
 
-def login(
-    enterprise_domain: str | None = typer.Option(
-        None,
-        "--enterprise-domain",
-        help="GitHub Enterprise hostname. Omit for github.com.",
-    ),
-    force: bool = typer.Option(
-        False,
-        "--force",
-        help="Replace any cached Copilot credentials without prompting.",
-    ),
-) -> None:
+def login(enterprise_domain: str | None = None, force: bool = False) -> None:
     """Authenticate with GitHub and cache Copilot credentials locally."""
     normalized_domain = normalize_domain(enterprise_domain)
     if enterprise_domain and not normalized_domain:
         raise CopilotError("Invalid GitHub Enterprise hostname.")
 
-    existing = load_credentials()
+    existing: CopilotCredentials | None = None
+    try:
+        existing = load_credentials()
+    except CopilotError:
+        if not force:
+            raise
+
     if existing and not force:
         raise CopilotError(
             f"Cached credentials already exist at {credentials_path()}. Re-run with --force to replace them."
@@ -1173,16 +1207,45 @@ def login(
         console.print(f"[yellow]Warning:[/yellow] {warning}")
 
 
-def ask(prompt: str, model: str | None = None) -> str:
-    """Send a prompt to GitHub Copilot and print the reply."""
+def _ask_once(client: httpx.Client, prompt: str, model: str | None = None) -> str:
+    credentials = ensure_fresh_credentials(client)
+    all_models = list_models(client, credentials)
+
+    selected_model = pick_model(all_models, model)
+    return complete_text_prompt(
+        client,
+        credentials,
+        model=selected_model,
+        prompt=prompt,
+    )
+
+
+def _with_reauthentication(action: Callable[[httpx.Client], T]) -> T:
+    try:
+        with make_http_client() as client:
+            return action(client)
+    except CopilotError as exc:
+        if not should_reauthenticate(exc):
+            raise
+
+    console.print(
+        "[yellow]Cached GitHub Copilot credentials are missing or no longer valid. Starting authentication...[/yellow]"
+    )
+    login(force=True)
+
     with make_http_client() as client:
+        return action(client)
+
+
+def ensure_auth_ready(model: str | None = None) -> None:
+    def validate(client: httpx.Client) -> None:
         credentials = ensure_fresh_credentials(client)
         all_models = list_models(client, credentials)
+        pick_model(all_models, model)
 
-        selected_model = pick_model(all_models, model)
-        return complete_text_prompt(
-            client,
-            credentials,
-            model=selected_model,
-            prompt=prompt,
-        )
+    _with_reauthentication(validate)
+
+
+def ask(prompt: str, model: str | None = None) -> str:
+    """Send a prompt to GitHub Copilot and print the reply."""
+    return _with_reauthentication(lambda client: _ask_once(client, prompt, model))

{git_copilot_commit-0.4.3.dist-info → git_copilot_commit-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.4.3
+Version: 0.4.5
 Summary: Automatically generate and commit changes using copilot
 Author-email: Dheepak Krishnamurthy <1813121+kdheepak@users.noreply.github.com>
 License-File: LICENSE
@@ -77,6 +77,12 @@ pipx install git-copilot-commit
    uvx git-copilot-commit authenticate
    ```
 
+   If your cached GitHub token is revoked or expires, refresh it with:
+
+   ```bash
+   uvx git-copilot-commit authenticate --force
+   ```
+
 2. Make changes in your repository.
 
 3. Generate and commit:

{git_copilot_commit-0.4.3.dist-info → git_copilot_commit-0.4.5.dist-info}/RECORD

@@ -1,13 +1,13 @@
 git_copilot_commit/__init__.py,sha256=v3x5oBkxwKJEZLv62QqSmP3iqNKLtZgrWZfH8eFzlQg,60
-git_copilot_commit/cli.py,sha256=bLMhakRnKpfJiB_gPCJ67i-oyHarpUqFlOmMXbIx1UY,8535
+git_copilot_commit/cli.py,sha256=gXRoJDhpW0Ck7-sBDpMmulYztUH1IExuF-SczbgQqF0,9434
 git_copilot_commit/git.py,sha256=f42GawgkyrsFkl127XvDrdg2xVEf87lb-5QO04nuRoU,9459
-git_copilot_commit/github_copilot.py,sha256=38oMeOwJ8yh4XKLgK28W39I-OJP7Gq3NWISi4hUROHY,37478
+git_copilot_commit/github_copilot.py,sha256=lP-LLk4mOC4D9-rCtxIBs7XN_oFImZHpoKyHNBQFf-c,39484
 git_copilot_commit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 git_copilot_commit/settings.py,sha256=asaCxX_TAr5lCRkoSLtHSk1eUrT-y4bJbLUNQZSzAs0,2793
 git_copilot_commit/version.py,sha256=AieHOUX52g6N67HL0iLWtDKrgOYyulxwHWViu26Jrd4,105
 git_copilot_commit/prompts/commit-message-generator-prompt.md,sha256=ZvllyqtsLRwj6NmvygNGFajdLKNkO67hUnLsR_P1WOs,2370
-git_copilot_commit-0.4.3.dist-info/METADATA,sha256=VJbSZnZzU8tIoOeHEmLiYMeFalHqlD2Eb_Q1OX7jjfI,3921
-git_copilot_commit-0.4.3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-git_copilot_commit-0.4.3.dist-info/entry_points.txt,sha256=Imboc0oJa4Oq1O3C-wWcy7ZxfsVSkkC-OC-iPbTn3Fg,66
-git_copilot_commit-0.4.3.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
-git_copilot_commit-0.4.3.dist-info/RECORD,,
+git_copilot_commit-0.4.5.dist-info/METADATA,sha256=BFvZy64MhMB6GGeAiBS6L7N5EcPqNS_9miCE8roZ9E8,4059
+git_copilot_commit-0.4.5.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+git_copilot_commit-0.4.5.dist-info/entry_points.txt,sha256=Imboc0oJa4Oq1O3C-wWcy7ZxfsVSkkC-OC-iPbTn3Fg,66
+git_copilot_commit-0.4.5.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
+git_copilot_commit-0.4.5.dist-info/RECORD,,