ngpt 2.15.2__py3-none-any.whl → 2.16.0__py3-none-any.whl

ngpt/cli/modes/gitcommsg.py

@@ -4,6 +4,7 @@ import sys
 import tempfile
 import time
 import subprocess
+import threading
 from datetime import datetime
 import logging
 from ..formatters import COLORS
@@ -498,12 +499,27 @@ def process_with_chunking(client, diff_content, context, chunk_size=200, recursi
             logger.log_template("DEBUG", "CHUNK", chunk_prompt)
         
         # Process chunk - use technical system prompt for analysis
-        print(f"{COLORS['yellow']}Analyzing changes...{COLORS['reset']}")
+        stop_spinner = threading.Event()
+        spinner_thread = threading.Thread(
+            target=spinner, 
+            args=("Analyzing changes...",), 
+            kwargs={"stop_event": stop_spinner, "color": COLORS['yellow']}
+        )
+        spinner_thread.daemon = True
+        spinner_thread.start()
+        
         try:
             result = handle_api_call(client, chunk_prompt, technical_system_prompt, logger)
-            partial_analyses.append(result)
+            # Stop the spinner
+            stop_spinner.set()
+            spinner_thread.join()
+            # Show success message
             print(f"{COLORS['green']}✓ Chunk {i+1} processed{COLORS['reset']}")
+            partial_analyses.append(result)
         except Exception as e:
+            # Stop the spinner
+            stop_spinner.set()
+            spinner_thread.join()
             print(f"{COLORS['red']}Error processing chunk {i+1}: {str(e)}{COLORS['reset']}")
             if logger:
                 logger.error(f"Error processing chunk {i+1}: {str(e)}")
@@ -511,7 +527,7 @@ def process_with_chunking(client, diff_content, context, chunk_size=200, recursi
         
         # Rate limit protection between chunks
         if i < chunk_count - 1:
-            # Use the spinner function
+            # Use the spinner function with fixed duration
             spinner("Waiting to avoid rate limits...", 5, color=COLORS['yellow'])
     
     # Combine partial analyses
@@ -539,7 +555,16 @@ def process_with_chunking(client, diff_content, context, chunk_size=200, recursi
         )
     else:
         # Combined analysis is under the chunk size limit, generate the commit message
-        print(f"{COLORS['green']}Generating commit message from combined analysis...{COLORS['reset']}")
+        # Start spinner for generating commit message
+        stop_spinner = threading.Event()
+        spinner_thread = threading.Thread(
+            target=spinner, 
+            args=("Generating commit message from combined analysis...",), 
+            kwargs={"stop_event": stop_spinner, "color": COLORS['green']}
+        )
+        spinner_thread.daemon = True
+        spinner_thread.start()
+        
         combine_prompt = create_combine_prompt(partial_analyses)
         
         # Log combine template
@@ -550,6 +575,10 @@ def process_with_chunking(client, diff_content, context, chunk_size=200, recursi
             # Use commit message system prompt for final generation
             commit_message = handle_api_call(client, combine_prompt, commit_system_prompt, logger)
             
+            # Stop the spinner
+            stop_spinner.set()
+            spinner_thread.join()
+            
             # If the commit message is too long, we need to condense it
             if len(commit_message.splitlines()) > max_msg_lines:
                 return condense_commit_message(
@@ -563,6 +592,10 @@ def process_with_chunking(client, diff_content, context, chunk_size=200, recursi
                 )
             return commit_message
         except Exception as e:
+            # Stop the spinner
+            stop_spinner.set()
+            spinner_thread.join()
+            
             print(f"{COLORS['red']}Error combining analyses: {str(e)}{COLORS['reset']}")
             if logger:
                 logger.error(f"Error combining analyses: {str(e)}")
@@ -683,18 +716,33 @@ SECTION OF ANALYSIS TO CONDENSE:
         if logger:
             logger.log_template("DEBUG", f"CONDENSE_ANALYSIS_DEPTH_{current_depth}_CHUNK_{i+1}", condense_prompt)
         
-        print(f"{COLORS['yellow']}Condensing analysis chunk {i+1}/{analysis_chunk_count}...{COLORS['reset']}")
+        # Start spinner for analysis
+        stop_spinner = threading.Event()
+        spinner_thread = threading.Thread(
+            target=spinner, 
+            args=(f"Condensing analysis chunk {i+1}/{analysis_chunk_count}...",), 
+            kwargs={"stop_event": stop_spinner, "color": COLORS['yellow']}
+        )
+        spinner_thread.daemon = True
+        spinner_thread.start()
         
         # Condense this analysis chunk - use technical system prompt for condensing analysis
         try:
             condensed_chunk = handle_api_call(client, condense_prompt, technical_system_prompt, logger)
+            # Stop the spinner
+            stop_spinner.set()
+            spinner_thread.join()
+            
+            print(f"{COLORS['green']}✓ Analysis chunk {i+1}/{analysis_chunk_count} condensed{COLORS['reset']}")
             condensed_chunks.append(condensed_chunk)
             
             if logger:
                 logger.log_content("DEBUG", f"CONDENSED_ANALYSIS_DEPTH_{current_depth}_CHUNK_{i+1}", condensed_chunk)
-                
-            print(f"{COLORS['green']}✓ Analysis chunk {i+1}/{analysis_chunk_count} condensed{COLORS['reset']}")
         except Exception as e:
+            # Stop the spinner
+            stop_spinner.set()
+            spinner_thread.join()
+            
             print(f"{COLORS['red']}Error condensing analysis chunk {i+1}: {str(e)}{COLORS['reset']}")
             if logger:
                 logger.error(f"Error condensing analysis chunk {i+1} at depth {current_depth}: {str(e)}")
@@ -702,7 +750,7 @@ SECTION OF ANALYSIS TO CONDENSE:
         
         # Rate limit protection between chunks
         if i < analysis_chunk_count - 1:
-            # Use the spinner function
+            # Use the spinner function with fixed duration
             spinner("Waiting to avoid rate limits...", 5, color=COLORS['yellow'])
     
     # Combine condensed chunks
@@ -812,10 +860,21 @@ REQUIREMENTS:
     if logger:
         logger.log_template("DEBUG", f"CONDENSE_PROMPT_DEPTH_{current_depth}", condense_prompt)
     
-    print(f"{COLORS['yellow']}Condensing commit message (depth {current_depth}/{max_recursion_depth})...{COLORS['reset']}")
+    # Start spinner for condensing
+    stop_spinner = threading.Event()
+    spinner_thread = threading.Thread(
+        target=spinner, 
+        args=(f"Condensing commit message (depth {current_depth}/{max_recursion_depth})...",), 
+        kwargs={"stop_event": stop_spinner, "color": COLORS['yellow']}
+    )
+    spinner_thread.daemon = True
+    spinner_thread.start()
     
     try:
         condensed_result = handle_api_call(client, condense_prompt, system_prompt, logger)
+        # Stop the spinner
+        stop_spinner.set()
+        spinner_thread.join()
         
         if logger:
             logger.log_content("DEBUG", f"CONDENSED_RESULT_DEPTH_{current_depth}", condensed_result)
@@ -842,6 +901,10 @@ REQUIREMENTS:
         else:
             return condensed_result
     except Exception as e:
+        # Stop the spinner
+        stop_spinner.set()
+        spinner_thread.join()
+        
         print(f"{COLORS['red']}Error condensing commit message: {str(e)}{COLORS['reset']}")
         if logger:
             logger.error(f"Error condensing commit message at depth {current_depth}: {str(e)}")

ngpt/cli/ui.py

@@ -154,14 +154,16 @@ def get_multiline_input():
             print("\nInput cancelled by user. Exiting gracefully.")
             return None
 
-def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color=None):
+def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color=None, stop_event=None):
     """Display a spinner animation with a message.
     
     Args:
         message: The message to display alongside the spinner
-        duration: Duration in seconds to show the spinner
+        duration: Duration in seconds to show the spinner (used if stop_event is None)
         spinner_chars: Characters to use for the spinner animation
         color: Optional color from COLORS dict to use for the message
+        stop_event: Optional threading.Event to signal when to stop the spinner
+                   If provided, duration is ignored and spinner runs until event is set
     """
     # Default color handling
     color_start = ""
@@ -172,16 +174,24 @@ def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color
     
     # Each character shows for 0.2 seconds
     char_duration = 0.2
-    # Total number of characters to show (not iterations through the entire spinner sequence)
-    total_chars = int(duration / char_duration)
     
-    # Run the spinner
-    for i in range(total_chars):
-        # Get the appropriate character by cycling through the spinner characters
-        char = spinner_chars[i % len(spinner_chars)]
-        sys.stdout.write(f"\r{color_start}{message} {char}{color_end}")
-        sys.stdout.flush()
-        time.sleep(char_duration)
+    if stop_event:
+        # Run until stop_event is set
+        i = 0
+        while not stop_event.is_set():
+            char = spinner_chars[i % len(spinner_chars)]
+            sys.stdout.write(f"\r{color_start}{message} {char}{color_end}")
+            sys.stdout.flush()
+            i += 1
+            time.sleep(char_duration)
+    else:
+        # Run for fixed duration
+        total_chars = int(duration / char_duration)
+        for i in range(total_chars):
+            char = spinner_chars[i % len(spinner_chars)]
+            sys.stdout.write(f"\r{color_start}{message} {char}{color_end}")
+            sys.stdout.flush()
+            time.sleep(char_duration)
     
     # Clear the line when done
     sys.stdout.write("\r" + " " * (len(message) + 10) + "\r")

{ngpt-2.15.2.dist-info → ngpt-2.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.15.2
+Version: 2.16.0
 Summary: A lightweight Python CLI and library for interacting with OpenAI-compatible APIs, supporting both official and self-hosted LLM endpoints.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt

{ngpt-2.15.2.dist-info → ngpt-2.16.0.dist-info}/RECORD

@@ -8,11 +8,11 @@ ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
 ngpt/cli/interactive.py,sha256=DZFbExcXd7RylkpBiZBhiI6N8FBaT0m_lBes0Pvhi48,10894
 ngpt/cli/main.py,sha256=6GO4r9e9su7FFukj9JeVmJt1bJsqPOJBj6xo3iyMZXU,28911
 ngpt/cli/renderers.py,sha256=gJ3WdVvCGkNxrLEkLCh6gk9HBFMK8y7an6CsEkqt2Z8,10535
-ngpt/cli/ui.py,sha256=gTtxg2E1WJg4W9JQxrUaM83OYjKjv6pOFTOaWlfa6Mw,6548
+ngpt/cli/ui.py,sha256=j3i1Zyv5Yop8zpl1EqP03VmzEmbu4LamCxCsDlnvc58,6962
 ngpt/cli/modes/__init__.py,sha256=R3aO662RIzWEOvr3moTrEI8Tpg0zDDyMGGh1-OxiRgM,285
 ngpt/cli/modes/chat.py,sha256=4a5EgM_5A1zCSrLrjgQMDnBwIHd1Rnu5_BjSKSm7p24,4255
 ngpt/cli/modes/code.py,sha256=RjOAj7BDO5vLUdIPkUfPtyIkI_W6qEHsZvYh-sIdVaM,4293
-ngpt/cli/modes/gitcommsg.py,sha256=dbT9_Y1RiahJxBXvrKC0IIEddzd7CXjMae7txauOK7Q,44840
+ngpt/cli/modes/gitcommsg.py,sha256=Bhgg9UArrfRUwosgVlNLUB7i1B8j-1ngpkmCm5iZBkM,46786
 ngpt/cli/modes/rewrite.py,sha256=Zb0PFvWRKXs4xJCF3GEdYc-LSmy6qRszz8-QJuldHc0,8595
 ngpt/cli/modes/shell.py,sha256=lF9f7w-0bl_FdZl-WJnZuV736BKrWQtrwoKr3ejPXFE,2682
 ngpt/cli/modes/text.py,sha256=ncYnfLFMdTPuHiOvAaHNiOWhox6GF6S-2fTwMIrAz-g,3140
@@ -20,8 +20,8 @@ ngpt/utils/__init__.py,sha256=E46suk2-QgYBI0Qrs6WXOajOUOebF3ETAFY7ah8DTWs,942
 ngpt/utils/cli_config.py,sha256=tQxR3a2iXyc5TfRBPQHSUXPInO2dv_zTPGn04eWfmoo,11285
 ngpt/utils/config.py,sha256=WYOk_b1eiYjo6hpV3pfXr2RjqhOnmKqwZwKid1T41I4,10363
 ngpt/utils/log.py,sha256=f1jg2iFo35PAmsarH8FVL_62plq4VXH0Mu2QiP6RJGw,15934
-ngpt-2.15.2.dist-info/METADATA,sha256=ZUt1VWznWOfW3-kOB9EgIV8Xkw0x2LdoR8Q9BTMeOkg,23523
-ngpt-2.15.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-2.15.2.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-2.15.2.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-2.15.2.dist-info/RECORD,,
+ngpt-2.16.0.dist-info/METADATA,sha256=T5OEQ8AtdLDyct1rLRKElBBUCZgehw1iesLMhZrcnKA,23523
+ngpt-2.16.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-2.16.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-2.16.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-2.16.0.dist-info/RECORD,,