fancygit 1.0.24__tar.gz → 1.0.26__tar.gz

{fancygit-1.0.24 → fancygit-1.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fancygit
-Version: 1.0.24
+Version: 1.0.26
 Summary: A smart CLI tool that provides intelligent recommendations and helps solve merge conflicts
 Author: Youssif Ashmawy
 Author-email: ashmawyyoussif@gmail.com

fancygit-1.0.26/VERSION

@@ -0,0 +1 @@
+1.0.26

{fancygit-1.0.24 → fancygit-1.0.26}/fancygit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fancygit
-Version: 1.0.24
+Version: 1.0.26
 Summary: A smart CLI tool that provides intelligent recommendations and helps solve merge conflicts
 Author: Youssif Ashmawy
 Author-email: ashmawyyoussif@gmail.com

{fancygit-1.0.24 → fancygit-1.0.26}/fancygit.py

@@ -560,6 +560,19 @@ class FancyGit:
                 print(f"  Deps  : {color_file(paths['deps_mmd'])}")
                 print(f"  HTML  : {color_file(paths['html'])}")
 
+                # Add output directory to .gitignore if not already present
+                gitignore_path = os.path.join(os.getcwd(), '.gitignore')
+                output_dir_name = os.path.basename(os.path.abspath(output_dir))
+                gitignore_entry = f'{output_dir_name}/'
+                existing_lines = []
+                if os.path.exists(gitignore_path):
+                    with open(gitignore_path, 'r', encoding='utf-8') as f:
+                        existing_lines = f.read().splitlines()
+                if gitignore_entry not in existing_lines and output_dir_name not in existing_lines:
+                    with open(gitignore_path, 'a', encoding='utf-8') as f:
+                        f.write(f'\n{gitignore_entry}\n')
+                    print(color_info(f"Added {gitignore_entry} to .gitignore"))
+
                 if open_browser:
                     # Convert to absolute path for browser
                     html_path = os.path.abspath(paths['html'])

{fancygit-1.0.24 → fancygit-1.0.26}/src/ai_engine.py

@@ -3,6 +3,7 @@ from src.model_provider import ModelProvider
 from src.providers.ollama_model import OllamaModel
 from src.config_manager import ConfigManager
 from typing import List, Dict, Optional
+import re
 import time
 
 class AIEngine:
@@ -38,10 +39,25 @@ class AIEngine:
 
         try:
             response = self.analysis_provider._call_model(prompt)
-            return response if response else "Unable to get AI analysis."
+            return self._strip_markdown(response) if response else "Unable to get AI analysis."
         except Exception as e:
             return f"Failed to get AI analysis: {str(e)}"
 
+    def _strip_markdown(self, text: str) -> str:
+        """Remove markdown formatting so output renders cleanly in a terminal."""
+        # Remove bold/italic: **text**, *text*, __text__, _text_
+        text = re.sub(r'\*{1,3}(.*?)\*{1,3}', r'\1', text)
+        text = re.sub(r'_{1,3}(.*?)_{1,3}', r'\1', text)
+        # Remove ATX headings: ## Heading → Heading
+        text = re.sub(r'^\s{0,3}#{1,6}\s+', '', text, flags=re.MULTILINE)
+        # Remove inline code: `code` → code
+        text = re.sub(r'`([^`]+)`', r'\1', text)
+        # Remove code fences
+        text = re.sub(r'```.*?```', '', text, flags=re.DOTALL)
+        # Collapse 3+ blank lines down to 2
+        text = re.sub(r'\n{3,}', '\n\n', text)
+        return text.strip()
+
     def explain_command(self, command: str) -> Optional[str]:
         """
         Explain a git command using the configured explanation provider.
@@ -76,24 +92,34 @@ class AIEngine:
 
     def _build_analysis_prompt(self, messages: List[Dict]) -> str:
         """Build the analysis prompt for the AI model"""
-        prompt = """You are a Git expert assistant. Analyze the following Git error/warning messages and provide:
-        1. A clear summary of what went wrong
-        2. Step-by-step instructions on how to resolve the issue
-        3. Any preventive measures to avoid this in the future
+        prompt = """You are a Git expert assistant. Analyze the following Git error/warning messages.
 
-        Keep your response concise, practical, and focused on solutions.
+IMPORTANT FORMATTING RULES — you MUST follow these exactly:
+- Plain text only. No markdown. No asterisks, no hashes, no backticks, no bold, no headers.
+- Use this exact structure with these exact labels on their own lines:
+
+WHAT WENT WRONG:
+[1-2 sentences explaining the root cause]
+
+HOW TO FIX IT:
+1. [first step]
+2. [second step]
+(add more steps only if truly needed)
+
+TIP:
+[one short preventive tip, or omit this section entirely if not useful]
+
+Messages to analyze:
+"""
 
-        Messages to analyze:
-        """
-        
         for i, msg in enumerate(messages, 1):
             severity = msg.get('severity', 'unknown').upper()
             message_text = msg.get('message', str(msg))
             error_type = msg.get('type', 'Unknown')
             file_info = f" (file: {msg.get('file', 'N/A')})" if msg.get('file') else ""
-            
+
             prompt += f"\n{i}. [{severity}] {error_type}{file_info}\n   {message_text}\n"
-        
+
         prompt += "\n\nAnalysis:"
         return prompt
     

{fancygit-1.0.24 → fancygit-1.0.26}/src/mermaid_export.py

@@ -1063,6 +1063,14 @@ class MermaidExporter:
             """
         )
 
+    def _diagram_has_content(self, mmd: str) -> bool:
+        """Return True if the diagram has actual node/edge content (not just header and styling)."""
+        for line in mmd.splitlines():
+            stripped = line.strip()
+            if stripped and not stripped.startswith('flowchart') and not stripped.startswith('classDef'):
+                return True
+        return False
+
     def export_all(self, output_dir: str, repo_state: dict, max_commits: int = 15) -> dict:
         os.makedirs(output_dir, exist_ok=True)
 
@@ -1073,13 +1081,15 @@ class MermaidExporter:
         deps_mmd = self.python_import_dependency_flowchart(repo_root)
         tree_mmd = self.repo_file_structure_flowchart(repo_root)
 
-        diagrams = {
+        all_diagrams = {
             'Repo Status': status_mmd,
             'Commit Graph': graph_mmd,
             'Python Import Dependencies': deps_mmd,
             'Repo File Structure': tree_mmd,
         }
 
+        diagrams = {name: mmd for name, mmd in all_diagrams.items() if self._diagram_has_content(mmd)}
+
         html = self.build_html(diagrams)
 
         status_path = os.path.join(output_dir, 'repo_status.mmd')

{fancygit-1.0.24 → fancygit-1.0.26}/tests/test_ai_engine.py

@@ -139,9 +139,8 @@ class TestAIEngine:
         
         # Check prompt structure
         assert "You are a Git expert assistant" in call_args
-        assert "1. A clear summary of what went wrong" in call_args
-        assert "2. Step-by-step instructions" in call_args
-        assert "3. Any preventive measures" in call_args
+        assert "WHAT WENT WRONG:" in call_args
+        assert "HOW TO FIX IT:" in call_args
         assert "Messages to analyze:" in call_args
         assert "Analysis:" in call_args
     

fancygit-1.0.24/VERSION

@@ -1 +0,0 @@
-1.0.24