ngpt 2.16.4__py3-none-any.whl → 2.16.6__py3-none-any.whl

ngpt/cli/interactive.py

@@ -1,6 +1,8 @@
 import os
 import shutil
 import traceback
+import threading
+import sys
 from .formatters import COLORS
 from .renderers import prettify_markdown, prettify_streaming_markdown
 
@@ -197,21 +199,53 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             # Setup for stream-prettify
             stream_callback = None
             live_display = None
+            stop_spinner_func = None
+            stop_spinner_event = None
+            first_content_received = False
             
             if stream_prettify and should_stream:
                 # Get the correct header for interactive mode
                 header = ngpt_header()
-                live_display, stream_callback = prettify_streaming_markdown(renderer, is_interactive=True, header_text=header)
+                live_display, stream_callback, setup_spinner = prettify_streaming_markdown(renderer, is_interactive=True, header_text=header)
                 if not live_display:
                     # Fallback to normal prettify if live display setup failed
                     prettify = True
                     stream_prettify = False
                     should_stream = False
                     print(f"{COLORS['yellow']}Falling back to regular prettify mode.{COLORS['reset']}")
-            
-            # Start live display if using stream-prettify
-            if stream_prettify and live_display:
-                live_display.start()
+                else:
+                    # Create a wrapper for the stream callback that handles spinner and live display
+                    original_callback = stream_callback
+                    
+                    def spinner_handling_callback(content):
+                        nonlocal first_content_received
+                        
+                        # On first content, stop the spinner and start the live display
+                        if not first_content_received:
+                            first_content_received = True
+                            
+                            # Stop the spinner if it's running
+                            if stop_spinner_func:
+                                stop_spinner_func()
+                                
+                            # Clear the spinner line completely
+                            sys.stdout.write("\r" + " " * 100 + "\r")
+                            sys.stdout.flush()
+                            
+                            # Now start the live display
+                            if live_display:
+                                live_display.start()
+                        
+                        # Call the original callback to update content
+                        if original_callback:
+                            original_callback(content)
+                    
+                    # Use our wrapper callback
+                    stream_callback = spinner_handling_callback
+                    
+                    # Set up and start the spinner
+                    stop_spinner_event = threading.Event()
+                    stop_spinner_func = setup_spinner(stop_spinner_event, "Waiting for response...", color=COLORS['green'])
             
             # Get AI response with conversation history
             response = client.chat(
@@ -226,8 +260,14 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
                 stream_callback=stream_callback
             )
             
+            # Ensure spinner is stopped if no content was received
+            if stop_spinner_event and not first_content_received:
+                stop_spinner_event.set()
+                sys.stdout.write("\r" + " " * 100 + "\r")
+                sys.stdout.flush()
+            
             # Stop live display if using stream-prettify
-            if stream_prettify and live_display:
+            if stream_prettify and live_display and first_content_received:
                 live_display.stop()
             
             # Add AI response to conversation history

ngpt/cli/modes/chat.py

@@ -97,7 +97,7 @@ def chat_mode(client, args, logger=None):
     stop_spinner_event = None
     if args.stream_prettify and live_display:
         stop_spinner_event = threading.Event()
-        stop_spinner_func = setup_spinner(stop_spinner_event)
+        stop_spinner_func = setup_spinner(stop_spinner_event, color=COLORS['cyan'])
     
     # Create a wrapper for the stream callback that will stop the spinner on first content
     original_callback = stream_callback

ngpt/cli/modes/code.py

@@ -82,7 +82,7 @@ def code_mode(client, args, logger=None):
     stop_spinner_event = None
     if use_stream_prettify and live_display:
         stop_spinner_event = threading.Event()
-        stop_spinner_func = setup_spinner(stop_spinner_event)
+        stop_spinner_func = setup_spinner(stop_spinner_event, color=COLORS['cyan'])
     
     # Create a wrapper for the stream callback that will stop the spinner on first content
     original_callback = stream_callback

ngpt/cli/modes/rewrite.py

@@ -131,8 +131,6 @@ def rewrite_mode(client, args, logger=None):
         {"role": "user", "content": input_text}
     ]
     
-    print("\nSubmission successful. Waiting for response...")
-    
     # Log the messages if logging is enabled
     if logger:
         logger.log("system", REWRITE_SYSTEM_PROMPT)
