ace-git-copilot 0.1.9__tar.gz → 0.2.0__tar.gz

{ace_git_copilot-0.1.9 → ace_git_copilot-0.2.0}/PKG-INFO

@@ -1,12 +1,14 @@
 Metadata-Version: 2.4
 Name: ace-git-copilot
-Version: 0.1.9
+Version: 0.2.0
 Summary: AI-powered Git copilot — talk to Git in plain English
 Requires-Python: >=3.11
 Requires-Dist: click>=8.0
 Requires-Dist: gitpython>=3.1
+Requires-Dist: langchain-anthropic>=0.1.0
 Requires-Dist: langchain-nvidia-ai-endpoints>=0.3
 Requires-Dist: langchain-ollama>=0.3
+Requires-Dist: langchain-openai>=0.1.0
 Requires-Dist: langchain>=0.3
 Requires-Dist: python-dotenv>=1.0
 Requires-Dist: rich>=13.0
@@ -94,16 +96,33 @@ Run the built-in configuration wizard to select your AI model provider:
 ```bash
 ace setup
 ```
-Ace saves your configuration file to `~/.ace/config.toml`. It supports:
+Ace saves your configuration file to `~/.ace/config.toml`. It supports the following AI model providers:
 
-### 1. Cloud Models (NVIDIA NIM API)
-Uses cloud-hosted high-performance models. 
-* To use this, you will need an NVIDIA developer API key. Get one for free at [NVIDIA build](https://build.nvidia.com/).
+### 1. NVIDIA NIM API (Cloud)
+Uses cloud-hosted high-performance models.
+* You will need an NVIDIA developer API key. Get one for free at [NVIDIA build](https://build.nvidia.com/).
+* Default model: `meta/llama-3.3-70b-instruct`
 
-### 2. Local Models (Ollama)
+### 2. Ollama (Local Models)
 For a 100% private, offline, and free experience.
 * Ensure [Ollama](https://ollama.com/) is installed and running on your system.
-* You can select models like `qwen2.5-coder`, `llama3.1`, or `mistral`. If the selected model is not downloaded yet, Ace will automatically pull it for you during setup.
+* Default model: `qwen2.5-coder:7b`
+* If the selected model is not downloaded yet, Ace will automatically pull it for you during setup.
+
+### 3. OpenAI
+Uses OpenAI GPT models.
+* You will need an OpenAI API key.
+* Default model: `gpt-4o-mini`
+
+### 4. Anthropic
+Uses Anthropic Claude models.
+* You will need an Anthropic API key.
+* Default model: `claude-3-5-sonnet-latest`
+
+### 5. Custom OpenAI-Compatible
+Allows using any custom endpoint that supports the OpenAI API schema (e.g. Groq, OpenRouter, Together AI).
+* You will need the provider's API key and custom API base URL (e.g. `https://api.groq.com/openai/v1`).
+* Default model: `custom-model`
 
 ---
 

{ace_git_copilot-0.1.9 → ace_git_copilot-0.2.0}/README.md

@@ -74,16 +74,33 @@ Run the built-in configuration wizard to select your AI model provider:
 ```bash
 ace setup
 ```
-Ace saves your configuration file to `~/.ace/config.toml`. It supports:
+Ace saves your configuration file to `~/.ace/config.toml`. It supports the following AI model providers:
 
-### 1. Cloud Models (NVIDIA NIM API)
-Uses cloud-hosted high-performance models. 
-* To use this, you will need an NVIDIA developer API key. Get one for free at [NVIDIA build](https://build.nvidia.com/).
+### 1. NVIDIA NIM API (Cloud)
+Uses cloud-hosted high-performance models.
+* You will need an NVIDIA developer API key. Get one for free at [NVIDIA build](https://build.nvidia.com/).
+* Default model: `meta/llama-3.3-70b-instruct`
 
-### 2. Local Models (Ollama)
+### 2. Ollama (Local Models)
 For a 100% private, offline, and free experience.
 * Ensure [Ollama](https://ollama.com/) is installed and running on your system.
-* You can select models like `qwen2.5-coder`, `llama3.1`, or `mistral`. If the selected model is not downloaded yet, Ace will automatically pull it for you during setup.
+* Default model: `qwen2.5-coder:7b`
+* If the selected model is not downloaded yet, Ace will automatically pull it for you during setup.
+
+### 3. OpenAI
+Uses OpenAI GPT models.
+* You will need an OpenAI API key.
+* Default model: `gpt-4o-mini`
+
+### 4. Anthropic
+Uses Anthropic Claude models.
+* You will need an Anthropic API key.
+* Default model: `claude-3-5-sonnet-latest`
+
+### 5. Custom OpenAI-Compatible
+Allows using any custom endpoint that supports the OpenAI API schema (e.g. Groq, OpenRouter, Together AI).
+* You will need the provider's API key and custom API base URL (e.g. `https://api.groq.com/openai/v1`).
+* Default model: `custom-model`
 
 ---
 

ace_git_copilot-0.2.0/ace/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.0"

{ace_git_copilot-0.1.9 → ace_git_copilot-0.2.0}/ace/ai/llm_factory.py

@@ -110,7 +110,55 @@ def get_llm(offline_override: bool = False) -> BaseChatModel:
             num_predict=2048,
         )
         
+    elif provider == "openai":
+        api_key = config.ai.openai_api_key or os.getenv("OPENAI_API_KEY")
+        if not api_key:
+            raise LLMConfigurationError(
+                "OpenAI API Key not found. Please set the OPENAI_API_KEY environment variable "
+                "or configure it using 'ace setup'."
+            )
+        from langchain_openai import ChatOpenAI
+        return ChatOpenAI(
+            model=config.ai.openai_model or "gpt-4o-mini",
+            api_key=api_key,
+            temperature=0.0,
+            max_tokens=2048,
+        )
+
+    elif provider == "anthropic":
+        api_key = config.ai.anthropic_api_key or os.getenv("ANTHROPIC_API_KEY")
+        if not api_key:
+            raise LLMConfigurationError(
+                "Anthropic API Key not found. Please set the ANTHROPIC_API_KEY environment variable "
+                "or configure it using 'ace setup'."
+            )
+        from langchain_anthropic import ChatAnthropic
+        return ChatAnthropic(
+            model=config.ai.anthropic_model or "claude-3-5-sonnet-latest",
+            api_key=api_key,
+            temperature=0.0,
+            max_tokens=2048,
+        )
+
+    elif provider == "custom":
+        api_key = config.ai.custom_api_key or os.getenv("CUSTOM_API_KEY")
+        base_url = config.ai.custom_api_base or os.getenv("CUSTOM_API_BASE")
+        model_name = config.ai.custom_model or os.getenv("CUSTOM_MODEL")
+        if not base_url:
+            raise LLMConfigurationError(
+                "Custom API Base URL not found. Please set the CUSTOM_API_BASE environment variable "
+                "or configure it using 'ace setup'."
+            )
+        from langchain_openai import ChatOpenAI
+        return ChatOpenAI(
+            model=model_name or "custom-model",
+            api_key=api_key or "no-key",
+            base_url=base_url,
+            temperature=0.0,
+            max_tokens=2048,
+        )
+
     else:
         raise LLMConfigurationError(
-            f"Unsupported AI provider: '{provider}'. Supported providers are 'nvidia' and 'ollama'."
+            f"Unsupported AI provider: '{provider}'. Supported providers are: nvidia, ollama, openai, anthropic, custom."
         )

{ace_git_copilot-0.1.9 → ace_git_copilot-0.2.0}/ace/cli.py

@@ -404,18 +404,42 @@ def setup_cmd():
         pass
         
     console.print("[bold orange3]Welcome to Ace AI Git Copilot Setup![/bold orange3] 🚀\n")
+    console.print("Configure your preferences and AI provider step-by-step.\n")
     
     config = get_config()
 
-    
     # Provider select
-    provider = typer.prompt("Select AI Provider (nvidia or ollama)", default=config.ai.provider)
-    provider = provider.lower().strip()
-    if provider not in ("nvidia", "ollama"):
-        print_error("Invalid provider. Defaulting to 'nvidia'.")
+    console.print("[bold]Select your AI Provider:[/bold]")
+    console.print("  [bold cyan]1[/bold cyan] -> NVIDIA API Endpoints (Cloud)")
+    console.print("  [bold cyan]2[/bold cyan] -> Ollama (Local Models)")
+    console.print("  [bold cyan]3[/bold cyan] -> OpenAI (GPT-4o, etc.)")
+    console.print("  [bold cyan]4[/bold cyan] -> Anthropic (Claude)")
+    console.print("  [bold cyan]5[/bold cyan] -> Custom OpenAI-Compatible (Groq, OpenRouter, etc.)")
+    console.print("")
+
+    provider_map = {
+        "1": "nvidia",
+        "2": "ollama",
+        "3": "openai",
+        "4": "anthropic",
+        "5": "custom",
+    }
+    provider_reverse_map = {v: k for k, v in provider_map.items()}
+    default_choice = provider_reverse_map.get(config.ai.provider, "1")
+
+    choice = typer.prompt("Enter choice (1-5)", default=default_choice)
+    choice_clean = choice.strip().lower()
+
+    if choice_clean in provider_map:
+        provider = provider_map[choice_clean]
+    elif choice_clean in provider_reverse_map:
+        provider = choice_clean
+    else:
+        print_warning("Invalid choice. Defaulting to NVIDIA.")
         provider = "nvidia"
         
     config.ai.provider = provider
+    console.print(f"Selected Provider: [bold cyan]{provider.upper()}[/bold cyan]\n")
     
     # NVIDIA setup
     if provider == "nvidia":
@@ -430,7 +454,31 @@ def setup_cmd():
         config.ai.ollama_url = ollama_url
         ollama_model = typer.prompt("Ollama model name", default=config.ai.ollama_model)
         config.ai.ollama_model = ollama_model
+
+    # OpenAI setup
+    elif provider == "openai":
+        openai_key = typer.prompt("Enter your OpenAI API Key", default=config.ai.openai_api_key, hide_input=True)
+        config.ai.openai_api_key = openai_key
+        openai_model = typer.prompt("OpenAI LLM Model name", default=config.ai.openai_model)
+        config.ai.openai_model = openai_model
+
+    # Anthropic setup
+    elif provider == "anthropic":
+        anthropic_key = typer.prompt("Enter your Anthropic API Key", default=config.ai.anthropic_api_key, hide_input=True)
+        config.ai.anthropic_api_key = anthropic_key
+        anthropic_model = typer.prompt("Anthropic LLM Model name", default=config.ai.anthropic_model)
+        config.ai.anthropic_model = anthropic_model
+
+    # Custom setup
+    elif provider == "custom":
+        custom_base = typer.prompt("Custom API Base URL (e.g., https://api.groq.com/openai/v1)", default=config.ai.custom_api_base)
+        config.ai.custom_api_base = custom_base
+        custom_key = typer.prompt("Enter your Custom API Key", default=config.ai.custom_api_key, hide_input=True)
+        config.ai.custom_api_key = custom_key
+        custom_model = typer.prompt("Custom LLM Model name", default=config.ai.custom_model)
+        config.ai.custom_model = custom_model
         
+    console.print("\n[bold]Configure Commit Preferences:[/bold]")
     # Commit pref setup
     commit_format = typer.prompt("Default commit format (conventional, simple, detailed)", default=config.commit.format)
     if commit_format.lower().strip() in ("conventional", "simple", "detailed"):
@@ -438,6 +486,9 @@ def setup_cmd():
         
     sign_commits = confirm("Should Ace sign commits by default (GPG/SSH)?", default=config.commit.sign)
     config.commit.sign = sign_commits
+
+    use_emoji = confirm("Should Ace use emojis in commit messages by default?", default=config.commit.emoji)
+    config.commit.emoji = use_emoji
     
     # Save config
     try:
@@ -455,16 +506,23 @@ def config_cmd():
     table.add_column("Setting")
     table.add_column("Value")
     
-    # Mask API key
-    nv_key = config.ai.nvidia_api_key
-    masked_key = nv_key[:8] + "..." if nv_key else "Not set"
+    # Mask API key helper
+    def mask_key(k: str) -> str:
+        return k[:8] + "..." if k else "Not set"
     
     # Add items
     table.add_row("AI", "Provider", config.ai.provider)
-    table.add_row("AI", "NVIDIA API Key", masked_key)
+    table.add_row("AI", "NVIDIA API Key", mask_key(config.ai.nvidia_api_key))
     table.add_row("AI", "NVIDIA Model", config.ai.nvidia_model)
     table.add_row("AI", "Ollama URL", config.ai.ollama_url)
     table.add_row("AI", "Ollama Model", config.ai.ollama_model)
+    table.add_row("AI", "OpenAI API Key", mask_key(config.ai.openai_api_key))
+    table.add_row("AI", "OpenAI Model", config.ai.openai_model)
+    table.add_row("AI", "Anthropic API Key", mask_key(config.ai.anthropic_api_key))
+    table.add_row("AI", "Anthropic Model", config.ai.anthropic_model)
+    table.add_row("AI", "Custom API Base URL", config.ai.custom_api_base or "Not set")
+    table.add_row("AI", "Custom API Key", mask_key(config.ai.custom_api_key))
+    table.add_row("AI", "Custom Model", config.ai.custom_model or "Not set")
     
     table.add_row("Commit", "Default Format", config.commit.format)
     table.add_row("Commit", "Sign Commits", str(config.commit.sign))

{ace_git_copilot-0.1.9 → ace_git_copilot-0.2.0}/ace/core/config.py

@@ -13,6 +13,13 @@ DEFAULT_CONFIG: Dict[str, Any] = {
         "nvidia_model": "meta/llama-3.3-70b-instruct",
         "ollama_model": "qwen2.5-coder:7b",
         "ollama_url": "http://localhost:11434",
+        "openai_api_key": "",
+        "openai_model": "gpt-4o-mini",
+        "anthropic_api_key": "",
+        "anthropic_model": "claude-3-5-sonnet-latest",
+        "custom_api_key": "",
+        "custom_api_base": "",
+        "custom_model": "",
     },
     "commit": {
         "format": "conventional",
@@ -117,6 +124,33 @@ def get_config() -> Config:
     if env_ollama_url:
         data["ai"]["ollama_url"] = env_ollama_url
 
+    # OpenAI API Key & Model
+    env_openai_key = os.getenv("OPENAI_API_KEY")
+    if env_openai_key:
+        data["ai"]["openai_api_key"] = env_openai_key
+    env_openai_model = os.getenv("OPENAI_MODEL")
+    if env_openai_model:
+        data["ai"]["openai_model"] = env_openai_model
+
+    # Anthropic API Key & Model
+    env_anthropic_key = os.getenv("ANTHROPIC_API_KEY")
+    if env_anthropic_key:
+        data["ai"]["anthropic_api_key"] = env_anthropic_key
+    env_anthropic_model = os.getenv("ANTHROPIC_MODEL")
+    if env_anthropic_model:
+        data["ai"]["anthropic_model"] = env_anthropic_model
+
+    # Custom API Key, Base, & Model
+    env_custom_key = os.getenv("CUSTOM_API_KEY")
+    if env_custom_key:
+        data["ai"]["custom_api_key"] = env_custom_key
+    env_custom_base = os.getenv("CUSTOM_API_BASE")
+    if env_custom_base:
+        data["ai"]["custom_api_base"] = env_custom_base
+    env_custom_model = os.getenv("CUSTOM_MODEL")
+    if env_custom_model:
+        data["ai"]["custom_model"] = env_custom_model
+
     return Config(data)
 
 def save_config(config: Config) -> None:

{ace_git_copilot-0.1.9 → ace_git_copilot-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ace-git-copilot"
-version = "0.1.9"
+version = "0.2.0"
 description = "AI-powered Git copilot — talk to Git in plain English"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -12,6 +12,8 @@ dependencies = [
     "langchain>=0.3",
     "langchain-nvidia-ai-endpoints>=0.3",
     "langchain-ollama>=0.3",
+    "langchain-openai>=0.1.0",
+    "langchain-anthropic>=0.1.0",
     "python-dotenv>=1.0",
     "toml>=0.10.2",
 ]

ace_git_copilot-0.2.0/tests/test_llm_factory.py

@@ -0,0 +1,173 @@
+import json
+from unittest.mock import MagicMock, patch
+from ace.ai.llm_factory import ensure_ollama_model, _checked_ollama_models, get_llm
+
+def test_ensure_ollama_model_cached():
+    # Setup cache key
+    _checked_ollama_models.add(("http://localhost:11434", "test-model"))
+    
+    with patch("urllib.request.urlopen") as mock_urlopen:
+        ensure_ollama_model("http://localhost:11434", "test-model")
+        mock_urlopen.assert_not_called()
+
+@patch("urllib.request.urlopen")
+def test_ensure_ollama_model_exists(mock_urlopen):
+    # Reset cache
+    _checked_ollama_models.clear()
+    
+    # Mock tags response
+    mock_resp = MagicMock()
+    mock_resp.read.return_value = json.dumps({
+        "models": [{"name": "llama3:latest"}]
+    }).encode("utf-8")
+    mock_urlopen.return_value.__enter__.return_value = mock_resp
+    
+    ensure_ollama_model("http://localhost:11434", "llama3")
+    assert ("http://localhost:11434", "llama3") in _checked_ollama_models
+
+@patch("urllib.request.urlopen")
+@patch("ace.ui.prompts.confirm", return_value=True)
+def test_ensure_ollama_model_pull(mock_confirm, mock_urlopen):
+    _checked_ollama_models.clear()
+    
+    # Mock tags response (not exists) and then pull response
+    mock_tags_resp = MagicMock()
+    mock_tags_resp.read.return_value = json.dumps({
+        "models": [{"name": "other-model:latest"}]
+    }).encode("utf-8")
+    
+    mock_pull_resp = MagicMock()
+    mock_pull_resp.read.return_value = json.dumps({
+        "status": "success"
+    }).encode("utf-8")
+    
+    # urlopen will be called twice: first for tags, second for pull
+    mock_urlopen.return_value.__enter__.side_effect = [mock_tags_resp, mock_pull_resp]
+    
+    ensure_ollama_model("http://localhost:11434", "llama3")
+    
+    # Check both calls
+    assert mock_urlopen.call_count == 2
+    assert mock_confirm.called
+
+def test_get_llm_nvidia():
+    import pytest
+    from ace.core.config import Config
+    mock_config = Config({
+        "ai": {
+            "provider": "nvidia",
+            "nvidia_api_key": "nv-api-key-test",
+            "nvidia_model": "meta/llama-3.3-70b-instruct",
+        }
+    })
+    with patch("ace.ai.llm_factory.get_config", return_value=mock_config), \
+         patch("langchain_nvidia_ai_endpoints.ChatNVIDIA") as mock_chat:
+        get_llm()
+        mock_chat.assert_called_once_with(
+            model="meta/llama-3.3-70b-instruct",
+            api_key="nv-api-key-test",
+            base_url="https://integrate.api.nvidia.com/v1",
+            temperature=0.0,
+            max_tokens=2048,
+        )
+
+def test_get_llm_openai():
+    from ace.core.config import Config
+    mock_config = Config({
+        "ai": {
+            "provider": "openai",
+            "openai_api_key": "openai-key-test",
+            "openai_model": "gpt-4o-mini",
+        }
+    })
+    with patch("ace.ai.llm_factory.get_config", return_value=mock_config), \
+         patch("langchain_openai.ChatOpenAI") as mock_chat:
+        get_llm()
+        mock_chat.assert_called_once_with(
+            model="gpt-4o-mini",
+            api_key="openai-key-test",
+            temperature=0.0,
+            max_tokens=2048,
+        )
+
+def test_get_llm_anthropic():
+    from ace.core.config import Config
+    mock_config = Config({
+        "ai": {
+            "provider": "anthropic",
+            "anthropic_api_key": "anthropic-key-test",
+            "anthropic_model": "claude-3-5-sonnet-latest",
+        }
+    })
+    with patch("ace.ai.llm_factory.get_config", return_value=mock_config), \
+         patch("langchain_anthropic.ChatAnthropic") as mock_chat:
+        get_llm()
+        mock_chat.assert_called_once_with(
+            model="claude-3-5-sonnet-latest",
+            api_key="anthropic-key-test",
+            temperature=0.0,
+            max_tokens=2048,
+        )
+
+def test_get_llm_custom():
+    from ace.core.config import Config
+    mock_config = Config({
+        "ai": {
+            "provider": "custom",
+            "custom_api_key": "custom-key-test",
+            "custom_api_base": "https://custom-url.com/v1",
+            "custom_model": "my-custom-model",
+        }
+    })
+    with patch("ace.ai.llm_factory.get_config", return_value=mock_config), \
+         patch("langchain_openai.ChatOpenAI") as mock_chat:
+        get_llm()
+        mock_chat.assert_called_once_with(
+            model="my-custom-model",
+            api_key="custom-key-test",
+            base_url="https://custom-url.com/v1",
+            temperature=0.0,
+            max_tokens=2048,
+        )
+
+def test_get_llm_missing_keys():
+    import pytest
+    from ace.core.config import Config
+    from ace.ai.llm_factory import LLMConfigurationError
+
+    # Test openai missing key
+    mock_config = Config({
+        "ai": {
+            "provider": "openai",
+            "openai_api_key": "",
+            "openai_model": "gpt-4o-mini",
+        }
+    })
+    with patch("ace.ai.llm_factory.get_config", return_value=mock_config):
+        with pytest.raises(LLMConfigurationError, match="OpenAI API Key not found"):
+            get_llm()
+
+    # Test anthropic missing key
+    mock_config = Config({
+        "ai": {
+            "provider": "anthropic",
+            "anthropic_api_key": "",
+            "anthropic_model": "claude-3-5-sonnet-latest",
+        }
+    })
+    with patch("ace.ai.llm_factory.get_config", return_value=mock_config):
+        with pytest.raises(LLMConfigurationError, match="Anthropic API Key not found"):
+            get_llm()
+
+    # Test custom missing base url
+    mock_config = Config({
+        "ai": {
+            "provider": "custom",
+            "custom_api_key": "some-key",
+            "custom_api_base": "",
+            "custom_model": "custom-model",
+        }
+    })
+    with patch("ace.ai.llm_factory.get_config", return_value=mock_config):
+        with pytest.raises(LLMConfigurationError, match="Custom API Base URL not found"):
+            get_llm()

ace_git_copilot-0.1.9/ace/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.0"

ace_git_copilot-0.1.9/tests/test_llm_factory.py

@@ -1,51 +0,0 @@
-import json
-from unittest.mock import MagicMock, patch
-from ace.ai.llm_factory import ensure_ollama_model, _checked_ollama_models
-
-def test_ensure_ollama_model_cached():
-    # Setup cache key
-    _checked_ollama_models.add(("http://localhost:11434", "test-model"))
-    
-    with patch("urllib.request.urlopen") as mock_urlopen:
-        ensure_ollama_model("http://localhost:11434", "test-model")
-        mock_urlopen.assert_not_called()
-
-@patch("urllib.request.urlopen")
-def test_ensure_ollama_model_exists(mock_urlopen):
-    # Reset cache
-    _checked_ollama_models.clear()
-    
-    # Mock tags response
-    mock_resp = MagicMock()
-    mock_resp.read.return_value = json.dumps({
-        "models": [{"name": "llama3:latest"}]
-    }).encode("utf-8")
-    mock_urlopen.return_value.__enter__.return_value = mock_resp
-    
-    ensure_ollama_model("http://localhost:11434", "llama3")
-    assert ("http://localhost:11434", "llama3") in _checked_ollama_models
-
-@patch("urllib.request.urlopen")
-@patch("ace.ui.prompts.confirm", return_value=True)
-def test_ensure_ollama_model_pull(mock_confirm, mock_urlopen):
-    _checked_ollama_models.clear()
-    
-    # Mock tags response (not exists) and then pull response
-    mock_tags_resp = MagicMock()
-    mock_tags_resp.read.return_value = json.dumps({
-        "models": [{"name": "other-model:latest"}]
-    }).encode("utf-8")
-    
-    mock_pull_resp = MagicMock()
-    mock_pull_resp.read.return_value = json.dumps({
-        "status": "success"
-    }).encode("utf-8")
-    
-    # urlopen will be called twice: first for tags, second for pull
-    mock_urlopen.return_value.__enter__.side_effect = [mock_tags_resp, mock_pull_resp]
-    
-    ensure_ollama_model("http://localhost:11434", "llama3")
-    
-    # Check both calls
-    assert mock_urlopen.call_count == 2
-    assert mock_confirm.called