feat(app/commit.py, setup.py): enhance commit functionality with concise messages and diff output coverage

Author: jwongster2

app/cli.py

@@ -7,7 +7,18 @@
 
 
 def process_query(query: str):
-    response = query_ollama(query)
+
+    history = subprocess.getoutput("history")
+    prompt = (
+        f"""Convert the following natural language command to a bash command: {query}
+History of CLI commands if it helps:
+<history>
+{history}
+</history>
+""",
+    )
+
+    response = query_ollama(prompt)
     bash_commands = extract_bash_commands(response)
     if len(bash_commands) == 0:
         print("No command could be produced")

app/commit.py

@@ -0,0 +1,51 @@
+"""Generate AI-driven commits from diffs
+"""
+
+import subprocess
+from app.query_ollama import query_ollama
+from textwrap import dedent
+
+
+def generate_commit_message():
+    # Get the git diff output
+    git_diff_output = subprocess.getoutput("git diff")
+
+    if not git_diff_output:
+        print("No changes to commit.")
+        return None
+
+    print(git_diff_output)
+    # Generate a commit message using the Ollama model
+    commit_message = query_ollama(
+        dedent(
+            f"""
+        Please generate a git commit message off this. Be concise but cover all files and changes.
+        Git diff:
+        {git_diff_output}
+
+        Example commit message: ``feat(app/cli.py, query_ollama.py): enhance CLI experience with history and bash command conversion`
+
+        Commit message:
+        """
+        )
+    )
+
+    if not commit_message:
+        print("Failed to generate a commit message.")
+        return None
+
+    return commit_message.strip()
+
+
+def main():
+    commit_message = generate_commit_message()
+    if commit_message:
+        print("Generated commit message:")
+        print(commit_message)
+        # Here you could add code to automatically commit using this message
+        # For example:
+        # subprocess.run(["git", "commit", "-am", commit_message])
+
+
+if __name__ == "__main__":
+    main()

app/query_ollama.py

@@ -17,46 +17,29 @@ def init_ollama():
     )
 
 
-def query_ollama(prompt, stream: bool = True):
+def query_ollama(prompt: str, stream: bool = True):
     init_ollama()
     url = os.getenv("HOW_DEFAULT_URL", DEFAULT_URL)
     model = os.getenv("HOW_DEFAULT_MODEL", DEFAULT_MODEL)
-    history = subprocess.getoutput("history")
 
     data = {
         "model": model,
-        "prompt": f"""Convert the following natural language command to a bash command: {prompt}
-History of CLI commands if it helps:
-<history>
-{history}
-</history>
-""",
+        "prompt": prompt,
         "stream": stream,
     }
 
-    if stream:
-        full_response = ""
-        with requests.post(url, json=data, stream=True) as response:
-            for line in response.iter_lines():
-                if line:
-                    json_response = json.loads(line)
-                    chunk = json_response.get("response", "")
-                    full_response += chunk
-                    print(chunk, end="", flush=True)
-                if json_response.get("done", False):
-                    print()  # Print a newline at the end
-                    break
-        return full_response.strip()
-    else:
-        response = requests.post(url, json=data)
-        if response.status_code == 200:
-            response_text = response.json()["response"].strip()
-            print(response_text)
-            return response_text
-        else:
-            error_message = f"Error: Unable to get response from Ollama. Status code: {response.status_code}"
-            print(error_message)
-            return error_message
+    full_response = ""
+    with requests.post(url, json=data, stream=True) as response:
+        for line in response.iter_lines():
+            if line:
+                json_response = json.loads(line)
+                chunk = json_response.get("response", "")
+                full_response += chunk
+                print(chunk, end="", flush=True)
+            if json_response.get("done", False):
+                print()  # Print a newline at the end
+                break
+    return full_response.strip()
 
 
 if __name__ == "__main__":

setup.py

@@ -32,6 +32,7 @@
     entry_points={
         "console_scripts": [
             "how=app.cli:main",
+            "how-commit=app.commit:main",
         ],
     },
 )