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

ngpt/cli/args.py

@@ -135,6 +135,11 @@ def setup_argument_parser():
     mode_exclusive_group.add_argument('-g', '--gitcommsg', action='store_true',
                                       help='Generate AI-powered git commit messages from staged changes or diff file')
     
+    # Rewrite mode options
+    rewrite_group = parser.add_argument_group('Rewrite Mode Options')
+    rewrite_group.add_argument('--humanize', action='store_true',
+                              help='Transform AI-generated text into human-like content that passes AI detection tools')
+    
     return parser
 
 def parse_args():

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/cli/modes/rewrite.py

@@ -70,6 +70,80 @@ ORIGINAL: "The user interface, which is built using React, Redux, and various ot
 BETTER: "The React/Redux user interface needs redesigning to accommodate our planned new features."
 """
 
+# System prompt for humanizing AI-generated text
+HUMANIZE_SYSTEM_PROMPT = """You are an advanced TextHumanizer specialist with expertise in transforming AI-generated content into authentic, undetectable human writing. Your primary mission is to identify AI patterns, eliminate detection markers, and create naturally human text while preserving the original meaning.
+
+PRIMARY GOAL:
+Transform AI-generated text to make it indistinguishable from human writing while preserving the core meaning and information.
+
+IDENTIFICATION AND ANALYSIS:
+1. Identify common AI writing patterns, including:
+   - Overuse of em dashes (—) and predictable sentence structures (e.g., "It's not just X, it's Y")
+   - Formulaic lists and groups of three items (AI loves triplets)
+   - Repetitive clarifications and unnecessary context setting
+   - Overly consistent paragraph lengths and sentence structures
+   - Perfect grammar and overly formal academic language
+   - Excessive use of transition phrases and connecting words
+   - Generic corporate language and vague positive adjectives ("innovative", "practical", "elevate")
+   - Unusual collocations or word pairings that feel slightly off
+   - Predictable flow that lacks natural human tangents
+   - Perfectly balanced arguments without personal bias
+   - Suspiciously consistent tone throughout the piece
+
+HUMANIZATION TECHNIQUES:
+1. Vary sentence structure with a mix of simple, compound, and complex sentences
+2. Create irregular paragraph lengths, mimicking natural human writing patterns
+3. Introduce strategic "imperfections" like sentence fragments or occasional wordiness
+4. Replace clichés and stock phrases with unexpected alternatives
+5. Break predictable patterns by varying rhythm and cadence
+6. Add strategic redundancies where natural in human speech
+7. Insert occasional asides, parentheticals, or digressions that feel authentic
+8. Use distinctive punctuation patterns (like dashes, ellipses, or parentheses) strategically
+9. Incorporate idioms, colloquialisms, and culturally relevant references
+10. Add subtle opinion markers or perspective indicators
+11. Include personal anecdotes or first-person perspective ONLY when specific personal context is provided by the user - NEVER invent or hallucinate personal experiences or relationships
+
+CONTENT TYPE CUSTOMIZATION:
+1. Academic papers: Maintain scholarly tone while adding natural voice variations, citation preferences, and subtle perspective markers
+2. Blog posts: Incorporate conversational tone, personal anecdotes (only if provided), and reader engagement elements
+3. Business content: Balance professionalism with authentic voice, avoiding corporate jargon while maintaining expertise
+4. Creative writing: Enhance style variations, unique metaphors, and distinctive voice elements
+5. Technical content: Preserve accuracy while adding natural explanations and occasional simplifications
+6. Social media: Include informal language, cultural references, and authentic engagement hooks
+
+AI DETECTION EVASION STRATEGIES:
+1. Avoid perfect coherence between paragraphs, mimicking natural thought progression
+2. Introduce strategic tense variations where naturally occurring
+3. Simulate human thinking patterns with occasional backtracking or clarification
+4. Vary vocabulary sophistication throughout the text
+5. Include subjective judgments and personal opinions where appropriate
+6. Add culturally or temporally relevant references that AIs might miss
+7. Incorporate casual phrasings, contractions, and verbal quirks
+8. Use nonlinear information organization that follows human association patterns
+
+READABILITY AND PURPOSE ADJUSTMENT:
+1. Adapt content to the specified audience and goal
+2. Match language complexity to human capabilities
+3. Allow perspective shifts that occur naturally in human writing
+4. Use strategic repetition for emphasis (unlike AI's mechanical repetition)
+5. Create natural flow between topics rather than mechanical transitions
+
+IMPORTANT: Never invent personal stories, experiences, or relationships unless specifically provided by the user.
+
+OUTPUT INSTRUCTION:
+Provide ONLY the humanized text with no explanations, comments, or meta-text.
+
+EXAMPLES:
+
+AI VERSION: "Artificial intelligence is revolutionizing the healthcare industry by enhancing diagnostic accuracy, streamlining administrative processes, and improving patient outcomes. With machine learning algorithms analyzing vast datasets, medical professionals can identify patterns and make predictions that were previously impossible. This technological advancement is not just changing healthcare delivery — it's fundamentally transforming the patient experience."
+
+HUMANIZED VERSION: "AI is shaking things up in healthcare, and honestly, it's about time. Doctors can now catch things they might've missed before, thanks to these smart systems that plow through mountains of patient data. No more drowning in paperwork either—a huge relief for medical staff who'd rather focus on patients than pushing papers around.
+
+The real winners? Patients. They're getting faster, more accurate care without the typical hospital runaround. Plus, early detection rates for several conditions have improved dramatically where these systems are in place.
+
+But let's not pretend it's all perfect. These systems cost a fortune to implement, and plenty of doctors still view them with skepticism. Can't really blame them-medicine has always been as much art as science. The trick will be finding that sweet spot where technology enhances the human touch rather than replacing it."
+"""
+
 def rewrite_mode(client, args, logger=None):
     """Handle the text rewriting mode.
     
@@ -94,7 +168,10 @@ def rewrite_mode(client, args, logger=None):
         input_text = args.prompt
     else:
         # No pipe or prompt - use multiline input
-        print("Enter or paste text to rewrite (Ctrl+D or Ctrl+Z to submit):")
+        if getattr(args, 'humanize', False):
+            print("Enter or paste AI-generated text to humanize (Ctrl+D or Ctrl+Z to submit):")
+        else:
+            print("Enter or paste text to rewrite (Ctrl+D or Ctrl+Z to submit):")
         input_text = get_multiline_input()
         if input_text is None:
             # Input was cancelled or empty
@@ -145,15 +222,18 @@ def rewrite_mode(client, args, logger=None):
             print(f"{COLORS['yellow']}Warning: Failed to enhance input with web search: {str(e)}{COLORS['reset']}")
             # Continue with the original input if web search fails
     
+    # Determine which system prompt to use based on the humanize flag
+    system_prompt = HUMANIZE_SYSTEM_PROMPT if getattr(args, 'humanize', False) else REWRITE_SYSTEM_PROMPT
+    
     # Set up messages array with system prompt and user content
     messages = [
-        {"role": "system", "content": REWRITE_SYSTEM_PROMPT},
+        {"role": "system", "content": system_prompt},
         {"role": "user", "content": input_text}
     ]
     
     # Log the messages if logging is enabled
     if logger:
-        logger.log("system", REWRITE_SYSTEM_PROMPT)
+        logger.log("system", system_prompt)
         logger.log("user", input_text)
     
     # Set default streaming behavior based on --no-stream and --prettify arguments
@@ -215,6 +295,24 @@ def rewrite_mode(client, args, logger=None):
     if args.stream_prettify and live_display:
         stream_callback = spinner_handling_callback
     
+    if getattr(args, 'humanize', False):
+        operation_text = "Humanizing AI text"
+    else:
+        operation_text = "Rewriting text"
+    
+    # Start spinner for processing
+    if not args.stream_prettify and not args.no_stream:
+        stop_spinner = threading.Event()
+        spinner_thread = threading.Thread(
+            target=spinner, 
+            args=(f"{operation_text}...",), 
+            kwargs={"stop_event": stop_spinner, "color": COLORS['cyan']}
+        )
+        spinner_thread.daemon = True
+        # Use lock to prevent terminal rendering conflicts when starting spinner
+        with TERMINAL_RENDER_LOCK:
+            spinner_thread.start()
+    
     response = client.chat(
         prompt=None,  # Not used when messages are provided
         stream=should_stream, 
@@ -226,6 +324,15 @@ def rewrite_mode(client, args, logger=None):
         messages=messages  # Use messages array instead of prompt
     )
     
+    # Stop spinner if it was started
+    if not args.stream_prettify and not args.no_stream:
+        stop_spinner.set()
+        spinner_thread.join()
+        # Clear the spinner line
+        with TERMINAL_RENDER_LOCK:
+            sys.stdout.write("\r" + " " * 100 + "\r")
+            sys.stdout.flush()
+    
     # Ensure spinner is stopped if no content was received
     if stop_spinner_event and not first_content_received:
         stop_spinner_event.set()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.9.6
+Version: 3.11.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
@@ -288,7 +288,7 @@ usage: ngpt [-h] [-v] [--language LANGUAGE] [--config [CONFIG]] [--config-index
             [--preprompt PREPROMPT | --role ROLE] [--no-stream | --prettify | --stream-prettify]
             [--renderer {auto,rich,glow}] [--rec-chunk] [--diff [FILE]] [--chunk-size CHUNK_SIZE]
             [--analyses-chunk-size ANALYSES_CHUNK_SIZE] [--max-msg-lines MAX_MSG_LINES]
-            [--max-recursion-depth MAX_RECURSION_DEPTH] [-i | -s | -c | -t | -r | -g]
+            [--max-recursion-depth MAX_RECURSION_DEPTH] [-i | -s | -c | -t | -r | -g] [--humanize]
             [prompt]
 
 nGPT - Interact with AI language models via OpenAI-compatible APIs
@@ -355,6 +355,10 @@ Modes (mutually exclusive)::
 -r, --rewrite                       Rewrite text from stdin to be more natural while preserving tone and meaning
 -g, --gitcommsg                     Generate AI-powered git commit messages from staged changes or diff file
 
+Rewrite Mode Options::
+
+--humanize                          Transform AI-generated text into human-like content that passes AI detection tools
+
 ```
 
 > **Note**: For better visualization of conventional commit messages on GitHub, you can use the [GitHub Commit Labels](https://greasyfork.org/en/scripts/526153-github-commit-labels) userscript, which adds colorful labels to your commits.

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

@@ -2,7 +2,7 @@ ngpt/__init__.py,sha256=kpKhViLakwMdHZkuLht2vWcjt0uD_5gR33gvMhfXr6w,664
 ngpt/__main__.py,sha256=j3eFYPOtCCFBOGh7NK5IWEnADnTMMSEB9GLyIDoW724,66
 ngpt/client.py,sha256=XjpA2UnvrRvzk6_DzVEddUTzoPlF8koQ-cZURpHoT7c,9041
 ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
-ngpt/cli/args.py,sha256=2T5QGXxcIT8dfJpZwUvpgfgoEev28zP_ZCBct17deJs,14759
+ngpt/cli/args.py,sha256=Vih8fBectyHHr2G8q3Kl2lflo_yFbB0ory55MZv1dEI,15048
 ngpt/cli/config_manager.py,sha256=NQQcWnjUppAAd0s0p9YAf8EyKS1ex5-0EB4DvKdB4dk,3662
 ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
 ngpt/cli/main.py,sha256=36mi8uYDcl56IhTkt-TJTRRhwHeF157xMAYgufLRAMo,29256
@@ -12,9 +12,9 @@ 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/rewrite.py,sha256=hA3KxfuZSTGKWD0HyzpHP2cExncQrTM2npln_3k_-N4,18050
 ngpt/cli/modes/shell.py,sha256=it1Brq1-LGeNfPKYBeVAwF-a78g9UP-KscofBZQkbr4,41589
 ngpt/cli/modes/text.py,sha256=NOikaU9YVCBgyaCl6pwy9EVt-YY5Q4jBx0l47izpVTA,6986
 ngpt/utils/__init__.py,sha256=_92f8eGMMOtQQA3uwgSRVwUEl1EIRFjWPUjcfGgI-eI,1244
@@ -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.11.0.dist-info/METADATA,sha256=LVlb93ajT_eKq-CbaqX2zzShkKfxlAlgpt5ctdbNma8,31332
+ngpt-3.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.11.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.11.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.11.0.dist-info/RECORD,,