ngpt 3.1.1__py3-none-any.whl → 3.2.0__py3-none-any.whl

ngpt/cli/interactive.py

@@ -64,9 +64,16 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
     if logger:
         print(f"{COLORS['green']}Logging conversation to: {logger.get_log_path()}{COLORS['reset']}")
     
+    # Display a note about markdown rendering only once at the beginning
+    if prettify and not no_stream and not stream_prettify:
+        print(f"{COLORS['yellow']}Note: Using standard markdown rendering (--prettify). For streaming markdown rendering, use --stream-prettify instead.{COLORS['reset']}")
+    
     # Custom separator - use the same length for consistency
     def print_separator():
-        print(f"\n{separator}\n")
+        # Make sure there's exactly one newline before and after
+        # Use sys.stdout.write for direct control, avoiding any extra newlines
+        sys.stdout.write(f"\n{separator}\n")
+        sys.stdout.flush()
     
     # Initialize conversation history
     system_prompt = preprompt if preprompt else "You are a helpful assistant."
@@ -182,19 +189,26 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             if logger:
                 logger.log("user", user_input)
             
-            # Print assistant indicator with formatting
-            if not no_stream and not stream_prettify:
-                print(f"\n{ngpt_header()}: {COLORS['reset']}", end="", flush=True)
-            elif not stream_prettify:
-                print(f"\n{ngpt_header()}: {COLORS['reset']}", flush=True)
+            # Print assistant indicator with formatting - but only if we're not going to show a rich formatted box
+            # With Rich prettify, no header should be printed as the Rich panel already includes it
+            should_print_header = True
+
+            # Determine if we should print a header based on formatting options
+            if prettify and renderer != 'glow':
+                # Don't print header for Rich prettify
+                should_print_header = False
+
+            # Print the header if needed
+            if should_print_header:
+                if not no_stream and not stream_prettify:
+                    print(f"\n{ngpt_header()}: {COLORS['reset']}", end="", flush=True)
+                elif not stream_prettify:
+                    print(f"\n{ngpt_header()}: {COLORS['reset']}", flush=True)
             
-            # If prettify is enabled with regular streaming
+            # Determine streaming behavior
             if prettify and not no_stream and not stream_prettify:
-                print(f"\n{COLORS['yellow']}Note: Streaming disabled to enable markdown rendering.{COLORS['reset']}")
-                print(f"\n{ngpt_header()}: {COLORS['reset']}", flush=True)
                 should_stream = False
             else:
-                # Regular behavior with stream-prettify taking precedence
                 should_stream = not no_stream
             
             # Setup for stream-prettify
@@ -205,9 +219,15 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             first_content_received = False
             
             if stream_prettify and should_stream:
-                # Get the correct header for interactive mode
-                header = ngpt_header()
-                live_display, stream_callback, setup_spinner = prettify_streaming_markdown(renderer, is_interactive=True, header_text=header)
+                # Don't pass the header_text for rich renderer as it already creates its own header,
+                # but pass it for other renderers like glow
+                if renderer == 'rich' or renderer == 'auto':
+                    live_display, stream_callback, setup_spinner = prettify_streaming_markdown(renderer, is_interactive=True)
+                else:
+                    # Get the correct header for interactive mode for non-rich renderers
+                    header = ngpt_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
@@ -229,8 +249,9 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
                             if stop_spinner_func:
                                 stop_spinner_func()
                                 
-                            # Clear the spinner line completely
-                            sys.stdout.write("\r" + " " * 100 + "\r")
+                            # Clear the spinner line completely without leaving extra newlines
+                            # Use direct terminal control to ensure consistency
+                            sys.stdout.write("\r" + " " * shutil.get_terminal_size().columns + "\r")
                             sys.stdout.flush()
                             
                             # Now start the live display
@@ -264,7 +285,9 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             # 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")
+                # Clear the spinner line completely without leaving extra newlines
+                # Use direct terminal control to ensure consistency
+                sys.stdout.write("\r" + " " * shutil.get_terminal_size().columns + "\r")
                 sys.stdout.flush()
             
             # Stop live display if using stream-prettify
@@ -281,6 +304,7 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
                 # Print response if not streamed (either due to no_stream or prettify)
                 if no_stream or prettify:
                     if prettify:
