gitpr-cli 0.0.23__py3-none-any.whl → 0.0.25__py3-none-any.whl

{gitpr_cli-0.0.23.dist-info → gitpr_cli-0.0.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitpr-cli
-Version: 0.0.23
+Version: 0.0.25
 Summary: Automação de PRs, Commits e Code Review com IA (Gemini e DeepSeek)
 Author-email: Natan Fiuza <contato@natanfiuza.dev.br>
 Requires-Python: >=3.10

gitpr_cli-0.0.25.dist-info/RECORD

@@ -0,0 +1,23 @@
+gitpr_cli-0.0.25.dist-info/licenses/LICENSE,sha256=UQzLC6mwqb-ZNDkBBAqOxC-SMQcEID0gaM6oFcu6u48,27030
+src/__init__.py,sha256=U6ksarernNcryHO20aj4rNG7w0thT7xdMs5KzBJyPvE,28
+src/ai_providers.py,sha256=rf4IJTG6P8nLKU-C-BdUdy68JvhnsgzvhEsJdp-9El0,3477
+src/blame_engine.py,sha256=Ci7t08xTcC1kBWAjQ_ulP-Zraau_PC35MDfAngc4AYk,10396
+src/cache.py,sha256=XggMTy00GlZfeF1VoLEYCdxL5h0eTg11TJfPIRPx7fs,3201
+src/config.py,sha256=VJ9ekDlTVG5ETWDuO1kZWlgrncXbrvduxa5Zg7wN_ZY,9064
+src/core.py,sha256=MtcbftxhFFADNKzf6YBImeeTwW3oFxkQgvUArv-aHLA,18246
+src/i18n.py,sha256=Bn1OrhCYEaT0kUidu5SeTu6kiIuWOZ4OjB-7mIb6RtY,3185
+src/issue_engine.py,sha256=435kPPgdsFMcY3nvutxdIfJAnLP0U4FMCPdbok6C2sc,3626
+src/linter_engine.py,sha256=D04wvOgRa-vZEYknm-z-Cg7V_3gnoQz_64PMorWnISo,4414
+src/main.py,sha256=k4WNlrqWHZqR1t7-IGfKUpmlxjTyp17dulP_cS01jho,27734
+src/security.py,sha256=Li0zM8ZURTK2nKRHIt49TWLO4DIddBEHzXPrVycv0Rs,1343
+src/spinner.py,sha256=LeawExgx7lnHUvyuIlEx0Bc4WlAfC5KzSRWMEiu-ufY,6331
+src/tui_issue.py,sha256=gcAJCIfMcdeMjrFJUWQQvdgBv7fnOBtxQxwdBk2Sk40,1789
+src/updater.py,sha256=JEzyGu6pcdrKDziCSU8iM-yjStC-3ii6o76GUHfj3Zw,5886
+src/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+src/ui/help_screen.py,sha256=tjbokXhwyzLnkOC0S56NbpX-78hcFQnvsQMpNU1wt0c,1862
+src/ui/issue_app.py,sha256=8MdBcOVdCHPFx6EUhs80CiZ2G-29KulskkCz9qMZ_Lg,4737
+gitpr_cli-0.0.25.dist-info/METADATA,sha256=EcoI5mi-eX_wE8qpmmN1AuVC6RGDDVzparNEIUPyVwQ,15488
+gitpr_cli-0.0.25.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+gitpr_cli-0.0.25.dist-info/entry_points.txt,sha256=mh_4F_idM4cj0XhfRGBDQb5Nnku93YJ-dyKh5SufwlE,39
+gitpr_cli-0.0.25.dist-info/top_level.txt,sha256=74rtVfumQlgAPzR5_2CgYN24MB0XARCg0t-gzk6gTrM,4
+gitpr_cli-0.0.25.dist-info/RECORD,,

src/ai_providers.py

@@ -34,11 +34,13 @@ def call_ai_model(provider, api_key, api_model, prompt, system_instruction, quie
                     )
                     result_text = response.text
 
-                elif provider == "deepseek":
-                    # DeepSeek is 100% compatible with the OpenAI library
-                    client = OpenAI(api_key=api_key, base_url="https://api.deepseek.com")
+                elif provider in ["deepseek", "ollama"]:
+                    # DeepSeek and Ollama are 100% compatible with the OpenAI library.
+                    base_url = "https://api.deepseek.com" if provider == "deepseek" else "http://localhost:11434/v1"
+                    client = OpenAI(api_key=api_key, base_url=base_url)
+                    
                     response = client.chat.completions.create(
-                        model=api_model,  # e.g.: "deepseek-chat"
+                        model=api_model, 
                         messages=[
                             {"role": "system", "content": system_instruction},
                             {"role": "user", "content": prompt}

src/blame_engine.py

@@ -4,7 +4,7 @@ import re
 import os
 from datetime import datetime
 from src.core import get_current_branch
-from src.config import get_api_key, get_api_model, get_ai_provider
+from src.config import get_api_key, get_api_model, get_ai_provider, resolve_skill_path
 from src.ai_providers import call_ai_model
 from src.i18n import __
 
@@ -69,7 +69,7 @@ def analyze_commit_with_ai(commit_hash, file_path):
     # Use the 'simple' model (Flash/Lite) to save money in the loop
     api_model = get_api_model(provider, task_complexity="simple")
 
-    skill_path = os.path.join(os.getcwd(), ".gitpr.blame.md")
+    skill_path = resolve_skill_path(".gitpr.blame.md")
     if os.path.exists(skill_path):
         with open(skill_path, "r", encoding="utf-8") as f:
             sys_inst = f.read()

src/config.py

@@ -1,6 +1,7 @@
 import os
 import sys
 import socket
+import shutil
 import click
 import yaml
 from pathlib import Path
@@ -18,6 +19,8 @@ DEFAULT_CONFIG = {
     "GEMINI_API_MODEL_SECONDARY": "gemini-flash-lite-latest",
     "DEEPSEEK_API_MODEL_PRIMARY": "deepseek-v4-pro",
     "DEEPSEEK_API_MODEL_SECONDARY": "deepseek-v4-flash",
+    "OLLAMA_API_MODEL_PRIMARY": "llama3",
+    "OLLAMA_API_MODEL_SECONDARY": "llama3",
     "OUTPUT_FILE_NAME": "{branch}_{datetime}_PR_DESC.md",
     "OUTPUT_FILE_NAME_REVIEW": "{branch}_{datetime}_PR_REVIEW.txt",
     "OUTPUT_FILE_NAME_FULLREVIEW": "{branch}_{datetime}_PR_FULLREVIEW.txt",
@@ -26,6 +29,41 @@ DEFAULT_CONFIG = {
     "OUTPUT_FILE_NAME_ISSUE": "{branch}_{datetime}_ISSUE.md"
 }
 
+def get_skill_dir():
+    """Returns the absolute path to the project's skill folder (.gitpr/skill)."""
+    return os.path.join(os.getcwd(), ".gitpr", "skill")
+
+
+def resolve_skill_path(filename):
+    """
+    Resolves the path of a skill/config file (e.g.: .gitpr.commit.md).
+
+    The canonical location is the '.gitpr/skill/' folder inside the project.
+    For backward compatibility, if the file still lives in the project root,
+    it is transparently migrated (moved) into '.gitpr/skill/'.
+
+    Always returns the path inside '.gitpr/skill/' (whether the file exists or
+    not), unless a migration failed — in that case it falls back to the legacy
+    root path so the tool keeps working.
+    """
+    skill_dir = get_skill_dir()
+    target_path = os.path.join(skill_dir, filename)
+    legacy_path = os.path.join(os.getcwd(), filename)
+
+    # Migrate a legacy root file into the skill folder (only if not already there)
+    if os.path.exists(legacy_path) and not os.path.exists(target_path):
+        try:
+            os.makedirs(skill_dir, exist_ok=True)
+            shutil.move(legacy_path, target_path)
+            click.secho(__("📦 Skill file {filename} moved to .gitpr/skill/", filename=filename), fg="cyan", dim=True)
+        except Exception as e:
+            # If moving fails, fall back to the legacy location so the tool keeps working
+            click.secho(__("⚠️ Warning: Could not move {filename} to .gitpr/skill/ ({error})", filename=filename, error=str(e)), fg="yellow")
+            return legacy_path
+
+    return target_path
+
+
 def get_ai_provider():
     """Returns the configured default AI provider, or 'gemini' as fallback."""
     load_dotenv(ENV_FILE)
@@ -35,10 +73,17 @@ def get_api_key(provider):
     """Reads and decrypts the API key corresponding to the chosen provider."""
     load_dotenv(ENV_FILE)
 
+    # Suporte a CI/CD: Tenta ler a chave raw primeiro (ex: injetada via GitHub Secrets)
+    raw_key = os.getenv(f"{provider.upper()}_API_KEY")
+    if raw_key:
+        return raw_key
+
     if provider == "gemini":
         encrypted_key = os.getenv("GEMINI_API_KEY_ENCRYPTED")
     elif provider == "deepseek":
         encrypted_key = os.getenv("DEEPSEEK_API_KEY_ENCRYPTED")
+    elif provider == "ollama":
+        return "ollama-local" # Olama does not require authentication!
     else:
         return None
 
@@ -86,7 +131,7 @@ def setup_environment():
         click.secho(__("🤖 Welcome to GitPR! Let's configure your AI engine."), fg="cyan", bold=True)
         provider = click.prompt(
             __("Which artificial intelligence do you want to use as default?"),
-            type=click.Choice(['gemini', 'deepseek'], case_sensitive=False),
+            type=click.Choice(['gemini', 'deepseek', 'ollama'], case_sensitive=False),
             default='gemini'
         ).lower()
         set_key(ENV_FILE, "DEFAULT_AI_PROVIDER", provider)
@@ -95,6 +140,12 @@ def setup_environment():
     # Check if the chosen provider's key exists
     api_key = get_api_key(provider)
     if not api_key:
+        # 🛡️ Escudo de CI/CD: Impede que o prompt trave a pipeline do GitHub Actions
+        if os.getenv("CI") or os.getenv("GITHUB_ACTIONS"):
+            click.secho(__("❌ Error: API Key not configured for provider '{provider}' in the CI/CD environment.", provider=provider), fg="red")
+            click.secho(__("💡 Tip: Pass the key as an environment variable (e.g., GEMINI_API_KEY)."), fg="yellow")
+            sys.exit(1)
+            
         click.secho(__("🔑 API Key for {provider} not found.", provider=provider.capitalize()), fg="yellow")
         raw_key = click.prompt(__("Paste your {provider} API key here", provider=provider.capitalize()), hide_input=True)
 
@@ -132,7 +183,7 @@ def load_linter_rules():
     Loads the static linter rules from the .gitpr.linter.yml file.
     Returns a list of rules or an empty list if the file does not exist.
     """
-    file_path = os.path.join(os.getcwd(), ".gitpr.linter.yml")
+    file_path = resolve_skill_path(".gitpr.linter.yml")
 
     # If the file does not exist in the project, it's not an error. There are simply no rules to apply.
     if not os.path.exists(file_path):

src/core.py

@@ -9,7 +9,7 @@ import urllib.error
 from google import genai
 from src.security import decrypt_data
 from src.cache import get_cached_response, save_cached_response, get_cached_pr_descriptions
-from src.config import get_api_key, get_api_model
+from src.config import get_api_key, get_api_model, get_skill_dir, resolve_skill_path
 from src.ai_providers import call_ai_model
 from src.i18n import __, CURRENT_LANG
 
@@ -130,10 +130,10 @@ def get_skill_context(action_type="pr"):
     else:  # review or fullreview
         target_file = ".gitpr.review.md"
 
-    skill_file = os.path.join(os.getcwd(), target_file)
+    skill_file = resolve_skill_path(target_file)
 
     # Fallback to the old file (for backward compatibility with previous version users)
-    legacy_file = os.path.join(os.getcwd(), ".gitpr.md")
+    legacy_file = resolve_skill_path(".gitpr.md")
 
     # Check the new one first; if not found, try the old one
     file_to_load = skill_file if os.path.exists(skill_file) else (legacy_file if os.path.exists(legacy_file) else None)
@@ -252,11 +252,16 @@ def generate_skill_template():
     }
     
     success_count = 0
-    
+
+    # Templates now live inside the project's .gitpr/skill/ folder
+    skill_dir = get_skill_dir()
+    os.makedirs(skill_dir, exist_ok=True)
+
     for local_name, remote_name in files_to_download.items():
-        file_path = os.path.join(os.getcwd(), local_name)
+        # Migrate any legacy root file into .gitpr/skill/ and resolve final path
+        file_path = resolve_skill_path(local_name)
         url = base_url + remote_name
-        
+
         if os.path.exists(file_path):
             click.secho(__("⚠️ File {local_name} already exists in this directory. It will not be overwritten.", local_name=local_name), fg="yellow")
             continue
@@ -278,9 +283,9 @@ def generate_skill_template():
 
     if success_count > 0:
         click.secho(__("\n✅ Base templates successfully configured!"), fg="green", bold=True)
-        click.echo(__("You can now open the generated files and customize the tool's behavior for your project:\n"))       
-        click.echo(__("  1. Architecture rules for AI in '.gitpr.pr.md' and '.gitpr.review.md'\n"))
-        click.echo(__("  2. Local regex rules in '.gitpr.linter.yml'\n"))
+        click.echo(__("You can now open the generated files in '.gitpr/skill/' and customize the tool's behavior for your project:\n"))
+        click.echo(__("  1. Architecture rules for AI in '.gitpr/skill/.gitpr.pr.md' and '.gitpr/skill/.gitpr.review.md'\n"))
+        click.echo(__("  2. Local regex rules in '.gitpr/skill/.gitpr.linter.yml'\n"))
     else:
         click.echo(__("\nNo new files were downloaded."))
 

src/issue_engine.py

@@ -4,7 +4,7 @@ import os
 import click
 from src.ai_providers import call_ai_model
 from src.cache import get_cached_response, save_cached_response
-from src.config import get_api_key, get_api_model, get_ai_provider
+from src.config import get_api_key, get_api_model, get_ai_provider, resolve_skill_path
 from src.ai_providers import call_ai_model
 from src.i18n import __
 
@@ -45,7 +45,7 @@ def generate_issue_content(context_text, context_type="diff"):
     # Use the advanced model to ensure Issue structure quality
     api_model = get_api_model(provider, task_complexity="advanced")
 
-    skill_path = os.path.join(os.getcwd(), ".gitpr.issue.md")
+    skill_path = resolve_skill_path(".gitpr.issue.md")
     sys_inst = ""
 
     if os.path.exists(skill_path):

src/main.py

@@ -66,7 +66,7 @@ HELP_MAP: dict[str, dict[str, str]] = {
     'skill': {
         'url': get_doc_url('skill-template.md'),
         'title': __('Skills and Templates System (--skill)'),
-        'description': __('Downloads template files (.gitpr.*.md and .gitpr.linter.yml) from the official repository to the project root. These files allow customizing the AI behavior according to your team\'s rules. NEVER overwrites existing local files.'),
+        'description': __('Downloads template files (.gitpr.*.md and .gitpr.linter.yml) from the official repository into the project\'s .gitpr/skill/ folder. These files allow customizing the AI behavior according to your team\'s rules. NEVER overwrites existing local files.'),
     },
     'update': {
         'url': get_doc_url('auto-update.md'),
@@ -96,7 +96,7 @@ HELP_MAP: dict[str, dict[str, str]] = {
     'provider': {
         'url': get_doc_url('providers-ia.md'),
         'title': __('AI Provider Selection (--provider)'),
-        'description': __('Forces the use of a specific AI provider for this execution: gemini (Google Gemini) or deepseek (DeepSeek). Temporarily overrides the default provider defined in the .env file.'),
+        'description': __('Forces the use of a specific AI provider for this execution: gemini (Google Gemini), deepseek (DeepSeek) or ollama (Local). Temporarily overrides the default provider defined in the .env file.'),
     },
 }
 
@@ -124,7 +124,7 @@ HELP_PRIORITY: dict[str, int] = {
 @click.option('-r', '--review', is_flag=True, help=__("Performs a code review of local changes (git diff)."))
 @click.option('-f', '--fullreview', is_flag=True, help=__("Performs a code review of all changes since the remote main branch (origin/main)."))
 @click.option('-l', '--linter', is_flag=True, help=__("Runs only the local static linter (ideal for CI/CD)."))
-@click.option('-s', '--skill', is_flag=True, help=__("Generates the .gitpr.md template file in the current folder."))
+@click.option('-s', '--skill', is_flag=True, help=__("Downloads the skill template files into the .gitpr/skill/ folder."))
 @click.option('-u', '--update', is_flag=True, help=__("Checks and installs the latest version of GitPR."))
 @click.option('-ih', '--installhooks', is_flag=True, help=__("Automatically installs validation Git Hooks in the project."))
 @click.option('--hook', type=click.Path(), hidden=True, help=__("Commit file path (internal hook use)."))
@@ -133,7 +133,7 @@ HELP_PRIORITY: dict[str, int] = {
 @click.option('-b', '--blame', type=str, help=__("Analyzes the origin of a business rule (e.g., file.py:10-20 or just file.py)."))
 @click.option('-ht', '--history', is_flag=True, help=__("Uses the entire branch history (Git Log + PR Cache) as context to generate the issue."))
 @click.option('-is', '--issue', is_flag=True, help=__("Generates a standardized Issue from current changes and opens the interactive interface."))
-@click.option('-p', '--provider', type=click.Choice(['gemini', 'deepseek']), help=__("Forces the use of a specific AI provider for this execution."))
+@click.option('-p', '--provider', type=click.Choice(['gemini', 'deepseek', 'ollama']), help=__("Forces the use of a specific AI provider for this execution."))
 @click.option('-h', '--help', 'help_flag', is_flag=True, help=__("Shows this message and exits. Use with another flag for contextual help (e.g., -h --issue)."))
 def cli(commit, review, fullreview, linter, skill, update, installhooks, hook, quiet, provider, input, blame, history, issue, help_flag):
     """

src/spinner.py

@@ -12,7 +12,7 @@ import threading
 import urllib.request
 from pathlib import Path
 from dotenv import load_dotenv, set_key
-from src.i18n import __
+from src.i18n import __, CURRENT_LANG
 
 # ANSI color codes
 MAGENTA = '\033[35m'
@@ -35,10 +35,13 @@ WORD_COLORS = [
 # Caracteres braille unicode que simulam um giro
 BRAILLE_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
 
-# URL do template remoto com a lista de palavras
+# URL do template remoto com a lista de palavras (language-aware).
+# English (en) = original file without suffix; other languages get a suffix
+# (e.g.: gitpr.thinking-words.pt_br.md), mirroring generate_skill_template().
+_LANG_SUFFIX = "" if CURRENT_LANG.startswith("en") else f".{CURRENT_LANG}"
 THINKING_WORDS_URL = (
     "https://raw.githubusercontent.com/natanfiuza/gitpr/"
-    "refs/heads/main/templates/gitpr.thinking-words.md"
+    f"refs/heads/main/templates/gitpr.thinking-words{_LANG_SUFFIX}.md"
 )
 
 # Fallback interno caso o download falhe

src/updater.py

@@ -7,8 +7,8 @@ import click
 from datetime import datetime
 
 # Current version of your local executable (Update this on every new build!)
-__version__ = "0.0.22"  # GitPR current version
-__lang_version__ = "v0.0.1"  # Language dictionary version control
+__version__ = "0.0.25"  # GitPR current version
+__lang_version__ = "v0.0.3"  # Language dictionary version control
 GITHUB_API_URL = "https://api.github.com/repos/natanfiuza/gitpr/releases/latest"
 PYPI_API_URL = "https://pypi.org/pypi/gitpr-cli/json"
 

gitpr_cli-0.0.23.dist-info/RECORD

@@ -1,23 +0,0 @@
-gitpr_cli-0.0.23.dist-info/licenses/LICENSE,sha256=UQzLC6mwqb-ZNDkBBAqOxC-SMQcEID0gaM6oFcu6u48,27030
-src/__init__.py,sha256=U6ksarernNcryHO20aj4rNG7w0thT7xdMs5KzBJyPvE,28
-src/ai_providers.py,sha256=3O91HmlnqE1o5SV0seley_gGH0-3BImVIluHIMpq9lU,3354
-src/blame_engine.py,sha256=056Rp5JkQU2cFB4b3lmIx99xjwfLj-tc7jwyevDoik8,10383
-src/cache.py,sha256=XggMTy00GlZfeF1VoLEYCdxL5h0eTg11TJfPIRPx7fs,3201
-src/config.py,sha256=QpKKpoP0RHpSl2s1zJDfx6wETKqJ8wLtn6T1zAnznis,6621
-src/core.py,sha256=eIpnTttGQhUwrEm7Xh59HYVu59LQcprf7K-IwN7kNYk,17965
-src/i18n.py,sha256=Bn1OrhCYEaT0kUidu5SeTu6kiIuWOZ4OjB-7mIb6RtY,3185
-src/issue_engine.py,sha256=QLEEHp9l6_QiaaLLrFtBU_-LkkxPE2Gs5-TLEYEBWCA,3613
-src/linter_engine.py,sha256=D04wvOgRa-vZEYknm-z-Cg7V_3gnoQz_64PMorWnISo,4414
-src/main.py,sha256=mzSYqNF7YgdI6vsuwWSgqUks_tA7Zn5gMk6fkebZFIY,27682
-src/security.py,sha256=Li0zM8ZURTK2nKRHIt49TWLO4DIddBEHzXPrVycv0Rs,1343
-src/spinner.py,sha256=UM-53CfrfQ6Ymg4-d2_pYgMaDdiEV69DFetaQtCyJzo,6055
-src/tui_issue.py,sha256=gcAJCIfMcdeMjrFJUWQQvdgBv7fnOBtxQxwdBk2Sk40,1789
-src/updater.py,sha256=giLCq9ygRXGhLbVqwLEDZrO2szEIk5nFUMl9NhiZZ90,5886
-src/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/ui/help_screen.py,sha256=tjbokXhwyzLnkOC0S56NbpX-78hcFQnvsQMpNU1wt0c,1862
-src/ui/issue_app.py,sha256=8MdBcOVdCHPFx6EUhs80CiZ2G-29KulskkCz9qMZ_Lg,4737
-gitpr_cli-0.0.23.dist-info/METADATA,sha256=2rnIIo3C6OqfV1EZHF5YQNIp1u9FS4U8BJI5TM9FMVM,15488
-gitpr_cli-0.0.23.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-gitpr_cli-0.0.23.dist-info/entry_points.txt,sha256=mh_4F_idM4cj0XhfRGBDQb5Nnku93YJ-dyKh5SufwlE,39
-gitpr_cli-0.0.23.dist-info/top_level.txt,sha256=74rtVfumQlgAPzR5_2CgYN24MB0XARCg0t-gzk6gTrM,4
-gitpr_cli-0.0.23.dist-info/RECORD,,