ngpt 3.9.6__py3-none-any.whl → 3.10.0__py3-none-any.whl

ngpt/cli/modes/gitcommsg.py

@@ -582,7 +582,7 @@ def process_with_chunking(client, diff_content, preprompt, chunk_size=200, recur
             
             # If the commit message is too long, we need to condense it
             if len(commit_message.splitlines()) > max_msg_lines:
-                return condense_commit_message(
+                commit_message = condense_commit_message(
                     client,
                     commit_message,
                     commit_system_prompt,
@@ -591,6 +591,10 @@ def process_with_chunking(client, diff_content, preprompt, chunk_size=200, recur
                     1,  # Start at depth 1
                     logger
                 )
+                
+            # Format the final commit message to eliminate path repetition and improve readability
+            commit_message = optimize_file_references(client, commit_message, commit_system_prompt, logger)
+                
             return commit_message
         except Exception as e:
             # Stop the spinner
@@ -672,7 +676,7 @@ DO NOT include any explanation or commentary outside the commit message format."
         
         # If the commit message is too long, we need to condense it
         if len(commit_message.splitlines()) > max_msg_lines:
-            return condense_commit_message(
+            commit_message = condense_commit_message(
                 client,
                 commit_message,
                 commit_system_prompt,
@@ -681,6 +685,10 @@ DO NOT include any explanation or commentary outside the commit message format."
                 1,  # Start at depth 1
                 logger
             )
+        
+        # Format the final commit message to eliminate path repetition and improve readability
+        commit_message = optimize_file_references(client, commit_message, commit_system_prompt, logger)
+        
         return commit_message
     
     # Analysis is still too large, need to chunk it
@@ -1015,6 +1023,105 @@ def strip_code_block_formatting(text):
         return match.group(1).rstrip()
     return text
 
+def optimize_file_references(client, commit_message, system_prompt=None, logger=None):
+    """Optimize the file references in the commit message by eliminating path repetition and improving readability.
+    
+    Args:
+        client: The NGPTClient instance
+        commit_message: The commit message to format
+        system_prompt: Optional system prompt for formatting
+        logger: Optional logger instance
+        
+    Returns:
+        str: Commit message with optimized file references
+    """
+    # If no system prompt provided, use a minimalist one
+    if not system_prompt:
+        system_prompt = """You are an expert Git commit message formatter."""
+    
+    format_prompt = f"""TASK: Reformat file paths in this commit message to make it more readable while preserving the standard format
+
+COMMIT MESSAGE TO OPTIMIZE:
+{commit_message}
+
+MAINTAIN THIS EXACT FORMAT FOR EACH BULLET:
+- [type] Description with file references (filepath:line/function)
+
+FILE PATH OPTIMIZATION RULES (CRITICAL PRIORITY):
+1. PRESERVE PROPER PARENTHESES FORMAT - File references go in parentheses at the end of each bullet:
+   • "- [add] Add components (src/components/Button.jsx, Card.jsx)"
+   • Always keep references in parentheses at the end
+
+2. ELIMINATE PATH REPETITION in file lists:
+   • "- [add] Add components (src/components/Button.jsx, src/components/Card.jsx)" - BAD
+   • "- [add] Add components (src/components/*.jsx)" - Use wildcard when appropriate
+   • "- [add] Add 5 component files (src/components/)" - Use count for many files
+
+3. AVOID REDUNDANT FILENAMES:
+   • Don't repeat filenames in both description and parentheses
+   • Group files by category in the description
+
+EXAMPLES THAT FOLLOW THE PROPER FORMAT:
+
+❌ BEFORE (POOR FORMATTING):
+- [docs] Add documentation for tawhid, names_of_allah, transcendence (islam/beliefs/tawhid.md, islam/beliefs/names_of_allah.md, islam/beliefs/transcendence.md)
+
+✅ AFTER (GOOD FORMATTING):
+- [docs] Add documentation for theological concepts (islam/beliefs/tawhid.md, names_of_allah.md, transcendence.md)
+
+❌ BEFORE (POOR FORMATTING):
+- [fix] Update error handling in app/utils/errors.js, app/utils/validation.js, app/utils/formatting.js
+
+✅ AFTER (GOOD FORMATTING):
+- [fix] Update error handling (app/utils/errors.js, validation.js, formatting.js)
+
+RULES FOR OUTPUT:
+1. PRESERVE proper format with parentheses at the end
+2. Keep the same bullet structure and number of bullets
+3. DO NOT change type tags or summary line
+4. Mention common paths ONCE, then list files
+
+THE STANDARD FORMAT FOR COMMIT MESSAGES IS:
+type[(scope)]: concise summary
+
+- [type] Description (filepath:line/function)
+- [type] Another description (filepath:line/function)"""
+    
+    # Log formatting template
+    if logger:
+        logger.log_template("DEBUG", "OPTIMIZE_FILE_REFS", format_prompt)
+    
+    # Start spinner for formatting
+    stop_spinner = threading.Event()
+    spinner_thread = threading.Thread(
+        target=spinner, 
+        args=("Optimizing file references...",), 
+        kwargs={"stop_event": stop_spinner, "color": COLORS['green']}
+    )
+    spinner_thread.daemon = True
+    spinner_thread.start()
+    
+    try:
+        formatted_message = handle_api_call(client, format_prompt, system_prompt, logger)
+        # Stop the spinner
+        stop_spinner.set()
+        spinner_thread.join()
+        
+        if logger:
+            logger.log_content("DEBUG", "OPTIMIZED_FILE_REFS", formatted_message)
+        
+        return formatted_message
+    except Exception as e:
+        # Stop the spinner
+        stop_spinner.set()
+        spinner_thread.join()
+        
+        print(f"{COLORS['red']}Error optimizing file references: {str(e)}{COLORS['reset']}")
+        if logger:
+            logger.error(f"Error optimizing file references: {str(e)}")
+        # Return the original message if formatting fails
+        return commit_message
+
 def gitcommsg_mode(client, args, logger=None):
     """Handle the Git commit message generation mode.
     
@@ -1195,6 +1302,9 @@ def gitcommsg_mode(client, args, logger=None):
                     1,  # Start at depth 1
                     active_logger
                 )
+                
+            # Format the final commit message to eliminate path repetition and improve readability
+            result = optimize_file_references(client, result, commit_system_prompt, active_logger)
         
         if not result:
             print(f"{COLORS['red']}Failed to generate commit message.{COLORS['reset']}")

{ngpt-3.9.6.dist-info → ngpt-3.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.9.6
+Version: 3.10.0
 Summary: A Swiss army knife for LLMs: A fast, lightweight CLI and interactive chat tool that brings the power of any OpenAI-compatible LLM (OpenAI, Ollama, Groq, Claude, Gemini, etc.) straight to your terminal. rewrite texts or refine code, craft git commit messages, generate and run OS-aware shell commands.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt

{ngpt-3.9.6.dist-info → ngpt-3.10.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ ngpt/cli/ui.py,sha256=8-WyPMwgQiqLXWO0mGfBhKTRnIDDtPUtm_XCvOnqBJA,11334
 ngpt/cli/modes/__init__.py,sha256=KP7VR6Xw9k1p5Jcu0F38RDxSFvFIzH3j1ThDLNwznUI,363
 ngpt/cli/modes/chat.py,sha256=x1leClKq7UupA_CdW4tym0AivY2o_II123-I5IcAkxQ,7091
 ngpt/cli/modes/code.py,sha256=Qj59xq6fZqgUDw7SbvmPKX_gdpc7DHJhNkn1sB5qgUU,12932
-ngpt/cli/modes/gitcommsg.py,sha256=21I3WZYa8Eb3BKPn6-aLMN7OhEmo1KHHnhTpnJkGesg,50242
+ngpt/cli/modes/gitcommsg.py,sha256=qFOrll333ebFOkzLP_WD1Qw0VfpphYqeiuHumkP6OB4,54833
 ngpt/cli/modes/interactive.py,sha256=E0c38NA8xnuRKAce40F35uFYcohFDvaqSB8nf1ywS-4,17958
 ngpt/cli/modes/rewrite.py,sha256=QQm453X9aoUQP9CAtmeghlMytMJPlsDZPKef9tGfj6g,11181
 ngpt/cli/modes/shell.py,sha256=it1Brq1-LGeNfPKYBeVAwF-a78g9UP-KscofBZQkbr4,41589
@@ -23,8 +23,8 @@ ngpt/utils/config.py,sha256=wsArA4osnh8fKqOvtsPqqBxAz3DpdjtaWUFaRtnUdyc,10452
 ngpt/utils/log.py,sha256=f1jg2iFo35PAmsarH8FVL_62plq4VXH0Mu2QiP6RJGw,15934
 ngpt/utils/pipe.py,sha256=qRHF-Ma7bbU0cOcb1Yhe4S-kBavivtnnvLA3EYS4FY4,2162
 ngpt/utils/web_search.py,sha256=w5ke4KJMRxq7r5jtbUXvspja6XhjoPZloVkZ0IvBXIE,30731
-ngpt-3.9.6.dist-info/METADATA,sha256=ZuhiHI7b-ZzBTx1YUeWCdFlcGvzFTtgAVuTCQV2CaJo,31174
-ngpt-3.9.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.9.6.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.9.6.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.9.6.dist-info/RECORD,,
+ngpt-3.10.0.dist-info/METADATA,sha256=aQd90ttzPmR6FOrNLBA-Y1RdnInO2Q48R-8WS4Ey650,31175
+ngpt-3.10.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.10.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.10.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.10.0.dist-info/RECORD,,