+                        # For pretty formatting with rich, don't print any header text as the rich renderer already includes it
                         prettify_markdown(response, renderer)
                     else:
                         print(response)

ngpt/cli/modes/chat.py

@@ -87,7 +87,7 @@ def chat_mode(client, args, logger=None):
     
     # If regular prettify is enabled with streaming, inform the user
     if args.prettify and not args.no_stream:
-        print(f"{COLORS['yellow']}Note: Streaming disabled to enable markdown rendering.{COLORS['reset']}")
+        print(f"{COLORS['yellow']}Note: Using standard markdown rendering (--prettify). For streaming markdown rendering, use --stream-prettify instead.{COLORS['reset']}")
     
     # Show a static message if live_display is not available
     if args.stream_prettify and not live_display:

ngpt/cli/modes/code.py

@@ -62,7 +62,7 @@ def code_mode(client, args, logger=None):
         if has_markdown_renderer(args.renderer):
             should_stream = False
             use_regular_prettify = True
-            print(f"{COLORS['yellow']}Note: Streaming disabled to enable regular markdown rendering (--prettify).{COLORS['reset']}")
+            print(f"{COLORS['yellow']}Note: Using standard markdown rendering (--prettify). For streaming markdown rendering, use --stream-prettify instead.{COLORS['reset']}")
         else:
             # Renderer not available for prettify
             print(f"{COLORS['yellow']}Warning: Renderer '{args.renderer}' not available for --prettify.{COLORS['reset']}")

ngpt/cli/modes/rewrite.py

@@ -156,7 +156,7 @@ def rewrite_mode(client, args, logger=None):
     
     # If regular prettify is enabled with streaming, inform the user
     if args.prettify and not args.no_stream:
-        print(f"{COLORS['yellow']}Note: Streaming disabled to enable markdown rendering.{COLORS['reset']}")
+        print(f"{COLORS['yellow']}Note: Using standard markdown rendering (--prettify). For streaming markdown rendering, use --stream-prettify instead.{COLORS['reset']}")
     
     # Show a static message if live_display is not available
     if args.stream_prettify and not live_display:

ngpt/cli/modes/text.py

@@ -58,7 +58,7 @@ def text_mode(client, args, logger=None):
     
     # If regular prettify is enabled with streaming, inform the user
     if args.prettify and not args.no_stream:
-        print(f"{COLORS['yellow']}Note: Streaming disabled to enable markdown rendering.{COLORS['reset']}")
+        print(f"{COLORS['yellow']}Note: Using standard markdown rendering (--prettify). For streaming markdown rendering, use --stream-prettify instead.{COLORS['reset']}")
     
     # Show a static message if live_display is not available
     if args.stream_prettify and not live_display:

ngpt/cli/renderers.py

@@ -168,8 +168,31 @@ def prettify_markdown(text, renderer='auto'):
         # Use rich
         try:
             console = Console()
+            
+            # Create a panel around the markdown for consistency with stream_prettify
+            from rich.panel import Panel
+            import rich.box
+            from rich.text import Text
+            
+            # Get terminal dimensions
+            term_width = shutil.get_terminal_size().columns
+            
+            # Create panel with similar styling to stream_prettify
+            clean_header = "🤖 nGPT"
+            panel_title = Text(clean_header, style="cyan bold")
+            
             md = Markdown(text)
-            console.print(md)
+            panel = Panel(
+                md,
+                title=panel_title,
+                title_align="left",
+                border_style="cyan",
+                padding=(1, 1),
+                width=console.width - 4,  # Make panel slightly narrower than console
+                box=rich.box.ROUNDED
+            )
+            
+            console.print(panel)
             return True
         except Exception as e:
             print(f"{COLORS['yellow']}Error using rich for markdown: {str(e)}{COLORS['reset']}")
@@ -237,7 +260,20 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
                 box=rich.box.ROUNDED
             )
         else:
-            md_obj = Markdown("")
+            # Always use a panel - even in non-interactive mode
+            clean_header = "🤖 nGPT"
+            panel_title = Text(clean_header, style="cyan bold")
+            
+            padding = (1, 1)  # Less horizontal padding (left, right)
+            md_obj = Panel(
+                Markdown(""),
+                title=panel_title,
+                title_align="left",
+                border_style="cyan",
+                padding=padding,
+                width=console.width - 4,  # Make panel slightly narrower than console
+                box=rich.box.ROUNDED
+            )
         
         # Get terminal dimensions for better display
         term_width = shutil.get_terminal_size().columns