@@ -168,7 +166,7 @@ def rewrite_mode(client, args, logger=None):
     stop_spinner_event = None
     if args.stream_prettify and live_display:
         stop_spinner_event = threading.Event()
-        stop_spinner_func = setup_spinner(stop_spinner_event)
+        stop_spinner_func = setup_spinner(stop_spinner_event, color=COLORS['cyan'])
     
     # Create a wrapper for the stream callback that will stop the spinner on first content
     original_callback = stream_callback

ngpt/cli/modes/shell.py

@@ -31,7 +31,7 @@ def shell_mode(client, args, logger=None):
     spinner_thread = threading.Thread(
         target=spinner, 
         args=("Generating command...",), 
-        kwargs={"stop_event": stop_spinner}
+        kwargs={"stop_event": stop_spinner, "color": COLORS['cyan']}
     )
     spinner_thread.daemon = True
     spinner_thread.start()

ngpt/cli/modes/text.py

@@ -21,8 +21,6 @@ def text_mode(client, args, logger=None):
             print("Exiting.")
             return
     
-    print("\nSubmission successful. Waiting for response...")
-    
     # Log the user message if logging is enabled
     if logger:
         logger.log("user", prompt)
@@ -70,7 +68,7 @@ def text_mode(client, args, logger=None):
     stop_spinner_event = None
     if args.stream_prettify and live_display:
         stop_spinner_event = threading.Event()
-        stop_spinner_func = setup_spinner(stop_spinner_event)
+        stop_spinner_func = setup_spinner(stop_spinner_event, color=COLORS['cyan'])
     
     # Create a wrapper for the stream callback that will stop the spinner on first content
     original_callback = stream_callback

ngpt/cli/renderers.py

@@ -239,8 +239,14 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
         else:
             md_obj = Markdown("")
         
-        # Initialize the Live display with an empty markdown
-        live = Live(md_obj, console=console, refresh_per_second=10, auto_refresh=False)
+        # Initialize the Live display with vertical overflow handling
+        live = Live(
+            md_obj, 
+            console=console, 
+            refresh_per_second=10, 
+            auto_refresh=False,
+            vertical_overflow="visible"  # Attempt to make overflow visible
+        )
         
         # Track if this is the first content update
         first_update = True
@@ -259,7 +265,7 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
                 sys.stdout.flush()
                 live.start()
             
-            # Update content
+            # Update content in live display
             if is_interactive and header_text:
                 # Update the panel content
                 md_obj.renderable = Markdown(content)
@@ -272,7 +278,7 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
             live.refresh()
             
         # Define a function to set up and start the spinner
-        def setup_spinner(stop_event, message="Waiting for AI response..."):
+        def setup_spinner(stop_event, message="Waiting for AI response...", color=COLORS['cyan']):
             nonlocal stop_spinner_event, spinner_thread
             from .ui import spinner
             import threading
@@ -284,7 +290,7 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
             spinner_thread = threading.Thread(
                 target=spinner,
                 args=(message,),
-                kwargs={"stop_event": stop_event}
+                kwargs={"stop_event": stop_event, "color": color}
             )
             spinner_thread.daemon = True
             spinner_thread.start()

ngpt/cli/ui.py

@@ -1,6 +1,7 @@
 import sys
 import time
 import shutil
+from .formatters import COLORS
 
 # Optional imports for enhanced UI
 try:
