move fzf function to cli

Author: MikeBirdTech

src/blueprint/cli.py

@@ -5,16 +5,17 @@
 import sys
 import time
 import logging
+import subprocess
+from typing import List, Optional
 
 from blueprint.commit_generator import (
     get_git_diff,
     generate_commit_messages,
-    select_message_with_fzf,
     create_commit,
 )
 
 DEFAULT_OLLAMA_MODEL = "llama3.1"
-DEFAULT_JAN_MODEL = "llama3.1-8b-instruct"
+DEFAULT_JAN_MODEL = "llama3.2-3b-instruct"
 
 
 def setup_logging(debug_mode):
@@ -27,6 +28,80 @@ def setup_logging(debug_mode):
     )
 
 
+def select_message_with_fzf(
+    messages: List[str],
+    use_vim: bool = False,
+    use_num: bool = False,
+) -> Optional[str]:
+    """Use fzf to select a commit message, with option to regenerate.
+
+    Args:
+        messages: List of commit messages to select from
+        use_vim: Whether to use vim-style navigation
+        use_num: Whether to display numbers for selection
+
+    Returns:
+        Selected message, "regenerate" to regenerate messages, or None if cancelled
+    """
+    logger = logging.getLogger(__name__)
+    logger.debug("Displaying fzf selector for commit messages")
+
+    try:
+        messages.append("Regenerate messages")
+        fzf_args = [
+            "fzf",
+            "--height=10",
+            "--layout=reverse",
+            "--prompt=Select a commit message (ESC to cancel): ",
+            "--no-info",
+            "--margin=1,2",
+            "--border",
+            "--color=prompt:#D73BC9,pointer:#D73BC9",
+        ]
+
+        if use_vim:
+            fzf_args.extend(["--bind", "j:down,k:up"])
+            logger.debug("Using vim-style navigation in fzf")
+
+        if use_num:
+            for i, msg in enumerate(messages):
+                messages[i] = f"{i+1}. {msg}"
+            fzf_args.extend(
+                [
+                    "--bind",
+                    "1:accept-non-empty,2:accept-non-empty,3:accept-non-empty,4:accept-non-empty",
+                ]
+            )
+            logger.debug("Using number selection in fzf")
+
+        logger.debug(f"Displaying {len(messages)} options in fzf")
+        result = subprocess.run(
+            fzf_args,
+            input="\n".join(messages),
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode == 130:  # User pressed ESC
+            logger.debug("User cancelled selection with ESC")
+            return None
+        selected = result.stdout.strip()
+        logger.debug(f"User selected: '{selected}'")
+
+        if selected == "Regenerate messages" or selected == "4. Regenerate messages":
+            logger.debug("User chose to regenerate messages")
+            return "regenerate"
+
+        final_selection = (
+            selected.split(". ", 1)[1] if use_num and selected else selected
+        )
+        logger.debug(f"Final selection: '{final_selection}'")
+        return final_selection
+    except subprocess.CalledProcessError as e:
+        logger.error(f"fzf selection failed: {e}")
+        print("Error: fzf selection failed.")
+        return None
+
+
 def main():
     """Main entry point for the CLI application."""
     OLLAMA_MODEL = os.getenv("OLLAMA_MODEL", DEFAULT_OLLAMA_MODEL)
@@ -108,7 +183,7 @@ def main():
     # Select message or regenerate
     while True:
         selected_message = select_message_with_fzf(
-            commit_messages, use_vim=args.vim, use_num=args.num, debug=args.debug
+            commit_messages, use_vim=args.vim, use_num=args.num
         )
 
         if selected_message == "regenerate":

src/blueprint/commit_generator.py

@@ -3,7 +3,7 @@
 import subprocess
 import sys
 import logging
-from typing import List, Optional
+from typing import List
 
 from blueprint.ai_service import AIService
 
@@ -242,82 +242,6 @@ def parse_commit_messages(response: str, debug: bool = False) -> List[str]:
     return messages
 
 
-def select_message_with_fzf(
-    messages: List[str],
-    use_vim: bool = False,
-    use_num: bool = False,
-    debug: bool = False,
-) -> Optional[str]:
-    """Use fzf to select a commit message, with option to regenerate.
-
-    Args:
-        messages: List of commit messages to select from
-        use_vim: Whether to use vim-style navigation
-        use_num: Whether to display numbers for selection
-        debug: Whether to enable debug logging
-
-    Returns:
-        Selected message, "regenerate" to regenerate messages, or None if cancelled
-    """
-    logger = logging.getLogger(__name__)
-    logger.debug("Displaying fzf selector for commit messages")
-
-    try:
-        messages.append("Regenerate messages")
-        fzf_args = [
-            "fzf",
-            "--height=10",
-            "--layout=reverse",
-            "--prompt=Select a commit message (ESC to cancel): ",
-            "--no-info",
-            "--margin=1,2",
-            "--border",
-            "--color=prompt:#D73BC9,pointer:#D73BC9",
-        ]
-
-        if use_vim:
-            fzf_args.extend(["--bind", "j:down,k:up"])
-            logger.debug("Using vim-style navigation in fzf")
-
-        if use_num:
-            for i, msg in enumerate(messages):
-                messages[i] = f"{i+1}. {msg}"
-            fzf_args.extend(
-                [
-                    "--bind",
-                    "1:accept-non-empty,2:accept-non-empty,3:accept-non-empty,4:accept-non-empty",
-                ]
-            )
-            logger.debug("Using number selection in fzf")
-
-        logger.debug(f"Displaying {len(messages)} options in fzf")
-        result = subprocess.run(
-            fzf_args,
-            input="\n".join(messages),
-            capture_output=True,
-            text=True,
-        )
-        if result.returncode == 130:  # User pressed ESC
-            logger.debug("User cancelled selection with ESC")
-            return None
-        selected = result.stdout.strip()
-        logger.debug(f"User selected: '{selected}'")
-
-        if selected == "Regenerate messages" or selected == "4. Regenerate messages":
-            logger.debug("User chose to regenerate messages")
-            return "regenerate"
-
-        final_selection = (
-            selected.split(". ", 1)[1] if use_num and selected else selected
-        )
-        logger.debug(f"Final selection: '{final_selection}'")
-        return final_selection
-    except subprocess.CalledProcessError as e:
-        logger.error(f"fzf selection failed: {e}")
-        print("Error: fzf selection failed.")
-        return None
-
-
 def create_commit(message: str, debug: bool = False) -> bool:
     """Create a git commit with the selected message.