@@ -275,9 +311,8 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
             # Start live display on first content
             if first_update:
                 first_update = False
-                # Clear the spinner line completely before starting the display
-                sys.stdout.write("\r" + " " * 100 + "\r")
-                sys.stdout.flush()
+                # Let the spinner's clean_exit handle the cleanup
+                # No additional cleanup needed here
                 live.start()
             
             # Update content in live display
@@ -304,17 +339,17 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
                 if not is_complete:
                     # Calculate approximate lines needed
                     content_lines = content.count('\n') + 1
-                    available_height = display_height - 1  # Account for minimal overhead
+                    available_height = display_height - 4  # Account for panel borders and padding
                     
                     if content_lines > available_height:
                         # If content is too big, show only the last part that fits
                         lines = content.split('\n')
                         truncated_content = '\n'.join(lines[-available_height:])
-                        md_obj = Markdown(truncated_content)
+                        md_obj.renderable = Markdown(truncated_content)
                     else:
-                        md_obj = Markdown(content)
+                        md_obj.renderable = Markdown(content)
                 else:
-                    md_obj = Markdown(content)
+                    md_obj.renderable = Markdown(content)
                     
                 live.update(md_obj)
                 
@@ -344,7 +379,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, "color": color}
+                kwargs={"stop_event": stop_event, "color": color, "clean_exit": True}
             )
             spinner_thread.daemon = True
             spinner_thread.start()

ngpt/cli/ui.py

@@ -155,7 +155,7 @@ def get_multiline_input():
             print("\nInput cancelled by user. Exiting gracefully.")
             return None
 
-def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color=None, stop_event=None):
+def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color=None, stop_event=None, clean_exit=False):
     """Display a spinner animation with a message.
     
     Args:
@@ -165,6 +165,7 @@ def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color
         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
+        clean_exit: When True, cleans up more aggressively to prevent blank lines
     """
     char_duration = 0.2
 