@@ -167,18 +168,23 @@ def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color
     """
     char_duration = 0.2
 
+    # Apply color to message if provided
+    colored_message = message
+    if color:
+        colored_message = f"{color}{message}{COLORS['reset']}"
+
     if stop_event:
         i = 0
         while not stop_event.is_set():
             char = spinner_chars[i % len(spinner_chars)]
-            print(f"\r{message} {char}", end="", flush=True)
+            print(f"\r{colored_message} {char}", end="", flush=True)
             i += 1
             time.sleep(char_duration)
     else:
         total_chars = int(duration / char_duration)
         for i in range(total_chars):
             char = spinner_chars[i % len(spinner_chars)]
-            print(f"\r{message} {char}", end="", flush=True)
+            print(f"\r{colored_message} {char}", end="", flush=True)
             time.sleep(char_duration)
 
     # Clear the line when done

{ngpt-2.16.4.dist-info → ngpt-2.16.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 2.16.4
+Version: 2.16.6
 Summary: Swiss army knife for LLMs: powerful CLI, interactive chatbot, and flexible Python library. Works with OpenAI, Ollama, Groq, Claude, and any OpenAI-compatible API.
 Project-URL: Homepage, https://github.com/nazdridoy/ngpt
 Project-URL: Repository, https://github.com/nazdridoy/ngpt

{ngpt-2.16.4.dist-info → ngpt-2.16.6.dist-info}/RECORD

@@ -5,23 +5,23 @@ ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
 ngpt/cli/args.py,sha256=VJM6ySMnVrXgKaGb7Qb3AQPYxcQCv3FfCI4x8YkAsLQ,11534
 ngpt/cli/config_manager.py,sha256=NQQcWnjUppAAd0s0p9YAf8EyKS1ex5-0EB4DvKdB4dk,3662
 ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
-ngpt/cli/interactive.py,sha256=DZFbExcXd7RylkpBiZBhiI6N8FBaT0m_lBes0Pvhi48,10894
+ngpt/cli/interactive.py,sha256=oLflfYVSX_NdYb5D8BsEeYr2m_6yWw06Rw-BS5tLqkI,12923
 ngpt/cli/main.py,sha256=6GO4r9e9su7FFukj9JeVmJt1bJsqPOJBj6xo3iyMZXU,28911
-ngpt/cli/renderers.py,sha256=0ditb6F8uKIAX70jS8bnzcXUd9xttLv3zIYfDCBixgw,12221
-ngpt/cli/ui.py,sha256=B4dgipuJsH66gjpfKXfjJ0ANBveFciTkepmkZXtqJvg,6579
+ngpt/cli/renderers.py,sha256=yYt3b_cWUYckfgLQ1wkEiQCnq5v5m7hfn5PWxHJzR9Y,12422
+ngpt/cli/ui.py,sha256=m8qtd4cCSHBGHPUlHVdBEfun1G1Se4vLKTSgnS7QOKE,6775
 ngpt/cli/modes/__init__.py,sha256=R3aO662RIzWEOvr3moTrEI8Tpg0zDDyMGGh1-OxiRgM,285
-ngpt/cli/modes/chat.py,sha256=XmRmPxHr2W_t8D_9JGTbEUWydnfm5BmGA5ODAu0u2oU,5679
-ngpt/cli/modes/code.py,sha256=On3JQZO79FOeUK5Tw89jsQF_lI8rAIHHe_zu2bHX99c,5712
+ngpt/cli/modes/chat.py,sha256=-g8hMHkn9Dv3iGFZvbXXFQwG8KsXEgngr6Si9AUdQXE,5701
+ngpt/cli/modes/code.py,sha256=1EeiooyNe1jvTyNu6r0J9xY34QXb2uBQKPeNca-DrRI,5734
 ngpt/cli/modes/gitcommsg.py,sha256=Bhgg9UArrfRUwosgVlNLUB7i1B8j-1ngpkmCm5iZBkM,46786
-ngpt/cli/modes/rewrite.py,sha256=8QDhjzAjWDnDAHEBXRWIGg7xx6fqRhIPse_GVHMBe4o,10157
-ngpt/cli/modes/shell.py,sha256=-uZ3CeWdZBidUnfStNGX0sr20WSovn5DSfwsMkBWaEo,3286
-ngpt/cli/modes/text.py,sha256=Q5vfBwDPyEtFubs8fPS_pPQBlyTxcDgOF-tCsz3oIH0,4559
+ngpt/cli/modes/rewrite.py,sha256=iEMn6i6cuaxOiKq886Lsh961riCmPj5K1mXVQeT2Z7k,10112
+ngpt/cli/modes/shell.py,sha256=QkprnOxMMTg2v5DIwcofDnnr3JPNfuk-YgSQaae5Xps,3311
+ngpt/cli/modes/text.py,sha256=z08xaW2r0XzyunUzBhwZKqnwPjyRol_CSazjLygmLRs,4514
 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.16.4.dist-info/METADATA,sha256=LMstFvIe9EaUm9w1pbDxJJrTzquFGYzu_-6gRbBKBgs,24938
-ngpt-2.16.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-2.16.4.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-2.16.4.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-2.16.4.dist-info/RECORD,,
+ngpt-2.16.6.dist-info/METADATA,sha256=DayL8rMlMWdplumfhcy9agLbWwXVQxGQv0kjOhGu14k,24938
+ngpt-2.16.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-2.16.6.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-2.16.6.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-2.16.6.dist-info/RECORD,,