git-copilot-commit 0.2.2__py3-none-any.whl → 0.3.1__py3-none-any.whl

git_copilot_commit/cli.py

@@ -3,17 +3,14 @@ git-copilot-commit - AI-powered Git commit assistant
 """
 
 import rich.terminal_theme
-import sys
 import typer
 from rich.console import Console
 from rich.prompt import Confirm
 from rich.panel import Panel
-from rich.table import Table
 import rich
 from pathlib import Path
 
-from pycopilot.copilot import Copilot, CopilotAPIError  # type: ignore
-from pycopilot.auth import Authentication
+from litellm import completion
 from .git import GitRepository, GitError, NotAGitRepositoryError
 from .settings import Settings
 from .version import __version__
@@ -87,6 +84,29 @@ def load_system_prompt() -> str:
     raise typer.Exit(1)
 
 
+def ask(prompt, model) -> str:
+    response = completion(
+        model=model,
+        messages=[
+            {"role": "system", "content": load_system_prompt()},
+            {"role": "user", "content": prompt},
+        ],
+        extra_headers={
+            "editor-version": "vscode/1.85.1",
+            "Copilot-Integration-Id": "vscode-chat",
+        },
+    )
+    text = response.choices[0].message.content
+    text = text.strip()
+    # Remove triple backticks if they wrap the entire text
+    if text.startswith("```") and text.endswith("```"):
+        text = text[3:-3].strip()
+    # Otherwise remove single backticks if they wrap the entire text
+    elif text.startswith("`") and text.endswith("`"):
+        text = text[1:-1].strip()
+    return text
+
+
 def generate_commit_message(
     repo: GitRepository, model: str | None = None, context: str = ""
 ) -> str:
@@ -99,9 +119,6 @@ def generate_commit_message(
         console.print("[red]No staged changes to commit.[/red]")
         raise typer.Exit()
 
-    system_prompt = load_system_prompt()
-    client = Copilot(system_prompt=system_prompt)
-
     prompt_parts = [
         "`git status`:\n",
         f"```\n{status.get_porcelain_output()}\n```",
@@ -116,11 +133,19 @@ def generate_commit_message(
 
     prompt = "\n".join(prompt_parts)
 
+    if model is None:
+        model = "github_copilot/gpt-4"
+
+    if not model.startswith("github_copilot/"):
+        model = f"github_copilot/{model}"
+
     try:
-        client.reset()
-        response = client.ask(prompt, model=model) if model else client.ask(prompt)
-        return response.content
+        return ask(prompt, model=model)
     except Exception as _:
+        console.print(
+            "Prompt failed, falling back to simpler commit message generation."
+        )
+
         fallback_prompt_parts = [
             "`git status`:\n",
             f"```\n{status.get_porcelain_output()}\n```",
@@ -137,13 +162,7 @@ def generate_commit_message(
 
         fallback_prompt = "\n".join(fallback_prompt_parts)
 
-        client.reset()
-        response = (
-            client.ask(fallback_prompt, model=model)
-            if model
-            else client.ask(fallback_prompt)
-        )
-        return response.content
+        return ask(fallback_prompt, model=model)
 
 
 @app.command()
@@ -221,9 +240,7 @@ def commit(
     ):
         commit_message = generate_commit_message(repo, model, context=context)
 
-    console.print(
-        "[yellow]Generated commit message based on [bold]`git diff --staged`[/] ...[/yellow]"
-    )
+    console.print("[yellow]Generated commit message.[/yellow]")
 
     # Display commit message
     console.print(
@@ -275,47 +292,6 @@ def commit(
     console.print(f"[green]✓ Successfully committed: {commit_sha[:8]}[/green]")
 
 
-@app.command()
-def authenticate():
-    """Autheticate with GitHub Copilot."""
-    Authentication().auth()
-
-
-@app.command()
-def models():
-    """List models available for chat in a table."""
-    models = Copilot().models
-
-    console = Console()
-    table = Table(title="Available Models")
-
-    table.add_column("ID", style="cyan", no_wrap=True)
-    table.add_column("Name", style="magenta")
-    table.add_column("Vendor", style="green")
-    table.add_column("Version", style="yellow")
-    table.add_column("Family", style="white")
-    table.add_column("Max Tokens", style="white")
-    table.add_column("Streaming", style="white")
-
-    for model in models:
-        capabilities = model.get("capabilities", {})
-        family = capabilities.get("family", "N/A")
-        max_tokens = capabilities.get("limits", {}).get("max_output_tokens", "N/A")
-        streaming = capabilities.get("supports", {}).get("streaming", False)
-
-        table.add_row(
-            model.get("id", "N/A"),
-            model.get("name", "N/A"),
-            model.get("vendor", "N/A"),
-            model.get("version", "N/A"),
-            family,
-            str(max_tokens),
-            str(streaming),
-        )
-
-    console.print(table)
-
-
 @app.command()
 def config(
     set_default_model: str | None = typer.Option(
@@ -347,51 +323,5 @@ def config(
         console.print(f"Config file: [dim]{settings.config_file}[/dim]")
 
 
-@app.command()
-def echo(
-    model: str | None = typer.Option(
-        None, "--model", "-m", help="Model to use for generating commit message"
-    ),
-):
-    """
-    Generate commit message from stdin input (useful for pipes).
-    """
-    # Read from stdin
-    input_text = sys.stdin.read()
-
-    if not input_text.strip():
-        console.print("[red]Error: No input provided via stdin[/red]")
-        raise typer.Exit(1)
-
-    # Load settings and use default model if none provided
-    settings = Settings()
-    if model is None:
-        model = settings.default_model
-
-    # Load system prompt and create client
-    system_prompt = load_system_prompt()
-    client = Copilot(system_prompt=system_prompt)
-
-    # Generate commit message from the input
-    prompt = f"""
-`git diff --staged`:
-
-```
-{input_text.strip()}
-```
-
-Generate a conventional commit message based on the input above:"""
-
-    try:
-        response = client.ask(prompt, model=model) if model else client.ask(prompt)
-        # Print the commit message directly to stdout (no rich formatting for pipes)
-        import builtins
-
-        builtins.print(response.content)
-    except CopilotAPIError as e:
-        console.print(f"[red]Error generating commit message: {e}[/red]")
-        raise typer.Exit(1)
-
-
 if __name__ == "__main__":
     app()

git_copilot_commit/prompts/commit-message-generator-prompt.md

@@ -1,23 +1,18 @@
 # Commit Message Generator System Prompt
 
-You are a Git commit message assistant trained to write a single clear, structured, and informative commit message following the Conventional Commits specification. You will receive:
+You are a Git commit message assistant trained to write a single clear, structured, and informative commit message following the Conventional Commits specification. 
 
-1. A `git diff --staged` output (or a summary of changed files)
-2. Optionally, additional **user-provided context**
+Your task is to generate a commit message in the [Conventional Commits](https://www.conventionalcommits.org/) format based on both inputs.
 
-Your task is to generate a **single-line commit message** in the [Conventional Commits](https://www.conventionalcommits.org/) format based on both inputs. If no context is provided, rely **only** on the diff.
+## Output Format
 
-## ✅ Output Format
-
-```
 <type>(<optional scope>): <description>
-```
 
 - Do not include a body or footer.
 - Do not wrap the message in backticks or code blocks.
 - Keep the title line ≤72 characters.
 
-## ✅ Valid Types
+## `<type>` 
 
 - `feat`: New feature
 - `fix`: Bug fix
@@ -29,34 +24,35 @@ Your task is to generate a **single-line commit message** in the [Conventional C
 - `chore`: Maintenance tasks (e.g., CI/CD, dependencies)
 - `revert`: Revert of a previous commit
 
-## ✅ Scope (Optional)
+## `(<optional scope>)`
 
 - Lowercase, single word or hyphenated phrase
 - Represents the affected area, module, or file
 - Use broad area if multiple related files are affected
 
-## ✅ Subject Line
+## `<description>`
 
 - Use imperative mood ("remove" not "removed")
 - Focus on **what** changed, not why or how
 - Be concise and specific
 - Use abbreviations (e.g., "config" not "configuration")
 
-## ✅ Using User-Provided Context
-
-- If additional context is provided by the user, you may **incorporate it** to clarify purpose (e.g., "remove duplicate entry").
-- If no such context is provided, **do not speculate or infer**.
-- Only use terms like "unused", "duplicate", or "deprecated" when explicitly stated by the user or clearly shown in the diff.
+---
 
-## ❌ Do Not
+## Do Not
 
+- Do not speculate or infer what the diff is doing
 - Do not use vague phrases ("made changes", "updated code")
 - Do not use past tense ("added", "removed")
+- Do not use terms like "unused", "duplicate", or "deprecated" unless explicitly stated by the user or clearly shown in the diff.
 - Do not explain implementation or reasoning ("to fix bug", "because of issue")
 - Do not guess purpose based on intuition or incomplete file context
+- Do not wrap the response in single backticks or triple backticks or code blocks
 
 ---
 
-Given a Git diff, a list of modified files, or a short description of changes, generate a single, short, clear and structured Conventional Commit message following the above rules. If multiple changes are detected, prioritize the most important changes in a single commit message. Do not add any body or footer. You can only give one reply for each conversation.
+The user will provide a Git diff, a list of modified files, or a short description of changes.
+
+Generate a single, short, clear and structured Conventional Commit message following the above rules. If multiple changes are detected, prioritize the most important changes in a single commit message. Do not add any body or footer. You can only give one reply for each conversation.
 
-Do not wrap the response in triple backticks or single backticks. Return the commit message as the output without any additional text, explanations, or formatting markers.
+Return the commit message as the output without any additional text, explanations, or formatting markers.

{git_copilot_commit-0.2.2.dist-info → git_copilot_commit-0.3.1.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.2.2
+Version: 0.3.1
 Summary: Automatically generate and commit changes using copilot
 Author-email: Dheepak Krishnamurthy <1813121+kdheepak@users.noreply.github.com>
 License-File: LICENSE
 Requires-Python: >=3.12
+Requires-Dist: litellm>=1.75.4
 Requires-Dist: platformdirs>=4.0.0
-Requires-Dist: pycopilot>=0.1.7
 Requires-Dist: rich>=14.0.0
 Requires-Dist: typer>=0.16.0
 Description-Content-Type: text/markdown

{git_copilot_commit-0.2.2.dist-info → git_copilot_commit-0.3.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 git_copilot_commit/__init__.py,sha256=v3x5oBkxwKJEZLv62QqSmP3iqNKLtZgrWZfH8eFzlQg,60
-git_copilot_commit/cli.py,sha256=N5ydsywarRLSlv9Sr0iuPWJXa_G8NNdz53O_TyFQ0ro,12388
+git_copilot_commit/cli.py,sha256=JqpYDKu1RZY0MqlhxyjxArxHmBhEcQMamqEsL8msR9Q,10405
 git_copilot_commit/git.py,sha256=8CSGS6sPPdL32b_EHX8swvoxqmUC26afUr4wVFcYdqk,9134
 git_copilot_commit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 git_copilot_commit/settings.py,sha256=nrtD71TFmIQwLpda-GgIhciafxbi4Ul4aNfbqoQ24tY,2801
 git_copilot_commit/version.py,sha256=AieHOUX52g6N67HL0iLWtDKrgOYyulxwHWViu26Jrd4,105
-git_copilot_commit/prompts/commit-message-generator-prompt.md,sha256=zYcSbM-60zTggIQDMJmHZXhc3lYWRdJeMf2i0K-smog,2655
-git_copilot_commit-0.2.2.dist-info/METADATA,sha256=TYQ1i70vU57R9kgHb22vl6x2OCBzIlo-7nqFtySOMBw,4640
-git_copilot_commit-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-git_copilot_commit-0.2.2.dist-info/entry_points.txt,sha256=Imboc0oJa4Oq1O3C-wWcy7ZxfsVSkkC-OC-iPbTn3Fg,66
-git_copilot_commit-0.2.2.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
-git_copilot_commit-0.2.2.dist-info/RECORD,,
+git_copilot_commit/prompts/commit-message-generator-prompt.md,sha256=--GFR6GRL4PUjk81XsULPAH_2mJ6ymvP-bgBSX7kqlM,2290
+git_copilot_commit-0.3.1.dist-info/METADATA,sha256=NtAJL_k6x94KEuQB1E01fWXb4vMWHyAIi6HSRkfCGDs,4639
+git_copilot_commit-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+git_copilot_commit-0.3.1.dist-info/entry_points.txt,sha256=Imboc0oJa4Oq1O3C-wWcy7ZxfsVSkkC-OC-iPbTn3Fg,66
+git_copilot_commit-0.3.1.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
+git_copilot_commit-0.3.1.dist-info/RECORD,,