npcsh 1.0.16__py3-none-any.whl → 1.0.18__py3-none-any.whl

npcsh/spool.py

@@ -4,174 +4,126 @@ from npcpy.data.image import capture_screenshot
 from npcpy.data.text import rag_search
 
 import os
+import sys
 from npcpy.npc_sysenv import (    
     print_and_process_stream_with_markdown,
+    get_system_message, 
+    render_markdown,
 )
-from npcpy.npc_sysenv import (
-        get_system_message, 
-        render_markdown,
-
-)
-from npcsh._state import    (
+from npcsh._state import (
     orange, 
-    NPCSH_VISION_MODEL, 
-    NPCSH_VISION_PROVIDER, 
-    NPCSH_CHAT_MODEL,
-    NPCSH_CHAT_PROVIDER,
-    NPCSH_STREAM_OUTPUT
+    ShellState,
+    execute_command,
+    get_multiline_input,
+    readline_safe_prompt,
+    setup_shell,
+    get_npc_path,
+    process_result,
+    initial_state,
 )
-from npcpy.llm_funcs import (get_llm_response,)
-
+from npcpy.llm_funcs import get_llm_response
 from npcpy.npc_compiler import NPC
 from typing import Any, List, Dict, Union
 from npcsh.yap import enter_yap_mode
-
-
+from termcolor import colored
+def print_spool_ascii():
+    spool_art = """
+ ██████╗██████╗  ████████╗   ████████╗  ██╗     
+██╔════╝██╔══██╗██╔🧵🧵🧵██ ██╔🧵🧵🧵██ ██║     
+╚█████╗ ██████╔╝██║🧵🔴🧵██ ██║🧵🔴🧵██ ██║     
+ ╚═══██╗██╔═══╝ ██║🧵🧵🧵██ ██║🧵🧵🧵██ ██║     
+██████╔╝██║     ██╚══════██ ██ ══════██ ██║
+╚═════╝ ╚═╝     ╚═████████   ███████═╝ █████████╗
+"""
+    print(spool_art)
 def enter_spool_mode(
     npc: NPC = None,    
     team = None,
     model: str = None, 
     provider: str = None,
-    vision_model:str = None,
-    vision_provider:str = None,
+    vmodel: str = None,
+    vprovider: str = None,
     attachments: List[str] = None,
     rag_similarity_threshold: float = 0.3,
     messages: List[Dict] = None,
     conversation_id: str = None,
-    stream: bool = NPCSH_STREAM_OUTPUT,
+    stream: bool = None,
     **kwargs,
 ) -> Dict:
+    print_spool_ascii()
+    # Initialize state using existing infrastructure
+    command_history, state_team, default_npc = setup_shell()
     
-    session_model = model or (npc.model if npc else NPCSH_CHAT_MODEL)
-    session_provider = provider or (npc.provider if npc else NPCSH_CHAT_PROVIDER)
-    session_vision_model = vision_model or NPCSH_VISION_MODEL
-    session_vision_provider = vision_provider or NPCSH_VISION_PROVIDER
-
-    npc_info = f" (NPC: {npc.name})" if npc else ""
-    print(f"Entering spool mode{npc_info}. Type '/sq' to exit spool mode.")
+    # Create spool state, inheriting from initial_state
+    spool_state = ShellState(
+        npc=npc or default_npc,
+        team=team or state_team,
+        messages=messages.copy() if messages else [],
+        conversation_id=conversation_id or start_new_conversation(),
+        current_path=os.getcwd(),
+        stream_output=stream if stream is not None else initial_state.stream_output,
+        attachments=None,
+    )
+    
+    # Override models/providers if specified
+    if model:
+        spool_state.chat_model = model
+    if provider:
+        spool_state.chat_provider = provider
+    if vmodel:
+        spool_state.vision_model = vmodel
+    if vprovider:
+        spool_state.vision_provider = vprovider
+
+    npc_info = f" (NPC: {spool_state.npc.name})" if spool_state.npc else ""
+    print(f"🧵 Entering spool mode{npc_info}. Type '/sq' to exit spool mode.")
     print("💡 Tip: Press Ctrl+C during streaming to interrupt and continue with a new message.")
 
-    spool_context = messages.copy() if messages else []
+    # Handle file loading
     loaded_chunks = {}
-
-    if not conversation_id:
-        conversation_id = start_new_conversation()
-
-    command_history = CommandHistory()
-    
-    files_to_load = attachments
-    if files_to_load:
-        if isinstance(files_to_load, str):
-            files_to_load = [f.strip() for f in files_to_load.split(',')]
+    if attachments:
+        if isinstance(attachments, str):
+            attachments = [f.strip() for f in attachments.split(',')]
         
-        for file_path in files_to_load:
+        for file_path in attachments:
             file_path = os.path.expanduser(file_path)
             if not os.path.exists(file_path):
-                print(f"Error: File not found at {file_path}")
+                print(colored(f"Error: File not found at {file_path}", "red"))
                 continue
             try:
                 chunks = load_file_contents(file_path)
                 loaded_chunks[file_path] = chunks
-                print(f"Loaded {len(chunks)} chunks from: {file_path}")
+                print(colored(f"Loaded {len(chunks)} chunks from: {file_path}", "green"))
             except Exception as e:
-                print(f"Error loading {file_path}: {str(e)}")
-
-    system_message = get_system_message(npc) if npc else "You are a helpful assistant."
-    if not spool_context or spool_context[0].get("role") != "system":
-        spool_context.insert(0, {"role": "system", "content": system_message})
-
-    if loaded_chunks:
-        initial_file_context = "\n\n--- The user has loaded the following files for this session ---\n"
-        for filename, chunks in loaded_chunks.items():
-            initial_file_context += f"\n\n--- Start of content from {filename} ---\n"
-            initial_file_context += "\n".join(chunks)
-            initial_file_context += f"\n--- End of content from {filename} ---\n"
-
-    def _handle_llm_interaction(
-        prompt, 
-        current_context, 
-        model_to_use, 
-        provider_to_use, 
-        images_to_use=None
-    ):
-        
-        current_context.append({"role": "user", "content": prompt})
+                print(colored(f"Error loading {file_path}: {str(e)}", "red"))
 
-        save_conversation_message(
-            command_history, 
-            conversation_id, 
-            "user", 
-            prompt,
-            wd=os.getcwd(), 
-            model=model_to_use, 
-            provider=provider_to_use,
-            npc=npc.name if npc else None, 
-            team=team.name if team else None,
-        )
-        
-        assistant_reply = ""
-        
-        try:
-            response = get_llm_response(
-                prompt,
-                model=model_to_use, 
-                provider=provider_to_use,
-                messages=current_context, 
-                images=images_to_use, 
-                stream=stream, 
-                npc=npc
-            )
-            assistant_reply = response.get('response')
-
-            if stream:
-                print(orange(f'{npc.name if npc else "🧵"}....> '), end='', flush=True)
-                
-                # The streaming function now handles KeyboardInterrupt internally
-                assistant_reply = print_and_process_stream_with_markdown(
-                    assistant_reply, 
-                    model=model_to_use, 
-                    provider=provider_to_use
-                )
-            else:
-                render_markdown(assistant_reply)
-        
-        except Exception as e:
-            assistant_reply = f"[Error during response generation: {str(e)}]"
-            print(f"\n❌ Error: {str(e)}")
-        
-        current_context.append({"role": "assistant", "content": assistant_reply})
-        
-        if assistant_reply and assistant_reply.count("```") % 2 != 0:
-            assistant_reply += "```"
-
-        save_conversation_message(
-            command_history, 
-            conversation_id, 
-            "assistant", 
-            assistant_reply,
-            wd=os.getcwd(), 
-            model=model_to_use, 
-            provider=provider_to_use,
-            npc=npc.name if npc else None, 
-            team=team.name if team else None,
-        )
-        
-        return current_context
+    # Initialize context with system message if needed
+    if not spool_state.messages or spool_state.messages[0].get("role") != "system":
+        system_message = get_system_message(spool_state.npc) if spool_state.npc else "You are a helpful assistant."
+        spool_state.messages.insert(0, {"role": "system", "content": system_message})
 
     while True:
         try:
-            prompt_text = orange(f"🧵:{npc.name if npc else 'chat'}:{session_model}> ")
-            user_input = input(prompt_text).strip()
+            # Use consistent prompt styling with npcsh
+            npc_name = spool_state.npc.name if spool_state.npc else "chat"
+            display_model = spool_state.npc.model if spool_state.npc and spool_state.npc.model else spool_state.chat_model
+            
+            prompt_str = f"{orange(npc_name)}:{display_model}🧵> "
+            prompt = readline_safe_prompt(prompt_str)
+            user_input = get_multiline_input(prompt).strip()
 
             if not user_input:
                 continue
+                
             if user_input.lower() == "/sq":
                 print("Exiting spool mode.")
                 break
+                
             if user_input.lower() == "/yap":
-                spool_context = enter_yap_mode(spool_context, npc)
+                spool_state.messages = enter_yap_mode(spool_state.messages, spool_state.npc)
                 continue
 
+            # Handle vision commands
             if user_input.startswith("/ots"):
                 command_parts = user_input.split()
                 image_paths = []
@@ -179,26 +131,42 @@ def enter_spool_mode(
                 if len(command_parts) > 1:
                     for img_path in command_parts[1:]:
                         full_path = os.path.expanduser(img_path)
-                        if os.path.exists(full_path): image_paths.append(full_path)
-                        else: print(f"Error: Image file not found at {full_path}")
+                        if os.path.exists(full_path): 
+                            image_paths.append(full_path)
+                        else: 
+                            print(colored(f"Error: Image file not found at {full_path}", "red"))
                 else:
                     screenshot = capture_screenshot()
                     if screenshot and "file_path" in screenshot:
                         image_paths.append(screenshot["file_path"])
-                        print(f"Screenshot captured: {screenshot['filename']}")
+                        print(colored(f"Screenshot captured: {screenshot['filename']}", "green"))
                 
-                if not image_paths: continue
+                if not image_paths: 
+                    continue
                 
                 vision_prompt = input("Prompt for image(s) (or press Enter): ").strip() or "Describe these images."
-                spool_context = _handle_llm_interaction(
-                    vision_prompt, 
-                    spool_context, 
-                    session_vision_model, 
-                    session_vision_provider, 
-                    images_to_use=image_paths
+                
+                # Use vision models for image processing
+                response = get_llm_response(
+                    vision_prompt,
+                    model=spool_state.vision_model,
+                    provider=spool_state.vision_provider,
+                    messages=spool_state.messages,
+                    images=image_paths,
+                    stream=spool_state.stream_output,
+                    npc=spool_state.npc, 
+                    **kwargs
+                    
                 )
+                
+                spool_state.messages = response.get('messages', spool_state.messages)
+                output = response.get('response')
+                
+                # Process and display the result
+                process_result(vision_prompt, spool_state, {'output': output}, command_history)
                 continue
             
+            # Handle RAG context if files are loaded
             current_prompt = user_input
             if loaded_chunks:
                 context_content = ""
@@ -214,24 +182,32 @@ def enter_spool_mode(
                 
                 if context_content:
                     current_prompt += f"\n\n--- Relevant context from loaded files ---\n{context_content}"
-                print(f'prepped  context_content : {context_content}')
             
-            spool_context = _handle_llm_interaction(
-                current_prompt, 
-                spool_context, 
-                session_model, 
-                session_provider
+            # Use standard LLM processing
+            response = get_llm_response(
+                current_prompt,
+                model=spool_state.npc.model if spool_state.npc and spool_state.npc.model else spool_state.chat_model,
+                provider=spool_state.npc.provider if spool_state.npc and spool_state.npc.provider else spool_state.chat_provider,
+                messages=spool_state.messages,
+                stream=spool_state.stream_output,
+                npc=spool_state.npc, 
+                **kwargs
             )
+            
+            spool_state.messages = response.get('messages', spool_state.messages)
+            output = response.get('response')
+            
+            # Use existing result processing
+            process_result(current_prompt, spool_state, {'output': output}, command_history)
 
         except (EOFError,):
             print("\nExiting spool mode.")
             break
         except KeyboardInterrupt:
-            # This handles Ctrl+C at the input prompt (not during streaming)
             print("\n🔄 Use '/sq' to exit or continue with a new message.")
             continue
 
-    return {"messages": spool_context, "output": "Exited spool mode."}
+    return {"messages": spool_state.messages, "output": "Exited spool mode."}
 
 
 def main():
@@ -241,14 +217,32 @@ def main():
     parser.add_argument("--provider", help="Provider to use")
     parser.add_argument("--attachments", nargs="*", help="Files to load into context")
     parser.add_argument("--stream", default="true", help="Use streaming mode")
-    parser.add_argument("--npc", type=str, default=os.path.expanduser('~/.npcsh/npc_team/sibiji.npc'), help="Path to NPC file")
+    parser.add_argument("--npc", type=str, help="NPC name or path to NPC file", default='sibiji',)
     
     args = parser.parse_args()
     
-    npc = NPC(file=args.npc) if os.path.exists(os.path.expanduser(args.npc)) else None
+    # Use existing infrastructure to get NPC
+    command_history, team, default_npc = setup_shell()
+    
+    npc = None
+    if args.npc:
+        if os.path.exists(os.path.expanduser(args.npc)):
+            npc = NPC(file=args.npc)
+        elif team and args.npc in team.npcs:
+            npc = team.npcs[args.npc]
+        else:
+            try:
+                npc_path = get_npc_path(args.npc, command_history.db_path)
+                npc = NPC(file=npc_path)
+            except ValueError:
+                print(colored(f"NPC '{args.npc}' not found. Using default.", "yellow"))
+                npc = default_npc
+    else:
+        npc = default_npc
 
     enter_spool_mode(
         npc=npc,
+        team=team,
         model=args.model,
         provider=args.provider,
         attachments=args.attachments,