debug logging

Author: MikeBirdTech

src/blueprint/ai_service.py

@@ -1,7 +1,7 @@
 """AI Service module for interacting with different LLM providers."""
 
 from typing import Optional
-
+import logging
 import requests
 
 JAN_BASE_URL = "http://localhost:1337/v1/chat/completions"
@@ -11,15 +11,20 @@
 class AIService:
     """Service for interacting with different AI providers."""
 
-    def __init__(self, service_type: str, model: Optional[str] = None):
+    def __init__(
+        self, service_type: str, model: Optional[str] = None, debug: bool = False
+    ):
         """Initialize AI service.
 
         Args:
             service_type: Type of AI service ('ollama' or 'jan')
             model: Model name to use
+            debug: Whether to enable debug logging
         """
         self.service_type = service_type
         self.model = model
+        self.debug = debug
+        self.logger = logging.getLogger(__name__)
 
         # Set up base URLs for services
         self.base_urls = {
@@ -28,8 +33,13 @@ def __init__(self, service_type: str, model: Optional[str] = None):
         }
 
         if service_type not in self.base_urls:
+            self.logger.error(f"Unsupported service type: {service_type}")
             raise ValueError(f"Unsupported service type: {service_type}")
 
+        self.logger.debug(
+            f"Initialized AIService with {service_type} and model {model}"
+        )
+
     def query(self, prompt: str) -> str:
         """Query the AI service with the given prompt.
 
@@ -47,6 +57,7 @@ def query(self, prompt: str) -> str:
         elif self.service_type == "jan":
             return self._query_jan(prompt)
         else:
+            self.logger.error(f"Unsupported service type: {self.service_type}")
             raise ValueError(f"Unsupported service type: {self.service_type}")
 
     def _query_ollama(self, prompt: str) -> str:
@@ -61,11 +72,31 @@ def _query_ollama(self, prompt: str) -> str:
         url = self.base_urls["ollama"]
         data = {"model": self.model, "prompt": prompt, "stream": False}
 
+        self.logger.debug(f"Sending request to Ollama API at {url}")
+        if self.debug:
+            self.logger.debug(f"Request data: {data}")
+
         try:
+            self.logger.debug("Making POST request to Ollama API")
             response = requests.post(url, json=data)
+            self.logger.debug(
+                f"Received response with status code: {response.status_code}"
+            )
+
+            if self.debug:
+                self.logger.debug(f"Response headers: {response.headers}")
+
             response.raise_for_status()
-            return response.json().get("response", "")
+            result = response.json()
+
+            if not result.get("response"):
+                self.logger.error(f"Unexpected response format from Ollama: {result}")
+                if self.debug:
+                    self.logger.debug(f"Full response: {result}")
+
+            return result.get("response", "")
         except Exception as e:
+            self.logger.error(f"Error querying Ollama API: {e}")
             raise Exception(f"Error querying Ollama API: {e}")
 
     def _query_jan(self, prompt: str) -> str:
@@ -88,9 +119,31 @@ def _query_jan(self, prompt: str) -> str:
             "temperature": 0.7,
         }
 
+        self.logger.debug(f"Sending request to Jan AI API at {url}")
+        if self.debug:
+            self.logger.debug(f"Request data: {data}")
+
         try:
+            self.logger.debug("Making POST request to Jan AI API")
             response = requests.post(url, headers=headers, json=data)
+            self.logger.debug(
+                f"Received response with status code: {response.status_code}"
+            )
+
+            if self.debug:
+                self.logger.debug(f"Response headers: {response.headers}")
+
             response.raise_for_status()
-            return response.json()["choices"][0]["message"]["content"]
+            result = response.json()
+
+            if not result.get("choices") or not result["choices"][0].get("message"):
+                self.logger.error(f"Unexpected response format from Jan AI: {result}")
+                if self.debug:
+                    self.logger.debug(f"Full response: {result}")
+                return ""
+
+            content = result["choices"][0]["message"]["content"]
+            return content
         except Exception as e:
+            self.logger.error(f"Error querying Jan AI API: {e}")
             raise Exception(f"Error querying Jan AI API: {e}")

src/blueprint/cli.py

@@ -4,6 +4,7 @@
 import os
 import sys
 import time
+import logging
 
 from blueprint.commit_generator import (
     get_git_diff,
@@ -16,6 +17,16 @@
 DEFAULT_JAN_MODEL = "llama3.1-8b-instruct"
 
 
+def setup_logging(debug_mode):
+    """Set up logging based on debug mode."""
+    log_level = logging.DEBUG if debug_mode else logging.INFO
+    logging.basicConfig(
+        level=log_level,
+        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+    )
+
+
 def main():
     """Main entry point for the CLI application."""
     OLLAMA_MODEL = os.getenv("OLLAMA_MODEL", DEFAULT_OLLAMA_MODEL)
@@ -44,25 +55,35 @@ def main():
         default=75,
         help="Suggested maximum number of characters for each commit message (default: 75)",
     )
+    parser.add_argument("--debug", action="store_true", help="Enable debug logging")
     args = parser.parse_args()
 
+    # Set up logging
+    setup_logging(args.debug)
+    logger = logging.getLogger(__name__)
+    logger.debug("Debug mode enabled")
+
     # Start timing
     start_time = time.time()
 
     # Get git diff
-    diff = get_git_diff()
+    logger.debug("Getting git diff")
+    diff = get_git_diff(debug=args.debug)
     if not diff:
+        logger.error("No changes to commit")
         print("No changes to commit.")
         sys.exit(0)
 
     # Generate commit messages
     service_type = "ollama" if args.ollama else "jan"
+    logger.debug(f"Generating commit messages using {service_type}")
     commit_messages = generate_commit_messages(
         diff=diff,
         max_chars=args.max_chars,
         service_type=service_type,
         ollama_model=OLLAMA_MODEL,
         jan_model=JAN_MODEL,
+        debug=args.debug,
     )
 
     # Stop timing for initial generation
@@ -80,25 +101,28 @@ def main():
 
     # Check if we have messages
     if not commit_messages:
+        logger.error("Could not generate commit messages")
         print("Error: Could not generate commit messages.")
         sys.exit(1)
 
     # Select message or regenerate
     while True:
         selected_message = select_message_with_fzf(
-            commit_messages, use_vim=args.vim, use_num=args.num
+            commit_messages, use_vim=args.vim, use_num=args.num, debug=args.debug
         )
 
         if selected_message == "regenerate":
             # Time regeneration
             start_time = time.time()
+            logger.debug("Regenerating commit messages")
 
             commit_messages = generate_commit_messages(
                 diff=diff,
                 max_chars=args.max_chars,
                 service_type=service_type,
                 ollama_model=OLLAMA_MODEL,
                 jan_model=JAN_MODEL,
+                debug=args.debug,
             )
 
             end_time = time.time()
@@ -111,12 +135,15 @@ def main():
                 print("")  # Add a blank line for better readability
 
             if not commit_messages:
+                logger.error("Could not regenerate commit messages")
                 print("Error: Could not generate commit messages.")
                 sys.exit(1)
         elif selected_message:
-            create_commit(selected_message)
+            logger.debug(f"Creating commit with message: {selected_message}")
+            create_commit(selected_message, debug=args.debug)
             break
         else:
+            logger.debug("Commit messages rejected")
             print("Commit messages rejected. Please create commit message manually.")
             break