makima-cli 1.2.1__tar.gz → 1.2.2__tar.gz

{makima_cli-1.2.1/makima_cli.egg-info → makima_cli-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makima-cli
-Version: 1.2.1
+Version: 1.2.2
 Summary: AI coding assistant for your terminal
 Author: Kanhaiya
 License: MIT License

makima_cli-1.2.2/makima/config.py

@@ -0,0 +1,18 @@
+
+import os
+import sys
+import json
+from pathlib import Path
+from dotenv import load_dotenv
+load_dotenv()
+
+config_file = Path.home() / ".makima" / "config.json"
+config = {}
+if config_file.exists():
+    with open(config_file, "r") as f:
+        config = json.load(f)
+
+GROQ_API_KEY = config.get("groq_api_key") or os.getenv("GROQ_API_KEY")
+MODEL_NAME = config.get("model") or "qwen/qwen3.6-27b"
+TOKEN_LIMIT = 6000
+PROJECT_ROOT = sys.argv[1] if len(sys.argv) > 1 else os.getcwd()

{makima_cli-1.2.1 → makima_cli-1.2.2}/makima/core/config_manager.py

@@ -122,4 +122,55 @@ def handle_config():
     if choice == "Change model":
         change_model()
     elif choice == "Change API key":
-        change_api_key()
+        change_api_key()
+
+
+from makima.tools.git_tools import get_git_diff, generate_commit_message, clean_message
+import subprocess
+import os
+
+def commit_only(message):
+    message = clean_message(message)
+    cmd = f'git add -A && git commit -m "{message}"'
+    result = subprocess.run(cmd, shell=True, text=True, capture_output=True)
+    if result.returncode == 0:
+        return "✓ Committed locally"
+    return f"✗ Failed: {result.stderr}"
+
+
+def analyze_changes():
+    diff = get_git_diff()
+
+    if not diff.strip():
+        return None, None
+    message = generate_commit_message(diff)
+    return  diff, message
+
+
+def handle_commit():
+    diff = get_git_diff()
+
+    if not diff.strip():
+        console.print("[yellow]No changes to commit.[/]")
+        return
+    
+    commit_message = generate_commit_message(diff=diff)
+    console.print(f"[white] {commit_message}")
+
+    # choice = questionary.select(
+    #     "What action you want?: ",
+    #     choices = [
+    #         "commit_and_push",
+    #         "commit only",
+    #         "cancle"
+    #     ]
+    # ).ask()
+
+    # if choice == "commit_and_push":
+    #     result = commit_and_push(message=commit_message)
+    #     console.print(f"[green]{result}[/]")
+    # elif choice == "commit only":
+    #     result = commit_only(diff)
+    #     console.print(f"[green]{result}[/]")
+
+        

makima_cli-1.2.2/makima/tools/git_tools.py

@@ -0,0 +1,72 @@
+import subprocess
+from groq import Groq
+from makima.config import GROQ_API_KEY, PROJECT_ROOT
+import re
+
+
+def get_git_diff():
+    diff = subprocess.run("git diff", shell=True, text=True, capture_output=True)
+    status = subprocess.run("git status", shell=True, text=True, capture_output=True)
+
+    return f"STATUS:\n{status.stdout}\n\nDIFF:\n{diff.stdout}"
+
+
+def generate_commit_message(diff):
+    prompt = f"""Generate ONE git commit message for this diff.
+    Format: type(scope): description
+    Types: feat/fix/refactor/docs/chore
+    Rules: max 72 chars, no quotes, no backticks, no explanation
+    Return ONLY the commit message line, nothing else.
+
+    {diff[:3000]}"""
+    
+    try:
+        client = Groq(api_key=GROQ_API_KEY)
+        result = client.chat.completions.create(
+            model="qwen/qwen3.6-27b",
+            messages=[{
+                "role": "user",
+                "content": prompt
+            }]
+        )
+    except Exception as e:
+        print(f"Message Generator Failed!\n {e}")
+        return f"Failed to generate message: {e}"
+
+    content = result.choices[0].message.content
+    if "</think>" in content:
+        content = content.split("</think>")[-1].strip()
+    content = re.sub(r'[`\n]', '', content).strip()
+    return content
+
+
+def commit_and_push(message):
+    try:
+        message = clean_message(message)
+        cmd = f'git add -A && git commit -m "{message}" && git push origin main'
+        result = subprocess.run(
+            cmd,
+            shell=True,
+            text=True,
+            capture_output=True,
+            timeout=120,
+            cwd=PROJECT_ROOT
+        )
+        if result.returncode == 0:
+            return f"✓ Committed and pushed: {message}"
+        else:
+            return f"✗ Failed: {result.stderr}"
+    except Exception as e:
+        return f"✗ Error: {e}"
+
+
+
+def clean_message(message):
+    # remove thinking blocks
+    if "</think>" in message:
+        message = message.split("</think>")[-1].strip()
+    # remove backticks, quotes, special shell characters
+    message = re.sub(r'[`"\'\n]', '', message)
+    # remove any remaining markdown
+    message = message.strip()
+    return message

makima_cli-1.2.2/makima/tools/shell_tools.py

@@ -0,0 +1,13 @@
+import subprocess
+
+
+def run_command(cmd):
+    result = subprocess.run(
+        cmd,
+        shell=True,
+        capture_output=True,
+        text=True,
+        timeout=30
+    )
+
+    return result.stdout + result.stderr

{makima_cli-1.2.1 → makima_cli-1.2.2}/makima/ui/app.py

@@ -3,14 +3,17 @@ from textual.widgets import Header, Footer, Input, RichLog
 from makima.config import PROJECT_ROOT
 from makima.tools import TOOL_REGISTRY
 from makima.tools.registry import TOOL_SCHEMAS
-from makima.core.config_manager import handle_config
-
+from makima.core.config_manager import handle_config, analyze_changes, commit_only
+from makima.tools.git_tools import commit_and_push
+from rich.text import Text
 import asyncio
 import json
 
 from makima.providers.groq_provider import GroqProvider
 from makima.core.memory import Memory
 
+from pathlib import Path
+
 
 SYSTEM_PROMPT = f"""
 You are a coding assistant. The project is at: {PROJECT_ROOT}
@@ -30,12 +33,14 @@ Rules:
 
 
 class MakimaApp(App):
-    CSS_PATH = "app.tcss"
+    CSS_PATH = Path(__file__).parent / "app.tcss"
     
     def __init__(self):
         super().__init__()
         self.memory = Memory(system_prompt=SYSTEM_PROMPT)
         self.provider = GroqProvider()
+        self.pending_commit = None
+
     
     def compose(self) -> ComposeResult:
         yield Header()
@@ -57,7 +62,7 @@ class MakimaApp(App):
         chat = self.query_one(RichLog)
         input_box = self.query_one(Input)
 
-        chat.write(f"[bold blue]You:[/] {user_input}")
+        chat.write(Text.from_markup(f"[bold blue]You:[/] {user_input}"))
         input_box.clear()
 
         if user_input == "exit":
@@ -69,16 +74,48 @@ class MakimaApp(App):
             await asyncio.to_thread(handle_config)
             return
 
+        if user_input == "/commit":
+            chat.write("[dim]Analyzing changes...[/]")
+            diff, message = await asyncio.to_thread(analyze_changes)
+
+            if not diff:
+                chat.write("[yellow]No changes to commit.[/]")
+                return
+
+            chat.write(Text.from_markup(f"[white]Generated message: {message}[/]"))
+            chat.write(Text.from_markup(f"[yellow]Type 'push' to commit and push, 'commit' to commit only, or 'cancel'[/]"))
+
+            self.pending_commit = {"diff": diff, "message": message}
+            return
+
+        if user_input == "push" and self.pending_commit:
+            result = await asyncio.to_thread(commit_and_push, self.pending_commit["message"])
+            chat.write(Text.from_markup(f"[green]{result}[/]"))
+            self.pending_commit = None
+            return
+
+        if user_input == "commit" and self.pending_commit:
+            result = await asyncio.to_thread(commit_only, self.pending_commit["message"])
+            chat.write(f"[green]{result}[/]")
+            self.pending_commit = None
+            return
+
+        if user_input == "cancel" and self.pending_commit:
+            chat.write("[yellow]Commit cancelled.[/]")
+            self.pending_commit = None
+            return
+        
         
         # show thinking indicator
-        chat.write("[dim]thinking...[/]")
+        chat.write(Text.from_markup("[dim]thinking...[/]"))
         
         # run agent in background thread
         response = await asyncio.to_thread(self.process_message, user_input)
         
         # remove "thinking..." and show response
         from rich.markdown import Markdown
-        chat.write(Markdown(f"[bold green]Agent:[/] {response}"))
+        chat.write(Text.from_markup(f"[bold green]Agent:[/]"))
+        chat.write(Markdown(response))
 
 
     def process_message(self, user_input):

{makima_cli-1.2.1 → makima_cli-1.2.2/makima_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makima-cli
-Version: 1.2.1
+Version: 1.2.2
 Summary: AI coding assistant for your terminal
 Author: Kanhaiya
 License: MIT License

{makima_cli-1.2.1 → makima_cli-1.2.2}/makima_cli.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ makima/providers/base.py
 makima/providers/groq_provider.py
 makima/tools/__init__.py
 makima/tools/file_tools.py
+makima/tools/git_tools.py
 makima/tools/registry.py
 makima/tools/shell_tools.py
 makima/ui/__init__.py

{makima_cli-1.2.1 → makima_cli-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "makima-cli"
-version = "1.2.1"
+version = "1.2.2"
 description = "AI coding assistant for your terminal"
 readme = "README.md"
 license = {file = "LICENSE"}

makima_cli-1.2.1/makima/config.py

@@ -1,38 +0,0 @@
-# import os
-# import sys
-# from makima.setup import setup_api_key,setup_model
-# from dotenv import load_dotenv
-# load_dotenv()
-
-# GROQ_API_KEY = setup_api_key()
-# # GROQ_API_KEY = os.getenv("GROQ_API_KEY")
-# MODEL_NAME = setup_model()
-# TOKEN_LIMIT = 10000
-# # PROJECT_ROOT = os.getcwd()
-# PROJECT_ROOT = sys.argv[1] if len(sys.argv) > 1 else os.getcwd()
-
-# if not GROQ_API_KEY:
-#     print("Error: GROQ_API_KEY not set.")
-#     print("Run this command first:")
-#     print('  Windows: setx GROQ_API_KEY "your-key-here"')
-#     print('  Linux/Mac: export GROQ_API_KEY="your-key-here"')
-#     print("Get a free key at: https://console.groq.com")
-#     sys.exit(1)
-
-import os
-import sys
-import json
-from pathlib import Path
-from dotenv import load_dotenv
-load_dotenv()
-
-config_file = Path.home() / ".makima" / "config.json"
-config = {}
-if config_file.exists():
-    with open(config_file, "r") as f:
-        config = json.load(f)
-
-GROQ_API_KEY = config.get("groq_api_key") or os.getenv("GROQ_API_KEY")
-MODEL_NAME = config.get("model") or "qwen/qwen3.6-27b"
-TOKEN_LIMIT = 6000
-PROJECT_ROOT = sys.argv[1] if len(sys.argv) > 1 else os.getcwd()

makima_cli-1.2.1/makima/tools/shell_tools.py

@@ -1,20 +0,0 @@
-import subprocess
-
-
-def run_command(cmd):
-    # print(f"Commands going to Run: {cmd}")
-    # User_answer = input("Run This? (Y/N): ")
-    # User_answer = User_answer.lower()
-
-    # if User_answer != "y":
-    #     return "Command cancelled"
-
-    result = subprocess.run(
-        cmd,
-        shell=True,
-        capture_output=True,
-        text=True,
-        timeout=30
-    )
-
-    return result.stdout + result.stderr