@@ -173,19 +174,30 @@ def spinner(message, duration=5, spinner_chars="⣾⣽⣻⢿⡿⣟⣯⣷", color
     if color:
         colored_message = f"{color}{message}{COLORS['reset']}"
 
+    # Save cursor position - will be needed for clean exit
+    if clean_exit:
+        # Start by printing a \r to ensure we begin at the start of the line
+        sys.stdout.write("\r")
+        sys.stdout.flush()
+
     if stop_event:
         i = 0
         while not stop_event.is_set():
             char = spinner_chars[i % len(spinner_chars)]
-            print(f"\r{colored_message} {char}", end="", flush=True)
+            # Always use sys.stdout.write for consistent behavior
+            sys.stdout.write(f"\r{colored_message} {char}")
+            sys.stdout.flush()
             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{colored_message} {char}", end="", flush=True)
+            sys.stdout.write(f"\r{colored_message} {char}")
+            sys.stdout.flush()
             time.sleep(char_duration)
 
-    # Clear the line when done
-    print("\r" + " " * (len(message) + 10) + "\r", end="", flush=True) 
+    # Clear the line when done - use terminal width to clear the entire line
+    terminal_width = shutil.get_terminal_size().columns
+    sys.stdout.write("\r" + " " * terminal_width + "\r")
+    sys.stdout.flush() 

{ngpt-3.1.1.dist-info → ngpt-3.2.0.dist-info}/METADATA

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

{ngpt-3.1.1.dist-info → ngpt-3.2.0.dist-info}/RECORD

@@ -5,23 +5,23 @@ ngpt/cli/__init__.py,sha256=hebbDSMGiOd43YNnQP67uzr67Ue6rZPwm2czynr5iZY,43
 ngpt/cli/args.py,sha256=XQvofZs_WkbgUto3Dbx7Yw-AmPAQHh8kdHUe3uWy8w4,11382
 ngpt/cli/config_manager.py,sha256=NQQcWnjUppAAd0s0p9YAf8EyKS1ex5-0EB4DvKdB4dk,3662
 ngpt/cli/formatters.py,sha256=HBYGlx_7eoAKyzfy0Vq5L0yn8yVKjngqYBukMmXCcz0,9401
-ngpt/cli/interactive.py,sha256=Zep4yiGRFPVrJV1zp7xB5lXg7hVhXhbRlaVA4DgRBbQ,13241
+ngpt/cli/interactive.py,sha256=4--9vucwV17n0aH3BNIB4mPGGL6tJYbfL4-h9ZxNezk,14842
 ngpt/cli/main.py,sha256=9um40RplKHSW5UHcUUO2cwMNqkGUhfQwikI1CHHFbnk,28926
-ngpt/cli/renderers.py,sha256=ovV0IexZyrjCk8LK5ZGVvf5K7wCLco4jRhDv_tp6Kvw,15184
-ngpt/cli/ui.py,sha256=m8qtd4cCSHBGHPUlHVdBEfun1G1Se4vLKTSgnS7QOKE,6775
+ngpt/cli/renderers.py,sha256=m71BeUXKynpKKGXFzwRSW1XngvyKiZ_xEsdujUbU0MA,16597
+ngpt/cli/ui.py,sha256=HoHDFpLiwMBP5wtMb8YYo244FMiqiPFRoBNcNGp6N0A,7310
 ngpt/cli/modes/__init__.py,sha256=R3aO662RIzWEOvr3moTrEI8Tpg0zDDyMGGh1-OxiRgM,285
-ngpt/cli/modes/chat.py,sha256=oibPaN4LAqrzIbWpw--ql0TwU0u_jlLCeNuxxyO7wPg,5887
-ngpt/cli/modes/code.py,sha256=AEsQKdL8mh4ImcI5R7TXzwEq_JBTkmS-L0AA_-dpHm0,5934
+ngpt/cli/modes/chat.py,sha256=byOULc1pTl_16IxwRW5FxBgTy_WUF9AJ5TIhdfawzj0,5951
+ngpt/cli/modes/code.py,sha256=CVZrqlbMS3Weej5xllBhw95qtlOKkNdHGN24trQDesw,5977
 ngpt/cli/modes/gitcommsg.py,sha256=rsfMoeOupmNp-5p5fsMSPAf18BbzXWq-4PF2HjEz6SY,46991
-ngpt/cli/modes/rewrite.py,sha256=CrzUHxUoZc48D3ooVIvDbCjIIuERO1v-ddG3ajhETQs,10646
+ngpt/cli/modes/rewrite.py,sha256=2h3liGXch6cZyduj1HrEXpHTjKVDDV_zRJwB7fKdoGg,10710
 ngpt/cli/modes/shell.py,sha256=QkprnOxMMTg2v5DIwcofDnnr3JPNfuk-YgSQaae5Xps,3311
-ngpt/cli/modes/text.py,sha256=vCwZnVxIbsTCLE8YVJIPwZsGgk7VRs8v-eeaVwCOZqI,4702
+ngpt/cli/modes/text.py,sha256=knz4vhOzCW2wbwRmFN2AdSl9twe8IgatlGIx-t7b9ZU,4766
 ngpt/utils/__init__.py,sha256=E46suk2-QgYBI0Qrs6WXOajOUOebF3ETAFY7ah8DTWs,942
 ngpt/utils/cli_config.py,sha256=IlHnOEEGpLoGZInynM778wgpxLVcJ_STKWxg2Ypvir4,11196
 ngpt/utils/config.py,sha256=wsArA4osnh8fKqOvtsPqqBxAz3DpdjtaWUFaRtnUdyc,10452
 ngpt/utils/log.py,sha256=f1jg2iFo35PAmsarH8FVL_62plq4VXH0Mu2QiP6RJGw,15934
-ngpt-3.1.1.dist-info/METADATA,sha256=YPavkwb6Jg4oblYwYtBX3XrDmvcQWVhQZO2d9r5yByI,28992
-ngpt-3.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.1.1.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.1.1.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.1.1.dist-info/RECORD,,
+ngpt-3.2.0.dist-info/METADATA,sha256=Oyhg9XpBGgDZ4M4wA700C0Vr92lQSVpWd0-OqXe5cHg,28992
+ngpt-3.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngpt-3.2.0.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
+ngpt-3.2.0.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
+ngpt-3.2.0.dist-info/RECORD,,