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

ngpt/cli/interactive.py

@@ -218,7 +218,7 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
                     # Create a wrapper for the stream callback that handles spinner and live display
                     original_callback = stream_callback
                     
-                    def spinner_handling_callback(content):
+                    def spinner_handling_callback(content, **kwargs):
                         nonlocal first_content_received
                         
                         # On first content, stop the spinner and start the live display
@@ -239,7 +239,7 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
                         
                         # Call the original callback to update content
                         if original_callback:
-                            original_callback(content)
+                            original_callback(content, **kwargs)
                     
                     # Use our wrapper callback
                     stream_callback = spinner_handling_callback
@@ -269,7 +269,9 @@ def interactive_chat_session(client, web_search=False, no_stream=False, temperat
             
             # Stop live display if using stream-prettify
             if stream_prettify and live_display and first_content_received:
-                live_display.stop()
+                # Before stopping the live display, update with complete=True to show final formatted content
+                if stream_callback and response:
+                    stream_callback(response, complete=True)
             
             # Add AI response to conversation history
             if response:

ngpt/cli/main.py

@@ -297,12 +297,12 @@ def main():
                 elif len(matching_configs) > 1:
                     print(f"Multiple configurations found for provider '{effective_provider}':")
                     for i, idx in enumerate(matching_configs):
-                        print(f"  [{i}] Index {idx}: {configs[idx].get('model', 'Unknown model')}")
+                        print(f"  Choice [{i+1}] → Config #{idx}: {configs[idx].get('model', 'Unknown model')}")
                     
                     try:
                         choice = input("Choose a configuration to remove (or press Enter to cancel): ")
-                        if choice and choice.isdigit() and 0 <= int(choice) < len(matching_configs):
-                            config_index = matching_configs[int(choice)]
+                        if choice and choice.isdigit() and 1 <= int(choice) <= len(matching_configs):
+                            config_index = matching_configs[int(choice)-1]
                         else:
                             print("Configuration removal cancelled.")
                             return

ngpt/cli/modes/chat.py

@@ -103,7 +103,7 @@ def chat_mode(client, args, logger=None):
     original_callback = stream_callback
     first_content_received = False
     
-    def spinner_handling_callback(content):
+    def spinner_handling_callback(content, **kwargs):
         nonlocal first_content_received
         
         # On first content, stop the spinner 
@@ -117,7 +117,7 @@ def chat_mode(client, args, logger=None):
         
         # Call the original callback to update the display
         if original_callback:
-            original_callback(content)
+            original_callback(content, **kwargs)
     
     # Use our wrapper callback
     if args.stream_prettify and live_display:
@@ -135,7 +135,9 @@ def chat_mode(client, args, logger=None):
     
     # Stop live display if using stream-prettify
     if args.stream_prettify and live_display:
-        live_display.stop()
+        # Before stopping the live display, update with complete=True to show final formatted content
+        if stream_callback and response:
+            stream_callback(response, complete=True)
     
     # Log the AI response if logging is enabled
     if logger and response:

ngpt/cli/modes/code.py

@@ -88,7 +88,7 @@ def code_mode(client, args, logger=None):
     original_callback = stream_callback
     first_content_received = False
     
-    def spinner_handling_callback(content):
+    def spinner_handling_callback(content, **kwargs):
         nonlocal first_content_received
         
         # On first content, stop the spinner 
@@ -102,7 +102,7 @@ def code_mode(client, args, logger=None):
         
         # Call the original callback to update the display
         if original_callback:
-            original_callback(content)
+            original_callback(content, **kwargs)
     
     # Use our wrapper callback
     if use_stream_prettify and live_display:
@@ -127,7 +127,9 @@ def code_mode(client, args, logger=None):
     
     # Stop live display if using stream-prettify
     if use_stream_prettify and live_display:
-        live_display.stop()
+        # Before stopping the live display, update with complete=True to show final formatted content
+        if stream_callback and generated_code:
+            stream_callback(generated_code, complete=True)
     
     # Log the generated code if logging is enabled
     if logger and generated_code:

ngpt/cli/modes/rewrite.py

@@ -172,7 +172,7 @@ def rewrite_mode(client, args, logger=None):
     original_callback = stream_callback
     first_content_received = False
     
-    def spinner_handling_callback(content):
+    def spinner_handling_callback(content, **kwargs):
         nonlocal first_content_received
         
         # On first content, stop the spinner 
@@ -186,7 +186,7 @@ def rewrite_mode(client, args, logger=None):
         
         # Call the original callback to update the display
         if original_callback:
-            original_callback(content)
+            original_callback(content, **kwargs)
     
     # Use our wrapper callback
     if args.stream_prettify and live_display:
@@ -210,7 +210,10 @@ def rewrite_mode(client, args, logger=None):
     
     # Stop live display if using stream-prettify
     if args.stream_prettify and live_display:
-        live_display.stop()
+        # Before stopping the live display, update with complete=True to show final formatted content
+        if stream_callback and response:
+            stream_callback(response, complete=True)
+        # No need for else clause - the complete=True will handle stopping the live display
         # Add a small delay to ensure terminal stability
         time.sleep(0.2)
         

ngpt/cli/modes/text.py

@@ -74,7 +74,7 @@ def text_mode(client, args, logger=None):
     original_callback = stream_callback
     first_content_received = False
     
-    def spinner_handling_callback(content):
+    def spinner_handling_callback(content, **kwargs):
         nonlocal first_content_received
         
         # On first content, stop the spinner 
@@ -88,7 +88,7 @@ def text_mode(client, args, logger=None):
         
         # Call the original callback to update the display
         if original_callback:
-            original_callback(content)
+            original_callback(content, **kwargs)
     
     # Use our wrapper callback
     if args.stream_prettify and live_display:
@@ -106,7 +106,9 @@ def text_mode(client, args, logger=None):
     
     # Stop live display if using stream-prettify
     if args.stream_prettify and live_display:
-        live_display.stop()
+        # Before stopping the live display, update with complete=True to show final formatted content
+        if stream_callback and response:
+            stream_callback(response, complete=True)
         
     # Log the AI response if logging is enabled
     if logger and response:

ngpt/cli/renderers.py

@@ -239,7 +239,14 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
         else:
             md_obj = Markdown("")
         
-        # Initialize the Live display
+        # Get terminal dimensions for better display
+        term_width = shutil.get_terminal_size().columns
+        term_height = shutil.get_terminal_size().lines
+        
+        # Use 2/3 of terminal height for content display (min 10 lines, max 30 lines)
+        display_height = max(10, min(30, int(term_height * 2/3)))
+        
+        # Initialize the Live display (without height parameter)
         live = Live(
             md_obj, 
             console=console, 
@@ -252,9 +259,18 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
         stop_spinner_event = None
         spinner_thread = None
         
+        # Store the full content for final display
+        full_content = ""
+        
         # Define an update function that will be called with new content
-        def update_content(content):
-            nonlocal md_obj, first_update
+        def update_content(content, **kwargs):
+            nonlocal md_obj, first_update, full_content, live, display_height
+            
+            # Store the full content for final display
+            full_content = content
+            
+            # Check if this is the final update (complete flag)
+            is_complete = kwargs.get('complete', False)
             
             # Start live display on first content
             if first_update:
@@ -266,16 +282,55 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
             
             # Update content in live display
             if is_interactive and header_text:
-                # Update the panel content
-                md_obj.renderable = Markdown(content)
+                # Update the panel content - for streaming, only show the last portion that fits in display_height
+                if not is_complete:
+                    # Calculate approximate lines needed (rough estimation)
+                    content_lines = content.count('\n') + 1
+                    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.renderable = Markdown(truncated_content)
+                    else:
+                        md_obj.renderable = Markdown(content)
+                else:
+                    md_obj.renderable = Markdown(content)
+                
                 live.update(md_obj)
             else:
-                md_obj = Markdown(content)
+                # Same logic for non-interactive mode
+                if not is_complete:
+                    # Calculate approximate lines needed
+                    content_lines = content.count('\n') + 1
+                    available_height = display_height - 1  # Account for minimal overhead
+                    
+                    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)
+                    else:
+                        md_obj = Markdown(content)
+                else:
+                    md_obj = Markdown(content)
+                    
                 live.update(md_obj)
                 
             # Ensure the display refreshes with new content
             live.refresh()
             
+            # If streaming is complete, stop the live display
+            if is_complete:
+                try:
+                    # Just stop the live display when complete - no need to redisplay content
+                    live.stop()
+                except Exception as e:
+                    # Fallback if something goes wrong
+                    sys.stderr.write(f"\nError stopping live display: {str(e)}\n")
+                    sys.stderr.flush()
+        
         # Define a function to set up and start the spinner
         def setup_spinner(stop_event, message="Waiting for AI response...", color=COLORS['cyan']):
             nonlocal stop_spinner_event, spinner_thread
@@ -297,6 +352,7 @@ def prettify_streaming_markdown(renderer='rich', is_interactive=False, header_te
             # Return a function that can be used to stop the spinner
             return lambda: stop_event.set() if stop_event else None
                 
+        # Return the necessary components for streaming to work
         return live, update_content, setup_spinner
     except Exception as e:
         print(f"{COLORS['yellow']}Error setting up Rich streaming display: {str(e)}{COLORS['reset']}")

ngpt/utils/config.py

@@ -172,18 +172,19 @@ def load_config(custom_path: Optional[str] = None, config_index: int = 0, provid
         elif len(matching_configs) > 1:
             print(f"Warning: Multiple configurations found for provider '{provider}'.")
             for i, idx in enumerate(matching_configs):
-                print(f"  [{i}] Index {idx}: {configs[idx].get('model', 'Unknown model')}")
+                print(f"  Choice [{i+1}] → Config #{idx}: {configs[idx].get('model', 'Unknown model')}")
             
             try:
-                choice = input("Choose a configuration (or press Enter for the first one): ")
-                if choice and choice.isdigit() and 0 <= int(choice) < len(matching_configs):
-                    config_index = matching_configs[int(choice)]
+                choice = input("Enter choice number (or press Enter for the first one): ")
+                if choice and choice.isdigit() and 1 <= int(choice) <= len(matching_configs):
+                    config_index = matching_configs[int(choice)-1]
+                    print(f"Selected configuration #{config_index}.")
                 else:
                     config_index = matching_configs[0]
-                    print(f"Using first matching configuration (index {config_index}).")
+                    print(f"Using first matching configuration (config #{config_index}).")
             except (ValueError, IndexError, KeyboardInterrupt):
                 config_index = matching_configs[0]
-                print(f"Using first matching configuration (index {config_index}).")
+                print(f"Using first matching configuration (config #{config_index}).")
         else:
             config_index = matching_configs[0]
     

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngpt
-Version: 3.0.6
+Version: 3.1.1
 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.0.6.dist-info → ngpt-3.1.1.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=TiGiu85Bi7tFqRuhOPUdm8LjCEGr0WbZmCYzrx8cL9g,13037
-ngpt/cli/main.py,sha256=rIGbsr1wll4fJhAmPx8C9fCJYlhKijdHqal9e3NC2I8,28908
-ngpt/cli/renderers.py,sha256=6wW3176wL7vfY_Lw2hmJz_YPQsNyuWVVZTiUYXObKVo,12313
+ngpt/cli/interactive.py,sha256=Zep4yiGRFPVrJV1zp7xB5lXg7hVhXhbRlaVA4DgRBbQ,13241
+ngpt/cli/main.py,sha256=9um40RplKHSW5UHcUUO2cwMNqkGUhfQwikI1CHHFbnk,28926
+ngpt/cli/renderers.py,sha256=ovV0IexZyrjCk8LK5ZGVvf5K7wCLco4jRhDv_tp6Kvw,15184
 ngpt/cli/ui.py,sha256=m8qtd4cCSHBGHPUlHVdBEfun1G1Se4vLKTSgnS7QOKE,6775
 ngpt/cli/modes/__init__.py,sha256=R3aO662RIzWEOvr3moTrEI8Tpg0zDDyMGGh1-OxiRgM,285
-ngpt/cli/modes/chat.py,sha256=ULSIFach3Namb3FQBhgACxhHXME-fX7bLBDum9JQfks,5699
-ngpt/cli/modes/code.py,sha256=1EeiooyNe1jvTyNu6r0J9xY34QXb2uBQKPeNca-DrRI,5734
+ngpt/cli/modes/chat.py,sha256=oibPaN4LAqrzIbWpw--ql0TwU0u_jlLCeNuxxyO7wPg,5887
+ngpt/cli/modes/code.py,sha256=AEsQKdL8mh4ImcI5R7TXzwEq_JBTkmS-L0AA_-dpHm0,5934
 ngpt/cli/modes/gitcommsg.py,sha256=rsfMoeOupmNp-5p5fsMSPAf18BbzXWq-4PF2HjEz6SY,46991
-ngpt/cli/modes/rewrite.py,sha256=CEo8vzd_sIZbzZx52kPlMpXU0-rsoQg03KqG10h_0nU,10366
+ngpt/cli/modes/rewrite.py,sha256=CrzUHxUoZc48D3ooVIvDbCjIIuERO1v-ddG3ajhETQs,10646
 ngpt/cli/modes/shell.py,sha256=QkprnOxMMTg2v5DIwcofDnnr3JPNfuk-YgSQaae5Xps,3311
-ngpt/cli/modes/text.py,sha256=z08xaW2r0XzyunUzBhwZKqnwPjyRol_CSazjLygmLRs,4514
+ngpt/cli/modes/text.py,sha256=vCwZnVxIbsTCLE8YVJIPwZsGgk7VRs8v-eeaVwCOZqI,4702
 ngpt/utils/__init__.py,sha256=E46suk2-QgYBI0Qrs6WXOajOUOebF3ETAFY7ah8DTWs,942
 ngpt/utils/cli_config.py,sha256=IlHnOEEGpLoGZInynM778wgpxLVcJ_STKWxg2Ypvir4,11196
-ngpt/utils/config.py,sha256=WYOk_b1eiYjo6hpV3pfXr2RjqhOnmKqwZwKid1T41I4,10363
+ngpt/utils/config.py,sha256=wsArA4osnh8fKqOvtsPqqBxAz3DpdjtaWUFaRtnUdyc,10452
 ngpt/utils/log.py,sha256=f1jg2iFo35PAmsarH8FVL_62plq4VXH0Mu2QiP6RJGw,15934
-ngpt-3.0.6.dist-info/METADATA,sha256=MNmwMmzgoTmKlODb95VVAASHBmB0dfjFKPaymwQoTME,28992
-ngpt-3.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngpt-3.0.6.dist-info/entry_points.txt,sha256=SqAAvLhMrsEpkIr4YFRdUeyuXQ9o0IBCeYgE6AVojoI,44
-ngpt-3.0.6.dist-info/licenses/LICENSE,sha256=mQkpWoADxbHqE0HRefYLJdm7OpdrXBr3vNv5bZ8w72M,1065
-ngpt-3.0.6.dist-info/RECORD,,
+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,,